sync with 0.8.11cvs43

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index d72dfaab2b4bdef1a78a82fadcef867148b436f2..ab542d5129558c63545308e77ed56af94a392a18 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1139,7 +1139,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                 item->sort_type == SORT_DESCENDING
                                 ? 0 : GTK_CLIST(ctree)->rows - 1);
                }
-               if (prefs_common.open_unread_on_enter) {
+               if (prefs_common.open_unread_on_enter ||
+                   prefs_common.always_show_msg) {
                        summary_unlock(summaryview);
                        summary_select_node(summaryview, node, TRUE, TRUE);
                        summary_lock(summaryview);
@@ -4671,7 +4672,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        if (summaryview->display_msg ||
-           (prefs_common.show_msg_with_cursor_key &&
+           (prefs_common.always_show_msg &&
             messageview_is_visible(summaryview->messageview))) {
                summaryview->display_msg = FALSE;
                if (summaryview->displayed != row) {