Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2014-03-06 c70f26776ef2a539834caa04ca86a0f71ee80cee

 program/steps/mail/func.inc

@@ -37,7 +37,7 @@

$a_threading        = $RCMAIL->config->get('message_threading', array());
$message_sort_col   = $RCMAIL->config->get('message_sort_col');
$message_sort_order = $RCMAIL->config->get('message_sort_col');
$message_sort_order = $RCMAIL->config->get('message_sort_order');

// set default sort col/order to session
if (!isset($_SESSION['sort_col'])) {