put back a g_free()
[claws.git] / src / summaryview.c
index a3ccc2cf909d6a1cd3809095ea3ed8c6e763e639..feb139f5f1f8c91a49014c3a41b0ba88121e6d13 100644 (file)
@@ -58,7 +58,6 @@
 #include "foldersel.h"
 #include "procmsg.h"
 #include "procheader.h"
-#include "headerwindow.h"
 #include "sourcewindow.h"
 #include "prefs_common.h"
 #include "prefs_summary_column.h"
@@ -69,7 +68,6 @@
 #include "gtkutils.h"
 #include "stock_pixmap.h"
 #include "filesel.h"
-#include "manage_window.h"
 #include "alertpanel.h"
 #include "inputdialog.h"
 #include "statusbar.h"
@@ -382,6 +380,9 @@ static gint summary_cmp_by_label    (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 
+static void news_process_crossposted   (MsgInfo *msginfo);
+static void news_flag_crosspost                (MsgInfo *msginfo);
+
 GtkTargetEntry summary_drag_types[1] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
@@ -398,6 +399,9 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {N_("/Select _thread"),         NULL, summary_select_thread, 0, NULL},
+       {N_("/Select _all"),            NULL, summary_select_all, 0, NULL},
+       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/M_ove..."),               NULL, summary_move_to,  0, NULL},
        {N_("/_Copy..."),               NULL, summary_copy_to,  0, NULL},
        {N_("/_Delete"),                NULL, summary_delete,   0, NULL},
@@ -422,12 +426,10 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_View/Open in new _window"),
                                        NULL, summary_open_msg, 0, NULL},
        {N_("/_View/_Source"),          NULL, summary_view_source, 0, NULL},
-       {N_("/_View/All _header"),      NULL, summary_show_all_header_cb, 0, NULL},
+       {N_("/_View/All _header"),      NULL, summary_show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            NULL, summary_save_as,  0, NULL},
        {N_("/_Print..."),              NULL, summary_print,    0, NULL},
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/Select _all"),            NULL, summary_select_all, 0, NULL}
 };
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
@@ -596,6 +598,7 @@ void summary_init(SummaryView *summaryview)
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
        gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
        gtk_widget_show(pixmap);
+       summaryview->folder_pixmap = pixmap;
 
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
@@ -739,7 +742,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
-       summary_set_menu_sensitive(summaryview);
        if (!is_refresh)
                messageview_clear(summaryview->messageview);
 
@@ -878,8 +880,10 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        node = summary_find_next_unread_msg(summaryview, NULL);
                        if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
                                node = gtk_ctree_node_nth
-                                       (ctree, GTK_CLIST(ctree)->rows - 1);
-                       summary_select_node(summaryview, node, FALSE);
+                                       (ctree, sort_type == 
+                                        GTK_SORT_DESCENDING ? 0 : 
+                                        GTK_CLIST(ctree)->rows - 1);
+                       summary_select_node(summaryview, node, FALSE, TRUE);
                }
        } else {
                /* select first unread message */
@@ -892,14 +896,16 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
                        /* Get the last visible node on screen */
                        /* FIXME: huh, what happens if node is null? that allowed?? */
-                       node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+                       node = gtk_ctree_node_nth(ctree, sort_type == 
+                                                 GTK_SORT_DESCENDING ? 0 : 
+                                                 GTK_CLIST(ctree)->rows - 1);
                }       
                if (prefs_common.open_unread_on_enter) {
                        summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, TRUE);
+                       summary_select_node(summaryview, node, TRUE, TRUE);
                        summary_lock(summaryview);
                } else
-                       summary_select_node(summaryview, node, FALSE);
+                       summary_select_node(summaryview, node, FALSE, TRUE);
        }
 
        summary_status_show(summaryview);
@@ -1019,6 +1025,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 {
        GtkItemFactory *ifactory = summaryview->popupfactory;
        SummarySelection selection;
+       GtkWidget *menuitem;
        gboolean sens;
 
        selection = summary_get_selection_type(summaryview);
@@ -1035,15 +1042,18 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                return;
        }
 
-       if (summaryview->folder_item->folder->type != F_NEWS) {
+       if (summaryview->folder_item->folder->type != F_NEWS)
                menu_set_sensitive(ifactory, "/Move...", TRUE);
-               menu_set_sensitive(ifactory, "/Delete", TRUE);
-       }
+       else
+               menu_set_sensitive(ifactory, "/Move...", FALSE);
 
+       menu_set_sensitive(ifactory, "/Delete", TRUE);
+       menu_set_sensitive(ifactory, "/Select thread", TRUE);
+       menu_set_sensitive(ifactory, "/Select all", TRUE);
        menu_set_sensitive(ifactory, "/Copy...", TRUE);
        menu_set_sensitive(ifactory, "/Execute", TRUE);
 
-        menu_set_sensitive(ifactory, "/Mark", TRUE);
+       menu_set_sensitive(ifactory, "/Mark", TRUE);
        menu_set_sensitive(ifactory, "/Mark/Mark",   TRUE);
        menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
 
@@ -1072,24 +1082,29 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
            summaryview->folder_item->stype == F_DRAFT  ||
            summaryview->folder_item->stype == F_QUEUE)
                menu_set_sensitive(ifactory, "/Re-edit", sens);
+       else
+               menu_set_sensitive(ifactory, "/Re-edit", FALSE);
 
        menu_set_sensitive(ifactory, "/Save as...", sens);
        menu_set_sensitive(ifactory, "/Print...",   TRUE);
 
-       menu_set_sensitive(ifactory, "/Select all", TRUE);
-
        if (summaryview->folder_item->folder->account)
                sens = summaryview->folder_item->folder->account->protocol
                        == A_NNTP;
        else
                sens = FALSE;
        menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
+       summary_lock(summaryview);
+       menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
+       gtk_check_menu_item_set_active
+               (GTK_CHECK_MENU_ITEM(menuitem),
+                summaryview->messageview->textview->show_all_headers);
+       summary_unlock(summaryview);
 }
 
 void summary_select_prev_unread(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
        node = summary_find_prev_unread_msg(summaryview, summaryview->selected);
 
@@ -1117,16 +1132,10 @@ void summary_select_prev_unread(SummaryView *summaryview)
                node = summary_find_prev_unread_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No unread messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_next_unread(SummaryView *summaryview)
@@ -1148,7 +1157,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                                val = G_ALERTDEFAULT;
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                               val = !G_ALERTDEFAULT;
+                               val = G_ALERTOTHER;
                                break;
                        default:
                                debug_print(
@@ -1169,20 +1178,13 @@ void summary_select_next_unread(SummaryView *summaryview)
                        return;
        }
 
-       if (node) {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node);
-       }
+       if (node)
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_prev_marked(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
        node = summary_find_prev_marked_msg(summaryview, summaryview->selected);
 
@@ -1197,22 +1199,15 @@ void summary_select_prev_marked(SummaryView *summaryview)
                node = summary_find_prev_marked_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No marked messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_next_marked(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
        node = summary_find_next_marked_msg(summaryview, summaryview->selected);
 
@@ -1227,22 +1222,15 @@ void summary_select_next_marked(SummaryView *summaryview)
                node = summary_find_next_marked_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No marked messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_prev_labeled(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
        node = summary_find_prev_labeled_msg(summaryview, summaryview->selected);
 
@@ -1257,22 +1245,15 @@ void summary_select_prev_labeled(SummaryView *summaryview)
                node = summary_find_prev_labeled_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No labeled messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_next_labeled(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
        node = summary_find_next_labeled_msg(summaryview, summaryview->selected);
 
@@ -1287,16 +1268,10 @@ void summary_select_next_labeled(SummaryView *summaryview)
                node = summary_find_next_labeled_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No labeled messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
@@ -1304,7 +1279,7 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
        GtkCTreeNode *node;
 
        node = summary_find_msg_by_msgnum(summaryview, msgnum);
-       summary_select_node(summaryview, node, FALSE);
+       summary_select_node(summaryview, node, FALSE, TRUE);
 }
 
 /**
@@ -1312,22 +1287,28 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
  * @summaryview: Summary view.
  * @node: Summary tree node.
  * @display_msg: TRUE to display the selected message.
+ * @do_refresh: TRUE to refresh the widget.
  *
  * Select @node (bringing it into view by scrolling and expanding its
  * thread, if necessary) and unselect all others.  If @display_msg is
  * TRUE, display the corresponding message in the message view.
+ * If @do_refresh is TRUE, the widget is refreshed.
  **/
 void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
-                        gboolean display_msg)
+                        gboolean display_msg, gboolean do_refresh)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
        if (node) {
-               GTK_EVENTS_FLUSH();
                gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
-               gtk_widget_grab_focus(GTK_WIDGET(ctree));
+               if (do_refresh) {
+                       GTK_EVENTS_FLUSH();
+                       gtk_widget_grab_focus(GTK_WIDGET(ctree));
+                       gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+               }
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               if (display_msg && summaryview->displayed == node)
+                       summaryview->displayed = NULL;
                summaryview->display_msg = display_msg;
                gtk_sctree_select(GTK_SCTREE(ctree), node);
        }
@@ -1627,6 +1608,9 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
 
+       if (MSG_IS_NEWS(msginfo->flags))
+               news_flag_crosspost(msginfo);
+
        if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->newmsgs++;
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
@@ -1697,11 +1681,16 @@ static void summary_status_show(SummaryView *summaryview)
                n_selected++;
        }
 
-       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
-                     summaryview->folder_item &&
-                     summaryview->folder_item->folder->type == F_NEWS
-                     ? g_basename(summaryview->folder_item->path)
-                     : summaryview->folder_item->path);
+       if (summaryview->folder_item->folder->type == F_NEWS) {
+               gchar *group;
+               group = get_abbrev_newsgroup_name
+                       (g_basename(summaryview->folder_item->path));
+               gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
+               g_free(group);
+       } else {
+               gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
+                             summaryview->folder_item->path);
+       }
 
        if (summaryview->deleted)
                del = g_strdup_printf(_("%d deleted"), summaryview->deleted);
@@ -1747,8 +1736,7 @@ static void summary_status_show(SummaryView *summaryview)
        g_free(cp);
        g_free(itstr);
 
-       if (summaryview->folder_item &&
-           FOLDER_IS_LOCAL(summaryview->folder_item->folder)) {
+       if (FOLDER_IS_LOCAL(summaryview->folder_item->folder)) {
                str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
                                      summaryview->newmsgs,
                                      summaryview->unread,
@@ -1763,11 +1751,12 @@ static void summary_status_show(SummaryView *summaryview)
        gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
 
+       summaryview->folder_item->new    = summaryview->newmsgs;
+       summaryview->folder_item->unread = summaryview->unread;
+       summaryview->folder_item->total  = summaryview->messages;
+
        folderview_update_msg_num(summaryview->folderview,
-                                 summaryview->folderview->opened,
-                                 summaryview->newmsgs,
-                                 summaryview->unread,
-                                 summaryview->messages);
+                                 summaryview->folderview->opened);
 }
 
 static void summary_set_column_titles(SummaryView *summaryview)
@@ -1980,7 +1969,7 @@ gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
        GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
        summary_set_marks_func(ctree, cnode, summaryview);
 
-       if (msgid)
+       if (msgid && msgid[0] != '\0')
                g_hash_table_insert(msgid_table, (gchar *)msgid, cnode);
 
        return TRUE;
@@ -2059,7 +2048,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
                        summary_set_marks_func(ctree, node, summaryview);
 
-                       if (msginfo->msgid)
+                       if (msginfo->msgid && msginfo->msgid[0] != '\0')
                                g_hash_table_insert(msgid_table,
                                                    msginfo->msgid, node);
 
@@ -2119,7 +2108,7 @@ gint summary_write_cache(SummaryView *summaryview)
 
        cachefile = folder_item_get_cache_file(summaryview->folder_item);
        g_return_val_if_fail(cachefile != NULL, -1);
-       if ((fps.cache_fp = fopen(cachefile, "w")) == NULL) {
+       if ((fps.cache_fp = fopen(cachefile, "wb")) == NULL) {
                FILE_OP_ERROR(cachefile, "fopen");
                g_free(cachefile);
                return -1;
@@ -2143,7 +2132,7 @@ gint summary_write_cache(SummaryView *summaryview)
        g_free(cachefile);
 
        markfile = folder_item_get_mark_file(summaryview->folder_item);
-       if ((fps.mark_fp = fopen(markfile, "w")) == NULL) {
+       if ((fps.mark_fp = fopen(markfile, "wb")) == NULL) {
                FILE_OP_ERROR(markfile, "fopen");
                fclose(fps.cache_fp);
                g_free(markfile);
@@ -2202,6 +2191,28 @@ static void summary_write_cache_func(GtkCTree *ctree, GtkCTreeNode *node,
        procmsg_write_flags(msginfo, fps->mark_fp);
 }
 
+static gchar *summary_complete_address(const gchar *addr)
+{
+       gint count;
+       gchar *res, *tmp, *email_addr;
+
+       Xstrdup_a(email_addr, addr, return NULL);
+       extract_address(email_addr);
+       g_return_val_if_fail(*email_addr, NULL);
+
+       /*
+        * completion stuff must be already initialized
+        */
+       res = NULL;
+       if (1 < (count = complete_address(email_addr))) {
+               tmp = get_complete_address(1);
+               res = procheader_get_fromname(tmp);
+               g_free(tmp);    
+       }
+       
+       return res;
+}
+
 static void summary_set_header(SummaryView *summaryview, gchar *text[],
                               MsgInfo *msginfo)
 {
@@ -2241,34 +2252,37 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                _("(No From)");
        if (prefs_common.swap_from && msginfo->from && msginfo->to &&
            !MSG_IS_NEWS(msginfo->flags)) {
-               gchar *from;
+               gchar *addr = NULL;
+
+               if (prefs_common.use_addr_book) {
+                       Xstrdup_a(addr, msginfo->from, return);
+                       extract_address(addr);
+               }
 
-               Xstrdup_a(from, msginfo->from, return);
-               extract_address(from);
-               if (account_find_from_address(from)) {
+               if (account_find_from_address(addr)) {
+                       addr = summary_complete_address(msginfo->to);
                        g_free(to);
-                       to = g_strconcat("-->", msginfo->to, NULL);
+                       to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
                        text[col_pos[S_COL_FROM]] = to;
                }
        }
 
-       if ((text[col_pos[S_COL_FROM]] != to) && prefs_common.use_addr_book &&
-           msginfo->from) {
-               gint count;
+       /*
+        * CLAWS: note that the "text[col_pos[S_COL_FROM]] != to" is really a hack, 
+        * checking whether the above block (which handles the special case of
+        * the --> in sent boxes) was executed.
+        */
+       if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
                gchar *from;
-  
-               Xstrdup_a(from, msginfo->from, return);
-               extract_address(from);
-               if (*from) {
-                       count = complete_address(from);
-                       if (count > 1) {
-                               g_free(from_name);
-                               from = get_complete_address(1);
-                               from_name = procheader_get_fromname(from);
-                               g_free(from);
-                               text[col_pos[S_COL_FROM]] = from_name;
-                       }
-               }
+               from = summary_complete_address(msginfo->from);
+               if (from) {
+                       /*
+                        * FIXME: this text[col_pos[S_COL_FROM]] should be freed
+                        * but may have been assigned _("No From"). Should be
+                        * freed??? 
+                        */
+                       text[col_pos[S_COL_FROM]] = from;
+               }       
        }
 
        if (prefs->enable_simplify_subject 
@@ -2355,7 +2369,9 @@ static void summary_display_msg_full(SummaryView *summaryview,
                messageview_show(msgview, msginfo, all_headers);
                if (msgview->type == MVIEW_TEXT ||
                    (msgview->type == MVIEW_MIME &&
-                    GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL))
+                    (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL ||
+                     gtk_notebook_get_current_page
+                       (GTK_NOTEBOOK(msgview->mimeview->notebook)) == 0)))
                        gtk_widget_grab_focus(summaryview->ctree);
                GTK_EVENTS_FLUSH();
                gtkut_ctree_node_move_if_on_the_edge(ctree, row);
@@ -2369,11 +2385,8 @@ static void summary_display_msg_full(SummaryView *summaryview,
                gtk_clist_thaw(GTK_CLIST(ctree));
                summary_status_show(summaryview);
        }
-
-#if 0
-       if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
-               header_window_show(summaryview->headerwin, msginfo);
-#endif
+       summary_set_menu_sensitive(summaryview);
+       main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        summary_unlock(summaryview);
 }
@@ -2381,6 +2394,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
 void summary_display_msg_selected(SummaryView *summaryview,
                                  gboolean all_headers)
 {
+       if (summary_is_locked(summaryview)) return;
        summaryview->displayed = NULL;
        summary_display_msg_full(summaryview, summaryview->selected, FALSE,
                                 all_headers);
@@ -2439,21 +2453,28 @@ void summary_reedit(SummaryView *summaryview)
 void summary_step(SummaryView *summaryview, GtkScrollType type)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
 
        if (summary_is_locked(summaryview)) return;
 
        if (type == GTK_SCROLL_STEP_FORWARD) {
-               GtkCTreeNode *node;
                node = gtkut_ctree_node_next(ctree, summaryview->selected);
                if (node)
                        gtkut_ctree_expand_parent_all(ctree, node);
+               else
+                       return;
+       } else {
+               if (summaryview->selected) {
+                       node = GTK_CTREE_NODE_PREV(summaryview->selected);
+                       if (!node) return;
+               }
        }
 
+       if (summaryview->msg_is_toggled_on)
+               summaryview->display_msg = TRUE;
+
        gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
                                type, 0.0);
-
-       if (summaryview->msg_is_toggled_on)
-               summary_display_msg(summaryview, summaryview->selected);
 }
 
 static void summary_toggle_view(SummaryView *summaryview)
@@ -2690,9 +2711,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
        gtk_ctree_node_set_row_style(ctree, row, style);
 
-        if (MSG_GET_COLORLABEL(flags))
-               summary_set_colorlabel_color(ctree, row,
-                                            MSG_GET_COLORLABEL_VALUE(flags));
+       if (MSG_GET_COLORLABEL(flags))
+               summary_set_colorlabel_color(ctree, row, MSG_GET_COLORLABEL_VALUE(flags));
 }
 
 void summary_set_marks_selected(SummaryView *summaryview)
@@ -2879,6 +2899,55 @@ void summary_mark_as_unread(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
+static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
+{
+       GList * cur;
+       gboolean found;
+
+       switch (summaryview->folder_item->folder->type) {
+
+       case F_NEWS:
+
+               /*
+                 security : checks if one the accounts correspond to
+                 the author of the post
+               */
+
+               found = FALSE;
+               for(cur = account_get_list() ; cur != NULL ; cur = cur->next) {
+                       PrefsAccount * account;
+                       gchar * from_name;
+                       
+                       account = cur->data;
+                       if (account->name && *account->name)
+                               from_name =
+                                       g_strdup_printf("%s <%s>",
+                                                       account->name,
+                                                       account->address);
+                       else
+                               from_name =
+                                       g_strdup_printf("%s",
+                                                       account->address);
+                       
+                       if (g_strcasecmp(from_name, msginfo->from) == 0) {
+                               g_free(from_name);
+                               found = TRUE;
+                               break;
+                       }
+                       g_free(from_name);
+               }
+
+               if (!found) {
+                       alertpanel_error(_("You're not the author of the article\n"));
+               }
+               
+               return found;
+
+       default:
+               return TRUE;
+       }
+}
+
 static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
        gboolean changed = FALSE;
@@ -2887,6 +2956,9 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
+       if (!check_permission(summaryview, msginfo))
+               return;
+
        if (MSG_IS_LOCKED(msginfo->flags)) return;
 
        if (MSG_IS_DELETED(msginfo->flags)) return;
@@ -2929,7 +3001,10 @@ void summary_delete(SummaryView *summaryview)
        GtkCTreeNode *sel_last = NULL;
        GtkCTreeNode *node;
 
+       if (!item) return;
+#if 0
        if (!item || item->folder->type == F_NEWS) return;
+#endif
 
        if (summary_is_locked(summaryview)) return;
 
@@ -2961,7 +3036,8 @@ void summary_delete(SummaryView *summaryview)
                        summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
                else
                        summary_select_node(summaryview, node,
-                                           summaryview->msg_is_toggled_on);
+                                           summaryview->msg_is_toggled_on,
+                                           FALSE);
        }
 
        if (prefs_common.immediate_exec || item->stype == F_TRASH)
@@ -3299,7 +3375,10 @@ void summary_save_as(SummaryView *summaryview)
        }
 
        src = procmsg_get_message_file(msginfo);
-       copy_file(src, dest);
+       if (copy_file(src, dest) < 0) {
+               alertpanel_error(_("Can't save the file `%s'."),
+                                g_basename(dest));
+       }
        g_free(src);
 }
 
@@ -3500,6 +3579,7 @@ static void summary_execute_delete(SummaryView *summaryview)
        GSList *cur;
 
        trash = summaryview->folder_item->folder->trash;
+
        if (summaryview->folder_item->folder->type == F_MH) {
                g_return_if_fail(trash != NULL);
        }
@@ -3510,10 +3590,11 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        if (!summaryview->mlist) return;
 
-       if (summaryview->folder_item != trash)
-               folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+       if (trash == NULL || summaryview->folder_item == trash)
+               folder_item_remove_msgs(summaryview->folder_item,
+                                       summaryview->mlist);
        else
-               folder_item_remove_msgs(trash, summaryview->mlist);
+               folder_item_move_msgs_with_dest(trash, summaryview->mlist);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
@@ -3521,7 +3602,7 @@ static void summary_execute_delete(SummaryView *summaryview)
        g_slist_free(summaryview->mlist);
        summaryview->mlist = NULL;
 
-       if (summaryview->folder_item != trash) {
+       if ((summaryview->folder_item != trash) && (trash != NULL)) {
                folder_item_scan(trash);
                folderview_update_item(trash, FALSE);
        }
@@ -3772,8 +3853,8 @@ void summary_processing(SummaryView *summaryview, GSList * mlist)
                MsgInfo * msginfo;
 
                msginfo = (MsgInfo *) cur->data;
-               filter_msginfo_move_or_delete(processing_list, msginfo,
-                                             summaryview->folder_table);
+               filter_message_by_msginfo(processing_list, msginfo,
+                                         summaryview->folder_table);
        }
        
        folder_item_scan_foreach(summaryview->folder_table);
@@ -3852,13 +3933,7 @@ void summary_filter(SummaryView *summaryview)
         * we want the lock to be context aware...  
         */
        if (global_processing) {
-               /*
-                * CLAWS: to prevent summary_show to write the cache,
-                * we force an update of the summaryview in a special way,
-                * like inc.c::inc_finished().
-                */
-               folderview_unselect(summaryview->folderview);
-               folderview_select(summaryview->folderview, summaryview->folder_item);
+               summary_show(summaryview, summaryview->folder_item, TRUE);              
        }               
 }
 
@@ -3879,31 +3954,48 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                if (dest && strcmp2(dest->path, FILTER_NOT_RECEIVE) != 0 &&
                    summaryview->folder_item != dest)
                        summary_move_row_to(summaryview, node, dest);
-       }
-       else 
-               filter_msginfo_move_or_delete(global_processing, msginfo,
-                                             summaryview->folder_table);
+       } else 
+               filter_message_by_msginfo(global_processing, msginfo, summaryview->folder_table);
 }
 
 void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
 {
-       static HeaderEntry hentry[] = {{"List-Id:",        NULL, FALSE},
+       static HeaderEntry hentry[] = {{"X-BeenThere:",    NULL, FALSE},
                                       {"X-ML-Name:",      NULL, FALSE},
                                       {"X-List:",         NULL, FALSE},
                                       {"X-Mailing-list:", NULL, FALSE},
+                                      {"List-Id:",        NULL, FALSE},
                                       {NULL,              NULL, FALSE}};
+
+       static gchar *header_strs[] = {"From", "from", "To", "to", "Subject", "subject"};
+
+       static gchar *hentry_strs[]   = {"X-BeenThere", "X-ML-Name", "X-List",
+                                        "X-Mailing-List", "List-Id",
+                                        "header \"X-BeenThere\"", "header \"X-ML-Name\"",
+                                        "header \"X-List\"", "header \"X-Mailing-List\"",
+                                        "header \"List-Id\""};
        enum
        {
-               H_LIST_ID        = 0,
+               H_X_BEENTHERE    = 0,
                H_X_ML_NAME      = 1,
                H_X_LIST         = 2,
-               H_X_MAILING_LIST = 3
+               H_X_MAILING_LIST = 3,
+               H_LIST_ID        = 4
+       };
+
+       enum
+       {
+               H_FROM    = 0,
+               H_TO      = 2,
+               H_SUBJECT = 4
        };
 
        MsgInfo *msginfo;
        gchar *header = NULL;
        gchar *key = NULL;
        FILE *fp;
+       int header_offset;
+       int hentry_offset;
 
        if (!summaryview->selected) return;
 
@@ -3911,6 +4003,15 @@ void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
                                              summaryview->selected);
        if (!msginfo) return;
 
+       if (global_processing) {
+               header_offset = 1;
+               hentry_offset = 5;
+       }
+       else {
+               header_offset = 0;
+               hentry_offset = 0;
+       }
+
        switch (type) {
        case FILTER_BY_NONE:
                break;
@@ -3919,104 +4020,109 @@ void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
                procheader_get_header_fields(fp, hentry);
                fclose(fp);
 
-               if (hentry[H_LIST_ID].body != NULL) {
-                       header = "List-Id";
-                       Xstrdup_a(key, hentry[H_LIST_ID].body, );
+               if (hentry[H_X_BEENTHERE].body != NULL) {
+                       header = hentry_strs[H_X_BEENTHERE + hentry_offset];
+                       Xstrdup_a(key, hentry[H_X_BEENTHERE].body, );
                } else if (hentry[H_X_ML_NAME].body != NULL) {
-                       header = "X-ML-Name";
+                       header = hentry_strs[H_X_ML_NAME + hentry_offset];
                        Xstrdup_a(key, hentry[H_X_ML_NAME].body, );
                } else if (hentry[H_X_LIST].body != NULL) {
-                       header = "X-List";
+                       header = hentry_strs[H_X_LIST + hentry_offset];
                        Xstrdup_a(key, hentry[H_X_LIST].body, );
                } else if (hentry[H_X_MAILING_LIST].body != NULL) {
-                       header = "X-Mailing-list";
+                       header = hentry_strs[H_X_MAILING_LIST + hentry_offset];
                        Xstrdup_a(key, hentry[H_X_MAILING_LIST].body, );
+               } else if (hentry[H_LIST_ID].body != NULL) {
+                       header = hentry_strs[H_LIST_ID + hentry_offset];
+                       Xstrdup_a(key, hentry[H_LIST_ID].body, );
                } else if (msginfo->subject) {
-                       header = "Subject";
+                       header = header_strs[H_SUBJECT + header_offset];
                        key = msginfo->subject;
                }
 
-               g_free(hentry[H_LIST_ID].body);
-               hentry[H_LIST_ID].body = NULL;
+               g_free(hentry[H_X_BEENTHERE].body);
+               hentry[H_X_BEENTHERE].body = NULL;
                g_free(hentry[H_X_ML_NAME].body);
                hentry[H_X_ML_NAME].body = NULL;
                g_free(hentry[H_X_LIST].body);
                hentry[H_X_LIST].body = NULL;
                g_free(hentry[H_X_MAILING_LIST].body);
                hentry[H_X_MAILING_LIST].body = NULL;
+               g_free(hentry[H_LIST_ID].body);
+               hentry[H_LIST_ID].body = NULL;
 
                break;
        case FILTER_BY_FROM:
-               header = "From";
+               header = header_strs[H_FROM + header_offset];
                key = msginfo->from;
                break;
        case FILTER_BY_TO:
-               header = "To";
+               header = header_strs[H_TO + header_offset];
                key = msginfo->to;
                break;
        case FILTER_BY_SUBJECT:
-               header = "Subject";
+               header = header_strs[H_SUBJECT + header_offset];
                key = msginfo->subject;
                break;
        default:
                break;
        }
 
-       prefs_filter_open(header, key);
+       if (global_processing)
+               prefs_filtering_open(NULL, header, key);
+       else
+               prefs_filter_open(header, key);
 }
 
 void summary_reply(SummaryView *summaryview, ComposeMode mode)
 {
        GtkWidget *widget;
+       GList *sel = GTK_CLIST(summaryview->ctree)->selection;
        MsgInfo *msginfo;
-       GList  *sel = GTK_CLIST(summaryview->ctree)->selection;
-       gchar *seltext = NULL;
+       gchar *text;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
 
-       if (summaryview && summaryview->messageview  &&
-           summaryview->messageview->textview       &&
-           summaryview->messageview->textview->text)
-               seltext = gtkut_get_selection(
-                               summaryview->messageview->textview->text);
+       text = gtkut_editable_get_selection
+               (GTK_EDITABLE(summaryview->messageview->textview->text));
 
        switch (mode) {
        case COMPOSE_REPLY:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE, seltext);
+                             FALSE, FALSE, text);
                break;
        case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE, seltext);
+               compose_reply(msginfo, TRUE, FALSE, FALSE, text);
                break;
        case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE, seltext);
+               compose_reply(msginfo, FALSE, FALSE, FALSE, NULL);
                break;
        case COMPOSE_REPLY_TO_SENDER:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE, seltext);
+                             FALSE, TRUE, text);
                break;
        case COMPOSE_FOLLOWUP_AND_REPLY_TO:
                compose_followup_and_reply_to(msginfo,
                                              prefs_common.reply_with_quote,
-                                             FALSE, TRUE, seltext);
+                                             FALSE, TRUE, text);
                break;
        case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE, seltext);
+               compose_reply(msginfo, TRUE, FALSE, TRUE, text);
                break;
        case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE, seltext);
+               compose_reply(msginfo, FALSE, FALSE, TRUE, NULL);
                break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, TRUE, seltext);
+                             TRUE, FALSE, text);
                break;
        case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, TRUE, seltext);
+               compose_reply(msginfo, TRUE, TRUE, FALSE, text);
                break;
        case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, TRUE, seltext);
+               compose_reply(msginfo, FALSE, TRUE, FALSE, NULL);
                break;
        case COMPOSE_FORWARD:
                if (prefs_common.forward_as_attachment) {
@@ -4029,7 +4135,7 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode)
                break;
        case COMPOSE_FORWARD_INLINE:
                if (!sel->next) {
-                       compose_forward(NULL, msginfo, FALSE, seltext);
+                       compose_forward(NULL, msginfo, FALSE, text);
                        break;
                }
                /* if (sel->next) FALL THROUGH */
@@ -4052,9 +4158,7 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode)
        }
 
        summary_set_marks_selected(summaryview);
-
-       if (seltext)
-               g_free((gchar *) seltext);
+       g_free(text);
 }
 
 /* color label */
@@ -4412,6 +4516,7 @@ void summary_set_column_order(SummaryView *summaryview)
 }
 
 
+
 /* callback functions */
 
 static void summary_toggle_view_cb(GtkWidget *button,
@@ -4548,12 +4653,12 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        MsgInfo *msginfo;
 
        summary_status_show(summaryview);
-       summary_set_menu_sensitive(summaryview);
-       main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        if (GTK_CLIST(ctree)->selection &&
             GTK_CLIST(ctree)->selection->next) {
                summaryview->display_msg = FALSE;
+               summary_set_menu_sensitive(summaryview);
+               main_window_set_toolbar_sensitive(summaryview->mainwin);
                return;
        }
 
@@ -4595,10 +4700,13 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                break;
        }
 
-       if (summaryview->display_msg)
+       if (summaryview->display_msg) {
                summary_display_msg(summaryview, row);
-
-       summaryview->display_msg = FALSE;
+               summaryview->display_msg = FALSE;
+       } else {
+               summary_set_menu_sensitive(summaryview);
+               main_window_set_toolbar_sensitive(summaryview->mainwin);
+       }
 }
 
 static void summary_col_resized(GtkCList *clist, gint column, gint width,
@@ -4624,7 +4732,8 @@ static void summary_execute_cb(SummaryView *summaryview, guint action,
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
-       summary_display_msg_selected(summaryview, TRUE);
+       summary_display_msg_selected(summaryview,
+                                    GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
 static void summary_add_address_cb(SummaryView *summaryview,
@@ -4844,6 +4953,69 @@ static gint summary_cmp_by_label(GtkCList *clist,
        return MSG_GET_COLORLABEL(msginfo1->flags) -
                MSG_GET_COLORLABEL(msginfo2->flags);
 }
+
+static void news_flag_crosspost(MsgInfo *msginfo)
+{
+       GString *line;
+       gpointer key;
+       gpointer value;
+       MsgPermFlags flags;
+       Folder *mff = msginfo->folder->folder;
+
+       if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
+               line = g_string_sized_new(128);
+               g_string_sprintf(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>"), value);
+                       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+                               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+                               MSG_SET_COLORLABEL_VALUE(msginfo->flags, mff->account->crosspost_col);
+                       }
+                       g_hash_table_remove(mff->newsart, key);
+                       g_free(key);
+               }
+               g_string_free(line, TRUE);
+               debug_print(_("\n"));
+       }
+}
+
+static void news_process_crossposted(MsgInfo *msginfo)
+{
+       gchar **crossref;
+       gchar **crp;
+       gchar *cp;
+       gint cnt;
+       static char *read = "read";
+       Folder *mff = msginfo->folder->folder;
+
+       /* Get the Xref: line */
+       if (msginfo->xref) {
+               /* Retrieve the cross-posted groups and message ids */
+               /* Format of Xref is Xref: server message:id message:id ... */
+               crossref = g_strsplit(msginfo->xref, " ", 1024);
+               for (crp = crossref+2, cnt = 0; *crp; crp++, cnt++) {
+                       if ((cp = strchr(*crp, ':'))) {
+                               *cp = '\0';
+                               if (!strcmp(*crp, msginfo->folder->path)) continue;
+                               *cp = ':';
+
+                               /* On first pass, create a GHashTable to hold the list of
+                                * article numbers per newsgroup that have been read. */
+                               if (!mff->newsart) {
+                                       mff->newsart = g_hash_table_new(g_str_hash, g_str_equal);
+                               }
+                               /* When a summary is selected, the articles for that
+                                * newsgroup are marked based on this entry */
+                               g_hash_table_insert(mff->newsart, g_strdup(*crp), read);
+                               debug_print(_("Cross-reference %d: Hash <%s>\n"), cnt, *crp);
+                       }
+               }
+               g_strfreev(crossref);
+       }
+}
+
 static gint summary_cmp_by_score(GtkCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -4869,6 +5041,37 @@ static gint summary_cmp_by_locked(GtkCList *clist,
        return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
 }
 
+static void summary_select_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *) data;
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       gtk_ctree_select(GTK_CTREE(ctree), row);        
+       debug_print(_("Message %d selected\n"),
+           msginfo->msgnum);
+}
+
+/* select current thread */
+void summary_select_thread(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node = summaryview->selected;
+       GList *cur;
+
+       while (GTK_CTREE_ROW(node)->parent != NULL)
+               node = GTK_CTREE_ROW(node)->parent;
+
+       if (node && node != summaryview->selected)
+               summary_select_node(summaryview, node, TRUE, FALSE);
+
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+               gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_select_thread_func), summaryview);
+       }
+       
+       summary_status_show(summaryview);
+}
+
 static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;
@@ -4888,6 +5091,7 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
            msginfo->msgnum);
 }
 
+
 static void summary_ignore_thread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -4931,7 +5135,6 @@ static void summary_unignore_thread(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
-
 static gboolean processing_apply_func(GNode *node, gpointer data)
 {
        FolderItem *item;
@@ -4964,8 +5167,7 @@ static gboolean processing_apply_func(GNode *node, gpointer data)
                        MsgInfo * msginfo;
                        
                        msginfo = (MsgInfo *) cur->data;
-                       filter_msginfo_move_or_delete(processing, msginfo,
-                                                     NULL);
+                       filter_message_by_msginfo(processing, msginfo, NULL);
                        procmsg_msginfo_free(msginfo);
                }
 
@@ -5044,6 +5246,39 @@ static void summaryview_subject_filter_init(PrefsFolderItem *prefs)
        }
 }
 
+void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCTreeNode *node;
+       GtkWidget *pixmap; 
+
+       gtk_widget_destroy(summaryview->folder_pixmap);
+
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED, &deletedxpm, &deletedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_NEW, &newxpm, &newxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD, &unreadxpm, &unreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED, &repliedxpm, &repliedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm, &forwardedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP, &clipxpm, &clipxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED, &lockedxpm, &lockedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+
+       pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
+       gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
+       gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
+       gtk_widget_show(pixmap);
+       summaryview->folder_pixmap = pixmap; 
+
+       summary_write_cache(summaryview);
+
+       folderview_unselect(summaryview->folderview);
+       folderview_select(summaryview->folderview, summaryview->folder_item);
+}
+
 
 /*
  * End of Source.