fix sensitivity of 'Select thread'
[claws.git] / src / summaryview.c
index 499959af8e32a67c4ffadc39065fbb3377add292..33c097802aeccca99b1195b7c78c273137f3c48e 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "foldersel.h"
 #include "procmsg.h"
 #include "procheader.h"
-#include "headerwindow.h"
 #include "sourcewindow.h"
 #include "prefs_common.h"
 #include "prefs_summary_column.h"
+#include "prefs_filter.h"
+#include "prefs_filtering.h"
 #include "account.h"
 #include "compose.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "stock_pixmap.h"
 #include "filesel.h"
-#include "manage_window.h"
 #include "alertpanel.h"
 #include "inputdialog.h"
 #include "statusbar.h"
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_UNREAD_WIDTH       13
 #define SUMMARY_COL_LOCKED_WIDTH       13
-#define SUMMARY_COL_MIME_WIDTH         10
+#define SUMMARY_COL_MIME_WIDTH         11
 
 static GdkFont *boldfont;
 static GdkFont *smallfont;
@@ -132,6 +132,10 @@ static GdkBitmap *lockedxpmmask;
 
 static GdkPixmap *clipxpm;
 static GdkBitmap *clipxpmmask;
+static GdkPixmap *keyxpm;
+static GdkBitmap *keyxpmmask;
+static GdkPixmap *clipkeyxpm;
+static GdkBitmap *clipkeyxpmmask;
 
 static void summary_free_msginfo_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
@@ -157,24 +161,18 @@ static GtkCTreeNode *summary_find_prev_msg
 static GtkCTreeNode *summary_find_next_msg
                                        (SummaryView            *summaryview,
                                         GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_prev_unread_msg
-                                       (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_next_unread_msg
-                                       (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_prev_marked_msg
-                                       (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_next_marked_msg
-                                       (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_prev_labeled_msg
-                                       (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_next_labeled_msg
-                                       (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
+
+static GtkCTreeNode *summary_find_prev_flagged_msg
+                                       (SummaryView    *summaryview,
+                                        GtkCTreeNode   *current_node,
+                                        MsgPermFlags    flags,
+                                        gboolean        start_from_prev);
+static GtkCTreeNode *summary_find_next_flagged_msg
+                                       (SummaryView    *summaryview,
+                                        GtkCTreeNode   *current_node,
+                                        MsgPermFlags    flags,
+                                        gboolean        start_from_next);
+
 static GtkCTreeNode *summary_find_msg_by_msgnum
                                        (SummaryView            *summaryview,
                                         guint                   msgnum);
@@ -190,11 +188,14 @@ static void summary_set_header            (SummaryView            *summaryview,
                                         gchar                  *text[],
                                         MsgInfo                *msginfo);
 static void summary_display_msg                (SummaryView            *summaryview,
+                                        GtkCTreeNode           *row);
+static void summary_display_msg_full   (SummaryView            *summaryview,
                                         GtkCTreeNode           *row,
-                                        gboolean                new_window);
-static void summary_toggle_view                (SummaryView            *summaryview);
+                                        gboolean                new_window,
+                                        gboolean                all_headers);
 static void summary_set_row_marks      (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
+static void summaryview_subject_filter_init (PrefsFolderItem    *prefs);
 
 /* message handling */
 static void summary_mark_row           (SummaryView            *summaryview,
@@ -303,6 +304,9 @@ static void summary_show_all_header_cb      (SummaryView            *summaryview,
 static void summary_add_address_cb     (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+static void summary_create_filter_cb   (SummaryView            *summaryview,
+                                        guint                   action,
+                                        GtkWidget              *widget);
 
 static void summary_mark_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
@@ -373,6 +377,8 @@ static gint summary_cmp_by_label    (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 
+static void news_flag_crosspost                (MsgInfo *msginfo);
+
 GtkTargetEntry summary_drag_types[1] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
@@ -385,10 +391,13 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/Reply to a_ll"),          NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/Bounce"),                 NULL, summary_reply_cb, COMPOSE_BOUNCE, NULL},
+       {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
        {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},
@@ -408,17 +417,24 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/Add sender to address boo_k"),
                                        NULL, summary_add_address_cb, 0, NULL},
+       {N_("/Create f_ilter rule"),    NULL, NULL,             0, "<Branch>"},
+       {N_("/Create f_ilter rule/_Automatically"),
+                                       NULL, summary_create_filter_cb, FILTER_BY_AUTO, NULL},
+       {N_("/Create f_ilter rule/by _From"),
+                                       NULL, summary_create_filter_cb, FILTER_BY_FROM, NULL},
+       {N_("/Create f_ilter rule/by _To"),
+                                       NULL, summary_create_filter_cb, FILTER_BY_TO, NULL},
+       {N_("/Create f_ilter rule/by _Subject"),
+                                       NULL, summary_create_filter_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
        {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] = {
@@ -441,9 +457,11 @@ SummaryView *summary_create(void)
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
        GtkWidget *hbox;
+       GtkWidget *hbox_l;
        GtkWidget *statlabel_folder;
        GtkWidget *statlabel_select;
        GtkWidget *statlabel_msgs;
+       GtkWidget *hbox_spc;
        GtkWidget *toggle_eventbox;
        GtkWidget *toggle_arrow;
        GtkWidget *popupmenu;
@@ -476,10 +494,13 @@ SummaryView *summary_create(void)
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+       hbox_l = gtk_hbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
+
        statlabel_folder = gtk_label_new("");
-       gtk_box_pack_start(GTK_BOX(hbox), statlabel_folder, FALSE, FALSE, 2);
+       gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
        statlabel_select = gtk_label_new("");
-       gtk_box_pack_start(GTK_BOX(hbox), statlabel_select, FALSE, FALSE, 16);
+       gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
 
        /* toggle view button */
        toggle_eventbox = gtk_event_box_new();
@@ -493,6 +514,9 @@ SummaryView *summary_create(void)
        statlabel_msgs = gtk_label_new("");
        gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
 
+       hbox_spc = gtk_hbox_new(FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
+
        /* create popup menu */
        n_entries = sizeof(summary_popup_entries) /
                sizeof(summary_popup_entries[0]);
@@ -504,6 +528,7 @@ SummaryView *summary_create(void)
        summaryview->scrolledwin = scrolledwin;
        summaryview->ctree = ctree;
        summaryview->hbox = hbox;
+       summaryview->hbox_l = hbox_l;
        summaryview->statlabel_folder = statlabel_folder;
        summaryview->statlabel_select = statlabel_select;
        summaryview->statlabel_msgs = statlabel_msgs;
@@ -511,10 +536,7 @@ SummaryView *summary_create(void)
        summaryview->toggle_arrow = toggle_arrow;
        summaryview->popupmenu = popupmenu;
        summaryview->popupfactory = popupfactory;
-       summaryview->msg_is_toggled_on = TRUE;
        summaryview->lock_count = 0;
-       summaryview->sort_mode = SORT_BY_NONE;
-       summaryview->sort_type = GTK_SORT_ASCENDING;
 
        gtk_widget_show_all(vbox);
 
@@ -542,8 +564,12 @@ void summary_init(SummaryView *summaryview)
                         &clipxpm, &clipxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
                         &lockedxpm, &lockedxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
+       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);
 
        if (!small_style) {
                small_style = gtk_style_copy
@@ -579,10 +605,11 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_set_style(summaryview->statlabel_select, style);
        gtk_widget_set_style(summaryview->statlabel_msgs, style);
 
-       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);
+       pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
+       gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
+       gtk_box_reorder_child(GTK_BOX(summaryview->hbox_l), pixmap, 0);
        gtk_widget_show(pixmap);
+       summaryview->folder_pixmap = pixmap;
 
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
@@ -665,9 +692,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        guint displayed_msgnum = 0;
        GtkCTreeNode *selected_node = summaryview->folderview->selected;
        GSList *cur;
-       gint sort_mode;
-       gint sort_type;
-        static gboolean locked = FALSE;
 
        if (summary_is_locked(summaryview)) return FALSE;
 
@@ -694,9 +718,11 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                val = alertpanel(_("Process mark"),
                                 _("Some marks are left. Process it?"),
                                 _("Yes"), _("No"), _("Cancel"));
-               if (G_ALERTDEFAULT == val)
+               if (G_ALERTDEFAULT == val) {
+                       summary_unlock(summaryview);
                        summary_execute(summaryview);
-               else if (G_ALERTALTERNATE == val)
+                       summary_lock(summaryview);
+               } else if (G_ALERTALTERNATE == val)
                        summary_write_cache(summaryview);
                else {
                        summary_unlock(summaryview);
@@ -704,9 +730,21 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        return FALSE;
                }
                folder_update_op_count();
-       }
-        
-       summary_write_cache(summaryview);
+       } else {
+               /* 
+                * CLAWS: summary_show() is responsible for updating the caches. 
+                * after filtering inc.c::inc_finished() forces the update of
+                * the cache by indirectly calling summary_show() (by re-selecting
+                * the currently selected mail folder).  
+                * this collides with the new filtering system that may have set 
+                * any message flag before calling summary_show(). 
+                * we can prevent this cache-write by checking the opened member
+                * of the folderview. if this is NULL, the folderview forced
+                * an update of the summary view.
+                */
+               if (summaryview->folderview->opened) 
+                       summary_write_cache(summaryview);
+       }       
         
        summaryview->folderview->opened = selected_node;
 
@@ -714,7 +752,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);
 
@@ -738,6 +775,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        g_free(buf);
 
        summaryview->folder_item = item;
+       item->opened = TRUE;
 
        gtk_signal_handler_block_by_data(GTK_OBJECT(ctree), summaryview);
 
@@ -748,8 +786,15 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        main_window_cursor_wait(summaryview->mainwin);
 
+/*
        mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
 
+       !!! NEW !!!
+       USE LIST FROM CACHE, WILL NOT DISPLAY ANY MESSAGES DROPED
+       BY OTHER PROGRAMS TO THE FOLDER
+*/
+       mlist = folder_item_get_msg_list(item);
+
        summary_processing(summaryview, mlist);
 
        for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
@@ -767,7 +812,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        if (summaryview->folder_item->hide_read_msgs) {
                GSList *not_killed;
-               gint kill_score;
                
                summary_set_hide_read_msgs_menu(summaryview, TRUE);
                not_killed = NULL;
@@ -812,14 +856,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                mlist = not_killed;
        }
 
-       if (item->prefs->enable_simplify_subject
-           && item->prefs->simplify_subject_regexp != NULL
-           && strlen(item->prefs->simplify_subject_regexp) != 0) {
-               summary_simplify_subject(summaryview, 
-                                        item->prefs->simplify_subject_regexp,
-                                        mlist);
-       }
-
        STATUSBAR_POP(summaryview->mainwin);
 
        /* set ctree and hash table from the msginfo list
@@ -828,26 +864,18 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        g_slist_free(mlist);
 
+       folderview_update_msg_num(summaryview->folderview,
+                                 summaryview->folderview->opened);
+
+       if (item->sort_key != SORT_BY_NONE)
+               summary_sort(summaryview, item->sort_key, item->sort_type);
+
        summary_write_cache(summaryview);
 
        gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), summaryview);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
-       /* sort before */
-       sort_mode = prefs_folder_item_get_sort_mode(item);
-       sort_type = prefs_folder_item_get_sort_type(item);
-
-       if (sort_mode != SORT_BY_NONE) {
-               summaryview->sort_mode = sort_mode;
-               if (sort_type == GTK_SORT_DESCENDING)
-                       summaryview->sort_type = GTK_SORT_ASCENDING;
-               else
-                       summaryview->sort_type = GTK_SORT_DESCENDING;
-
-               summary_sort(summaryview, sort_mode);
-       }
-
        if (is_refresh) {
                summaryview->displayed =
                        summary_find_msg_by_msgnum(summaryview,
@@ -858,31 +886,35 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                if (!summaryview->selected) {
                        /* no selected message - select first unread
                           message, but do not display it */
-                       node = summary_find_next_unread_msg(summaryview, NULL);
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_UNREAD, FALSE);
                        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,
+                                        item->sort_type == SORT_DESCENDING
+                                        ? 0 : GTK_CLIST(ctree)->rows - 1);
+                       summary_select_node(summaryview, node, FALSE, TRUE);
                }
        } else {
                /* select first unread message */
-               if (sort_mode == SORT_BY_SCORE)
+               if (item->sort_key == SORT_BY_SCORE)
                        node = summary_find_next_important_score(summaryview,
                                                                 NULL);
                else
-                       node = summary_find_next_unread_msg(summaryview, NULL);
-
+               node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                    MSG_UNREAD, FALSE);
                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,
+                                item->sort_type == 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);
@@ -919,7 +951,10 @@ void summary_clear_list(SummaryView *summaryview)
        gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
                                NULL, summary_free_msginfo_func, NULL);
 
-       summaryview->folder_item = NULL;
+       if (summaryview->folder_item) {
+               summaryview->folder_item->opened = FALSE;
+               summaryview->folder_item = NULL;
+       }
 
        summaryview->display_msg = FALSE;
 
@@ -942,8 +977,6 @@ void summary_clear_list(SummaryView *summaryview)
                g_hash_table_destroy(summaryview->folder_table);
                summaryview->folder_table = NULL;
        }
-       summaryview->sort_mode = SORT_BY_NONE;
-       summaryview->sort_type = GTK_SORT_ASCENDING;
 
        gtk_clist_clear(clist);
        if (summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
@@ -1002,6 +1035,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);
@@ -1018,15 +1052,17 @@ 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, "/Copy...", 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 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);
 
@@ -1043,9 +1079,10 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menu_set_sensitive(ifactory, "/Reply to sender",          sens);
        menu_set_sensitive(ifactory, "/Reply to all",             sens);
        menu_set_sensitive(ifactory, "/Forward",                  TRUE);
-       menu_set_sensitive(ifactory, "/Bounce",                   TRUE);
+       menu_set_sensitive(ifactory, "/Redirect",                 sens);
 
        menu_set_sensitive(ifactory, "/Add sender to address book", sens);
+       menu_set_sensitive(ifactory, "/Create filter rule",         sens);
 
        menu_set_sensitive(ifactory, "/View", sens);
        menu_set_sensitive(ifactory, "/View/Open in new window", sens);
@@ -1055,29 +1092,36 @@ 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, "/Select thread", sens);
        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);
+       node = summary_find_prev_flagged_msg
+               (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
 
        if (!node) {
-               AlertValue val;
+               AlertValue val = 0;
 
                switch (prefs_common.next_unread_msg_dialog) {
                        case NEXTUNREADMSGDIALOG_ALWAYS:
@@ -1097,56 +1141,105 @@ void summary_select_prev_unread(SummaryView *summaryview)
                                        _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                }
                if (val != G_ALERTDEFAULT) return;
-               node = summary_find_prev_unread_msg(summaryview, NULL);
+               node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                    MSG_UNREAD, FALSE);
        }
 
-       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, FALSE);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_next_unread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCTreeNode *node = summaryview->selected;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       node = summary_find_next_unread_msg(summaryview, summaryview->selected);
+       node = summary_find_next_flagged_msg
+               (summaryview, node, MSG_UNREAD, FALSE);
+       
+       if (node)
+               summary_select_node(summaryview, node, TRUE, FALSE);
+       else {
+               node = summary_find_next_flagged_msg
+                       (summaryview, NULL, MSG_UNREAD, FALSE);
+               if (node == NULL) {
+                       AlertValue val = 0;
+
+                       switch (prefs_common.next_unread_msg_dialog) {
+                               case NEXTUNREADMSGDIALOG_ALWAYS:
+                                       val = alertpanel(_("No more unread messages"),
+                                                        _("No unread message found. "
+                                                          "Go to next folder?"),
+                                                        _("Yes"), _("No"), NULL);
+                                       break;
+                               case NEXTUNREADMSGDIALOG_ASSUME_YES:
+                                       val = G_ALERTDEFAULT;
+                                       break;
+                               case NEXTUNREADMSGDIALOG_ASSUME_NO:
+                                       val = G_ALERTOTHER;
+                                       break;
+                               default:
+                                       debug_print(
+                                               _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+                       }
+
+                       if (val == G_ALERTDEFAULT) {
+                               if (gtk_signal_n_emissions_by_name
+                                       (GTK_OBJECT(ctree), "key_press_event") > 0)
+                                               gtk_signal_emit_stop_by_name
+                                                       (GTK_OBJECT(ctree),
+                                                        "key_press_event");
+                               folderview_select_next_unread(summaryview->folderview);
+                               return;
+                       } 
+                       else
+                               return;
+               } else
+                       summary_select_node(summaryview, node, TRUE, FALSE);
 
-       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, FALSE);
-       } else {
+       }
+}
+
+void summary_select_prev_new(SummaryView *summaryview)
+{
+       GtkCTreeNode *node;
+
+       node = summary_find_prev_flagged_msg
+               (summaryview, summaryview->selected, MSG_NEW, FALSE);
+
+       if (!node) {
                AlertValue val;
 
-               switch (prefs_common.next_unread_msg_dialog) {
-                       case NEXTUNREADMSGDIALOG_ALWAYS:
-                               val = alertpanel(_("No more unread messages"),
-                                                _("No unread message found. "
-                                                  "Go to next folder?"),
-                                                _("Yes"), _("No"), NULL);
-                               break;
-                       case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                               val = G_ALERTDEFAULT;
-                               break;
-                       case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                               val = !G_ALERTDEFAULT;
-                               break;
-                       default:
-                               debug_print(
-                                       _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
-               }
+               val = alertpanel(_("No more new messages"),
+                                _("No new message found. "
+                                  "Search from the end?"),
+                                _("Yes"), _("No"), NULL);
+               if (val != G_ALERTDEFAULT) return;
+               node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                    MSG_NEW, FALSE);
+       }
+
+       if (!node)
+               alertpanel_notice(_("No new messages."));
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
+}
+
+void summary_select_next_new(SummaryView *summaryview)
+{
+       GtkCTreeNode *node = summaryview->selected;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
+       while ((node = summary_find_next_flagged_msg
+               (summaryview, node, MSG_NEW, FALSE)) == NULL) {
+               AlertValue val;
+
+               val = alertpanel(_("No more new messages"),
+                                _("No new message found. "
+                                  "Go to next folder?"),
+                                _("Yes"), _("Search again"), _("No"));
                if (val == G_ALERTDEFAULT) {
                        if (gtk_signal_n_emissions_by_name
                                (GTK_OBJECT(ctree), "key_press_event") > 0)
@@ -1154,16 +1247,23 @@ void summary_select_next_unread(SummaryView *summaryview)
                                                (GTK_OBJECT(ctree),
                                                 "key_press_event");
                        folderview_select_next_unread(summaryview->folderview);
-               }
+                       return;
+               } else if (val == G_ALERTALTERNATE)
+                       node = NULL;
+               else
+                       return;
        }
+
+       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);
+       node = summary_find_prev_flagged_msg
+               (summaryview, summaryview->selected, MSG_MARKED, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -1173,27 +1273,22 @@ void summary_select_prev_marked(SummaryView *summaryview)
                                   "Search from the end?"),
                                 _("Yes"), _("No"), NULL);
                if (val != G_ALERTDEFAULT) return;
-               node = summary_find_prev_marked_msg(summaryview, NULL);
+               node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                    MSG_MARKED, TRUE);
        }
 
-       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, FALSE);
-       }
+       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);
+       node = summary_find_next_flagged_msg
+               (summaryview, summaryview->selected, MSG_MARKED, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -1203,27 +1298,22 @@ void summary_select_next_marked(SummaryView *summaryview)
                                   "Search from the beginning?"),
                                 _("Yes"), _("No"), NULL);
                if (val != G_ALERTDEFAULT) return;
-               node = summary_find_next_marked_msg(summaryview, NULL);
+               node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                    MSG_MARKED, TRUE);
        }
 
-       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, FALSE);
-       }
+       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);
+       node = summary_find_prev_flagged_msg
+               (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -1233,27 +1323,22 @@ void summary_select_prev_labeled(SummaryView *summaryview)
                                   "Search from the end?"),
                                 _("Yes"), _("No"), NULL);
                if (val != G_ALERTDEFAULT) return;
-               node = summary_find_prev_labeled_msg(summaryview, NULL);
+               node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                    MSG_CLABEL_FLAG_MASK, TRUE);
        }
 
-       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, FALSE);
-       }
+       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);
+       node = summary_find_next_flagged_msg
+               (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -1263,19 +1348,14 @@ void summary_select_next_labeled(SummaryView *summaryview)
                                   "Search from the beginning?"),
                                 _("Yes"), _("No"), NULL);
                if (val != G_ALERTDEFAULT) return;
-               node = summary_find_next_labeled_msg(summaryview, NULL);
+               node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                    MSG_CLABEL_FLAG_MASK, TRUE);
        }
 
-       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, FALSE);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
@@ -1283,7 +1363,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);
 }
 
 /**
@@ -1291,22 +1371,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);
        }
@@ -1337,8 +1423,7 @@ static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (!MSG_IS_DELETED(msginfo->flags))
-                       break;
+               if (!MSG_IS_DELETED(msginfo->flags)) break;
        }
 
        return node;
@@ -1358,128 +1443,61 @@ 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 (!MSG_IS_DELETED(msginfo->flags))
-                       break;
-       }
-
-       return node;
-}
-
-static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
-                                                 GtkCTreeNode *current_node)
-{
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
-       MsgInfo *msginfo;
-
-       if (current_node)
-               node = current_node;
-       else
-               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
-
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
-       }
-
-       return node;
-}
-
-static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
-                                                 GtkCTreeNode *current_node)
-{
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
-       MsgInfo *msginfo;
-
-       if (current_node)
-               node = current_node;
-       else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
-       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
-       }
-
-       return node;
-}
-
-static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
-                                                 GtkCTreeNode *current_node)
-{
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
-       MsgInfo *msginfo;
-
-       if (current_node)
-               node = GTK_CTREE_NODE_PREV(current_node);
-       else
-               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
-
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (MSG_IS_MARKED(msginfo->flags)) break;
-       }
-
-       return node;
-}
-
-static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
-                                                 GtkCTreeNode *current_node)
-{
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
-       MsgInfo *msginfo;
-
-       if (current_node)
-               node = gtkut_ctree_node_next(ctree, current_node);
-       else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
-       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (MSG_IS_MARKED(msginfo->flags)) break;
+               if (!MSG_IS_DELETED(msginfo->flags)) break;
        }
 
        return node;
 }
 
-static GtkCTreeNode *summary_find_prev_labeled_msg(SummaryView *summaryview,
-                                                  GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
+                                                  GtkCTreeNode *current_node,
+                                                  MsgPermFlags flags,
+                                                  gboolean start_from_prev)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
        MsgInfo *msginfo;
 
-       if (current_node)
-               node = GTK_CTREE_NODE_PREV(current_node);
-       else
+       if (current_node) {
+               if (start_from_prev)
+                       node = GTK_CTREE_NODE_PREV(current_node);
+               else
+                       node = current_node;
+       } else
                node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+               if ((msginfo->flags.perm_flags & flags) != 0) break;
        }
 
        return node;
 }
 
-static GtkCTreeNode *summary_find_next_labeled_msg(SummaryView *summaryview,
-                                                  GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
+                                                  GtkCTreeNode *current_node,
+                                                  MsgPermFlags flags,
+                                                  gboolean start_from_next)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
        MsgInfo *msginfo;
 
-       if (current_node)
-               node = gtkut_ctree_node_next(ctree, current_node);
-       else
+       if (current_node) {
+               if (start_from_next)
+                       node = gtkut_ctree_node_next(ctree, current_node);
+               else
+                       node = current_node;
+       } else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+               /* Find msg with matching flags but ignore messages with
+                  ignore flags, if searching for new or unread messages */
+               if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) && 
+                       ((msginfo->flags.perm_flags & flags) != 0))
+                       break;
        }
 
        return node;
@@ -1606,6 +1624,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))
@@ -1676,11 +1697,17 @@ 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 &&
+           prefs_common.ng_abbrev_len < strlen(summaryview->folder_item->path)) {
+               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);
@@ -1726,8 +1753,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,
@@ -1741,12 +1767,6 @@ static void summary_status_show(SummaryView *summaryview)
        }
        gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
-
-       folderview_update_msg_num(summaryview->folderview,
-                                 summaryview->folderview->opened,
-                                 summaryview->newmsgs,
-                                 summaryview->unread,
-                                 summaryview->messages);
 }
 
 static void summary_set_column_titles(SummaryView *summaryview)
@@ -1760,8 +1780,9 @@ static void summary_set_column_titles(SummaryView *summaryview)
        SummaryColumnType type;
        gboolean single_char;
        GtkJustification justify;
+       FolderItem *item = summaryview->folder_item;
 
-       static SummarySortType sort_by[N_SUMMARY_COLS] = {
+       static FolderSortKey sort_by[N_SUMMARY_COLS] = {
                SORT_BY_MARK,
                SORT_BY_UNREAD,
                SORT_BY_MIME,
@@ -1769,14 +1790,16 @@ static void summary_set_column_titles(SummaryView *summaryview)
                SORT_BY_FROM,
                SORT_BY_DATE,
                SORT_BY_SIZE,
-               SORT_BY_NUMBER
+               SORT_BY_NUMBER,
+               SORT_BY_SCORE,
+               SORT_BY_LOCKED
        };
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
                type = summaryview->col_state[pos].type;
 
-               single_char = (type == S_COL_MIME ||
-                              type == S_COL_MARK || type == S_COL_UNREAD);
+               /* CLAWS: mime and unread are single char headers */
+               single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
                justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
                        ? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
 
@@ -1790,6 +1813,11 @@ static void summary_set_column_titles(SummaryView *summaryview)
                        else
                                title = col_label[type];
                        break;
+               /* CLAWS: dummies for mark and locked headers */        
+               case S_COL_MARK:        
+               case S_COL_LOCKED:
+                       title = "";
+                       break;
                default:
                        title = gettext(col_label[type]);
                }
@@ -1805,8 +1833,17 @@ static void summary_set_column_titles(SummaryView *summaryview)
                        continue;
                }
 
-               hbox = gtk_hbox_new(FALSE, 4);
-               label = gtk_label_new(title);
+               /* CLAWS: changed so that locked and mark headers
+                * show a pixmap instead of single character */
+               hbox  = gtk_hbox_new(FALSE, 4);
+               
+               if (type == S_COL_LOCKED)
+                       label = gtk_pixmap_new(lockedxpm, lockedxpmmask);
+               else if (type == S_COL_MARK) 
+                       label = gtk_pixmap_new(markxpm, markxpmmask);
+               else 
+                       label = gtk_label_new(title);
+               
                if (justify == GTK_JUSTIFY_RIGHT)
                        gtk_box_pack_end(GTK_BOX(hbox), label,
                                         FALSE, FALSE, 0);
@@ -1814,9 +1851,9 @@ static void summary_set_column_titles(SummaryView *summaryview)
                        gtk_box_pack_start(GTK_BOX(hbox), label,
                                           FALSE, FALSE, 0);
 
-               if (summaryview->sort_mode == sort_by[type]) {
+               if (item && item->sort_key == sort_by[type]) {
                        arrow = gtk_arrow_new
-                               (summaryview->sort_type == GTK_SORT_ASCENDING
+                               (item->sort_type == SORT_ASCENDING
                                 ? GTK_ARROW_DOWN : GTK_ARROW_UP,
                                 GTK_SHADOW_IN);
                        if (justify == GTK_JUSTIFY_RIGHT)
@@ -1832,16 +1869,17 @@ static void summary_set_column_titles(SummaryView *summaryview)
        }
 }
 
-void summary_sort(SummaryView *summaryview, SummarySortType type)
+void summary_sort(SummaryView *summaryview,
+                 FolderSortKey sort_key, FolderSortType sort_type)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCListCompareFunc cmp_func;
+       FolderItem *item = summaryview->folder_item;
 
-       if (!summaryview->folder_item)
-               return;
+       if (!item || !item->path || !item->parent || item->no_select) return;
 
-       switch (type) {
+       switch (sort_key) {
        case SORT_BY_MARK:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
                break;
@@ -1875,6 +1913,12 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        case SORT_BY_LABEL:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
                break;
+       case SORT_BY_NONE:
+               item->sort_key = sort_key;
+               item->sort_type = SORT_ASCENDING;
+               summary_set_column_titles(summaryview);
+               summary_set_menu_sensitive(summaryview);
+               return;
        default:
                return;
        }
@@ -1886,25 +1930,16 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
 
        gtk_clist_set_compare_func(clist, cmp_func);
 
-       /* toggle sort type if the same column is selected */
-       if (summaryview->sort_mode == type)
-               summaryview->sort_type =
-                       summaryview->sort_type == GTK_SORT_ASCENDING
-                       ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING;
-       else
-               summaryview->sort_type = GTK_SORT_ASCENDING;
-       gtk_clist_set_sort_type(clist, summaryview->sort_type);
-       summaryview->sort_mode = type;
+       gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
+       item->sort_key = sort_key;
+       item->sort_type = sort_type;
 
        summary_set_column_titles(summaryview);
+       summary_set_menu_sensitive(summaryview);
 
-       gtk_ctree_sort_node(ctree, NULL);
+       gtk_sctree_sort_recursive(ctree, NULL);
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
-       prefs_folder_item_set_config(summaryview->folder_item,
-                                    summaryview->sort_type,
-                                    summaryview->sort_mode);
-       prefs_folder_item_save_config(summaryview->folder_item);
 
        debug_print(_("done.\n"));
        STATUSBAR_POP(summaryview->mainwin);
@@ -1943,7 +1978,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;
@@ -1954,14 +1989,11 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
-       MsgInfo *parentinfo;
-       MsgInfo *cur_msginfo;
-       GtkCTreeNode *node = NULL;
+               GtkCTreeNode *node = NULL;
        GHashTable *msgid_table;
        GHashTable *subject_table;
        GSList * cur;
-       GtkCTreeNode *cur_parent;
-
+       
        if (!mlist) return;
 
        debug_print(_("\tSetting summary from message data..."));
@@ -1989,6 +2021,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        summaryview->important_score =
                                summaryview->folder_item->prefs->important_score;
        }
+
+       summaryview_subject_filter_init(summaryview->folder_item->prefs);
        
        if (summaryview->folder_item->threaded) {
                GNode *root, *gnode;
@@ -2020,7 +2054,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);
 
@@ -2068,19 +2102,25 @@ gint summary_write_cache(SummaryView *summaryview)
        gint ver = CACHE_VERSION;
        gchar *buf;
        gchar *cachefile, *markfile;
-       GSList * cur;
+       GSList *cur;
        gint filemode = 0;
        PrefsFolderItem *prefs;
 
        if (!summaryview->folder_item || !summaryview->folder_item->path)
                return -1;
+               
+       if (!summaryview->folder_item->cache)
+               return -1;
+       
+       folder_item_write_cache(summaryview->folder_item);
+       return 0;
 
        if (summaryview->folder_item->folder->update_mark != NULL)
                summaryview->folder_item->folder->update_mark(summaryview->folder_item->folder, summaryview->folder_item);
 
        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;
@@ -2104,7 +2144,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);
@@ -2134,14 +2174,14 @@ gint summary_write_cache(SummaryView *summaryview)
 
        gtk_ctree_pre_recursive(ctree, NULL, summary_write_cache_func, &fps);
 
-       for(cur = summaryview->killed_messages ; cur != NULL ;
-           cur = g_slist_next(cur)) {
-               MsgInfo *msginfo = (MsgInfo *) cur->data;
-
+       for (cur = summaryview->killed_messages; cur != NULL; cur = cur->next) {
+               MsgInfo *msginfo = (MsgInfo *)cur->data;
                procmsg_write_cache(msginfo, fps.cache_fp);
                procmsg_write_flags(msginfo, fps.mark_fp);
        }
 
+       procmsg_flush_mark_queue(summaryview->folder_item, fps.mark_fp);
+
        fclose(fps.cache_fp);
        fclose(fps.mark_fp);
 
@@ -2163,14 +2203,36 @@ 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)
 {
        static gchar date_modified[80];
        static gchar *to = NULL;
-       static gchar *from_name = NULL;
-       static gchar col_number[11];
        static gchar col_score[11];
+       static gchar buf[BUFFSIZE];
+       PrefsFolderItem *prefs = summaryview->folder_item->prefs;
        gint *col_pos = summaryview->col_pos;
 
        text[col_pos[S_COL_MARK]]   = NULL;
@@ -2179,12 +2241,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        text[col_pos[S_COL_LOCKED]] = NULL;
        text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
        text[col_pos[S_COL_SIZE]]   = to_human_readable(msginfo->size);
-
-#if 0
-       text[col_pos[S_COL_SCORE]]  = itos_buf(col_score, msginfo->threadscore);
-#else
        text[col_pos[S_COL_SCORE]]  = itos_buf(col_score, msginfo->score);
-#endif 
 
        if (msginfo->date_t) {
                procheader_date_get_localtime(date_modified,
@@ -2200,38 +2257,55 @@ 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;
+
+               Xstrdup_a(addr, msginfo->from, return);
+               extract_address(addr);
 
-               Xstrdup_a(from, msginfo->from, return);
-               extract_address(from);
-               if (account_find_from_address(from)) {
-                       g_free(to);
-                       to = g_strconcat("-->", msginfo->to, NULL);
-                       text[col_pos[S_COL_FROM]] = to;
+               if (prefs_common.use_addr_book) {
+                       if (account_find_from_address(addr)) {
+                               addr = summary_complete_address(msginfo->to);
+                               g_free(to);
+                               to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
+                               text[col_pos[S_COL_FROM]] = to;
+                       }
+               } else {
+                       if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
+                               g_free(to);
+                               to = g_strconcat("-->", msginfo->to, 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;
+               }       
        }
 
-       text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
-               _("(No Subject)");
+       if (prefs->enable_simplify_subject 
+           && prefs->simplify_subject_preg != NULL )
+               text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? 
+                       string_remove_match(buf, BUFFSIZE, msginfo->subject, 
+                                       prefs->simplify_subject_preg) : 
+                       
+                       _("(No Subject)");
+       else 
+               text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
+                       _("(No Subject)");
 }
 
 #define CHANGE_FLAGS(msginfo) \
@@ -2242,11 +2316,18 @@ msginfo->folder->folder->change_flags(msginfo->folder->folder, \
                                      msginfo); \
 }
 
-static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
-                               gboolean new_window)
+static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row)
+{
+       summary_display_msg_full(summaryview, row, FALSE, FALSE);
+}
+
+static void summary_display_msg_full(SummaryView *summaryview,
+                                    GtkCTreeNode *row,
+                                    gboolean new_window, gboolean all_headers)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
+       MsgFlags flags;
        gchar *filename;
 
        if (!new_window && summaryview->displayed == row) return;
@@ -2267,56 +2348,58 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        }
        g_free(filename);
 
+/* NOT NEEDED ANYMORE
        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))
                summaryview->unread--;
-       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags) || 
-           MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-               if (MSG_IS_IMAP(msginfo->flags))
-                       imap_msg_unset_perm_flags(msginfo, MSG_NEW | MSG_UNREAD);
-               summary_set_row_marks(summaryview, row);
-               gtk_clist_thaw(GTK_CLIST(ctree));
-               summary_status_show(summaryview);
-       }
+*/
+       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+       summary_set_row_marks(summaryview, row);
+       gtk_clist_thaw(GTK_CLIST(ctree));
+       summary_status_show(summaryview);
+
+       flags = msginfo->flags;
 
        if (new_window) {
                MessageView *msgview;
 
                msgview = messageview_create_with_new_window();
-               messageview_show(msgview, msginfo);
+               messageview_show(msgview, msginfo, all_headers);
        } else {
                MessageView *msgview;
 
                msgview = summaryview->messageview;
 
                summaryview->displayed = row;
-               if (!summaryview->msg_is_toggled_on)
-                       summary_toggle_view(summaryview);
-               messageview_show(msgview, msginfo);
+               if (!messageview_is_visible(msgview))
+                       main_window_toggle_message_view(summaryview->mainwin);
+               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);
        }
 
-       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-               CHANGE_FLAGS(msginfo);
-               summary_set_row_marks(summaryview, row);
-               gtk_clist_thaw(GTK_CLIST(ctree));
-               summary_status_show(summaryview);
-       }
-
-       if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
-               header_window_show(summaryview->headerwin, msginfo);
+       summary_set_menu_sensitive(summaryview);
+       main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        summary_unlock(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);
+}
+
 void summary_redisplay_msg(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
@@ -2324,7 +2407,7 @@ void summary_redisplay_msg(SummaryView *summaryview)
        if (summaryview->displayed) {
                node = summaryview->displayed;
                summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               summary_display_msg(summaryview, node);
        }
 }
 
@@ -2332,7 +2415,8 @@ void summary_open_msg(SummaryView *summaryview)
 {
        if (!summaryview->selected) return;
 
-       summary_display_msg(summaryview, summaryview->selected, TRUE);
+       summary_display_msg_full(summaryview, summaryview->selected,
+                                TRUE, FALSE);
 }
 
 void summary_view_source(SummaryView * summaryview)
@@ -2369,60 +2453,38 @@ 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 (messageview_is_visible(summaryview->messageview))
+               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, FALSE);
 }
 
-static void summary_toggle_view(SummaryView *summaryview)
+void summary_toggle_view(SummaryView *summaryview)
 {
-       MainWindow *mainwin = summaryview->mainwin;
-       union CompositeWin *cwin = &mainwin->win;
-       GtkWidget *vpaned = NULL;
-       GtkWidget *container = NULL;
-
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-               vpaned = cwin->sep_none.vpaned;
-               container = cwin->sep_none.hpaned;
-               break;
-       case SEPARATE_FOLDER:
-               vpaned = cwin->sep_folder.vpaned;
-               container = mainwin->vbox_body;
-               break;
-       case SEPARATE_MESSAGE:
-       case SEPARATE_BOTH:
-               return;
-       }
-
-       if (vpaned->parent != NULL) {
-               summaryview->msg_is_toggled_on = FALSE;
-               summaryview->displayed = NULL;
-               gtk_widget_ref(vpaned);
-               gtkut_container_remove(GTK_CONTAINER(container), vpaned);
-               gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_UP, GTK_SHADOW_OUT);
-       } else {
-               summaryview->msg_is_toggled_on = TRUE;
-               gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
-               gtk_container_add(GTK_CONTAINER(container), vpaned);
-               gtk_widget_unref(vpaned);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       }
-
-       gtk_widget_grab_focus(summaryview->ctree);
+       if (!messageview_is_visible(summaryview->messageview) &&
+           summaryview->selected)
+               summary_display_msg(summaryview,
+                                   summaryview->selected);
+       else
+               main_window_toggle_message_view(summaryview->mainwin);
 }
 
 static gboolean summary_search_unread_recursive(GtkCTree *ctree,
@@ -2560,7 +2622,13 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
        }
 
-       if (MSG_IS_MIME(flags)) {
+       if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         clipkeyxpm, clipkeyxpmmask);
+       } else if (MSG_IS_ENCRYPTED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         keyxpm, keyxpmmask);
+       } else if (MSG_IS_MIME(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipxpm, clipxpmmask);
        } else {
@@ -2571,17 +2639,16 @@ 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)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+            cur = cur->next)
                summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
 }
 
@@ -2608,12 +2675,8 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                        folderview_update_item(msginfo->to_folder, 0);
        }
        msginfo->to_folder = NULL;
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
-       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
-       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_set_perm_flags(msginfo, MSG_MARKED);
-       CHANGE_FLAGS(msginfo);
+       procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
+       procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %s/%d is marked\n"), msginfo->folder->path, msginfo->msgnum);
 }
@@ -2642,12 +2705,8 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
                        folderview_update_item(msginfo->to_folder, 0);
        }
        msginfo->to_folder = NULL;
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
-       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
-       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_set_perm_flags(msginfo, MSG_LOCKED);
-       CHANGE_FLAGS(msginfo);
+       procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
+       procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is locked\n"), msginfo->msgnum);
 }
@@ -2671,20 +2730,16 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
        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))
                summaryview->unread--;
-       if (MSG_IS_NEW(msginfo->flags) ||
-           MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-               if (MSG_IS_IMAP(msginfo->flags))
-                       imap_msg_unset_perm_flags(msginfo, MSG_NEW | MSG_UNREAD);
-               CHANGE_FLAGS(msginfo);
-               summary_set_row_marks(summaryview, row);
-               debug_print(_("Message %d is marked as read\n"),
-                           msginfo->msgnum);
-       }
+*/
+       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+       summary_set_row_marks(summaryview, row);
+       debug_print(_("Message %d is marked as read\n"),
+               msginfo->msgnum);
 }
 
 void summary_mark_as_read(SummaryView *summaryview)
@@ -2728,22 +2783,18 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
        if (MSG_IS_DELETED(msginfo->flags)) {
                msginfo->to_folder = NULL;
-               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
+               procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
                summaryview->deleted--;
        }
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
-       if (!MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
-               if (MSG_IS_IMAP(msginfo->flags))
-                       imap_msg_set_perm_flags(msginfo, MSG_UNREAD);
+/* NOT NEEDED ANYMORE
+       if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->unread++;
-               debug_print(_("Message %d is marked as unread\n"),
-                           msginfo->msgnum);
-       }
+*/
 
-       CHANGE_FLAGS(msginfo);
+       procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);
+       procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+       debug_print(_("Message %d is marked as unread\n"),
+               msginfo->msgnum);
 
        summary_set_row_marks(summaryview, row);
 }
@@ -2760,6 +2811,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;
@@ -2768,6 +2868,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;
@@ -2786,12 +2889,8 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                        folderview_update_item(msginfo->to_folder, 0);
        }
        msginfo->to_folder = NULL;
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
-       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
-       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
-       CHANGE_FLAGS(msginfo);
+       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
+       procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
        summaryview->deleted++;
 
        if (!prefs_common.immediate_exec && 
@@ -2810,7 +2909,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;
 
@@ -2841,8 +2943,10 @@ void summary_delete(SummaryView *summaryview)
                else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
                        summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
                else
-                       summary_select_node(summaryview, node,
-                                           summaryview->msg_is_toggled_on);
+                       summary_select_node
+                               (summaryview, node,
+                                messageview_is_visible(summaryview->messageview),
+                                FALSE);
        }
 
        if (prefs_common.immediate_exec || item->stype == F_TRASH)
@@ -2913,12 +3017,9 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                        folderview_update_item(msginfo->to_folder, 0);
        }
        msginfo->to_folder = NULL;
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
-       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
-       CHANGE_FLAGS(msginfo);
+       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
        summary_set_row_marks(summaryview, row);
+
        debug_print(_("Message %s/%d is unmarked\n"),
                    msginfo->folder->path, msginfo->msgnum);
 }
@@ -2961,12 +3062,9 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                if (!prefs_common.immediate_exec)
                        msginfo->to_folder->op_count--;
        }
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
-       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
        if (!MSG_IS_MOVE(msginfo->flags)) {
-               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
                summaryview->moved++;
                changed = TRUE;
        }
@@ -3021,7 +3119,8 @@ void summary_move_to(SummaryView *summaryview)
        if (!summaryview->folder_item ||
            summaryview->folder_item->folder->type == F_NEWS) return;
 
-       to_folder = foldersel_folder_sel(NULL, NULL);
+       to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
+                                        FOLDER_SEL_MOVE, NULL);
        summary_move_selected_to(summaryview, to_folder);
 }
 
@@ -3052,12 +3151,9 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                if (!prefs_common.immediate_exec)
                        msginfo->to_folder->op_count--;
        }
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
-       if (MSG_IS_IMAP(msginfo->flags))
-               imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
-       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
+       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
        if (!MSG_IS_COPY(msginfo->flags)) {
-               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
                summaryview->copied++;
                changed = TRUE;
        }
@@ -3079,8 +3175,7 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        GList *cur;
 
        if (!to_folder) return;
-       if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return;
+       if (!summaryview->folder_item) return;
 
        if (summary_is_locked(summaryview)) return;
 
@@ -3110,10 +3205,10 @@ void summary_copy_to(SummaryView *summaryview)
 {
        FolderItem *to_folder;
 
-       if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return;
+       if (!summaryview->folder_item) return;
 
-       to_folder = foldersel_folder_sel(NULL, NULL);
+       to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
+                                        FOLDER_SEL_COPY, NULL);
        summary_copy_selected_to(summaryview, to_folder);
 }
 
@@ -3157,13 +3252,18 @@ void summary_save_as(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
+       gchar *filename = NULL;
        gchar *src, *dest;
 
        if (!summaryview->selected) return;
        msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
        if (!msginfo) return;
 
-       dest = filesel_select_file(_("Save as"), NULL);
+       if (msginfo->subject) {
+               Xstrdup_a(filename, msginfo->subject, return);
+               subst_for_filename(filename);
+       }
+       dest = filesel_select_file(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
                AlertValue aval;
@@ -3175,7 +3275,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);
 }
 
@@ -3218,8 +3321,7 @@ gboolean summary_execute(SummaryView *summaryview)
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCTreeNode *node, *next;
 
-       if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return FALSE;
+       if (!summaryview->folder_item) return FALSE;
 
        if (summary_is_locked(summaryview)) return FALSE;
        summary_lock(summaryview);
@@ -3289,7 +3391,6 @@ static void summary_execute_move(SummaryView *summaryview)
        if (summaryview->mlist) {
                procmsg_move_messages(summaryview->mlist);
 
-               folder_item_scan_foreach(summaryview->folder_table);
                folderview_update_item_foreach(summaryview->folder_table);
 
                for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
@@ -3298,6 +3399,7 @@ static void summary_execute_move(SummaryView *summaryview)
                summaryview->mlist = NULL;
        }
 
+       folderview_update_item(summaryview->folder_item, FALSE);
        g_hash_table_destroy(summaryview->folder_table);
        summaryview->folder_table = NULL;
 }
@@ -3311,6 +3413,10 @@ static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
        msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
        if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
+               if (!prefs_common.immediate_exec &&
+                   msginfo->to_folder->op_count > 0)
+                       msginfo->to_folder->op_count--;
+
                g_hash_table_insert(summaryview->folder_table,
                                    msginfo->to_folder, GINT_TO_POINTER(1));
 
@@ -3339,7 +3445,7 @@ static void summary_execute_copy(SummaryView *summaryview)
        if (summaryview->mlist) {
                procmsg_copy_messages(summaryview->mlist);
 
-               folder_item_scan_foreach(summaryview->folder_table);
+               /* folder_item_scan_foreach(summaryview->folder_table); */
                folderview_update_item_foreach(summaryview->folder_table);
 
                g_slist_free(summaryview->mlist);
@@ -3359,13 +3465,17 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
        msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
        if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
+               if (!prefs_common.immediate_exec &&
+                   msginfo->to_folder->op_count > 0)
+                       msginfo->to_folder->op_count--;
+
                g_hash_table_insert(summaryview->folder_table,
                                    msginfo->to_folder, GINT_TO_POINTER(1));
 
                summaryview->mlist =
                        g_slist_append(summaryview->mlist, msginfo);
 
-               MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+               procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
                summary_set_row_marks(summaryview, node);
        }
 }
@@ -3387,10 +3497,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);
@@ -3398,10 +3509,10 @@ static void summary_execute_delete(SummaryView *summaryview)
        g_slist_free(summaryview->mlist);
        summaryview->mlist = NULL;
 
-       if (summaryview->folder_item != trash) {
-               folder_item_scan(trash);
+       if ((summaryview->folder_item != trash) && (trash != NULL)) {
                folderview_update_item(trash, FALSE);
        }
+       folderview_update_item(summaryview->folder_item, FALSE);
 }
 
 static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3534,7 +3645,7 @@ void summary_unthread(SummaryView *summaryview)
        debug_print(_("Unthreading..."));
        STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
        main_window_cursor_wait(summaryview->mainwin);
-
+       
        gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
                                         summary_tree_collapsed, summaryview);
        gtk_clist_freeze(GTK_CLIST(ctree));
@@ -3551,6 +3662,9 @@ void summary_unthread(SummaryView *summaryview)
                }
        }
 
+       /* CLAWS: and sort it */
+       gtk_sctree_sort_recursive(ctree, NULL); 
+
        gtk_clist_thaw(GTK_CLIST(ctree));
        gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
                                           summary_tree_collapsed, summaryview);
@@ -3617,23 +3731,11 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
        }
 }
 
-void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
-                             GSList * mlist)
-{
-       GSList * cur;
-       for(cur = mlist ; cur != NULL ; cur = cur->next) {
-               MsgInfo * msginfo = (MsgInfo *) cur->data;
-               string_remove_all_matches(msginfo->subject, rexp, 
-                                         REG_EXTENDED, 0);
-       }
-}
-
 void summary_processing(SummaryView *summaryview, GSList * mlist)
 {
        GSList * processing_list;
        FolderItem * folder_item;
        GSList * cur;
-       gchar * id;
        gchar * buf;
 
        folder_item = summaryview->folder_item;
@@ -3660,11 +3762,11 @@ 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);
+       /* folder_item_scan_foreach(summaryview->folder_table); */
        folderview_update_item_foreach(summaryview->folder_table);
        
        g_hash_table_destroy(summaryview->folder_table);
@@ -3684,6 +3786,42 @@ void summary_processing(SummaryView *summaryview, GSList * mlist)
        summary_unlock(summaryview);
 }
 
+void summary_expand_threads(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       gtk_clist_freeze(GTK_CLIST(ctree));
+
+       while (node) {
+               if (GTK_CTREE_ROW(node)->children)
+                       gtk_ctree_expand(ctree, node);
+               node = GTK_CTREE_NODE_NEXT(node);
+       }
+
+       gtk_clist_thaw(GTK_CLIST(ctree));
+
+       gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+}
+
+void summary_collapse_threads(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       gtk_clist_freeze(GTK_CLIST(ctree));
+
+       while (node) {
+               if (GTK_CTREE_ROW(node)->children)
+                       gtk_ctree_collapse(ctree, node);
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       gtk_clist_thaw(GTK_CLIST(ctree));
+
+       gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+}
+
 void summary_filter(SummaryView *summaryview)
 {
        if (!prefs_common.fltlist && !global_processing) {
@@ -3722,13 +3860,11 @@ void summary_filter(SummaryView *summaryview)
 
                gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
-               folder_item_scan_foreach(summaryview->folder_table);
+               /* folder_item_scan_foreach(summaryview->folder_table); */
                folderview_update_item_foreach(summaryview->folder_table);
 
                g_hash_table_destroy(summaryview->folder_table);
                summaryview->folder_table = NULL;
-
-               summary_show(summaryview, summaryview->folder_item, FALSE);
        }
 
        debug_print(_("done.\n"));
@@ -3736,6 +3872,14 @@ void summary_filter(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 
        summary_unlock(summaryview);
+
+       /* 
+        * CLAWS: summary_show() only valid after having a lock. ideally
+        * we want the lock to be context aware...  
+        */
+       if (global_processing) {
+               summary_show(summaryview, summaryview->folder_item, TRUE);              
+       }               
 }
 
 static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3748,17 +3892,231 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        if (global_processing == NULL) {
                /* old filtering */
-               file = procmsg_get_message_file_path(msginfo);
+               file = procmsg_get_message_file(msginfo);
                dest = filter_get_dest_folder(prefs_common.fltlist, file);
                g_free(file);
 
                if (dest && strcmp2(dest->path, FILTER_NOT_RECEIVE) != 0 &&
                    summaryview->folder_item != dest)
                        summary_move_row_to(summaryview, node, dest);
+       } else 
+               filter_message_by_msginfo(global_processing, msginfo, summaryview->folder_table);
+}
+
+void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
+{
+       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_X_BEENTHERE    = 0,
+               H_X_ML_NAME      = 1,
+               H_X_LIST         = 2,
+               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;
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             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;
+       case FILTER_BY_AUTO:
+               if ((fp = procmsg_open_message(msginfo)) == NULL) return;
+               procheader_get_header_fields(fp, hentry);
+               fclose(fp);
+
+               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 = 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 = 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 = 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 = header_strs[H_SUBJECT + header_offset];
+                       key = msginfo->subject;
+               }
+
+               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 = header_strs[H_FROM + header_offset];
+               key = msginfo->from;
+               break;
+       case FILTER_BY_TO:
+               header = header_strs[H_TO + header_offset];
+               key = msginfo->to;
+               break;
+       case FILTER_BY_SUBJECT:
+               header = header_strs[H_SUBJECT + header_offset];
+               key = msginfo->subject;
+               break;
+       default:
+               break;
        }
+
+       /*
+        * NOTE: key may be allocated on the stack, so 
+        * prefs_filter[ing]_open() should have completed 
+        * and have set entries. Otherwise we're hosed.  
+        */
+
+       if (global_processing)
+               prefs_filtering_open(NULL, header, key);
        else
-               filter_msginfo_move_or_delete(global_processing, msginfo,
-                                             summaryview->folder_table);
+               prefs_filter_open(header, key);
+}
+
+void summary_reply(SummaryView *summaryview, ComposeMode mode)
+{
+       GList *sel = GTK_CLIST(summaryview->ctree)->selection;
+       MsgInfo *msginfo;
+       gchar *text;
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       text = gtkut_editable_get_selection
+               (GTK_EDITABLE(summaryview->messageview->textview->text));
+
+       if (!text && summaryview->messageview->type == MVIEW_MIME
+           && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
+           && summaryview->messageview->mimeview->textview
+           && !summaryview->messageview->mimeview->textview->default_text) {
+               text = gtkut_editable_get_selection (GTK_EDITABLE 
+                        (summaryview->messageview->mimeview->textview->text));   
+       }
+       
+       switch (mode) {
+       case COMPOSE_REPLY:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE, text);
+               break;
+       case COMPOSE_REPLY_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, FALSE, text);
+               break;
+       case COMPOSE_REPLY_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, FALSE, NULL);
+               break;
+       case COMPOSE_REPLY_TO_SENDER:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE, text);
+               break;
+       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+               compose_followup_and_reply_to(msginfo,
+                                             prefs_common.reply_with_quote,
+                                             FALSE, TRUE, text);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, TRUE, text);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, TRUE, NULL);
+               break;
+       case COMPOSE_REPLY_TO_ALL:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             TRUE, FALSE, text);
+               break;
+       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, TRUE, FALSE, text);
+               break;
+       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, TRUE, FALSE, NULL);
+               break;
+       case COMPOSE_FORWARD:
+               if (prefs_common.forward_as_attachment) {
+                       summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
+                       return;
+               } else {
+                       summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, NULL);
+                       return;
+               }
+               break;
+       case COMPOSE_FORWARD_INLINE:
+               if (!sel->next) {
+                       compose_forward(NULL, msginfo, FALSE, text);
+                       break;
+               }
+               /* if (sel->next) FALL THROUGH */
+       case COMPOSE_FORWARD_AS_ATTACH:
+               {
+                       GSList *msginfo_list = NULL;
+                       for ( ; sel != NULL; sel = sel->next)
+                               msginfo_list = g_slist_append(msginfo_list, 
+                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                               GTK_CTREE_NODE(sel->data)));
+                       compose_forward_multiple(NULL, msginfo_list);
+                       g_slist_free(msginfo_list);
+               }                       
+               break;
+       case COMPOSE_REDIRECT:
+               compose_redirect(NULL, msginfo);
+               break;
+       default:
+               g_warning("summary_reply_cb(): invalid action: %d\n", mode);
+       }
+
+       summary_set_marks_selected(summaryview);
+       g_free(text);
 }
 
 /* color label */
@@ -3793,8 +4151,8 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
        gint color_index;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_CLABEL_FLAG_MASK);
-       MSG_SET_COLORLABEL_VALUE(msginfo->flags, labelcolor);
+       procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
+       procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
 
        color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
        ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
@@ -4083,7 +4441,6 @@ void summary_set_column_order(SummaryView *summaryview)
        guint selected_msgnum = summary_get_msgnum(summaryview, summaryview->selected);
        guint displayed_msgnum = summary_get_msgnum(summaryview, summaryview->displayed);
 
-       
        item = summaryview->folder_item;
 
        summary_lock(summaryview);
@@ -4121,13 +4478,9 @@ void summary_set_column_order(SummaryView *summaryview)
 static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
                                   SummaryView *summaryview)
 {
-       if (!event)
-               return;
+       if (!event) return;
 
-       if (!summaryview->msg_is_toggled_on && summaryview->selected)
-               summary_display_msg(summaryview, summaryview->selected, FALSE);
-       else
-               summary_toggle_view(summaryview);
+       summary_toggle_view(summaryview);
 }
 
 static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
@@ -4143,7 +4496,7 @@ static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                summaryview->display_msg = TRUE;
        } else if (event->button == 1) {
                if (!prefs_common.emulate_emacs &&
-                   summaryview->msg_is_toggled_on)
+                   messageview_is_visible(summaryview->messageview))
                        summaryview->display_msg = TRUE;
        }
 }
@@ -4164,69 +4517,16 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define RETURN_IF_LOCKED() \
        if (summaryview->mainwin->lock_count) return
 
-#define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(ctree), "key_press_event") > 0) { \
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
-                                            "key_press_event"); \
-       }
-
 static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(widget);
        GtkCTreeNode *node;
-       FolderItem *to_folder;
 
        if (summary_is_locked(summaryview)) return;
        if (!event) return;
 
        switch (event->keyval) {
-       case GDK_g:             /* Go */
-       case GDK_G:
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               to_folder = foldersel_folder_sel(NULL, NULL);
-               if (to_folder) {
-                       debug_print(_("Go to %s\n"), to_folder->path);
-                       folderview_select(summaryview->folderview, to_folder);
-               }
-               return;
-       case GDK_w:             /* Write new message */
-               BREAK_ON_MODIFIER_KEY();
-               if (summaryview->folder_item) {
-                       PrefsAccount *ac;
-                       ac = summaryview->folder_item->folder->account;
-                       if (ac && ac->protocol == A_NNTP)
-                               compose_new_with_recipient
-                                       (ac, summaryview->folder_item->path);
-                       else
-                               compose_new_with_folderitem(ac, summaryview->folder_item);
-               } else
-                       compose_new(NULL);
-               return;
-       case GDK_D:             /* Empty trash */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               main_window_empty_trash(summaryview->mainwin, TRUE);
-               return;
-       case GDK_Q:             /* Quit */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-
-               if (prefs_common.confirm_on_exit) {
-                       if (alertpanel(_("Exit"), _("Exit this program?"),
-                                      _("OK"), _("Cancel"), NULL)
-                                      == G_ALERTDEFAULT) {
-                               manage_window_focus_in
-                                       (summaryview->mainwin->window,
-                                        NULL, NULL);
-                               app_will_exit(NULL, summaryview->mainwin);
-                       }
-               }
-               return;
        case GDK_Left:          /* Move focus */
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
@@ -4247,40 +4547,20 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_space:         /* Page down or go to the next */
                if (summaryview->displayed != summaryview->selected) {
                        summary_display_msg(summaryview,
-                                           summaryview->selected, FALSE);
+                                           summaryview->selected);
                        break;
                }
                if (!textview_scroll_page(summaryview->messageview->textview,
                                          FALSE))
                        summary_select_next_unread(summaryview);
                break;
-       case GDK_n:             /* Next */
-       case GDK_N:
-               BREAK_ON_MODIFIER_KEY();
-               summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-               break;
        case GDK_BackSpace:     /* Page up */
                textview_scroll_page(summaryview->messageview->textview, TRUE);
                break;
-       case GDK_p:             /* Prev */
-       case GDK_P:
-               BREAK_ON_MODIFIER_KEY();
-               summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
-               break;
-       case GDK_v:             /* Toggle summary mode / message mode */
-       case GDK_V:
-               BREAK_ON_MODIFIER_KEY();
-
-               if (!summaryview->msg_is_toggled_on && summaryview->selected)
-                       summary_display_msg(summaryview,
-                                           summaryview->selected, FALSE);
-               else
-                       summary_toggle_view(summaryview);
-               break;
        case GDK_Return:        /* Scroll up/down one line */
                if (summaryview->displayed != summaryview->selected) {
                        summary_display_msg(summaryview,
-                                           summaryview->selected, FALSE);
+                                           summaryview->selected);
                        break;
                }
                textview_scroll_one_line(summaryview->messageview->textview,
@@ -4292,65 +4572,16 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_exclam:        /* Mark as unread */
                summary_mark_as_unread(summaryview);
                break;
-       case GDK_d:             /* Delete */
        case GDK_Delete:
                RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;
-       case GDK_u:             /* Unmark */
-       case GDK_U:
-               BREAK_ON_MODIFIER_KEY();
-               summary_unmark(summaryview);
-               break;
-       case GDK_o:             /* Move */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               summary_move_to(summaryview);
-               break;
-       case GDK_O:             /* Copy */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               summary_copy_to(summaryview);
-               break;
-       case GDK_x:             /* Execute */
-       case GDK_X:
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               summary_execute(summaryview);
-               break;
-       case GDK_a:             /* Reply to the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview,
-                                COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL);
-               break;
-       case GDK_A:             /* Reply to the message with quotation */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview,
-                                COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL);
-               break;
-       case GDK_f:             /* Forward the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview, COMPOSE_FORWARD, NULL);
-               break;
-       case GDK_F:
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
-               break;
-       case GDK_y:             /* Save the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_save_as(summaryview);
-               break;
        default:
                break;
        }
 }
 
-#undef BREAK_ON_MODIFIER_KEY
-#undef RETURN_IF_LOCKED
-#undef KEY_PRESS_EVENT_STOP
-
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
        if (summaryview->folder_item->stype == F_OUTBOX ||
@@ -4381,11 +4612,12 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        MsgInfo *msginfo;
 
        summary_status_show(summaryview);
-       summary_set_menu_sensitive(summaryview);
 
        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;
        }
 
@@ -4396,10 +4628,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        switch (column < 0 ? column : summaryview->col_state[column].type) {
        case S_COL_MARK:
                if (MSG_IS_MARKED(msginfo->flags)) {
-                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
-                       if (MSG_IS_IMAP(msginfo->flags))
-                               imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
-                       CHANGE_FLAGS(msginfo);
+                       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, 0);
                        summary_set_row_marks(summaryview, row);
                } else
                        summary_mark_row(summaryview, row);
@@ -4416,8 +4645,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                break;
        case S_COL_LOCKED:
                if (MSG_IS_LOCKED(msginfo->flags)) {
-                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
-                       CHANGE_FLAGS(msginfo);
+                       procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
                        summary_set_row_marks(summaryview, row);
                }
                else
@@ -4427,10 +4655,15 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                break;
        }
 
-       if (summaryview->display_msg)
-               summary_display_msg(summaryview, row, FALSE);
-
-       summaryview->display_msg = FALSE;
+       if (summaryview->display_msg ||
+           (prefs_common.show_msg_with_cursor_key &&
+            messageview_is_visible(summaryview->messageview))) {
+               summary_display_msg(summaryview, row);
+               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,
@@ -4444,83 +4677,7 @@ static void summary_col_resized(GtkCList *clist, gint column, gint width,
 static void summary_reply_cb(SummaryView *summaryview, guint action,
                             GtkWidget *widget)
 {
-       MsgInfo *msginfo;
-       GList  *sel = GTK_CLIST(summaryview->ctree)->selection;
-
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                             summaryview->selected);
-       if (!msginfo) return;
-
-       switch ((ComposeMode)action) {
-       case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE);
-               break;
-       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
-               compose_followup_and_reply_to(msginfo,
-                                             prefs_common.reply_with_quote,
-                                             FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, FALSE);
-               break;
-       case COMPOSE_FORWARD:
-               if (prefs_common.forward_as_attachment) {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, widget);
-                       return;
-               } else {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, widget);
-                       return;
-               }
-               break;
-       case COMPOSE_FORWARD_INLINE:
-               if (!sel->next) {
-                       compose_forward(NULL, msginfo, FALSE);
-                       break;
-               }
-               /* if (sel->next) FALL THROUGH */
-       case COMPOSE_FORWARD_AS_ATTACH:
-               {
-                       GSList *msginfo_list = NULL;
-                       for ( ; sel != NULL; sel = sel->next)
-                               msginfo_list = g_slist_append(msginfo_list, 
-                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                               GTK_CTREE_NODE(sel->data)));
-                       compose_forward_multiple(NULL, msginfo_list);
-                       g_slist_free(msginfo_list);
-               }                       
-               break;
-       case COMPOSE_BOUNCE:
-               compose_bounce(NULL, msginfo);
-               break;
-       default:
-               g_warning("summary_reply_cb(): invalid action: %d\n", action);
-       }
-
-       summary_set_marks_selected(summaryview);
+       summary_reply(summaryview, (ComposeMode)action);
 }
 
 static void summary_execute_cb(SummaryView *summaryview, guint action,
@@ -4532,7 +4689,8 @@ static void summary_execute_cb(SummaryView *summaryview, guint action,
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
-       header_window_show_cb(summaryview->mainwin, action, widget);
+       summary_display_msg_selected(summaryview,
+                                    GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
 static void summary_add_address_cb(SummaryView *summaryview,
@@ -4541,57 +4699,78 @@ static void summary_add_address_cb(SummaryView *summaryview,
        summary_add_address(summaryview);
 }
 
-static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_create_filter_cb(SummaryView *summaryview,
+                                    guint action, GtkWidget *widget)
 {
-       summary_sort(summaryview, SORT_BY_MARK);
+       summary_filter_open(summaryview, (PrefsFilterType)action);
 }
 
-static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_sort_by_column_click(SummaryView *summaryview,
+                                        FolderSortKey sort_key)
 {
-       summary_sort(summaryview, SORT_BY_UNREAD);
+       FolderItem *item = summaryview->folder_item;
+
+       if (!item) return;
+
+       if (item->sort_key == sort_key)
+               summary_sort(summaryview, sort_key,
+                            item->sort_type == SORT_ASCENDING
+                            ? SORT_DESCENDING : SORT_ASCENDING);
+       else
+               summary_sort(summaryview, sort_key, SORT_ASCENDING);
 }
 
-static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_MIME);
+       summary_sort_by_column_click(summaryview, SORT_BY_MARK);
 }
 
-static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_NUMBER);
+       summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
 }
 
-static void summary_score_clicked(GtkWidget *button,
-                                 SummaryView *summaryview)
+static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_SCORE);
+       summary_sort_by_column_click(summaryview, SORT_BY_MIME);
 }
 
-static void summary_locked_clicked(GtkWidget *button,
-                                 SummaryView *summaryview)
+static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_LOCKED);
+       summary_sort_by_column_click(summaryview, SORT_BY_NUMBER);
 }
 
 static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_SIZE);
+       summary_sort_by_column_click(summaryview, SORT_BY_SIZE);
 }
 
 static void summary_date_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_DATE);
+       summary_sort_by_column_click(summaryview, SORT_BY_DATE);
 }
 
 static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_FROM);
+       summary_sort_by_column_click(summaryview, SORT_BY_FROM);
 }
 
 static void summary_subject_clicked(GtkWidget *button,
                                    SummaryView *summaryview)
 {
-       summary_sort(summaryview, SORT_BY_SUBJECT);
+       summary_sort_by_column_click(summaryview, SORT_BY_SUBJECT);
+}
+
+static void summary_score_clicked(GtkWidget *button,
+                                 SummaryView *summaryview)
+{
+       summary_sort_by_column_click(summaryview, SORT_BY_SCORE);
+}
+
+static void summary_locked_clicked(GtkWidget *button,
+                                  SummaryView *summaryview)
+{
+       summary_sort_by_column_click(summaryview, SORT_BY_LOCKED);
 }
 
 static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
@@ -4603,9 +4782,7 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
        g_return_if_fail(summaryview != NULL);
        g_return_if_fail(summaryview->folder_item != NULL);
        g_return_if_fail(summaryview->folder_item->folder != NULL);
-       if (summaryview->folder_item->folder->type == F_NEWS ||
-           summaryview->selected == NULL)
-               return;
+       if (summaryview->selected == NULL) return;
 
        list = gtk_target_list_new(summary_drag_types, 1);
 
@@ -4631,7 +4808,7 @@ static void summary_drag_data_get(GtkWidget        *widget,
                     cur != NULL; cur = cur->next) {
                        msginfo = gtk_ctree_node_get_row_data
                                (ctree, GTK_CTREE_NODE(cur->data));
-                       tmp2 = procmsg_get_message_file_path(msginfo);
+                       tmp2 = procmsg_get_message_file(msginfo);
                        if (!tmp2) continue;
                        tmp1 = g_strconcat("file:/", tmp2, NULL);
                        g_free(tmp2);
@@ -4754,6 +4931,33 @@ 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;
+       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>"), (gchar *)value);
+                       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+                               procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+                               procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
+                       }
+                       g_hash_table_remove(mff->newsart, key);
+                       g_free(key);
+               }
+               g_string_free(line, TRUE);
+               debug_print(_("\n"));
+       }
+}
+
 static gint summary_cmp_by_score(GtkCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -4779,25 +4983,55 @@ 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)
+{
+       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;
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
        if (MSG_IS_NEW(msginfo->flags))
                summaryview->newmsgs--;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread--;
-       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
-
-       CHANGE_FLAGS(msginfo);
+*/
+       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked as ignore thread\n"),
            msginfo->msgnum);
 }
 
+
 static void summary_ignore_thread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -4816,14 +5050,14 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
        if (MSG_IS_NEW(msginfo->flags))
                summaryview->newmsgs++;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread++;
-       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+*/
+       procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
-       CHANGE_FLAGS(msginfo);
-               
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked as unignore thread\n"),
            msginfo->msgnum);
@@ -4841,7 +5075,6 @@ static void summary_unignore_thread(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
-
 static gboolean processing_apply_func(GNode *node, gpointer data)
 {
        FolderItem *item;
@@ -4857,6 +5090,7 @@ static gboolean processing_apply_func(GNode *node, gpointer data)
                return FALSE;
        processing = item->prefs->processing;
 
+
        if (processing != NULL) {
                gchar * buf;
                GSList * mlist;
@@ -4867,15 +5101,16 @@ static gboolean processing_apply_func(GNode *node, gpointer data)
                STATUSBAR_PUSH(summaryview->mainwin, buf);
                g_free(buf);
 
+/*
                mlist = item->folder->get_msg_list(item->folder, item,
                                                   TRUE);
-               
+*/             
+               mlist = folder_item_get_msg_list(item);
                for(cur = mlist ; cur != NULL ; cur = cur->next) {
                        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);
                }
 
@@ -4916,13 +5151,93 @@ static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
        GtkWidget *widget;
  
        widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
-                                          "/Summary/Hide read messages");
+                                          "/View/Hide read messages");
        gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
                            GINT_TO_POINTER(1));
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
        gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
                            GINT_TO_POINTER(0));
 }
+static void summaryview_subject_filter_init(PrefsFolderItem *prefs)
+{
+       int err;
+       gchar buf[BUFFSIZE];
+       if (prefs->enable_simplify_subject) {
+               if (prefs->simplify_subject_regexp && 
+                               *prefs->simplify_subject_regexp != 0x00) {
+
+                       if (!prefs->simplify_subject_preg) 
+                               prefs->simplify_subject_preg = g_new(regex_t, 1);
+                       else
+                               regfree(prefs->simplify_subject_preg);
+
+                       err = string_match_precompile(prefs->simplify_subject_regexp, 
+                                       prefs->simplify_subject_preg, REG_EXTENDED);
+                       if (err) {
+                               regerror(err, prefs->simplify_subject_preg, buf, BUFFSIZE);
+                               alertpanel_error(_("Regular expression (regexp) error:\n%s"), buf);
+                               g_free(prefs->simplify_subject_preg);
+                               prefs->simplify_subject_preg = NULL;
+                       }
+               } else {
+                       if (prefs->simplify_subject_preg) {
+                               regfree(prefs->simplify_subject_preg);
+                               g_free(prefs->simplify_subject_preg);
+                               prefs->simplify_subject_preg = NULL;
+                       }
+               }
+       }
+}
+
+void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
+{
+       GtkWidget *ctree = summaryview->ctree;
+       GtkWidget *pixmap; 
+
+       gtk_widget_destroy(summaryview->folder_pixmap);
+
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DELETED, &deletedxpm, &deletedxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW, &newxpm, &newxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm, &unreadxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm, &repliedxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm, &forwardedxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm, &clipxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm, &lockedxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
+       stock_pixmap_gdk(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);
+}
+
+/*
+ * Harvest addresses for selected messages in summary view.
+ */
+void summary_harvest_address( SummaryView *summaryview ) {
+       GtkCTree *ctree = GTK_CTREE( summaryview->ctree );
+       GList *cur;
+       GList *msgList;
+       MsgInfo *msginfo;
+
+       msgList = NULL;
+       for( cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next ) {
+               msginfo = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(cur->data) );
+               msgList = g_list_append( msgList, GUINT_TO_POINTER( msginfo->msgnum ) );
+       }
+       addressbook_harvest( summaryview->folder_item, TRUE, msgList );
+       g_list_free( msgList );
+}
+
 /*
  * End of Source.
  */