diff --git a/CHANGELOG b/CHANGELOG
index a6b54eec8..fecb57d39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where bold/strong text was converted to upper-case on html-to-text conversion (6758)
 - Fix bug in rcube_utils::parse_hosts() where %t, %d, %z could return only tld (#6746)
 - Fix bug where Next/Prev button in mail view didn't work with multi-folder search result (#6793)
+- Fix bug where selection of columns on messages list wasn't working
 
 RELEASE 1.3.9
 -------------
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 215d09e73..ab0a1e5dd 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -40,6 +40,14 @@ if ($sort = rcube_utils::get_input_value('_sort', rcube_utils::INPUT_GET)) {
     }
 }
 
+// is there a set of columns for this request?
+if ($cols = rcube_utils::get_input_value('_cols', rcube_utils::INPUT_GET)) {
+    $_SESSION['list_attrib']['columns'] = explode(',', $cols);
+    if (!in_array('list_cols', $dont_override)) {
+        $save_arr['list_cols'] = explode(',', $cols);
+    }
+}
+
 // register layout change
 if ($layout = rcube_utils::get_input_value('_layout', rcube_utils::INPUT_GET)) {
     $OUTPUT->set_env('layout', $layout);
@@ -47,13 +55,6 @@ if ($layout = rcube_utils::get_input_value('_layout', rcube_utils::INPUT_GET)) {
     // force header replace on layout change
     $cols = $_SESSION['list_attrib']['columns'];
 }
-// is there a set of columns for this request?
-else if ($cols = rcube_utils::get_input_value('_cols', rcube_utils::INPUT_GET)) {
-    $_SESSION['list_attrib']['columns'] = explode(',', $cols);
-    if (!in_array('list_cols', $dont_override)) {
-        $save_arr['list_cols'] = explode(',', $cols);
-    }
-}
 
 if (!empty($save_arr)) {
     $RCMAIL->user->save_prefs($save_arr);