2006-08-11 [colin] 2.4.0cvs41
[claws.git] / src / summaryview.c
index f737a70fea982bb9edf0996430a325c89b1eb644..5ca48f1089c82e916dbad03643997991684c6373 100644 (file)
@@ -88,6 +88,7 @@
 #include "timing.h"
 #include "gedit-print.h"
 #include "log.h"
+#include "manual.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
@@ -393,8 +394,6 @@ static gint summary_cmp_by_locked   (GtkCList               *clist,
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
 
-static void news_flag_crosspost                (MsgInfo *msginfo);
-
 static void quicksearch_execute_cb     (QuickSearch    *quicksearch,
                                         gpointer        data);
 static void tog_searchbar_cb           (GtkWidget      *w,
@@ -828,6 +827,17 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        summary_set_column_titles(summaryview);
 }
 
+static gboolean summaryview_quicksearch_recurse(gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *)data;
+       main_window_cursor_wait(summaryview->mainwin);
+       quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+       quicksearch_search_subfolders(summaryview->quicksearch, 
+                             summaryview->folderview,
+                             summaryview->folder_item);
+       main_window_cursor_normal(summaryview->mainwin);
+       return FALSE;
+}
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -846,6 +856,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (!summaryview->mainwin)
                return FALSE;
 
+       summaryview->last_displayed = NULL;
        summary_switch_from_to(summaryview, item);
 
        inc_lock();
@@ -1000,17 +1011,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                statusbar_pop_all();
                
                hidden_removed = TRUE;
-               if (quicksearch_is_running(summaryview->quicksearch)) {
-                       /* only scan subfolders when quicksearch changed,
-                        * not when search is the same and folder changed */
-                       main_window_cursor_wait(summaryview->mainwin);
-                       quicksearch_reset_cur_folder_item(summaryview->quicksearch);
-                       quicksearch_search_subfolders(summaryview->quicksearch, 
-                                             summaryview->folderview,
-                                             summaryview->folder_item);
-                       main_window_cursor_normal(summaryview->mainwin);
-               }
-
                if (!quicksearch_is_active(summaryview->quicksearch)) {
                        debug_print("search cancelled!\n");
                        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1049,7 +1049,15 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        g_slist_free(mlist);
 
+       if (quicksearch_is_active(summaryview->quicksearch) &&
+           quicksearch_is_running(summaryview->quicksearch)) {
+               /* only scan subfolders when quicksearch changed,
+                * not when search is the same and folder changed */
+               g_timeout_add(100, summaryview_quicksearch_recurse, summaryview);
+       }
+
        if (is_refresh) {
+               summaryview->last_displayed = summaryview->displayed;
                summaryview->displayed =
                        summary_find_msg_by_msgnum(summaryview,
                                                   displayed_msgnum);
@@ -1606,27 +1614,56 @@ void summary_select_prev_marked(SummaryView *summaryview)
 
 void summary_select_next_marked(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCTreeNode *node = summaryview->selected;
+       gboolean skip_cur = FALSE;
+       
+       if (summaryview->displayed 
+       &&  summaryview->selected == summaryview->displayed) {
+               debug_print("skipping cur (%p %p)\n",
+                       summaryview->displayed, summaryview->selected);
+               skip_cur = TRUE;
+       }
+
 
        node = summary_find_next_flagged_msg
-               (summaryview, summaryview->selected, MSG_MARKED, TRUE);
+               (summaryview, node, MSG_MARKED, skip_cur);
+       
+       if (node)
+               summary_select_node(summaryview, node, TRUE, FALSE);
+       else {
+               node = summary_find_next_flagged_msg
+                       (summaryview, NULL, MSG_MARKED, FALSE);
+               if (node == NULL || node == summaryview->selected) {
+                       AlertValue val = 0;
 
-       if (!node) {
-               AlertValue val;
+                       switch (prefs_common.next_unread_msg_dialog) {
+                               case NEXTUNREADMSGDIALOG_ALWAYS:
+                                       val = alertpanel(_("No more marked messages"),
+                                                        _("No marked message found. "
+                                                          "Go to next folder?"),
+                                                        GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                                       break;
+                               case NEXTUNREADMSGDIALOG_ASSUME_YES:
+                                       val = G_ALERTALTERNATE;
+                                       break;
+                               case NEXTUNREADMSGDIALOG_ASSUME_NO:
+                                       val = G_ALERTOTHER;
+                                       break;
+                               default:
+                                       debug_print(
+                                               _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+                       }
 
-               val = alertpanel(_("No more marked messages"),
-                                _("No marked message found. "
-                                  "Search from the beginning?"),
-                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
-               if (val != G_ALERTALTERNATE) return;
-               node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                    MSG_MARKED, TRUE);
-       }
+                       if (val == G_ALERTALTERNATE) {
+                               folderview_select_next_marked(summaryview->folderview);
+                               return;
+                       } 
+                       else
+                               return;
+               } else
+                       summary_select_node(summaryview, node, TRUE, FALSE);
 
-       if (!node)
-               alertpanel_notice(_("No marked messages."));
-       else
-               summary_select_node(summaryview, node, TRUE, FALSE);
+       }
 }
 
 void summary_select_prev_labeled(SummaryView *summaryview)
@@ -1679,6 +1716,22 @@ void summary_select_next_labeled(SummaryView *summaryview)
                summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
+void summary_select_last_read(SummaryView *summaryview)
+{
+       if (summaryview->last_displayed)
+               summary_select_node(summaryview, summaryview->last_displayed, TRUE, FALSE);
+}
+
+void summary_select_parent(SummaryView *summaryview)
+{
+       GtkCTreeNode *node = NULL;
+
+       if (summaryview->selected)
+               node = GTK_CTREE_ROW(summaryview->selected)->parent;
+       if (node)
+               summary_select_node(summaryview, node, TRUE, FALSE);
+}
+
 void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
 {
        GtkCTreeNode *node;
@@ -1786,7 +1839,8 @@ static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
+               if (msginfo && !MSG_IS_DELETED(msginfo->flags) 
+               && !MSG_IS_MOVE(msginfo->flags)) break;
        }
 
        return node;
@@ -1968,10 +2022,6 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
 
-       if (msginfo && msginfo->folder && msginfo->folder->folder &&
-           msginfo->folder->folder->klass->type == F_NEWS)
-               news_flag_crosspost(msginfo);
-
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
 
@@ -2020,6 +2070,7 @@ static void summary_status_show(SummaryView *summaryview)
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), "");
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs),   "");
+               toolbar_main_set_sensitive(summaryview->mainwin);
                return;
        }
 
@@ -2028,12 +2079,9 @@ static void summary_status_show(SummaryView *summaryview)
                msginfo = gtk_ctree_node_get_row_data
                        (GTK_CTREE(summaryview->ctree),
                         GTK_CTREE_NODE(cur->data));
-               if (!msginfo)
-                       g_warning("summary_status_show(): msginfo == NULL\n");
-               else {
+               if (msginfo) {
                        sel_size += msginfo->size;
                        n_selected++;
-                       
                }
        }
        
@@ -2044,9 +2092,7 @@ static void summary_status_show(SummaryView *summaryview)
                        msginfo = gtk_ctree_node_get_row_data
                                (GTK_CTREE(summaryview->ctree),
                                 GTK_CTREE_NODE(cur));
-                       if (!msginfo)
-                               g_warning("summary_status_show(): msginfo == NULL\n");
-                       else {
+                       if (msginfo) {
                                n_size += msginfo->size;
                                n_total++;
                                if (MSG_IS_NEW(msginfo->flags))
@@ -2116,6 +2162,7 @@ static void summary_status_show(SummaryView *summaryview)
                                      to_human_readable(n_size));
        gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
+       toolbar_main_set_sensitive(summaryview->mainwin);
 }
 
 static void summary_set_column_titles(SummaryView *summaryview)
@@ -2353,17 +2400,23 @@ gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
 
        gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
                                NULL, NULL, NULL, NULL, FALSE, summaryview->threaded && !summaryview->thread_collapsed);
-#define SET_TEXT(col) \
-       gtk_ctree_node_set_text(ctree, cnode, col_pos[col], \
-                               text[col_pos[col]])
-
-       SET_TEXT(S_COL_NUMBER);
-       SET_TEXT(S_COL_SCORE);
-       SET_TEXT(S_COL_SIZE);
-       SET_TEXT(S_COL_DATE);
-       SET_TEXT(S_COL_FROM);
-       SET_TEXT(S_COL_TO);
-       /* SET_TEXT(S_COL_SUBJECT);  already set by node info */
+#define SET_TEXT(col) {                                                \
+       gtk_ctree_node_set_text(ctree, cnode, col_pos[col],     \
+                               text[col_pos[col]]);            \
+}
+
+       if (summaryview->col_state[summaryview->col_pos[S_COL_NUMBER]].visible)
+               SET_TEXT(S_COL_NUMBER);
+       if (summaryview->col_state[summaryview->col_pos[S_COL_SCORE]].visible)
+               SET_TEXT(S_COL_SCORE);
+       if (summaryview->col_state[summaryview->col_pos[S_COL_SIZE]].visible)
+               SET_TEXT(S_COL_SIZE);
+       if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible)
+               SET_TEXT(S_COL_DATE);
+       if (summaryview->col_state[summaryview->col_pos[S_COL_FROM]].visible)
+               SET_TEXT(S_COL_FROM);
+       if (summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible)
+               SET_TEXT(S_COL_TO);
 
        if (free_from) {
                g_free(text[col_pos[S_COL_FROM]]);
@@ -2408,7 +2461,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        summaryview->subject_table = subject_table;
 
        if (prefs_common.use_addr_book)
-               start_address_completion();
+               start_address_completion(NULL);
        
        if (summaryview->threaded) {
                GNode *root, *gnode;
@@ -2546,20 +2599,33 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        text[col_pos[S_COL_MIME]]   = "";
        text[col_pos[S_COL_LOCKED]] = "";
        text[col_pos[S_COL_DATE]]   = "";
-       text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
-       text[col_pos[S_COL_SIZE]]   = to_human_readable(msginfo->size);
-       text[col_pos[S_COL_SCORE]]  = itos_buf(col_score, msginfo->score);
-
-       if (msginfo->date_t) {
-               procheader_date_get_localtime(date_modified,
-                                             sizeof(date_modified),
-                                             msginfo->date_t);
-               text[col_pos[S_COL_DATE]] = date_modified;
-       } else if (msginfo->date)
-               text[col_pos[S_COL_DATE]] = msginfo->date;
+       if (summaryview->col_state[summaryview->col_pos[S_COL_NUMBER]].visible)
+               text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
+       else
+               text[col_pos[S_COL_NUMBER]] = "";
+
+       if (summaryview->col_state[summaryview->col_pos[S_COL_SIZE]].visible)
+               text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
        else
-               text[col_pos[S_COL_DATE]] = _("(No Date)");
+               text[col_pos[S_COL_SIZE]] = "";
 
+       if (summaryview->col_state[summaryview->col_pos[S_COL_SCORE]].visible)
+               text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->score);
+       else
+               text[col_pos[S_COL_SCORE]] = "";
+
+       if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible) {
+               if (msginfo->date_t) {
+                       procheader_date_get_localtime(date_modified,
+                                                     sizeof(date_modified),
+                                                     msginfo->date_t);
+                       text[col_pos[S_COL_DATE]] = date_modified;
+               } else if (msginfo->date)
+                       text[col_pos[S_COL_DATE]] = msginfo->date;
+               else
+                       text[col_pos[S_COL_DATE]] = _("(No Date)");
+       }
+       
        if (prefs_common.swap_from && msginfo->from && msginfo->to
        &&  !summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible) {
                gchar *addr = NULL;
@@ -2580,10 +2646,17 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                                msginfo->fromname :
                                _("(No From)");
        } else {
+               gchar buf[BUFFSIZE];
                gchar *tmp = summary_complete_address(msginfo->from);
-               from_text = tmp ? tmp : (msginfo->fromname ?
-                                        msginfo->fromname: 
-                                               _("(No From)"));
+               if (tmp) {
+                       strncpy2(buf, tmp, sizeof(buf));
+                       g_free(tmp);
+                       from_text = buf;
+               } else {
+                       from_text = (msginfo->fromname) ?
+                                       msginfo->fromname: 
+                                       _("(No From)");
+               }
        }
        
        to_text = msginfo->to ? msginfo->to : 
@@ -2764,6 +2837,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        summary_lock(summaryview);
 
        STATUSBAR_POP(summaryview->mainwin);
+       GTK_EVENTS_FLUSH();
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
        
@@ -2778,7 +2852,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
                MessageView *msgview;
 
                msgview = summaryview->messageview;
-
+               summaryview->last_displayed = summaryview->displayed;
                summaryview->displayed = row;
                if (!messageview_is_visible(msgview)) {
                        main_window_toggle_message_view(summaryview->mainwin);
@@ -2869,7 +2943,7 @@ void summary_reedit(SummaryView *summaryview)
                                              summaryview->selected);
        if (!msginfo) return;
 
-       compose_reedit(msginfo);
+       compose_reedit(msginfo, FALSE);
 }
 
 gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
@@ -3456,10 +3530,12 @@ void summary_delete(SummaryView *summaryview)
 
        if (!summaryview->folder_item) return;
 
-       aval = alertpanel(_("Delete message(s)"),
-                         _("Do you really want to delete selected message(s)?"),
-                         GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
-       if (aval != G_ALERTALTERNATE) return;
+       if (!prefs_common.live_dangerously) {
+               aval = alertpanel(_("Delete message(s)"),
+                                 _("Do you really want to delete selected message(s)?"),
+                                 GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
+               if (aval != G_ALERTALTERNATE) return;
+       }
 
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
             cur = cur->next) {
@@ -3596,7 +3672,7 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
 void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 {
        GList *cur;
-
+       GtkCTreeNode *sel_last = NULL;
        if (!to_folder) return;
        if (!summaryview->folder_item ||
            FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
@@ -3611,10 +3687,11 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        START_LONG_OPERATION(summaryview); 
 
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
-            cur != NULL && cur->data != NULL; cur = cur->next)
+            cur != NULL && cur->data != NULL; cur = cur->next) {
+               sel_last = GTK_CTREE_NODE(cur->data);
                summary_move_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
-
+       }
        END_LONG_OPERATION(summaryview);
 
        summaryview->display_msg = prefs_common.always_show_msg;
@@ -3622,6 +3699,10 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        if (prefs_common.immediate_exec) {
                summary_execute(summaryview);
        } else {
+               GtkCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
+               if (!node)
+                       node = summary_find_prev_msg(summaryview, sel_last);
+               summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
                summary_status_show(summaryview);
        }
        
@@ -3962,7 +4043,7 @@ gboolean summary_execute(SummaryView *summaryview)
                        if (GTK_CTREE_ROW(node)->sibling) {
                                next = GTK_CTREE_ROW(node)->sibling;
                        } else {
-                               GtkCTreeRow *parent = NULL;
+                               GtkCTreeNode *parent = NULL;
                                for (parent = GTK_CTREE_ROW(node)->parent; parent != NULL;
                                     parent = GTK_CTREE_ROW(parent)->parent) {
                                        if (GTK_CTREE_ROW(parent)->sibling) {
@@ -4129,9 +4210,15 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        if (!summaryview->mlist) return;
 
+       hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
+               summaryview->msginfo_update_callback_id);
+
        folder_item_remove_msgs(summaryview->folder_item,
                                summaryview->mlist);
 
+       summaryview->msginfo_update_callback_id =
+               hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, 
+                       summary_update_msg, (gpointer) summaryview);
        for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
 
@@ -4216,7 +4303,7 @@ void summary_thread_build(SummaryView *summaryview)
                                 msginfo->subject);
                }
 
-               if (parent && parent != node) {
+               if (parent && parent != node && parent != GTK_CTREE_ROW(node)->parent) {
                        gtk_ctree_move(ctree, node, parent, NULL);
                }
 
@@ -4295,6 +4382,11 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
        child = GTK_CTREE_ROW(node)->children;
        if (!child) return;
 
+       if (node == summaryview->selected)
+               summaryview->selected = NULL;
+       if (node == summaryview->displayed)
+               summaryview->displayed = NULL;
+
        for (top_parent = node;
             GTK_CTREE_ROW(top_parent)->parent != NULL;
             top_parent = GTK_CTREE_ROW(top_parent)->parent)
@@ -4373,11 +4465,90 @@ void summary_collapse_threads(SummaryView *summaryview)
        gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 }
 
+void account_rules_radio_button_toggled_cb(GtkToggleButton *btn, gpointer data)
+{
+       prefs_common.apply_per_account_filtering_rules = GPOINTER_TO_INT(data);
+}
+
+gboolean summary_filter_get_mode(void)
+/* ask what to do w/ them: skip them, apply them regardless to the account,
+   use the current account */
+{
+       /* TODO: eventually also propose to use the current folder's default account,
+          if it is set */
+       /* TODO: eventually allow to select the account to use from a optmenu */
+
+       GtkWidget *vbox;
+       GtkWidget *account_rules_skip;
+       GtkWidget *account_rules_force;
+       GtkWidget *account_rules_user_current;
+       AlertValue val;
+
+       vbox = gtk_vbox_new (FALSE, 0);
+
+       account_rules_skip = gtk_radio_button_new_with_label
+                                                       (NULL, _("Skip these rules"));
+       account_rules_force = gtk_radio_button_new_with_label_from_widget
+                                                       (GTK_RADIO_BUTTON(account_rules_skip),
+                                                       _("Apply these rules regardless of the account they belong to"));
+       account_rules_user_current = gtk_radio_button_new_with_label_from_widget
+                                                       (GTK_RADIO_BUTTON(account_rules_skip),
+                                                       _("Use current account for these rules"));
+       gtk_box_pack_start (GTK_BOX (vbox), account_rules_skip, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox), account_rules_force, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox), account_rules_user_current, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(account_rules_skip), "toggled",
+                       G_CALLBACK(account_rules_radio_button_toggled_cb),
+                       GINT_TO_POINTER(FILTERING_ACCOUNT_RULES_SKIP));
+       g_signal_connect(G_OBJECT(account_rules_force), "toggled",
+                       G_CALLBACK(account_rules_radio_button_toggled_cb),
+                       GINT_TO_POINTER(FILTERING_ACCOUNT_RULES_FORCE));
+       g_signal_connect(G_OBJECT(account_rules_user_current), "toggled",
+                       G_CALLBACK(account_rules_radio_button_toggled_cb),
+                       GINT_TO_POINTER(FILTERING_ACCOUNT_RULES_USE_CURRENT));
+       switch (prefs_common.apply_per_account_filtering_rules) {
+       case FILTERING_ACCOUNT_RULES_SKIP:
+               gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(account_rules_skip), TRUE);
+               break;
+       case FILTERING_ACCOUNT_RULES_FORCE:
+               gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(account_rules_force), TRUE);
+               break;
+       case FILTERING_ACCOUNT_RULES_USE_CURRENT:
+               gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(account_rules_user_current), TRUE);
+               break;
+       }
+
+       val = alertpanel_with_widget(
+                       _("Filtering"),
+                       _("There are some filtering rules that belong to an account.\n"
+                         "Please choose what to do with these rules:"),
+                       _("_Filter"), _("_Cancel"), NULL, TRUE, vbox);
+       if ((val & ~G_ALERTDISABLE) != G_ALERTDEFAULT) {
+               return FALSE;
+       } else if (val & G_ALERTDISABLE)
+               prefs_common.ask_apply_per_account_filtering_rules = FALSE;
+
+       return TRUE;
+}
+
 void summary_filter(SummaryView *summaryview, gboolean selected_only)
 {
        GSList *mlist = NULL, *cur_list;
        summary_lock(summaryview);
 
+       /* are there any per-account filtering rules? */
+       if (prefs_common.ask_apply_per_account_filtering_rules == TRUE &&
+               filtering_peek_per_account_rules(filtering_rules)) {
+
+               if (summary_filter_get_mode() == FALSE) {
+                       summary_unlock(summaryview);
+                       return;
+               }
+       }
+
        folder_item_update_freeze();
        
        debug_print("filtering...");
@@ -4432,7 +4603,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);
+       filter_message_by_msginfo(filtering_rules, msginfo, NULL);
 }
 
 void summary_msginfo_filter_open(FolderItem * item, MsgInfo *msginfo,
@@ -4447,16 +4618,19 @@ void summary_msginfo_filter_open(FolderItem * item, MsgInfo *msginfo,
                if (item == NULL)
                        prefs_filtering_open(&pre_global_processing,
                                             _("Processing rules to apply before folder rules"),
-                                            header, key);
+                                            MANUAL_ANCHOR_PROCESSING,
+                                            header, key, FALSE);
                else
                        prefs_filtering_open(&item->prefs->processing,
                                             _("Processing configuration"),
-                                            header, key);
+                                            MANUAL_ANCHOR_PROCESSING,
+                                            header, key, FALSE);
        }
        else {
                prefs_filtering_open(&filtering_rules,
-                                    _("Filtering configuration"),
-                                      header, key);
+                               _("Filtering configuration"),
+                               MANUAL_ANCHOR_FILTERING,
+                               header, key, TRUE);
        }
        
        g_free(header);
@@ -4539,6 +4713,7 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
        }
 
        gtk_ctree_node_set_row_style(ctree, node, style);
+       gtk_style_unref(style);
 }
 
 static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
@@ -4866,6 +5041,7 @@ void summary_set_column_order(SummaryView *summaryview)
        summary_select_by_msgnum(summaryview, selected_msgnum);
 
        summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
+       summaryview->last_displayed = summaryview->displayed;
        if (!summaryview->displayed)
                messageview_clear(summaryview->messageview);
        else
@@ -5286,6 +5462,7 @@ static void summary_sort_by_column_click(SummaryView *summaryview,
 
        node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
 
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        if (prefs_common.bold_unread) {
                while (node) {
                        GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
@@ -5294,6 +5471,7 @@ static void summary_sort_by_column_click(SummaryView *summaryview,
                        node = next;
                }
        }
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        END_TIMING();
 }
 
@@ -5629,38 +5807,6 @@ static gint summary_cmp_by_score(GtkCList *clist,
                return summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
-static void news_flag_crosspost(MsgInfo *msginfo)
-{
-       GString *line;
-       gpointer key;
-       gpointer value;
-       Folder *mff;
-
-       g_return_if_fail(msginfo != NULL);
-       g_return_if_fail(msginfo->folder != NULL);
-       g_return_if_fail(msginfo->folder->folder != NULL);
-       mff = msginfo->folder->folder;
-       g_return_if_fail(mff->klass->type == F_NEWS);
-
-       if (mff->account->mark_crosspost_read) {
-               line = g_string_sized_new(128);
-               g_string_printf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
-               debug_print("nfcp: checking <%s>", line->str);
-               if (mff->newsart && 
-                   g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
-                       debug_print(" <%s>", (gchar *)value);
-                       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
-                               summary_msginfo_change_flags(msginfo, 
-                                       mff->account->crosspost_col, 0, MSG_NEW | MSG_UNREAD, 0);
-                       }
-                       g_hash_table_remove(mff->newsart, key);
-                       g_free(key);
-               }
-               g_string_free(line, TRUE);
-               debug_print("\n");
-       }
-}
-
 static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;