respect 'default selection' settings when moving a msg with manual filtering
[claws.git] / src / summaryview.c
index f4298a99ed4751073609faf023624cc83e8a5c84..88c2c39c98d107d845e595a850bdeb6ec0a91d4c 100644 (file)
@@ -46,6 +46,7 @@
 #include "prefs_filtering.h"
 #include "account.h"
 #include "compose.h"
+#include "file-utils.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "stock_pixmap.h"
@@ -230,7 +231,8 @@ static void summary_unthread_for_exec_func  (GtkCMCTree     *ctree,
 void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
                              GSList * mlist);
 
-static void summary_filter_func                (MsgInfo *msginfo);
+static void summary_filter_func                (MsgInfo                *msginfo,
+                                        PrefsAccount           *ac_prefs);
 
 static void summary_colorlabel_menu_item_activate_cb
                                          (GtkWidget    *widget,
@@ -418,16 +420,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 },
@@ -438,6 +445,20 @@ static GtkActionEntry summary_popup_entries[] =
        {"SummaryViewPopup/View",                 NULL, N_("_View"), NULL, NULL, NULL },
 };
 
+static void summary_header_lock_sorting_cb(GtkAction *gaction, gpointer data);
+static void summary_header_set_displayed_columns_cb(GtkAction *gaction, gpointer data);
+
+static GtkActionEntry summary_header_popup_entries[] =
+{
+       {"SummaryViewHeaderPopup",                     NULL, "SummaryViewHeaderPopup", NULL, NULL, NULL },
+       {"SummaryViewHeaderPopup/SetDisplayedColumns", NULL, N_("_Set displayed columns"), NULL, NULL, G_CALLBACK(summary_header_set_displayed_columns_cb) }
+};
+
+static GtkToggleActionEntry summary_header_popup_toggle_entries[] =
+{
+       {"SummaryViewHeaderPopup/LockColumnHeaders",     NULL, N_("_Lock column headers"), NULL, NULL, G_CALLBACK(summary_header_lock_sorting_cb), FALSE }
+};
+
 static const gchar *const col_label[N_SUMMARY_COLS] = {
        "",            /* S_COL_MARK    */
        N_("S"),       /* S_COL_STATUS  */
@@ -511,6 +532,19 @@ GtkWidget *summary_get_main_widget(SummaryView *summaryview)
                summary_update_msg, (gpointer) summaryview);    \
 }
 
+static void popup_menu_selection_done(GtkMenuShell *shell, gpointer user_data)
+{
+       SummaryView *summaryview = (SummaryView *)user_data;
+
+       cm_return_if_fail(summaryview != NULL);
+
+       /* If a message is displayed, place cursor back on the message. */
+       if (summaryview->displayed != NULL &&
+                       summaryview->displayed != summaryview->selected) {
+               gtk_sctree_select(GTK_SCTREE(summaryview->ctree), summaryview->displayed);
+       }
+}
+
 SummaryView *summary_create(MainWindow *mainwin)
 {
        SummaryView *summaryview;
@@ -656,20 +690,35 @@ SummaryView *summary_create(MainWindow *mainwin)
 
        /* create popup menu */
        
-       gtk_action_group_add_actions(mainwin->action_group, summary_popup_entries,
+       gtk_action_group_add_actions(mainwin->action_group,
+                       summary_popup_entries,
+                       G_N_ELEMENTS(summary_popup_entries),
+                       (gpointer)summaryview);
+
+       gtk_action_group_add_actions(mainwin->action_group,
+                       summary_header_popup_entries,
+                       G_N_ELEMENTS(summary_header_popup_entries),
+                       (gpointer)summaryview);
+
+       gtk_action_group_add_toggle_actions(mainwin->action_group,
+                       summary_header_popup_toggle_entries,
+                       G_N_ELEMENTS(summary_header_popup_toggle_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)
@@ -701,9 +750,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)
@@ -747,9 +796,15 @@ SummaryView *summary_create(MainWindow *mainwin)
 #ifndef GENERIC_UMPC
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/View", "AllHeaders", "View/AllHeaders", GTK_UI_MANAGER_MENUITEM)
 #endif         
+
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus", "SummaryViewHeaderPopup", "SummaryViewHeaderPopup", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewHeaderPopup", "LockColumnHeaders", "SummaryViewHeaderPopup/LockColumnHeaders", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewHeaderPopup", "SetDisplayedColumns", "SummaryViewHeaderPopup/SetDisplayedColumns", GTK_UI_MANAGER_MENUITEM)
+
        summaryview->popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
                                gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menus/SummaryViewPopup")) );
-
+       summaryview->headerpopupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+                               gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menus/SummaryViewHeaderPopup")) );
 
        summaryview->vbox = vbox;
        summaryview->scrolledwin = scrolledwin;
@@ -987,6 +1042,7 @@ void summary_init(SummaryView *summaryview)
        main_create_mailing_list_menu (summaryview->mainwin, NULL);     
        summary_set_menu_sensitive(summaryview);
 
+       summaryview->header_menu_lock = FALSE;
 }
 
 #define CURRENTLY_DISPLAYED(m) \
@@ -1142,7 +1198,7 @@ static void summaryview_quicksearch_recurse(SummaryView *summaryview)
                || summaryview->folder_item == NULL) {
                return;
        }
-
+       START_TIMING("");
        main_window_cursor_wait(summaryview->mainwin);
 
        summaryview_reset_recursive_folder_match(summaryview);
@@ -1151,6 +1207,7 @@ static void summaryview_quicksearch_recurse(SummaryView *summaryview)
        summaryview_quicksearch_search_subfolders(summaryview, summaryview->folder_item);
        
        main_window_cursor_normal(summaryview->mainwin);
+       END_TIMING();
 }
 
 static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
@@ -1454,52 +1511,43 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        g_slist_free(mlist);
 
-       if (is_refresh) {
-               if (!quicksearch_is_in_typing(summaryview->quicksearch)) {
-                       summaryview->displayed =
-                               summary_find_msg_by_msgnum(summaryview,
-                                                          displayed_msgnum);
-                       if (!summaryview->displayed)
-                               messageview_clear(summaryview->messageview);
+       if (quicksearch_is_in_typing(summaryview->quicksearch) ||
+           quicksearch_is_running(summaryview->quicksearch)) {
+               summaryview->displayed =
+                       summary_find_msg_by_msgnum(summaryview,
+                                                  displayed_msgnum);
+               if (!summaryview->displayed)
+                       messageview_clear(summaryview->messageview);
+               summary_unlock(summaryview);
+
+               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,
+                                       FALSE);
+
+               summary_lock(summaryview);
+               if (!summaryview->selected) {
+                       /* no selected message - select first unread
+                          message, but do not display it */
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_UNREAD, FALSE);
+                       if (node == NULL && GTK_CMCLIST(ctree)->row_list != NULL)
+                               node = gtk_cmctree_node_nth
+                                       (ctree,
+                                        item->sort_type == SORT_DESCENDING
+                                        ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                        summary_unlock(summaryview);
 
                        if (quicksearch_is_running(summaryview->quicksearch))
-                               summary_select_by_msgnum(summaryview, selected_msgnum,
+                               summary_select_node(summaryview, node,
                                                OPEN_SELECTED_ON_SEARCH_RESULTS);
                        else
-                               summary_select_by_msgnum(summaryview, selected_msgnum,
+                               summary_select_node(summaryview, node,
                                                OPEN_SELECTED_ON_FOLDER_OPEN);
 
                        summary_lock(summaryview);
-                       if (!summaryview->selected) {
-                               /* no selected message - select first unread
-                                  message, but do not display it */
-                               node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                                    MSG_UNREAD, FALSE);
-                               if (node == NULL && GTK_CMCLIST(ctree)->row_list != NULL)
-                                       node = gtk_cmctree_node_nth
-                                               (ctree,
-                                                item->sort_type == SORT_DESCENDING
-                                                ? 0 : GTK_CMCLIST(ctree)->rows - 1);
-                               summary_unlock(summaryview);
-
-                               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 {
-                       /* just select first/last */
-                       if (GTK_CMCLIST(ctree)->row_list != NULL)
-                               node = gtk_cmctree_node_nth
-                                       (ctree,
-                                        item->sort_type == SORT_DESCENDING
-                                        ? 0 : GTK_CMCLIST(ctree)->rows - 1);
-                       summary_select_node(summaryview, node, OPEN_SELECTED_ON_SEARCH_RESULTS);
                }
        } else {
                /* backward compat */
@@ -1605,12 +1653,10 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
                if (node) {
                        gint open_selected = -1;
-                       if (!is_refresh) {
-                               if (OPEN_SELECTED_ON_FOLDER_OPEN)
-                                       open_selected = 1;
-                               else
-                                       open_selected = 0;
-                       }
+                       if (OPEN_SELECTED_ON_FOLDER_OPEN)
+                               open_selected = 1;
+                       else
+                               open_selected = 0;
                        summary_select_node(summaryview, node, open_selected);
                }
 
@@ -1754,7 +1800,8 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
        for (cur = GTK_CMCLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
             cur = cur->next) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
-               mlist = g_slist_prepend(mlist, msginfo);
+               mlist = g_slist_prepend(mlist,
+                               procmsg_msginfo_new_ref(msginfo));
        }
 
        mlist = g_slist_reverse(mlist);
@@ -2225,7 +2272,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);
@@ -2304,7 +2352,11 @@ void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
                summary_lock(summaryview);
                GTK_EVENTS_FLUSH();
                summary_unlock(summaryview);
-               gtk_widget_grab_focus(GTK_WIDGET(ctree));
+
+               /* If quicksearch has focus, let's keep it there. */
+               if (!quicksearch_has_focus(summaryview->quicksearch))
+                       summary_grab_focus(summaryview);
+
                gtkut_ctree_node_move_if_on_the_edge(ctree, node, -1);
 
                if (display_msg && summaryview->displayed == node)
@@ -2722,6 +2774,8 @@ static void summary_status_show(SummaryView *summaryview)
                                              n_new, n_unread, n_total,
                                              to_human_readable((goffset)n_size));
 
+       g_signal_connect(G_OBJECT(summaryview->popupmenu), "selection-done",
+                       G_CALLBACK(popup_menu_selection_done), summaryview);
 
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
                g_free(str);
@@ -3364,7 +3418,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;
@@ -3454,9 +3509,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;
@@ -3481,9 +3536,16 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        if (!to_text)
                to_text = _("(No Recipient)");
        else {
-               if (prefs_common.summary_from_show == SHOW_NAME)
-                       to_text = procheader_get_fromname(to_text);
-               else if (prefs_common.summary_from_show == SHOW_ADDR)
+               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);
        }
 
@@ -3493,10 +3555,12 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *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)");
                        }
@@ -3543,9 +3607,14 @@ static void summary_display_msg(SummaryView *summaryview, GtkCMCTreeNode *row)
 }
 
 static gboolean defer_change(gpointer data);
+typedef enum {
+       FLAGS_UNSET,
+       FLAGS_SET,
+       FLAGS_CHANGE
+} ChangeType;
 typedef struct _ChangeData {
        MsgInfo *info;
-       gint op; /* 0, 1, 2 for unset, set, change */
+       ChangeType op;
        MsgPermFlags set_flags;
        MsgTmpFlags  set_tmp_flags;
        MsgPermFlags unset_flags;
@@ -3560,7 +3629,7 @@ static void summary_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags flags, Ms
        } else {
                ChangeData *unset_data = g_new0(ChangeData, 1);
                unset_data->info = msginfo;
-               unset_data->op = 0;
+               unset_data->op = FLAGS_UNSET;
                unset_data->unset_flags = flags;
                unset_data->unset_tmp_flags = tmp_flags;
                debug_print("flags: deferring unset\n");
@@ -3576,7 +3645,7 @@ static void summary_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags flags, MsgT
        } else {
                ChangeData *set_data = g_new0(ChangeData, 1);
                set_data->info = msginfo;
-               set_data->op = 1;
+               set_data->op = FLAGS_SET;
                set_data->set_flags = flags;
                set_data->set_tmp_flags = tmp_flags;
                debug_print("flags: deferring set\n");
@@ -3595,7 +3664,7 @@ static void summary_msginfo_change_flags(MsgInfo *msginfo,
        } else {
                ChangeData *change_data = g_new0(ChangeData, 1);
                change_data->info = msginfo;
-               change_data->op = 2;
+               change_data->op = FLAGS_CHANGE;
                change_data->set_flags = add_flags;
                change_data->set_tmp_flags = add_tmp_flags;
                change_data->unset_flags = rem_flags;
@@ -3614,13 +3683,13 @@ gboolean defer_change(gpointer data)
        } else {
                debug_print("flags: finally doing it\n");
                switch(chg->op) {
-               case 0:
+               case FLAGS_UNSET:
                        procmsg_msginfo_unset_flags(chg->info, chg->unset_flags, chg->unset_tmp_flags);
                        break;
-               case 1:
+               case FLAGS_SET:
                        procmsg_msginfo_set_flags(chg->info, chg->set_flags, chg->set_tmp_flags);
                        break;
-               case 2:
+               case FLAGS_CHANGE:
                        procmsg_msginfo_change_flags(chg->info, chg->set_flags, chg->set_tmp_flags,
                                chg->unset_flags, chg->unset_tmp_flags);
                        break;
@@ -4145,8 +4214,9 @@ 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))
+       if ((summaryview->folder_item->total_msgs == (gint)g_list_length(GTK_CMCLIST(ctree)->selection) &&
+            summaryview->folder_item->total_msgs > 1) &&
+           !summary_mark_all_read_confirm(TRUE))
                return;
 
        START_LONG_OPERATION(summaryview, FALSE);
@@ -4169,8 +4239,9 @@ 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))
+       if ((summaryview->folder_item->total_msgs == (gint)g_list_length(GTK_CMCLIST(ctree)->selection) &&
+            summaryview->folder_item->total_msgs > 1) &&
+           !summary_mark_all_unread_confirm(TRUE))
                return;
 
        START_LONG_OPERATION(summaryview, FALSE);
@@ -4241,7 +4312,7 @@ 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;
 
@@ -4251,16 +4322,16 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
        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);
 }
 
@@ -4287,7 +4358,7 @@ 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;
 
@@ -4297,16 +4368,16 @@ void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
        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);
 }
 
@@ -4934,6 +5005,7 @@ void summary_save_as(SummaryView *summaryview)
        gchar *filename = NULL;
        gchar *src, *dest;
        gchar *tmp;
+       gchar *filedir = NULL;
 
        AlertValue aval = 0;
 
@@ -4957,12 +5029,18 @@ void summary_save_as(SummaryView *summaryview)
                        g_warning("summary_save_as(): failed to convert character set.");
                        filename = g_strdup(oldstr);
                }
-               dest = filesel_select_file_save(_("Save as"), filename);
+               dest = filename;
                g_free(filename);
        } else
-               dest = filesel_select_file_save(_("Save as"), filename);
+               dest = filename;
        filename = NULL;
        if (!dest) return;
+       if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
+               dest = g_strconcat(prefs_common.attach_save_dir, G_DIR_SEPARATOR_S,
+                                  dest, NULL);
+       dest = filesel_select_file_save(_("Save as"), dest);
+       if (!dest) return;
+
        if (is_file_exist(dest)) {
                aval = alertpanel(_("Append or Overwrite"),
                                  _("Append or overwrite existing file?"),
@@ -4999,6 +5077,13 @@ void summary_save_as(SummaryView *summaryview)
                }
                g_free(src);
        }
+
+       filedir = g_path_get_dirname(dest);
+       if (filedir && strcmp(filedir, ".")) {
+               g_free(prefs_common.attach_save_dir);
+               prefs_common.attach_save_dir = g_filename_to_utf8(filedir, -1, NULL, NULL, NULL);
+       }
+
        g_free(dest);
        g_free(tmp);
 }
@@ -5765,6 +5850,7 @@ static gboolean summary_filter_get_mode(void)
 void summary_filter(SummaryView *summaryview, gboolean selected_only)
 {
        GSList *mlist = NULL, *cur_list;
+       PrefsAccount *ac_prefs = NULL;
        summary_lock(summaryview);
 
        /* are there any per-account filtering rules? */
@@ -5799,9 +5885,13 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
                mlist = folder_item_get_msg_list(summaryview->folder_item);
        }
        
+       ac_prefs = ((summaryview->folder_item->folder != NULL) &&
+                       (summaryview->folder_item->folder->account != NULL))
+               ? summaryview->folder_item->folder->account : NULL;
+
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
-               summary_filter_func((MsgInfo *)cur_list->data);
+               summary_filter_func((MsgInfo *)cur_list->data, ac_prefs);
        }
        folder_item_set_batch(summaryview->folder_item, FALSE);
        
@@ -5828,7 +5918,7 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
        summary_show(summaryview, summaryview->folder_item);
 }
 
-static void summary_filter_func(MsgInfo *msginfo)
+static void summary_filter_func(MsgInfo *msginfo, PrefsAccount *ac_prefs)
 {
        MailFilteringData mail_filtering_data;
 
@@ -5839,7 +5929,7 @@ static void summary_filter_func(MsgInfo *msginfo)
        if (hooks_invoke(MAIL_MANUAL_FILTERING_HOOKLIST, &mail_filtering_data))
                return;
 
-       filter_message_by_msginfo(filtering_rules, msginfo, NULL,
+       filter_message_by_msginfo(filtering_rules, msginfo, ac_prefs,
                        FILTERING_MANUALLY, NULL);
 }
 
@@ -6010,7 +6100,7 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
                                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,
+                       val = alertpanel_full(labelcolor == 0? _("Reset color label"): _("Set color label"), msg,
                                  GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
                                  TRUE, NULL, ALERT_QUESTION);
 
@@ -6577,6 +6667,38 @@ static gboolean tooltip_cb (GtkWidget  *widget,
        return TRUE;
 }
 #endif
+
+static gboolean summary_header_button_pressed(GtkWidget *widget,
+               GdkEvent *_event,
+               gpointer user_data)
+{
+       GdkEventButton *event = (GdkEventButton *)_event;
+       SummaryView *summaryview = (SummaryView *)user_data;
+
+       cm_return_val_if_fail(summaryview != NULL, FALSE);
+
+       /* Only handle single button presses. */
+       if (event->type == GDK_2BUTTON_PRESS ||
+                       event->type == GDK_3BUTTON_PRESS)
+               return FALSE;
+
+       /* Handle right-click for context menu */
+       if (event->button == 3) {
+               /* Set up any menu items that need setting up. */
+               summaryview->header_menu_lock = TRUE;
+               cm_toggle_menu_set_active_full(summaryview->mainwin->ui_manager,
+                               "Menus/SummaryViewHeaderPopup/LockColumnHeaders",
+                               prefs_common_get_prefs()->summary_col_lock);
+               summaryview->header_menu_lock = FALSE;
+
+               gtk_menu_popup(GTK_MENU(summaryview->headerpopupmenu),
+                               NULL, NULL, NULL, NULL, 3, event->time);
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
 static GtkWidget *summary_ctree_create(SummaryView *summaryview)
 {
        GtkWidget *ctree;
@@ -6644,7 +6766,6 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_TAGS],
                                   prefs_common.summary_col_size[S_COL_TAGS]);
 
-       gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
        gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
                             GTK_CMCTREE_EXPANDER_TRIANGLE);
 
@@ -6671,24 +6792,29 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
 
        /* connect signal to the buttons for sorting */
 #define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
+       g_signal_connect \
+               (G_OBJECT(GTK_CMCLIST(ctree)->column[col_pos[col]].button), \
+                "button-press-event", \
+                G_CALLBACK(summary_header_button_pressed), \
+                summaryview); \
        g_signal_connect \
                (G_OBJECT(GTK_CMCLIST(ctree)->column[col_pos[col]].button), \
                 "clicked", \
                 G_CALLBACK(func), \
-                summaryview)
-
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK   , summary_mark_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_STATUS , summary_status_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MIME   , summary_mime_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE   , summary_size_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_DATE   , summary_date_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM   , summary_from_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_TO     , summary_to_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SUBJECT, summary_subject_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE,   summary_score_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_LOCKED,  summary_locked_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_TAGS,    summary_tags_clicked);
+                summaryview);
+
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK   , summary_mark_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_STATUS , summary_status_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MIME   , summary_mime_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE   , summary_size_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_DATE   , summary_date_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM   , summary_from_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_TO     , summary_to_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SUBJECT, summary_subject_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE  , summary_score_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_LOCKED , summary_locked_clicked)
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_TAGS   , summary_tags_clicked)
        
 #undef CLIST_BUTTON_SIGNAL_CONNECT
 
@@ -6825,6 +6951,7 @@ static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                                       SummaryView *summaryview)
 {
        if (!event) return FALSE;
+       if (event->window != GTK_CMCLIST(ctree)->clist_window) return FALSE;
 
        if (event->button == 3) {
                /* right clicked */
@@ -6970,7 +7097,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                        break;
                                case GDK_KEY_Down: case GDK_KEY_KP_Down:
                                        next = gtk_cmctree_node_nth(ctree,
-                                                       MIN(GTK_CMCLIST(ctree)->focus_row + 1, GTK_CMCLIST(ctree)->rows));
+                                                       MIN(GTK_CMCLIST(ctree)->focus_row + 1, GTK_CMCLIST(ctree)->rows - 1));
                                        break;
                                case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
                                        next = gtk_cmctree_node_nth(ctree,
@@ -6988,7 +7115,8 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                        break;
                        }
 
-                       if (next) {
+                       if (next != NULL &&
+                                       next != gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->focus_row)) {
                                gtk_sctree_select_with_state
                                        (GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );
 
@@ -7284,6 +7412,11 @@ guint summary_get_selection_count(SummaryView *summaryview)
 static void summary_sort_by_column_click(SummaryView *summaryview,
                                         FolderSortKey sort_key)
 {
+       if (prefs_common.summary_col_lock) {
+               debug_print("summaryview columns locked, ignoring\n");
+               return;
+       }
+
        GtkCMCTreeNode *node = NULL;
        START_TIMING("");
        if (summaryview->sort_key == sort_key)
@@ -7291,7 +7424,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);
 
@@ -8387,3 +8520,76 @@ 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)
+{
+       cm_return_val_if_fail(summaryview != NULL, FALSE);
+
+       return (summaryview->displayed != NULL);
+}
+
+static void summary_header_lock_sorting_cb(GtkAction *gaction, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *)data;
+       gboolean sorting_lock = prefs_common_get_prefs()->summary_col_lock;
+
+       if (summaryview->header_menu_lock)
+               return;
+
+       debug_print("%slocking summaryview columns\n",
+                       sorting_lock ? "un" : "");
+       prefs_common_get_prefs()->summary_col_lock = !sorting_lock;
+}
+
+static void summary_header_set_displayed_columns_cb(GtkAction *gaction,
+               gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *)data;
+
+       if (summaryview->header_menu_lock)
+               return;
+
+       prefs_summary_column_open();
+}