Fix Reply from mainwindow menu and toolbar when mainwindow's
[claws.git] / src / summaryview.c
index 268047f4b3e2e19d8fc643158a1c382dcfcd59fa..8fe04840faea08d0327ff72ae97902e750b7fbfd 100644 (file)
@@ -163,7 +163,8 @@ static void summary_update_status   (SummaryView            *summaryview);
 static void summary_status_show                (SummaryView            *summaryview);
 static void summary_set_column_titles  (SummaryView            *summaryview);
 static void summary_set_ctree_from_list        (SummaryView            *summaryview,
-                                        GSList                 *mlist);
+                                        GSList                 *mlist,
+                                        guint                  selected_msgnum);
 static inline void summary_set_header  (SummaryView            *summaryview,
                                         gchar                  *text[],
                                         MsgInfo                *msginfo);
@@ -192,6 +193,8 @@ static void summary_mark_row_as_read        (SummaryView            *summaryview,
                                         GtkCMCTreeNode         *row);
 static void summary_mark_row_as_unread (SummaryView            *summaryview,
                                         GtkCMCTreeNode         *row);
+static gboolean summary_mark_all_read_confirm(gboolean ask_if_needed);
+static gboolean summary_mark_all_unread_confirm(gboolean ask_if_needed);
 static void summary_delete_row         (SummaryView            *summaryview,
                                         GtkCMCTreeNode         *row);
 static void summary_unmark_row         (SummaryView            *summaryview,
@@ -415,16 +418,21 @@ GtkTargetEntry summary_drag_types[3] =
        {"claws-mail/msg-path-list", 0, TARGET_MAIL_CM_PATH_LIST},
 };
 
-#define DO_ACTION(name, act) {                                         \
-       if(!strcmp(name, a_name)) {                                     \
-               act;                                                    \
-       }                                                               \
-}
+static void summary_reply_cb(GtkAction *gaction, gpointer data);
 
+/* Only submenus and specifically-handled menu entries here */
 static GtkActionEntry summary_popup_entries[] =
 {
        {"SummaryViewPopup",                      NULL, "SummaryViewPopup", NULL, NULL, NULL },
+       {"SummaryViewPopup/Reply",                NULL, N_("_Reply"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_REPLY */
        {"SummaryViewPopup/ReplyTo",              NULL, N_("Repl_y to"), NULL, NULL, NULL },
+       {"SummaryViewPopup/ReplyTo/All",          NULL, N_("_All"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_REPLY_TO_ALL */
+       {"SummaryViewPopup/ReplyTo/Sender",       NULL, N_("_Sender"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_REPLY_TO_SENDER */
+       {"SummaryViewPopup/ReplyTo/List",         NULL, N_("Mailing _list"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_REPLY_TO_LIST */
+
+       {"SummaryViewPopup/Forward",              NULL, N_("_Forward"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_FORWARD_INLINE */
+       {"SummaryViewPopup/ForwardAtt",           NULL, N_("For_ward as attachment"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_FORWARD_AS_ATTACH */
+       {"SummaryViewPopup/Redirect",             NULL, N_("Redirec_t"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_REDIRECT */
        {"SummaryViewPopup/Mark",                 NULL, N_("_Mark"), NULL, NULL, NULL },
        {"SummaryViewPopup/ColorLabel",           NULL, N_("Color la_bel"), NULL, NULL, NULL },
        {"SummaryViewPopup/Tags",                 NULL, N_("Ta_gs"), NULL, NULL, NULL },
@@ -553,7 +561,7 @@ SummaryView *summary_create(MainWindow *mainwin)
        toggle_search = gtk_toggle_button_new();
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
                                     prefs_common.show_searchbar);
-       gtkut_widget_set_can_focus(toggle_search, FALSE);
+       gtk_widget_set_can_focus(toggle_search, FALSE);
        gtk_widget_show(toggle_search);
 
        CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
@@ -656,17 +664,21 @@ SummaryView *summary_create(MainWindow *mainwin)
        gtk_action_group_add_actions(mainwin->action_group, summary_popup_entries,
                        G_N_ELEMENTS(summary_popup_entries), (gpointer)summaryview);
 
+       summaryview->ui_manager = gtk_ui_manager_new();
+       summaryview->action_group = cm_menu_create_action_group_full(summaryview->ui_manager,"Menu", summary_popup_entries,
+                       G_N_ELEMENTS(summary_popup_entries), (gpointer)summaryview);
+
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus", "SummaryViewPopup", "SummaryViewPopup", GTK_UI_MANAGER_MENU)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Reply", "SummaryViewPopup/Reply", GTK_UI_MANAGER_MENUITEM)
 #ifndef GENERIC_UMPC
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ReplyTo", "SummaryViewPopup/ReplyTo", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
 #endif
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Forward", "Message/Forward", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Forward", "SummaryViewPopup/Forward", GTK_UI_MANAGER_MENUITEM)
 #ifndef GENERIC_UMPC
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ForwardAtt", "Message/ForwardAtt", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Redirect", "Message/Redirect", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ForwardAtt", "SummaryViewPopup/ForwardAtt", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Redirect", "SummaryViewPopup/Redirect", GTK_UI_MANAGER_MENUITEM)
 #endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator2", "Message/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Move", "Message/Move", GTK_UI_MANAGER_MENUITEM)
@@ -698,9 +710,9 @@ SummaryView *summary_create(MainWindow *mainwin)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator6", "File/---", GTK_UI_MANAGER_SEPARATOR)
 
        /* submenus - replyto */
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "All", "Message/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "Sender", "Message/ReplyTo/Sender", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "MailingList", "Message/ReplyTo/List", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "All", "SummaryViewPopup/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "Sender", "SummaryViewPopup/ReplyTo/Sender", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "MailingList", "SummaryViewPopup/ReplyTo/List", GTK_UI_MANAGER_MENUITEM)
 
        /* submenus - mark */
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
@@ -885,10 +897,10 @@ static void summary_set_fonts(SummaryView *summaryview)
                        }
                }
                bold_marked_style = gtk_style_copy(bold_style);
-               bold_marked_style->fg[GTK_STATE_NORMAL] =
+               bold_marked_style->text[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
                bold_deleted_style = gtk_style_copy(bold_style);
-               bold_deleted_style->fg[GTK_STATE_NORMAL] =
+               bold_deleted_style->text[GTK_STATE_NORMAL] =
                        summaryview->color_dim;
        }
 
@@ -1278,7 +1290,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
                val = alertpanel(_("Process mark"),
                                 _("Some marks are left. Process them?"),
-                                GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL);
+                                GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL, ALERTFOCUS_FIRST);
                if (G_ALERTALTERNATE == val) {
                        summary_unlock(summaryview);
                        summary_execute(summaryview);
@@ -1447,7 +1459,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        /* set ctree and hash table from the msginfo list, and
           create the thread */
-       summary_set_ctree_from_list(summaryview, mlist);
+       summary_set_ctree_from_list(summaryview, mlist, selected_msgnum);
 
        g_slist_free(mlist);
 
@@ -1459,7 +1471,14 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        if (!summaryview->displayed)
                                messageview_clear(summaryview->messageview);
                        summary_unlock(summaryview);
-                       summary_select_by_msgnum(summaryview, selected_msgnum);
+
+                       if (quicksearch_is_running(summaryview->quicksearch))
+                               summary_select_by_msgnum(summaryview, selected_msgnum,
+                                               OPEN_SELECTED_ON_SEARCH_RESULTS);
+                       else
+                               summary_select_by_msgnum(summaryview, selected_msgnum,
+                                               OPEN_SELECTED_ON_FOLDER_OPEN);
+
                        summary_lock(summaryview);
                        if (!summaryview->selected) {
                                /* no selected message - select first unread
@@ -1472,7 +1491,14 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                                 item->sort_type == SORT_DESCENDING
                                                 ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                                summary_unlock(summaryview);
-                               summary_select_node(summaryview, node, 0);
+
+                               if (quicksearch_is_running(summaryview->quicksearch))
+                                       summary_select_node(summaryview, node,
+                                                       OPEN_SELECTED_ON_SEARCH_RESULTS);
+                               else
+                                       summary_select_node(summaryview, node,
+                                                       OPEN_SELECTED_ON_FOLDER_OPEN);
+
                                summary_lock(summaryview);
                        }
                } else {
@@ -1482,7 +1508,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                        (ctree,
                                         item->sort_type == SORT_DESCENDING
                                         ? 0 : GTK_CMCLIST(ctree)->rows - 1);
-                       summary_select_node(summaryview, node, -1);
+                       summary_select_node(summaryview, node, OPEN_SELECTED_ON_SEARCH_RESULTS);
                }
        } else {
                /* backward compat */
@@ -1503,16 +1529,52 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        EntryAction act = prefs_common.summary_select_prio[i];
                        
                        switch(act) {
-                       case ACTION_MARKED:
-                               node = summary_find_next_flagged_msg(summaryview, NULL,
+                       case ACTION_OLDEST_MARKED:
+                               if (summaryview->sort_type == SORT_ASCENDING)
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                            MSG_MARKED, FALSE);
+                               else
+                                       node = summary_find_prev_flagged_msg(summaryview, NULL,
                                             MSG_MARKED, FALSE);
                                break;
-                       case ACTION_NEW:
-                               node = summary_find_next_flagged_msg(summaryview, NULL,
+                       case ACTION_NEWEST_MARKED:
+                               if (summaryview->sort_type == SORT_ASCENDING)
+                                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                            MSG_MARKED, FALSE);
+                               else
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                            MSG_MARKED, FALSE);
+                               break;
+                       case ACTION_OLDEST_NEW:
+                               if (summaryview->sort_type == SORT_ASCENDING)
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                            MSG_NEW, FALSE);
+                               else
+                                       node = summary_find_prev_flagged_msg(summaryview, NULL,
                                             MSG_NEW, FALSE);
                                break;
-                       case ACTION_UNREAD:
-                               node = summary_find_next_flagged_msg(summaryview, NULL,
+                       case ACTION_NEWEST_NEW:
+                               if (summaryview->sort_type == SORT_ASCENDING)
+                                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                            MSG_NEW, FALSE);
+                               else
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                            MSG_NEW, FALSE);
+                               break;
+                       case ACTION_OLDEST_UNREAD:
+                               if (summaryview->sort_type == SORT_ASCENDING)
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                            MSG_UNREAD, FALSE);
+                               else
+                                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                            MSG_UNREAD, FALSE);
+                               break;
+                       case ACTION_NEWEST_UNREAD:
+                               if (summaryview->sort_type == SORT_ASCENDING)
+                                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                            MSG_UNREAD, FALSE);
+                               else
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
                                             MSG_UNREAD, FALSE);
                                break;
                        case ACTION_LAST_OPENED:
@@ -1521,7 +1583,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                                        summaryview->folder_item->last_seen);
                                }
                                break;
-                       case ACTION_LAST_LIST:
+                       case ACTION_NEWEST_LIST:
                                if (GTK_CMCLIST(ctree)->row_list != NULL) {
                                        node = gtk_cmctree_node_nth
                                                (ctree,
@@ -1529,7 +1591,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                                 ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                                }
                                break;
-                       case ACTION_FIRST_LIST:
+                       case ACTION_OLDEST_LIST:
                                if (GTK_CMCLIST(ctree)->row_list != NULL) {
                                        node = gtk_cmctree_node_nth
                                                (ctree,
@@ -1553,7 +1615,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                if (node) {
                        gint open_selected = -1;
                        if (!is_refresh) {
-                               if (prefs_common.open_selected_on_folder_open)
+                               if (OPEN_SELECTED_ON_FOLDER_OPEN)
                                        open_selected = 1;
                                else
                                        open_selected = 0;
@@ -1715,7 +1777,11 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
        gboolean sensitive;
        gint i;
 
+#ifndef GENERIC_UMPC
 #define N_ENTRIES 39
+#else
+#define N_ENTRIES 28
+#endif
        static struct {
                const gchar *entry;
                SensitiveCondMask cond;
@@ -1820,7 +1886,7 @@ void summary_select_prev(SummaryView *summaryview)
                node = gtkut_ctree_node_next(ctree, node);
 
        if (node && node != summaryview->selected)
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
 void summary_select_next(SummaryView *summaryview)
@@ -1834,7 +1900,7 @@ void summary_select_next(SummaryView *summaryview)
                node = gtkut_ctree_node_prev(ctree, node);
 
        if (node && node != summaryview->selected)
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
 void summary_select_prev_unread(SummaryView *summaryview)
@@ -1856,7 +1922,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                                                   "Search from the end?"),
-                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTALTERNATE;
@@ -1880,7 +1946,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
        if (!node)
                alertpanel_notice(_("No unread messages."));
        else
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
 void summary_select_next_unread(SummaryView *summaryview)
@@ -1895,7 +1961,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                        (summaryview, node, MSG_UNREAD, TRUE);
        
        if (node)
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
        else {
                AlertValue val = 0;
 
@@ -1904,7 +1970,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                                                   "Go to next folder?"),
-                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTALTERNATE;
@@ -1941,7 +2007,7 @@ void summary_select_prev_new(SummaryView *summaryview)
                                val = alertpanel(_("No more new messages"),
                                                 _("No new message found. "
                                                   "Search from the end?"),
-                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTALTERNATE;
@@ -1965,7 +2031,7 @@ void summary_select_prev_new(SummaryView *summaryview)
        if (!node)
                alertpanel_notice(_("No new messages."));
        else
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
 void summary_select_next_new(SummaryView *summaryview)
@@ -1980,7 +2046,7 @@ void summary_select_next_new(SummaryView *summaryview)
                        (summaryview, node, MSG_NEW, TRUE);
        
        if (node)
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
        else {
                AlertValue val = 0;
 
@@ -1989,7 +2055,7 @@ void summary_select_next_new(SummaryView *summaryview)
                                val = alertpanel(_("No more new messages"),
                                                 _("No new message found. "
                                                   "Go to next folder?"),
-                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTALTERNATE;
@@ -2023,7 +2089,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
                                   "Search from the end?"),
-                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                if (val != G_ALERTALTERNATE) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_MARKED, TRUE);
@@ -2032,7 +2098,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
        if (!node)
                alertpanel_notice(_("No marked messages."));
        else
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
 void summary_select_next_marked(SummaryView *summaryview)
@@ -2047,7 +2113,7 @@ void summary_select_next_marked(SummaryView *summaryview)
                        (summaryview, node, MSG_MARKED, TRUE);
        
        if (node)
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
        else {
                AlertValue val = 0;
 
@@ -2056,7 +2122,7 @@ void summary_select_next_marked(SummaryView *summaryview)
                                val = alertpanel(_("No more marked messages"),
                                                 _("No marked message found. "
                                                   "Go to next folder?"),
-                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTALTERNATE;
@@ -2090,7 +2156,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
                                   "Search from the end?"),
-                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                if (val != G_ALERTALTERNATE) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_CLABEL_FLAG_MASK, TRUE);
@@ -2099,7 +2165,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
        if (!node)
                alertpanel_notice(_("No labeled messages."));
        else
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
 void summary_select_next_labeled(SummaryView *summaryview)
@@ -2119,7 +2185,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
                                   "Search from the beginning?"),
-                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                if (val != G_ALERTALTERNATE) return;
                if (summaryview->sort_type == SORT_ASCENDING)
                        node = summary_find_next_flagged_msg(summaryview, NULL,
@@ -2132,7 +2198,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
        if (!node)
                alertpanel_notice(_("No labeled messages."));
        else
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
 void summary_select_parent(SummaryView *summaryview)
@@ -2142,23 +2208,16 @@ void summary_select_parent(SummaryView *summaryview)
        if (summaryview->selected)
                node = GTK_CMCTREE_ROW(summaryview->selected)->parent;
        if (node)
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_PREVNEXT);
 }
 
-void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
+void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum,
+               gboolean show)
 {
        GtkCMCTreeNode *node;
 
        node = summary_find_msg_by_msgnum(summaryview, msgnum);
-       summary_select_node(summaryview, node, 0);
-}
-
-void summary_display_by_msgnum(SummaryView *summaryview, guint msgnum)
-{
-       GtkCMCTreeNode *node;
-
-       node = summary_find_msg_by_msgnum(summaryview, msgnum);
-       summary_select_node(summaryview, node, 1);
+       summary_select_node(summaryview, node, show);
 }
 
 void summary_select_by_msg_list(SummaryView    *summaryview, GSList *msginfos)
@@ -2175,7 +2234,8 @@ void summary_select_by_msg_list(SummaryView       *summaryview, GSList *msginfos)
        for(walk = msgnum_list; walk; walk = walk->next) {
                GtkCMCTreeNode *node;
                node = summary_find_msg_by_msgnum(summaryview, GPOINTER_TO_UINT(walk->data));
-               gtk_cmctree_select(ctree, node);
+               if (node != NULL)
+                       gtk_cmctree_select(ctree, node);
        }
        END_LONG_OPERATION(summaryview);
        g_slist_free(msgnum_list);
@@ -2210,24 +2270,21 @@ static gboolean summary_select_retry(void *data)
  * summary_select_node:
  * @summaryview: Summary view.
  * @node: Summary tree node.
- * @force_display: -1 unset, 0 don't show the msg, 1 show the msg.
+ * @display_msg: whether to also display the message
  *
  * Select @node (bringing it into view by scrolling and expanding its
- * thread, if necessary) and unselect all others.  If @force_display is
- * 1, display the corresponding message in the message view, if
- * @force_display is -1, obey prefs_common.always_show_msg.
+ * thread, if necessary) and unselect all others.
  **/
 
 void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
-                        gint force_display)
+                        gboolean display_msg)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-       gboolean display_msg;
-       
-       display_msg = force_display > -1? force_display :
-               (prefs_common.always_show_msg == OPENMSG_YES) ||
-               ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
-                               messageview_is_visible(summaryview->messageview)));
+
+       /* If msgview is hidden, we never want to automatically display
+        * a selected message, since that would unhide the msgview. */
+       if (!messageview_is_visible(summaryview->messageview))
+               display_msg = FALSE;
 
        if (summary_is_locked(summaryview)
        && !GTK_SCTREE(ctree)->selecting_range
@@ -3074,6 +3131,35 @@ static gboolean summary_thread_is_read(GNode *gnode)
     return all_read;
 }
 
+typedef struct  _ThreadSelectedData {
+       guint msgnum;
+       gboolean is_selected;
+} ThreadSelectedData;
+
+static gboolean summary_update_is_selected(GNode *gnode, gpointer data)
+{
+       ThreadSelectedData *selected = (ThreadSelectedData *)data;
+       MsgInfo *msginfo = (MsgInfo *)gnode->data;
+
+       if (msginfo->msgnum == selected->msgnum) {
+               selected->is_selected = TRUE;
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+static gboolean summary_thread_is_selected(GNode *gnode, guint selected_msgnum)
+{
+       ThreadSelectedData selected;
+
+       selected.msgnum = selected_msgnum;
+       selected.is_selected = FALSE;
+       g_node_traverse(gnode, G_IN_ORDER, G_TRAVERSE_ALL, -1,
+                       summary_update_is_selected, &selected);
+       return selected.is_selected;
+}
+
 static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode *gnode,
                                   GtkCMCTreeNode *cnode, gpointer data)
 {
@@ -3125,7 +3211,7 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
 }
 
 static void summary_set_ctree_from_list(SummaryView *summaryview,
-                                       GSList *mlist)
+                                       GSList *mlist, guint selected_msgnum)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
@@ -3168,14 +3254,14 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                
                for (gnode = root->children; gnode != NULL;
                     gnode = gnode->next) {
-            if (!summaryview->folder_item->hide_read_threads ||
-                    !summary_thread_is_read(gnode))
-            {
-                summary_find_thread_age(gnode);
-                node = gtk_sctree_insert_gnode
-                    (ctree, NULL, node, gnode,
-                     summary_insert_gnode_func, summaryview);
-            }
+                       if (!summaryview->folder_item->hide_read_threads ||
+                           !summary_thread_is_read(gnode) ||
+                           summary_thread_is_selected(gnode, selected_msgnum)) {
+                               summary_find_thread_age(gnode);
+                               node = gtk_sctree_insert_gnode
+                                       (ctree, NULL, node, gnode,
+                                        summary_insert_gnode_func, summaryview);
+                       }
                }
 
                g_node_destroy(root);
@@ -3288,7 +3374,8 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 {
        static gchar date_modified[80];
        static gchar col_score[11];
-       static gchar buf[BUFFSIZE], tmp1[BUFFSIZE], tmp2[BUFFSIZE], tmp3[BUFFSIZE];
+       static gchar from_buf[BUFFSIZE], to_buf[BUFFSIZE];
+       static gchar tmp1[BUFFSIZE], tmp2[BUFFSIZE], tmp3[BUFFSIZE];
        gint *col_pos = summaryview->col_pos;
        gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
        gboolean should_swap = FALSE;
@@ -3378,9 +3465,9 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        } else {
                gchar *tmp = summary_complete_address(msginfo->from);
                if (tmp) {
-                       strncpy2(buf, tmp, sizeof(buf));
+                       strncpy2(from_buf, tmp, sizeof(from_buf));
                        g_free(tmp);
-                       from_text = buf;
+                       from_text = from_buf;
                } else {
                        if (prefs_common.summary_from_show == SHOW_NAME)
                                from_text = msginfo->fromname;
@@ -3398,20 +3485,38 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        
        to_text = msginfo->to ? msginfo->to : 
                   (msginfo->cc ? msginfo->cc :
-                    (msginfo->newsgroups ? msginfo->newsgroups : _("(No Recipient)")
+                    (msginfo->newsgroups ? msginfo->newsgroups : NULL
                     )
                   );
 
+       if (!to_text)
+               to_text = _("(No Recipient)");
+       else {
+               if (prefs_common.summary_from_show == SHOW_NAME) {
+                       gchar *tmp = procheader_get_fromname(to_text);
+                       /* need to keep to_text pointing to stack, so heap-allocated
+                        * string from procheader_get_fromname() will be copied to to_buf */
+                       if (tmp != NULL) {
+                               strncpy2(to_buf, tmp, sizeof(to_buf));
+                               g_free(tmp);
+                               to_text = to_buf;
+                       }
+               } else if (prefs_common.summary_from_show == SHOW_ADDR)
+                       extract_address(to_text);
+       }
+
        text[col_pos[S_COL_TO]] = to_text;
        if (!should_swap) {
                text[col_pos[S_COL_FROM]] = from_text;
        } else {
                if (prefs_common.use_addr_book) {
                        gchar *tmp = summary_complete_address(to_text);
+                       /* need to keep to_text pointing to stack, so heap-allocated
+                        * string from summary_complete_address() will be copied to to_buf */
                        if (tmp) {
-                               strncpy2(buf, tmp, sizeof(buf));
+                               strncpy2(to_buf, tmp, sizeof(to_buf));
                                g_free(tmp);
-                               to_text = buf;
+                               to_text = to_buf;
                        } else {
                                to_text = to_text ? to_text : _("(No From)");
                        }
@@ -4059,6 +4164,11 @@ void summary_mark_as_read(SummaryView *summaryview)
 
        if (summary_is_locked(summaryview))
                return;
+
+       if ((summaryview->folder_item->total_msgs == (gint)g_list_length(GTK_CMCLIST(ctree)->selection))
+                && !summary_mark_all_read_confirm(TRUE))
+               return;
+
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
@@ -4078,6 +4188,11 @@ void summary_mark_as_unread(SummaryView *summaryview)
 
        if (summary_is_locked(summaryview))
                return;
+
+       if ((summaryview->folder_item->total_msgs == (gint)g_list_length(GTK_CMCLIST(ctree)->selection))
+                && !summary_mark_all_unread_confirm(TRUE))
+               return;
+
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
@@ -4123,81 +4238,95 @@ void summary_msgs_unlock(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
-void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
+static gboolean summary_mark_all_read_confirm(gboolean ask_if_needed)
 {
-       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-       GtkCMCTreeNode *node;
-       AlertValue val;
-       gboolean froze = FALSE;
-
        /* ask_if_needed is FALSE when user-asking is performed by caller,
           commonly when the caller is a mark-as-read-recursive func */
        if (ask_if_needed && prefs_common.ask_mark_all_read) {
-               val = alertpanel_full(_("Mark all as read"),
+               AlertValue val = alertpanel_full(_("Mark all as read"),
                          _("Do you really want to mark all mails in this folder as read?"),
-                         GTK_STOCK_NO, GTK_STOCK_YES, NULL,
-                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+                         GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+                         TRUE, NULL, ALERT_QUESTION);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
-                       return;
+                       return FALSE;
                else if (val & G_ALERTDISABLE)
                        prefs_common.ask_mark_all_read = FALSE;
        }
-       
+       return TRUE;
+}
+
+void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
+       gboolean froze = FALSE;
+
        if (summary_is_locked(summaryview))
                return;
+
+       if (!summary_mark_all_read_confirm(ask_if_needed))
+               return;
+
        START_LONG_OPERATION(summaryview, TRUE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
-            node = gtkut_ctree_node_next(ctree, node))
+               node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
        folder_item_set_batch(summaryview->folder_item, FALSE);
        for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
-            node = gtkut_ctree_node_next(ctree, node)) {
+               node = gtkut_ctree_node_next(ctree, node)) {
                if (!GTK_CMCTREE_ROW(node)->expanded)
                        summary_set_row_marks(summaryview, node);
        }
        END_LONG_OPERATION(summaryview);
-       
+
        summary_status_show(summaryview);
 }
 
-void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
+static gboolean summary_mark_all_unread_confirm(gboolean ask_if_needed)
 {
-       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-       GtkCMCTreeNode *node;
-       AlertValue val;
-       gboolean froze = FALSE;
-
        /* ask_if_needed is FALSE when user-asking is performed by caller,
           commonly when the caller is a mark-as-unread-recursive func */
        if (ask_if_needed && prefs_common.ask_mark_all_read) {
-               val = alertpanel_full(_("Mark all as unread"),
+               AlertValue val = alertpanel_full(_("Mark all as unread"),
                          _("Do you really want to mark all mails in this folder as unread?"),
-                         GTK_STOCK_NO, GTK_STOCK_YES, NULL,
-                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+                         GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+                         TRUE, NULL, ALERT_QUESTION);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
-                       return;
+                       return FALSE;
                else if (val & G_ALERTDISABLE)
                        prefs_common.ask_mark_all_read = FALSE;
        }
-       
+       return TRUE;
+}
+
+void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
+       gboolean froze = FALSE;
+
        if (summary_is_locked(summaryview))
                return;
+
+       if (!summary_mark_all_unread_confirm(ask_if_needed))
+               return;
+
        START_LONG_OPERATION(summaryview, TRUE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
-            node = gtkut_ctree_node_next(ctree, node))
+               node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_unread(summaryview, node);
        folder_item_set_batch(summaryview->folder_item, FALSE);
        for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
-            node = gtkut_ctree_node_next(ctree, node)) {
+               node = gtkut_ctree_node_next(ctree, node)) {
                if (!GTK_CMCTREE_ROW(node)->expanded)
                        summary_set_row_marks(summaryview, node);
        }
        END_LONG_OPERATION(summaryview);
-       
+
        summary_status_show(summaryview);
 }
 
@@ -4307,7 +4436,7 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
                }
 
                if (!found) {
-                       alertpanel_error(_("You're not the author of the article.\n"));
+                       alertpanel_error(_("You're not the author of the article."));
                }
                
                return found;
@@ -4395,14 +4524,14 @@ void summary_delete(SummaryView *summaryview)
 
        if (!prefs_common.live_dangerously) {
                gchar *buf = NULL;
-               int num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
+               guint num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
                buf = g_strdup_printf(ngettext(
                        "Do you really want to delete the selected message?",
                        "Do you really want to delete the %d selected messages?", num),
                        num);
                aval = alertpanel(ngettext("Delete message", "Delete messages", num),
                                  buf,
-                                 GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
+                                 GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND);
                g_free(buf);
                if (aval != G_ALERTALTERNATE) {
                        END_LONG_OPERATION(summaryview);
@@ -4440,7 +4569,7 @@ void summary_delete(SummaryView *summaryview)
                if (!node || prefs_common.next_on_delete == FALSE)
                        node = summary_find_next_msg(summaryview, sel_last,TRUE);
        }
-       summary_select_node(summaryview, node, -1);
+       summary_select_node(summaryview, node, OPEN_SELECTED_ON_DELETEMOVE);
        
        if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
                summary_execute(summaryview);
@@ -4597,7 +4726,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                        if (!node || prefs_common.next_on_delete == FALSE)
                                node = summary_find_next_msg(summaryview, sel_last,TRUE);
                }
-               summary_select_node(summaryview, node, -1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_DELETEMOVE);
                summary_status_show(summaryview);
        }
        
@@ -4605,7 +4734,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                GtkCMCTreeNode *node = gtk_cmctree_node_nth (GTK_CMCTREE(summaryview->ctree), 
                                                         GTK_CMCLIST(summaryview->ctree)->rows - 1);
                if (node)
-                       summary_select_node(summaryview, node, -1);
+                       summary_select_node(summaryview, node, OPEN_SELECTED_ON_DELETEMOVE);
        }
 
 }
@@ -4749,11 +4878,26 @@ void summary_add_address(SummaryView *summaryview)
 
 void summary_select_all(SummaryView *summaryview)
 {
+       GtkCMCTreeNode *node;
+
        if (!summaryview->folder_item) return;
 
+       if (GTK_CMCLIST(summaryview->ctree)->focus_row < 0) {
+               /* If no row is selected, select (but do not open) the first
+                * row, to get summaryview into correct state for selecting all. */
+               debug_print("summary_select_all: no row selected, selecting first one\n");
+               if (GTK_CMCLIST(summaryview->ctree)->row_list != NULL) {
+                       node = gtk_cmctree_node_nth(GTK_CMCTREE(summaryview->ctree), 0);
+                       summary_select_node(summaryview, node, FALSE);
+               }
+       }
+
+       /* Now select all rows while locking the summaryview for
+        * faster performance. */
        summary_lock(summaryview);
        gtk_cmclist_select_all(GTK_CMCLIST(summaryview->ctree));
        summary_unlock(summaryview);
+
        summary_status_show(summaryview);
 }
 
@@ -4842,8 +4986,8 @@ void summary_save_as(SummaryView *summaryview)
        if (is_file_exist(dest)) {
                aval = alertpanel(_("Append or Overwrite"),
                                  _("Append or overwrite existing file?"),
-                                 _("_Append"), _("_Overwrite"),
-                                 GTK_STOCK_CANCEL);
+                                 _("_Append"), _("_Overwrite"), GTK_STOCK_CANCEL,
+                                       ALERTFOCUS_FIRST);
                if (aval != 0 && aval != 1)
                        return;
        }
@@ -4888,8 +5032,8 @@ void summary_print(SummaryView *summaryview)
                                       "want to continue?"), 
                                       g_list_length(clist->selection));
        if (g_list_length(clist->selection) > 9
-       &&  alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, "+" GTK_STOCK_YES, NULL)
-           != G_ALERTALTERNATE) {
+       &&  alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_YES,
+               NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE) {
                g_free(msg);
                return;
        }
@@ -4986,7 +5130,7 @@ gboolean summary_execute(SummaryView *summaryview)
 
        if (new_selected) {
                summary_unlock(summaryview);
-               summary_select_node(summaryview, new_selected, -1);
+               summary_select_node(summaryview, new_selected, OPEN_SELECTED_ON_DELETEMOVE);
                summary_lock(summaryview);
        }
 
@@ -5086,7 +5230,7 @@ gboolean summary_expunge(SummaryView *summaryview)
 
        if (new_selected) {
                summary_unlock(summaryview);
-               summary_select_node(summaryview, new_selected, -1);
+               summary_select_node(summaryview, new_selected, OPEN_SELECTED_ON_DELETEMOVE);
                summary_lock(summaryview);
        }
 
@@ -5542,7 +5686,7 @@ void summary_collapse_threads(SummaryView *summaryview)
        while (node && GTK_CMCTREE_ROW(node)->parent) {
                focus_node = node = GTK_CMCTREE_ROW(node)->parent;
        }
-       summary_select_node(summaryview, node, -1);
+       summary_select_node(summaryview, node, OPEN_SELECTED_ON_DIRECTIONAL);
        node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
        while (node) {
                if (GTK_CMCTREE_ROW(node)->children) {
@@ -5627,7 +5771,8 @@ static gboolean summary_filter_get_mode(void)
                        _("Filtering"),
                        _("There are some filtering rules that belong to an account.\n"
                          "Please choose what to do with these rules:"),
-                       GTK_STOCK_CANCEL, _("_Filter"), NULL, TRUE, G_ALERTALTERNATE, vbox);
+                       GTK_STOCK_CANCEL, _("_Filter"), NULL, ALERTFOCUS_SECOND,
+                       TRUE, vbox);
 
        if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) {
                return FALSE;
@@ -5787,7 +5932,7 @@ static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
 }
 
 /* summary_set_colorlabel_color() - labelcolor parameter is the color *flag*
- * for the messsage; not the color index */
+ * for the message; not the color index */
 void summary_set_colorlabel_color(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                  guint labelcolor)
 {
@@ -5806,22 +5951,22 @@ void summary_set_colorlabel_color(GtkCMCTree *ctree, GtkCMCTreeNode *node,
        if (color_index < 0 || color_index >= N_COLOR_LABELS) {
                if (!prev_style) return;
                style = gtk_style_copy(prev_style);
-               color = ctree_style->fg[GTK_STATE_NORMAL];
-               style->fg[GTK_STATE_NORMAL] = color;
-               color = ctree_style->fg[GTK_STATE_SELECTED];
-               style->fg[GTK_STATE_SELECTED] = color;
+               color = ctree_style->text[GTK_STATE_NORMAL];
+               style->text[GTK_STATE_NORMAL] = color;
+               color = ctree_style->text[GTK_STATE_SELECTED];
+               style->text[GTK_STATE_SELECTED] = color;
        } else {
                if (prev_style)
                        style = gtk_style_copy(prev_style);
                else
                        style = gtk_style_copy(ctree_style);
                color = colorlabel_get_color(color_index);
-               style->fg[GTK_STATE_NORMAL] = color;
+               style->text[GTK_STATE_NORMAL] = color;
                /* get the average of label color and selected fg color
                   for visibility */
-               style->fg[GTK_STATE_SELECTED].red   = (color.red   + 3*ctree_style->fg[GTK_STATE_SELECTED].red  ) / 4;
-               style->fg[GTK_STATE_SELECTED].green = (color.green + 3*ctree_style->fg[GTK_STATE_SELECTED].green) / 4;
-               style->fg[GTK_STATE_SELECTED].blue  = (color.blue  + 3*ctree_style->fg[GTK_STATE_SELECTED].blue ) / 4;
+               style->text[GTK_STATE_SELECTED].red   = (color.red   + 3*ctree_style->text[GTK_STATE_SELECTED].red  ) / 4;
+               style->text[GTK_STATE_SELECTED].green = (color.green + 3*ctree_style->text[GTK_STATE_SELECTED].green) / 4;
+               style->text[GTK_STATE_SELECTED].blue  = (color.blue  + 3*ctree_style->text[GTK_STATE_SELECTED].blue ) / 4;
        }
 
        gtk_cmctree_node_set_row_style(ctree, node, style);
@@ -5848,6 +5993,54 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
        GList *cur;
        gboolean froze = FALSE;
 
+       if (prefs_common.ask_override_colorlabel) {
+               GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+               gboolean ask = FALSE;
+               AlertValue val;
+               guint color;
+               gboolean already_this_color_everywhere = TRUE;
+
+               /* if clearing color labels (applying 'none', 0):
+                   - ask if at least one message has a non-0 color label set
+                  if applying a non-0 color label:
+                   - ask if at least one of the selected messages has a non-0 color label different
+                         from the one we want to apply.
+                   - don't ask if all messages have the same color label as the one we're applying
+               */
+               for (cur = GTK_CMCLIST(ctree)->selection;
+                        !ask && cur != NULL && cur->data != NULL;
+                        cur = cur->next) {
+                       MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, GTK_CMCTREE_NODE(cur->data));
+                       if (msginfo) {
+                               color = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
+                               if (labelcolor == 0) {
+                                       /* clearing color labels */
+                                       ask = (color != 0);
+                               } else {
+                                       already_this_color_everywhere &= (color == labelcolor);
+                                       ask = ((color != 0) && (color != labelcolor)) && !already_this_color_everywhere;
+                               }
+                       }
+               }
+
+               if (ask) {
+                       gchar *msg;
+
+                       if (labelcolor == 0)
+                               msg = _("Do you really want to reset the color label of all selected messages?");
+                       else
+                               msg = _("Do you really want to apply this color label to all selected messages?");
+                       val = alertpanel_full(_("Set color label"), msg,
+                                 GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+                                 TRUE, NULL, ALERT_QUESTION);
+
+                       if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
+                               return;
+                       else if (val & G_ALERTDISABLE)
+                               prefs_common.ask_override_colorlabel = FALSE;
+               }
+       }
+
        START_LONG_OPERATION(summaryview, FALSE);
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_set_row_colorlabel(summaryview,
@@ -6481,7 +6674,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
-               gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[pos].button,
+               gtk_widget_set_can_focus(GTK_CMCLIST(ctree)->column[pos].button,
                                       FALSE);
                if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
                     (pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
@@ -6601,7 +6794,7 @@ void summary_set_column_order(SummaryView *summaryview)
 
        summary_show(summaryview, item);
 
-       summary_select_by_msgnum(summaryview, selected_msgnum);
+       summary_select_by_msgnum(summaryview, selected_msgnum, FALSE);
 
        summaryview->selected = summary_find_msg_by_msgnum(summaryview, selected_msgnum);
        summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
@@ -6823,7 +7016,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                if (gtk_cmctree_node_is_visible(GTK_CMCTREE(ctree), next) != GTK_VISIBILITY_FULL)
                                        gtkut_ctree_node_move_if_on_the_edge(GTK_CMCTREE(ctree), next, -1);
                                if (!mod_pressed)
-                                       summary_select_node(summaryview, summaryview->selected, -1);
+                                       summary_select_node(summaryview, summaryview->selected, OPEN_SELECTED_ON_DIRECTIONAL);
                                summaryview->selected = next;
                        }
                }
@@ -7118,7 +7311,7 @@ static void summary_sort_by_column_click(SummaryView *summaryview,
                             summaryview->sort_type == SORT_ASCENDING
                             ? SORT_DESCENDING : SORT_ASCENDING);
        else
-               summary_sort(summaryview, sort_key, SORT_ASCENDING);
+               summary_sort(summaryview, sort_key, summaryview->sort_type);
 
        node = GTK_CMCTREE_NODE(GTK_CMCLIST(summaryview->ctree)->row_list);
 
@@ -7628,9 +7821,8 @@ static gint summary_cmp_by_score(GtkCMCList *clist,
                return summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
-static void summary_ignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
+static void summary_ignore_thread_func_mark_unread(GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
 {
-       SummaryView *summaryview = (SummaryView *) data;
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
@@ -7639,9 +7831,19 @@ static void summary_ignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, g
        summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
        summary_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
 
+       debug_print("Message %d is marked as ignore thread\n", msginfo->msgnum);
+}
+
+static void summary_ignore_thread_func_set_row(GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *) data;
+       MsgInfo *msginfo;
+
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
+       cm_return_if_fail(msginfo);
+
        summary_set_row_marks(summaryview, row);
-       debug_print("Message %d is marked as ignore thread\n",
-           msginfo->msgnum);
+       debug_print("Message %d update in row view\n", msginfo->msgnum);
 }
 
 void summary_ignore_thread(SummaryView *summaryview)
@@ -7652,8 +7854,13 @@ void summary_ignore_thread(SummaryView *summaryview)
 
        START_LONG_OPERATION(summaryview, FALSE);
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data), 
-                                       GTK_CMCTREE_FUNC(summary_ignore_thread_func), 
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data),
+                                       GTK_CMCTREE_FUNC(summary_ignore_thread_func_mark_unread),
+                                       summaryview);
+
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data),
+                                       GTK_CMCTREE_FUNC(summary_ignore_thread_func_set_row),
                                        summaryview);
 
        END_LONG_OPERATION(summaryview);
@@ -8163,7 +8370,7 @@ static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
 
        node = gtk_cmctree_node_nth(GTK_CMCTREE(summaryview->ctree), 0);
        if (node)
-               summary_select_node(summaryview, node, 1);
+               summary_select_node(summaryview, node, OPEN_SELECTED_ON_SEARCH_RESULTS);
 }
 
 gint summaryview_export_mbox_list(SummaryView *summaryview)
@@ -8200,3 +8407,57 @@ void summaryview_unlock(SummaryView *summaryview, FolderItem *item)
 {
        gtk_widget_set_sensitive(summaryview->ctree, TRUE);
 }
+
+#define DO_ACTION(name, act)   { if (!strcmp(a_name, name)) action = act; }
+static void summary_reply_cb(GtkAction *gaction, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *)data;
+       GSList *msginfo_list = NULL;
+       gint action = COMPOSE_REPLY;
+       const gchar *a_name = gtk_action_get_name(gaction);
+
+       DO_ACTION("SummaryViewPopup/Reply", COMPOSE_REPLY);
+       DO_ACTION("SummaryViewPopup/ReplyTo/All", COMPOSE_REPLY_TO_ALL);
+       DO_ACTION("SummaryViewPopup/ReplyTo/Sender", COMPOSE_REPLY_TO_SENDER);
+       DO_ACTION("SummaryViewPopup/ReplyTo/List", COMPOSE_REPLY_TO_LIST);
+       DO_ACTION("SummaryViewPopup/Forward", COMPOSE_FORWARD_INLINE);
+       DO_ACTION("SummaryViewPopup/ForwardAtt", COMPOSE_FORWARD_AS_ATTACH);
+       DO_ACTION("SummaryViewPopup/Redirect", COMPOSE_REDIRECT);
+
+       msginfo_list = summary_get_selection(summaryview);
+       cm_return_if_fail(msginfo_list != NULL);
+       compose_reply_from_messageview(NULL, msginfo_list, action);
+       g_slist_free(msginfo_list);
+}
+
+gboolean summary_is_opened_message_selected(SummaryView *summaryview)
+{
+       GList *sel = NULL;
+
+       cm_return_val_if_fail(summaryview != NULL, FALSE);
+
+       sel = GTK_CMCLIST(summaryview->ctree)->selection;
+
+       if (summaryview->displayed == NULL || sel == NULL) {
+               return FALSE;
+       }
+
+       for ( ; sel != NULL; sel = sel->next) {
+               if (summaryview->displayed == GTK_CMCTREE_NODE(sel->data)) {
+                       return TRUE;
+               }
+       }
+       return FALSE;
+}
+
+gboolean summary_has_opened_message(SummaryView *summaryview)
+{
+       GList *sel = NULL;
+
+       cm_return_val_if_fail(summaryview != NULL, FALSE);
+
+       sel = GTK_CMCLIST(summaryview->ctree)->selection;
+
+       return (summaryview->displayed != NULL);
+}
+