sync with 0.7.5cvs16
[claws.git] / src / summaryview.c
index 3ce8e2439a224d5460435cad18575711a4e50bbc..88552f2b25fbaca9505adca3335367909e30e801 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
@@ -46,6 +46,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <regex.h>
 
 #include "intl.h"
 #include "main.h"
 #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 "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"
 #include "folder.h"
 #include "colorlabel.h"
 #include "inc.h"
+#include "imap.h"
 #include "addressbook.h"
 #include "addr_compl.h"
 #include "scoring.h"
 #include "prefs_folder_item.h"
 #include "filtering.h"
-
-#include "pixmaps/dir-open.xpm"
-#include "pixmaps/mark.xpm"
-#include "pixmaps/deleted.xpm"
-#include "pixmaps/new.xpm"
-#include "pixmaps/unread.xpm"
-#include "pixmaps/replied.xpm"
-#include "pixmaps/forwarded.xpm"
-#include "pixmaps/clip.xpm"
-#include "pixmaps/ignorethread.xpm"
+#include "string_match.h"
 
 #define STATUSBAR_PUSH(mainwin, str) \
 { \
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_UNREAD_WIDTH       13
-#define SUMMARY_COL_MIME_WIDTH         10
+#define SUMMARY_COL_LOCKED_WIDTH       13
+#define SUMMARY_COL_MIME_WIDTH         11
 
 static GdkFont *boldfont;
 static GdkFont *smallfont;
@@ -117,9 +111,6 @@ static GtkStyle *small_style;
 static GtkStyle *small_marked_style;
 static GtkStyle *small_deleted_style;
 
-static GdkPixmap *folderxpm;
-static GdkBitmap *folderxpmmask;
-
 static GdkPixmap *markxpm;
 static GdkBitmap *markxpmmask;
 static GdkPixmap *deletedxpm;
@@ -135,9 +126,15 @@ static GdkPixmap *forwardedxpm;
 static GdkBitmap *forwardedxpmmask;
 static GdkPixmap *ignorethreadxpm;
 static GdkBitmap *ignorethreadxpmmask;
+static GdkPixmap *lockedxpm;
+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,
@@ -151,6 +148,9 @@ static void summary_write_cache_func        (GtkCTree               *ctree,
 
 static void summary_set_menu_sensitive (SummaryView            *summaryview);
 
+static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
+                                            guint action);
+
 static guint summary_get_msgnum                (SummaryView            *summaryview,
                                         GtkCTreeNode           *node);
 
@@ -186,21 +186,27 @@ static void summary_update_status (SummaryView            *summaryview);
 
 /* display functions */
 static void summary_status_show                (SummaryView            *summaryview);
+static void summary_set_column_titles  (SummaryView            *summaryview);
 static void summary_set_ctree_from_list        (SummaryView            *summaryview,
                                         GSList                 *mlist);
 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,
                                         GtkCTreeNode           *row);
+static void summary_lock_row           (SummaryView            *summaryview,
+                                        GtkCTreeNode           *row);
 static void summary_mark_row_as_read   (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
 static void summary_mark_row_as_unread (SummaryView            *summaryview,
@@ -243,6 +249,10 @@ static void summary_unthread_for_exec_func (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 gpointer        data);
 
+void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
+                             GSList * mlist);
+
+void summary_processing(SummaryView *summaryview, GSList * mlist);
 static void summary_filter_func                (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
                                         gpointer                data);
@@ -257,10 +267,11 @@ static void summary_colorlabel_menu_create(SummaryView    *summaryview);
 
 static GtkWidget *summary_ctree_create (SummaryView    *summaryview);
 
+static void summary_toggle_view(SummaryView *summarview);
+
 /* callback functions */
-static void summary_toggle_pressed     (GtkWidget              *eventbox,
-                                        GdkEventButton         *event,
-                                        SummaryView            *summaryview);
+static void summary_toggle_view_cb     (GtkWidget      *widget,
+                                        gpointer       data);                                   
 static void summary_button_pressed     (GtkWidget              *ctree,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
@@ -299,6 +310,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);
@@ -320,6 +334,8 @@ static void summary_subject_clicked (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_score_clicked      (GtkWidget              *button,
                                         SummaryView            *summaryview);
+static void summary_locked_clicked     (GtkWidget              *button,
+                                        SummaryView            *summaryview);
 
 static void summary_start_drag         (GtkWidget        *widget, 
                                         int button,
@@ -361,13 +377,14 @@ static gint summary_cmp_by_subject        (GtkCList               *clist,
 static gint summary_cmp_by_score       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
+static gint summary_cmp_by_locked      (GtkCList *clist,
+                                        gconstpointer ptr1, gconstpointer ptr2);
 static gint summary_cmp_by_label       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 
-#if MARK_ALL_READ
-static void summary_mark_all_read (SummaryView *summaryview);                                   
-#endif
+static void news_process_crossposted   (MsgInfo *msginfo);
+static void news_flag_crosspost                (MsgInfo *msginfo);
 
 GtkTargetEntry summary_drag_types[1] =
 {
@@ -381,11 +398,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_("/Forward as a_ttachment"),
-                                       NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/Bounce"),                 NULL, summary_reply_cb, COMPOSE_BOUNCE, 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},
@@ -405,17 +424,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] = {
@@ -427,7 +453,8 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("Date"),     /* S_COL_DATE    */
        N_("Size"),     /* S_COL_SIZE    */
        N_("No."),      /* S_COL_NUMBER  */
-       N_("Score")     /* S_COL_SCORE   */
+       N_("Score"),    /* S_COL_SCORE   */
+       N_("L")         /* S_COL_LOCKED  */
 };
 
 SummaryView *summary_create(void)
@@ -437,11 +464,13 @@ SummaryView *summary_create(void)
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
        GtkWidget *hbox;
+       GtkWidget *hbox_l;
        GtkWidget *statlabel_folder;
        GtkWidget *statlabel_select;
        GtkWidget *statlabel_msgs;
-       GtkWidget *toggle_eventbox;
-       GtkWidget *toggle_arrow;
+       GtkWidget *hbox_spc;
+       GtkWidget *toggle_view_btn;
+       GtkWidget *toggle_view_arrow;
        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
        gint n_entries;
@@ -472,23 +501,29 @@ 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);
-
-       /* toggle view button */
-       toggle_eventbox = gtk_event_box_new();
-       gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
-       toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
-       gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
-                          GTK_SIGNAL_FUNC(summary_toggle_pressed),
-                          summaryview);
+       gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
+
+       /* toggle view buttons */
+       toggle_view_btn = gtk_button_new();
+       gtk_box_pack_end(GTK_BOX(hbox), toggle_view_btn, FALSE, FALSE, 0);
+       gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+       toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+       gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                               GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
 
        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]);
@@ -500,11 +535,12 @@ 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;
-       summaryview->toggle_eventbox = toggle_eventbox;
-       summaryview->toggle_arrow = toggle_arrow;
+       summaryview->toggle_view_btn = toggle_view_btn;
+       summaryview->toggle_view_arrow = toggle_view_arrow;
        summaryview->popupmenu = popupmenu;
        summaryview->popupfactory = popupfactory;
        summaryview->msg_is_toggled_on = TRUE;
@@ -522,25 +558,28 @@ void summary_init(SummaryView *summaryview)
        GtkStyle *style;
        GtkWidget *pixmap;
 
-       PIXMAP_CREATE(summaryview->ctree, markxpm, markxpmmask, mark_xpm);
-       PIXMAP_CREATE(summaryview->ctree, deletedxpm, deletedxpmmask,
-                     deleted_xpm);
-       PIXMAP_CREATE(summaryview->ctree, newxpm, newxpmmask, new_xpm);
-       PIXMAP_CREATE(summaryview->ctree, unreadxpm, unreadxpmmask, unread_xpm);
-       PIXMAP_CREATE(summaryview->ctree, repliedxpm, repliedxpmmask,
-                     replied_xpm);
-       PIXMAP_CREATE(summaryview->ctree, forwardedxpm, forwardedxpmmask,
-                     forwarded_xpm);
-       PIXMAP_CREATE(summaryview->ctree, ignorethreadxpm, ignorethreadxpmmask,
-                     ignorethread_xpm);
-       PIXMAP_CREATE(summaryview->ctree, clipxpm, clipxpmmask, clip_xpm);
-       PIXMAP_CREATE(summaryview->hbox, folderxpm, folderxpmmask,
-                     dir_open_xpm);
-
-       pixmap = gtk_pixmap_new(clipxpm, clipxpmmask);
-       gtk_clist_set_column_widget(GTK_CLIST(summaryview->ctree),
-                                   summaryview->col_pos[S_COL_MIME], pixmap);
-       gtk_widget_show(pixmap);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
+                        &markxpm, &markxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
+                        &deletedxpm, &deletedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_NEW,
+                        &newxpm, &newxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD,
+                        &unreadxpm, &unreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED,
+                        &repliedxpm, &repliedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
+                        &forwardedxpm, &forwardedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
+                        &clipxpm, &clipxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
+                        &lockedxpm, &lockedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
+                        &ignorethreadxpm, &ignorethreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
+                        &clipkeyxpm, &clipkeyxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
+                        &keyxpm, &keyxpmmask);
 
        if (!small_style) {
                small_style = gtk_style_copy
@@ -576,12 +615,14 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_set_style(summaryview->statlabel_select, style);
        gtk_widget_set_style(summaryview->statlabel_msgs, style);
 
-       pixmap = gtk_pixmap_new(folderxpm, folderxpmmask);
-       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);
        summary_colorlabel_menu_create(summaryview);
        summary_set_menu_sensitive(summaryview);
 
@@ -690,9 +731,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);
@@ -700,19 +743,28 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        return FALSE;
                }
                folder_update_op_count();
-       }
-       else if (!summaryview->filtering_happened) {
-               summary_write_cache(summaryview);
-       }
-
-       summaryview->filtering_happened = FALSE;
-
+       } 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;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        summary_clear_list(summaryview);
-       summary_set_menu_sensitive(summaryview);
+       summary_set_column_titles(summaryview);
        if (!is_refresh)
                messageview_clear(summaryview->messageview);
 
@@ -723,6 +775,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
              change_dir(buf) < 0))) {
                g_free(buf);
                debug_print(_("empty folder\n\n"));
+               summary_set_hide_read_msgs_menu(summaryview, FALSE);
                if (is_refresh)
                        messageview_clear(summaryview->messageview);
                summary_clear_all(summaryview);
@@ -735,6 +788,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);
 
@@ -747,6 +801,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
 
+       summary_processing(summaryview, mlist);
+
        for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
                MsgInfo * msginfo = (MsgInfo *) cur->data;
 
@@ -759,6 +815,31 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        }
 
        summaryview->killed_messages = NULL;
+
+       if (summaryview->folder_item->hide_read_msgs) {
+               GSList *not_killed;
+               gint kill_score;
+               
+               summary_set_hide_read_msgs_menu(summaryview, TRUE);
+               not_killed = NULL;
+               for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+                       MsgInfo * msginfo = (MsgInfo *) cur->data;
+                       
+                       if ((MSG_IS_UNREAD(msginfo->flags)
+                            || MSG_IS_MARKED(msginfo->flags)
+                            || MSG_IS_LOCKED(msginfo->flags))
+                            && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                           not_killed = g_slist_append(not_killed, msginfo);
+                       else
+                               summaryview->killed_messages = 
+                                       g_slist_append(summaryview->killed_messages, msginfo);
+               }
+               g_slist_free(mlist);
+               mlist = not_killed;
+       } else {
+               summary_set_hide_read_msgs_menu(summaryview, FALSE);
+       }
+
        if ((global_scoring || item->prefs->scoring) &&
            (item->folder->type == F_NEWS)) {
                GSList *not_killed;
@@ -823,8 +904,10 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        node = summary_find_next_unread_msg(summaryview, NULL);
                        if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
                                node = gtk_ctree_node_nth
-                                       (ctree, GTK_CLIST(ctree)->rows - 1);
-                       summary_select_node(summaryview, node, FALSE);
+                                       (ctree, sort_type == 
+                                        GTK_SORT_DESCENDING ? 0 : 
+                                        GTK_CLIST(ctree)->rows - 1);
+                       summary_select_node(summaryview, node, FALSE, TRUE);
                }
        } else {
                /* select first unread message */
@@ -837,20 +920,20 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
                        /* Get the last visible node on screen */
                        /* FIXME: huh, what happens if node is null? that allowed?? */
-                       node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+                       node = gtk_ctree_node_nth(ctree, sort_type == 
+                                                 GTK_SORT_DESCENDING ? 0 : 
+                                                 GTK_CLIST(ctree)->rows - 1);
                }       
                if (prefs_common.open_unread_on_enter) {
                        summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, TRUE);
+                       summary_select_node(summaryview, node, TRUE, TRUE);
                        summary_lock(summaryview);
                } else
-                       summary_select_node(summaryview, node, FALSE);
+                       summary_select_node(summaryview, node, FALSE, TRUE);
        }
 
        summary_status_show(summaryview);
-
        summary_set_menu_sensitive(summaryview);
-
        main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        debug_print("\n");
@@ -883,7 +966,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;
 
@@ -966,6 +1052,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);
@@ -982,15 +1069,18 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                return;
        }
 
-       if (summaryview->folder_item->folder->type != F_NEWS) {
+       if (summaryview->folder_item->folder->type != F_NEWS)
                menu_set_sensitive(ifactory, "/Move...", TRUE);
-               menu_set_sensitive(ifactory, "/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 thread", TRUE);
+       menu_set_sensitive(ifactory, "/Select all", TRUE);
+       menu_set_sensitive(ifactory, "/Copy...", TRUE);
        menu_set_sensitive(ifactory, "/Execute", TRUE);
 
-        menu_set_sensitive(ifactory, "/Mark", TRUE);
+       menu_set_sensitive(ifactory, "/Mark", TRUE);
        menu_set_sensitive(ifactory, "/Mark/Mark",   TRUE);
        menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
 
@@ -1007,9 +1097,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, "/Forward as attachment",    TRUE);
+       menu_set_sensitive(ifactory, "/Bounce",                   TRUE);
 
        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);
@@ -1019,24 +1110,29 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
            summaryview->folder_item->stype == F_DRAFT  ||
            summaryview->folder_item->stype == F_QUEUE)
                menu_set_sensitive(ifactory, "/Re-edit", sens);
+       else
+               menu_set_sensitive(ifactory, "/Re-edit", FALSE);
 
        menu_set_sensitive(ifactory, "/Save as...", sens);
        menu_set_sensitive(ifactory, "/Print...",   TRUE);
 
-       menu_set_sensitive(ifactory, "/Select all", TRUE);
-
        if (summaryview->folder_item->folder->account)
                sens = summaryview->folder_item->folder->account->protocol
                        == A_NNTP;
        else
                sens = FALSE;
        menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
+       summary_lock(summaryview);
+       menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
+       gtk_check_menu_item_set_active
+               (GTK_CHECK_MENU_ITEM(menuitem),
+                summaryview->messageview->textview->show_all_headers);
+       summary_unlock(summaryview);
 }
 
 void summary_select_prev_unread(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
        node = summary_find_prev_unread_msg(summaryview, summaryview->selected);
 
@@ -1064,33 +1160,18 @@ void summary_select_prev_unread(SummaryView *summaryview)
                node = summary_find_prev_unread_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No unread messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, 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);
-
-       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 {
+       while ((node = summary_find_next_unread_msg(summaryview, node)) == NULL) {
                AlertValue val;
 
                switch (prefs_common.next_unread_msg_dialog) {
@@ -1098,13 +1179,13 @@ void summary_select_next_unread(SummaryView *summaryview)
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                                                   "Go to next folder?"),
-                                                _("Yes"), _("No"), NULL);
+                                                _("Yes"), _("Search again"), _("No"));
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTDEFAULT;
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                               val = !G_ALERTDEFAULT;
+                               val = G_ALERTOTHER;
                                break;
                        default:
                                debug_print(
@@ -1118,14 +1199,20 @@ 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);
 
@@ -1140,22 +1227,15 @@ void summary_select_prev_marked(SummaryView *summaryview)
                node = summary_find_prev_marked_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No marked messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, 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);
 
@@ -1170,22 +1250,15 @@ void summary_select_next_marked(SummaryView *summaryview)
                node = summary_find_next_marked_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No marked messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, 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);
 
@@ -1200,22 +1273,15 @@ void summary_select_prev_labeled(SummaryView *summaryview)
                node = summary_find_prev_labeled_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No labeled messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, 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);
 
@@ -1230,16 +1296,10 @@ void summary_select_next_labeled(SummaryView *summaryview)
                node = summary_find_next_labeled_msg(summaryview, NULL);
        }
 
-       if (!node) {
+       if (!node)
                alertpanel_notice(_("No labeled messages."));
-       } else {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
-       }
+       else
+               summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
@@ -1247,7 +1307,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);
 }
 
 /**
@@ -1255,22 +1315,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);
        }
@@ -1301,7 +1367,8 @@ 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;
@@ -1321,7 +1388,8 @@ static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (!MSG_IS_DELETED(msginfo->flags)) break;
+               if (!MSG_IS_DELETED(msginfo->flags))
+                       break;
        }
 
        return node;
@@ -1568,6 +1636,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))
@@ -1616,6 +1687,7 @@ static void summary_status_show(SummaryView *summaryview)
        gchar *del, *mv, *cp;
        gchar *sel;
        gchar *spc;
+       gchar *itstr;
        GList *rowlist, *cur;
        guint n_selected = 0;
        off_t sel_size = 0;
@@ -1637,11 +1709,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);
@@ -1666,22 +1744,28 @@ static void summary_status_show(SummaryView *summaryview)
        else
                spc = "";
 
-       if (n_selected)
+       if (n_selected) {
                sel = g_strdup_printf(" (%s)", to_human_readable(sel_size));
-       else
+               if (n_selected == 1)
+                       itstr = g_strdup(_(" item selected"));
+               else
+                       itstr = g_strdup(_(" items selected"));
+       } else {
                sel = g_strdup("");
+               itstr = g_strdup("");
+       }
+               
        str = g_strconcat(n_selected ? itos(n_selected) : "",
-                         n_selected ? _(" item(s) selected") : "",
-                         sel, spc, del, mv, cp, NULL);
+                                       itstr, sel, spc, del, mv, cp, NULL);
        gtk_label_set(GTK_LABEL(summaryview->statlabel_select), str);
        g_free(str);
        g_free(sel);
        g_free(del);
        g_free(mv);
        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,
@@ -1696,11 +1780,111 @@ static void summary_status_show(SummaryView *summaryview)
        gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
 
+       summaryview->folder_item->new    = summaryview->newmsgs;
+       summaryview->folder_item->unread = summaryview->unread;
+       summaryview->folder_item->total  = summaryview->messages;
+
        folderview_update_msg_num(summaryview->folderview,
-                                 summaryview->folderview->opened,
-                                 summaryview->newmsgs,
-                                 summaryview->unread,
-                                 summaryview->messages);
+                                 summaryview->folderview->opened);
+}
+
+static void summary_set_column_titles(SummaryView *summaryview)
+{
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkWidget *hbox;
+       GtkWidget *label;
+       GtkWidget *arrow;
+       gint pos;
+       const gchar *title;
+       SummaryColumnType type;
+       gboolean single_char;
+       GtkJustification justify;
+
+       static SummarySortType sort_by[N_SUMMARY_COLS] = {
+               SORT_BY_MARK,
+               SORT_BY_UNREAD,
+               SORT_BY_MIME,
+               SORT_BY_SUBJECT,
+               SORT_BY_FROM,
+               SORT_BY_DATE,
+               SORT_BY_SIZE,
+               SORT_BY_NUMBER,
+               SORT_BY_SCORE,
+               SORT_BY_LOCKED
+       };
+
+       for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
+               type = summaryview->col_state[pos].type;
+
+               /* 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;
+
+               switch (type) {
+               case S_COL_SUBJECT:
+               case S_COL_FROM:
+               case S_COL_DATE:
+               case S_COL_NUMBER:
+                       if (prefs_common.trans_hdr)
+                               title = gettext(col_label[type]);
+                       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]);
+               }
+
+               if (type == S_COL_MIME) {
+                       label = gtk_pixmap_new(clipxpm, clipxpmmask);
+                       gtk_widget_show(label);
+                       gtk_clist_set_column_widget(clist, pos, label);
+                       continue;
+               }
+               if (single_char) {
+                       gtk_clist_set_column_title(clist, pos, title);
+                       continue;
+               }
+
+               /* 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);
+               else
+                       gtk_box_pack_start(GTK_BOX(hbox), label,
+                                          FALSE, FALSE, 0);
+
+               if (summaryview->sort_mode == sort_by[type]) {
+                       arrow = gtk_arrow_new
+                               (summaryview->sort_type == GTK_SORT_ASCENDING
+                                ? GTK_ARROW_DOWN : GTK_ARROW_UP,
+                                GTK_SHADOW_IN);
+                       if (justify == GTK_JUSTIFY_RIGHT)
+                               gtk_box_pack_start(GTK_BOX(hbox), arrow,
+                                                  FALSE, FALSE, 0);
+                       else
+                               gtk_box_pack_end(GTK_BOX(hbox), arrow,
+                                                FALSE, FALSE, 0);
+               }
+
+               gtk_widget_show_all(hbox);
+               gtk_clist_set_column_widget(clist, pos, hbox);
+       }
 }
 
 void summary_sort(SummaryView *summaryview, SummarySortType type)
@@ -1740,6 +1924,9 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        case SORT_BY_SCORE:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
                break;
+       case SORT_BY_LOCKED:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+               break;
        case SORT_BY_LABEL:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
                break;
@@ -1764,11 +1951,11 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        gtk_clist_set_sort_type(clist, summaryview->sort_type);
        summaryview->sort_mode = type;
 
-       gtk_ctree_sort_node(ctree, NULL);
+       summary_set_column_titles(summaryview);
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
-       /*gtkut_ctree_set_focus_row(ctree, summaryview->selected);*/
+       gtk_ctree_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);
@@ -1811,30 +1998,12 @@ 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;
 }
 
-static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
-                                          gchar * subject)
-{
-       if (g_strncasecmp(subject, "Re: ", 4) == 0)
-               return g_hash_table_lookup(subject_table, subject + 4);
-       else
-               return g_hash_table_lookup(subject_table, subject);
-}
-
-static void subject_table_insert(GHashTable *subject_table, gchar * subject,
-                                GtkCTreeNode * node)
-{
-       if (g_strncasecmp(subject, "Re: ", 4) == 0)
-               g_hash_table_insert(subject_table, subject + 4, node);
-       else
-               g_hash_table_insert(subject_table, subject, node);
-}
-
 static void summary_set_ctree_from_list(SummaryView *summaryview,
                                        GSList *mlist)
 {
@@ -1875,6 +2044,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;
@@ -1906,9 +2077,13 @@ 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);
+
+                       subject_table_insert(subject_table,
+                                            msginfo->subject,
+                                            node);
                }
                mlist = g_slist_reverse(mlist);
        }
@@ -1950,7 +2125,7 @@ gint summary_write_cache(SummaryView *summaryview)
        gint ver = CACHE_VERSION;
        gchar *buf;
        gchar *cachefile, *markfile;
-       GSList * cur;
+       GSList *cur;
        gint filemode = 0;
        PrefsFolderItem *prefs;
 
@@ -1962,7 +2137,7 @@ gint summary_write_cache(SummaryView *summaryview)
 
        cachefile = folder_item_get_cache_file(summaryview->folder_item);
        g_return_val_if_fail(cachefile != NULL, -1);
-       if ((fps.cache_fp = fopen(cachefile, "w")) == NULL) {
+       if ((fps.cache_fp = fopen(cachefile, "wb")) == NULL) {
                FILE_OP_ERROR(cachefile, "fopen");
                g_free(cachefile);
                return -1;
@@ -1986,7 +2161,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);
@@ -2016,14 +2191,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);
 
@@ -2045,6 +2220,28 @@ static void summary_write_cache_func(GtkCTree *ctree, GtkCTreeNode *node,
        procmsg_write_flags(msginfo, fps->mark_fp);
 }
 
+static gchar *summary_complete_address(const gchar *addr)
+{
+       gint count;
+       gchar *res, *tmp, *email_addr;
+
+       Xstrdup_a(email_addr, addr, return NULL);
+       extract_address(email_addr);
+       g_return_val_if_fail(*email_addr, NULL);
+
+       /*
+        * completion stuff must be already initialized
+        */
+       res = NULL;
+       if (1 < (count = complete_address(email_addr))) {
+               tmp = get_complete_address(1);
+               res = procheader_get_fromname(tmp);
+               g_free(tmp);    
+       }
+       
+       return res;
+}
+
 static void summary_set_header(SummaryView *summaryview, gchar *text[],
                               MsgInfo *msginfo)
 {
@@ -2053,11 +2250,14 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        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;
        text[col_pos[S_COL_UNREAD]] = NULL;
        text[col_pos[S_COL_MIME]]   = NULL;
+       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);
 
@@ -2065,7 +2265,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        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
+#endif 
 
        if (msginfo->date_t) {
                procheader_date_get_localtime(date_modified,
@@ -2081,38 +2281,49 @@ 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(from, msginfo->from, return);
-               extract_address(from);
-               if (account_find_from_address(from)) {
+               if (prefs_common.use_addr_book) {
+                       Xstrdup_a(addr, msginfo->from, return);
+                       extract_address(addr);
+
+               if (account_find_from_address(addr)) {
+                       addr = summary_complete_address(msginfo->to);
                        g_free(to);
-                       to = g_strconcat("-->", msginfo->to, NULL);
+                       to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
                        text[col_pos[S_COL_FROM]] = to;
+                       }
                }
        }
 
-       if ((text[col_pos[S_COL_FROM]] != to) && prefs_common.use_addr_book &&
-           msginfo->from) {
-               gint count;
+       /*
+        * CLAWS: note that the "text[col_pos[S_COL_FROM]] != to" is really a hack, 
+        * checking whether the above block (which handles the special case of
+        * the --> in sent boxes) was executed.
+        */
+       if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
                gchar *from;
-  
-               Xstrdup_a(from, msginfo->from, return);
-               extract_address(from);
-               if (*from) {
-                       count = complete_address(from);
-                       if (count > 1) {
-                               g_free(from_name);
-                               from = get_complete_address(1);
-                               from_name = procheader_get_fromname(from);
-                               g_free(from);
-                               text[col_pos[S_COL_FROM]] = from_name;
-                       }
-               }
+               from = summary_complete_address(msginfo->from);
+               if (from) {
+                       /*
+                        * FIXME: this text[col_pos[S_COL_FROM]] should be freed
+                        * but may have been assigned _("No From"). Should be
+                        * freed??? 
+                        */
+                       text[col_pos[S_COL_FROM]] = from;
+               }       
        }
 
-       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) \
@@ -2123,11 +2334,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;
@@ -2152,19 +2370,23 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                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)) {
+       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);
-               CHANGE_FLAGS(msginfo);
+               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);
        }
 
+       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;
 
@@ -2173,21 +2395,40 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                summaryview->displayed = row;
                if (!summaryview->msg_is_toggled_on)
                        summary_toggle_view(summaryview);
-               messageview_show(msgview, msginfo);
+               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 (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
-               header_window_show(summaryview->headerwin, msginfo);
+       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags) ||
+           (MSG_IS_MIME(msginfo->flags) - MSG_IS_MIME(flags) != 0)) {
+               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);
+       }
+       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;
@@ -2195,7 +2436,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);
        }
 }
 
@@ -2203,7 +2444,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)
@@ -2240,28 +2482,51 @@ void summary_reedit(SummaryView *summaryview)
 void summary_step(SummaryView *summaryview, GtkScrollType type)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+
+       if (summary_is_locked(summaryview)) return;
 
        if (type == GTK_SCROLL_STEP_FORWARD) {
-               GtkCTreeNode *node;
                node = gtkut_ctree_node_next(ctree, summaryview->selected);
                if (node)
                        gtkut_ctree_expand_parent_all(ctree, node);
+               else
+                       return;
+       } else {
+               if (summaryview->selected) {
+                       node = GTK_CTREE_NODE_PREV(summaryview->selected);
+                       if (!node) return;
+               }
        }
 
+       if (summaryview->msg_is_toggled_on)
+               summaryview->display_msg = TRUE;
+
        gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
                                type, 0.0);
-       
-       if (summaryview->msg_is_toggled_on)
-               summary_display_msg(summaryview, summaryview->selected, FALSE);
 }
 
 static void summary_toggle_view(SummaryView *summaryview)
+{
+       MainWindow *mainwin = summaryview->mainwin;
+       GtkItemFactory *ifactory;
+       
+       if (!mainwin) return;
+       
+       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       menu_toggle_toggle(ifactory, "/View/Expand Summary View");
+}
+
+void summary_toggle_view_real(SummaryView *summaryview)
 {
        MainWindow *mainwin = summaryview->mainwin;
        union CompositeWin *cwin = &mainwin->win;
        GtkWidget *vpaned = NULL;
        GtkWidget *container = NULL;
-
+       GtkWidget *toggle_view_btn;
+       GtkWidget *toggle_view_arrow;
+       GtkItemFactory *ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       
        switch (mainwin->type) {
        case SEPARATE_NONE:
                vpaned = cwin->sep_none.vpaned;
@@ -2280,20 +2545,47 @@ static void summary_toggle_view(SummaryView *summaryview)
                summaryview->msg_is_toggled_on = FALSE;
                summaryview->displayed = NULL;
                gtk_widget_ref(vpaned);
-               gtk_container_remove(GTK_CONTAINER(container), 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);
+               
+               gtk_widget_destroy(summaryview->toggle_view_arrow);
+               gtk_widget_destroy(summaryview->toggle_view_btn);
+               
+               toggle_view_btn = gtk_button_new();
+               gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
+               gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
+               gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+               toggle_view_arrow=gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_OUT);
+               gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+               gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                                       GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+               gtk_widget_show_all(toggle_view_btn);
+               menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
        } 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_destroy(summaryview->toggle_view_arrow);
+               gtk_widget_destroy(summaryview->toggle_view_btn);
+               
+               toggle_view_btn = gtk_button_new();
+               gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
+               gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
+               gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+               toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+               gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+               gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                                       GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+               gtk_widget_show_all(toggle_view_btn);
+               menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
        }
 
        gtk_widget_grab_focus(summaryview->ctree);
+       
+       summaryview->toggle_view_btn = toggle_view_btn;
+       summaryview->toggle_view_arrow = toggle_view_arrow;
 }
 
 static gboolean summary_search_unread_recursive(GtkCTree *ctree,
@@ -2423,25 +2715,42 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }
 
-       if (MSG_IS_MIME(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                         clipxpm, clipxpmmask);
-       } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
+       if (MSG_IS_LOCKED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
+                                         lockedxpm, lockedxpmmask);
        }
-        if (!style)
+       else {
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
+       }
+
+       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 {
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
+       }
+        if (!style)
                style = small_style;
 
        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)
 {
-       summary_set_row_marks(summaryview, summaryview->selected);
+       GList *cur;
+
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+            cur = cur->next)
+               summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
 }
 
 static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
@@ -2470,9 +2779,45 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
        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);
        summary_set_row_marks(summaryview, row);
-       debug_print(_("Message %d is marked\n"), msginfo->msgnum);
+       debug_print(_("Message %s/%d is marked\n"), msginfo->folder->path, msginfo->msgnum);
+}
+
+static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
+{
+       /* almost verbatim summary_mark_row(); may want a menu action? */
+       gboolean changed = FALSE;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_DELETED(msginfo->flags))
+               summaryview->deleted--;
+       if (MSG_IS_MOVE(msginfo->flags)) {
+               summaryview->moved--;
+               changed = TRUE;
+       }
+       if (MSG_IS_COPY(msginfo->flags)) {
+               summaryview->copied--;
+               changed = TRUE;
+       }
+       if (changed && !prefs_common.immediate_exec) {
+               msginfo->to_folder->op_count--;
+               if (msginfo->to_folder->op_count == 0)
+                       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);
+       summary_set_row_marks(summaryview, row);
+       debug_print(_("Message %d is locked\n"), msginfo->msgnum);
 }
 
 void summary_mark(SummaryView *summaryview)
@@ -2501,6 +2846,8 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        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"),
@@ -2553,8 +2900,12 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
                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);
                summaryview->unread++;
                debug_print(_("Message %d is marked as unread\n"),
                            msginfo->msgnum);
@@ -2577,6 +2928,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;
@@ -2585,6 +2985,11 @@ 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;
 
        if (MSG_IS_MOVE(msginfo->flags)) {
@@ -2602,6 +3007,8 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
        }
        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);
@@ -2623,7 +3030,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;
 
@@ -2655,7 +3065,8 @@ void summary_delete(SummaryView *summaryview)
                        summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
                else
                        summary_select_node(summaryview, node,
-                                           summaryview->msg_is_toggled_on);
+                                           summaryview->msg_is_toggled_on,
+                                           FALSE);
        }
 
        if (prefs_common.immediate_exec || item->stype == F_TRASH)
@@ -2727,10 +3138,11 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
        }
        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);
        summary_set_row_marks(summaryview, row);
-
        debug_print(_("Message %s/%d is unmarked\n"),
                    msginfo->folder->path, msginfo->msgnum);
 }
@@ -2740,8 +3152,7 @@ void summary_unmark(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(ctree)->selection; cur != NULL; cur = cur->next)
                summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
 
        summary_status_show(summaryview);
@@ -2775,6 +3186,8 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                        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);
        if (!MSG_IS_MOVE(msginfo->flags)) {
                MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
@@ -2832,7 +3245,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);
 }
 
@@ -2864,6 +3278,8 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                        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);
        if (!MSG_IS_COPY(msginfo->flags)) {
                MSG_SET_TMP_FLAGS(msginfo->flags, MSG_COPY);
@@ -2888,8 +3304,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;
 
@@ -2919,10 +3334,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);
 }
 
@@ -2966,13 +3381,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;
@@ -2984,7 +3404,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);
 }
 
@@ -3027,8 +3450,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);
@@ -3120,6 +3542,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));
 
@@ -3168,6 +3594,10 @@ 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));
 
@@ -3186,6 +3616,7 @@ static void summary_execute_delete(SummaryView *summaryview)
        GSList *cur;
 
        trash = summaryview->folder_item->folder->trash;
+
        if (summaryview->folder_item->folder->type == F_MH) {
                g_return_if_fail(trash != NULL);
        }
@@ -3196,10 +3627,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);
@@ -3207,7 +3639,7 @@ static void summary_execute_delete(SummaryView *summaryview)
        g_slist_free(summaryview->mlist);
        summaryview->mlist = NULL;
 
-       if (summaryview->folder_item != trash) {
+       if ((summaryview->folder_item != trash) && (trash != NULL)) {
                folder_item_scan(trash);
                folderview_update_item(trash, FALSE);
        }
@@ -3231,13 +3663,6 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
                                                msginfo->msgid))
                        g_hash_table_remove(summaryview->msgid_table,
                                            msginfo->msgid);
-
-               if (msginfo->subject && 
-                   node == subject_table_lookup(summaryview->subject_table, 
-                                               msginfo->subject)) {
-                       gchar *s = msginfo->subject + (g_strncasecmp(msginfo->subject, "Re: ", 4) == 0 ? 4 : 0);
-                       g_hash_table_remove(summaryview->subject_table, s);
-               }                       
        }
 }
 
@@ -3267,24 +3692,25 @@ void summary_thread_build(SummaryView *summaryview)
 
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
+               parent = NULL;
+
                /* alfons - claws seems to prefer subject threading before
                 * inreplyto threading. we should look more deeply in this,
                 * because inreplyto should have precedence... */
                if (msginfo && msginfo->inreplyto) {
                        parent = g_hash_table_lookup(summaryview->msgid_table,
                                                     msginfo->inreplyto);
-                       if (parent && parent != node) {
-                               gtk_ctree_move(ctree, node, parent, NULL);
-                               gtk_ctree_expand(ctree, node);
-                       }
                }
-               else if (msginfo && msginfo->subject) {
-                       parent = g_hash_table_lookup
-                                       (summaryview->subject_table, msginfo->subject);
-                       if (parent && parent != node) {
-                               gtk_ctree_move(ctree, node, parent, NULL);
-                               gtk_ctree_expand(ctree, node);
-                       }
+
+               if (parent == NULL) {
+                       parent = subject_table_lookup
+                               (summaryview->subject_table,
+                                msginfo->subject);
+               }
+
+               if (parent && parent != node) {
+                       gtk_ctree_move(ctree, node, parent, NULL);
+                       gtk_ctree_expand(ctree, node);
                }
 
                node = next;
@@ -3432,9 +3858,65 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
        }
 }
 
+void summary_processing(SummaryView *summaryview, GSList * mlist)
+{
+       GSList * processing_list;
+       FolderItem * folder_item;
+       GSList * cur;
+       gchar * id;
+       gchar * buf;
+
+       folder_item = summaryview->folder_item;
+       if (folder_item == NULL)
+               return;
+
+       processing_list = folder_item->prefs->processing;
+
+       if (processing_list == NULL)
+               return;
+
+       summary_lock(summaryview);
+       
+       buf = g_strdup_printf(_("Processing (%s)..."), folder_item->path);
+       debug_print(buf);
+       STATUSBAR_PUSH(summaryview->mainwin, buf);
+       g_free(buf);
+
+       main_window_cursor_wait(summaryview->mainwin);
+
+       summaryview->folder_table = g_hash_table_new(NULL, NULL);
+
+       for(cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo;
+
+               msginfo = (MsgInfo *) cur->data;
+               filter_message_by_msginfo(processing_list, msginfo,
+                                         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;
+       
+       if (prefs_common.immediate_exec) {
+               summary_unlock(summaryview);
+               summary_execute(summaryview);
+               summary_lock(summaryview);
+       } else
+               summary_status_show(summaryview);
+
+       debug_print(_("done.\n"));
+       STATUSBAR_POP(summaryview->mainwin);
+       main_window_cursor_normal(summaryview->mainwin);
+
+       summary_unlock(summaryview);
+}
+
 void summary_filter(SummaryView *summaryview)
 {
-       if (!prefs_common.fltlist && !prefs_filtering) {
+       if (!prefs_common.fltlist && !global_processing) {
                alertpanel_error(_("No filter rules defined."));
                return;
        }
@@ -3447,7 +3929,7 @@ void summary_filter(SummaryView *summaryview)
 
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
-       if (prefs_filtering == NULL) {
+       if (global_processing == NULL) {
                gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                        GTK_CTREE_FUNC(summary_filter_func),
                                        summaryview);
@@ -3475,8 +3957,6 @@ void summary_filter(SummaryView *summaryview)
 
                g_hash_table_destroy(summaryview->folder_table);
                summaryview->folder_table = NULL;
-
-               summary_show(summaryview, summaryview->folder_item, FALSE);
        }
 
        debug_print(_("done.\n"));
@@ -3484,6 +3964,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,
@@ -3494,19 +3982,226 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
        gchar *file;
        FolderItem *dest;
 
-       if (prefs_filtering == NULL) {
+       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(prefs_filtering, msginfo,
-                                             summaryview->folder_table);
+               prefs_filter_open(header, key);
+}
+
+void summary_reply(SummaryView *summaryview, ComposeMode mode)
+{
+       GtkWidget *widget;
+       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));
+
+       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, 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, 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_BOUNCE:
+               compose_bounce(NULL, msginfo);
+               break;
+       default:
+               g_warning("summary_reply_cb(): invalid action: %d\n", mode);
+       }
+
+       summary_set_marks_selected(summaryview);
+       g_free(text);
 }
 
 /* color label */
@@ -3699,41 +4394,30 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        GtkWidget *ctree;
        gint *col_pos = summaryview->col_pos;
        SummaryColumnState *col_state;
-       const gchar *titles[N_SUMMARY_COLS];
+       gchar *titles[N_SUMMARY_COLS];
        SummaryColumnType type;
        gint pos;
 
+       memset(titles, 0, sizeof(titles));
+
        col_state = prefs_summary_column_get_config();
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
                summaryview->col_state[pos] = col_state[pos];
                type = col_state[pos].type;
                col_pos[type] = pos;
-
-               switch (type) {
-               case S_COL_NUMBER:
-               case S_COL_DATE:
-               case S_COL_FROM:
-               case S_COL_SUBJECT:
-               case S_COL_SCORE:
-                       if (prefs_common.trans_hdr)
-                               titles[pos] = gettext(col_label[type]);
-                       else
-                               titles[pos] = col_label[type];
-                       break;
-               default:
-                       titles[pos] = gettext(col_label[type]);
-               }
        }
        col_state = summaryview->col_state;
 
        ctree = gtk_sctree_new_with_titles
-               (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], (gchar **)titles);
+               (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
 
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
                                           GTK_JUSTIFY_CENTER);
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
+                                          GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
@@ -3746,6 +4430,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                   SUMMARY_COL_MARK_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
                                   SUMMARY_COL_UNREAD_WIDTH);
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
+                                  SUMMARY_COL_LOCKED_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                   SUMMARY_COL_MIME_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SUBJECT],
@@ -3795,6 +4481,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM   , summary_from_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SUBJECT, summary_subject_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE,   summary_score_clicked);
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_LOCKED,  summary_locked_clicked);
 
 #undef CLIST_BUTTON_SIGNAL_CONNECT
 
@@ -3836,8 +4523,16 @@ void summary_set_column_order(SummaryView *summaryview)
        GtkWidget *scrolledwin = summaryview->scrolledwin;
        GtkWidget *pixmap;
        FolderItem *item;
+       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);
+       summary_write_cache(summaryview);
+       summary_unlock(summaryview);
+       
        summary_clear_all(summaryview);
        gtk_widget_destroy(summaryview->ctree);
 
@@ -3854,19 +4549,26 @@ void summary_set_column_order(SummaryView *summaryview)
        gtk_widget_show(ctree);
 
        summary_show(summaryview, item, FALSE);
+
+       summary_select_by_msgnum(summaryview, selected_msgnum);
+       summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
+       if (!summaryview->displayed)
+               messageview_clear(summaryview->messageview);
+       else
+               summary_redisplay_msg(summaryview);
 }
 
 
+
 /* callback functions */
 
-static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
-                                  SummaryView *summaryview)
+static void summary_toggle_view_cb(GtkWidget *button,
+                                  gpointer data)
 {
-       if (!event)
-               return;
-
+       SummaryView *summaryview = (SummaryView *) data;
+       
        if (!summaryview->msg_is_toggled_on && summaryview->selected)
-               summary_display_msg(summaryview, summaryview->selected, FALSE);
+               summary_display_msg(summaryview, summaryview->selected);
        else
                summary_toggle_view(summaryview);
 }
@@ -3905,69 +4607,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);
@@ -3988,110 +4637,35 @@ 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 */
-       case GDK_Delete:
                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,
                                         (event->state & GDK_MOD1_MASK) != 0);
                break;
-       case GDK_asterisk:      /* Mark */
-               summary_mark(summaryview);
-               break;
-       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 ||
@@ -4122,11 +4696,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;
        }
 
@@ -4138,6 +4713,8 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        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);
                        summary_set_row_marks(summaryview, row);
                } else
@@ -4153,14 +4730,26 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        summary_status_show(summaryview);
                }
                break;
+       case S_COL_LOCKED:
+               if (MSG_IS_LOCKED(msginfo->flags)) {
+                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
+                       CHANGE_FLAGS(msginfo);
+                       summary_set_row_marks(summaryview, row);
+               }
+               else
+                       summary_lock_row(summaryview, row);
+               break;
        default:
                break;
        }
 
-       if (summaryview->display_msg)
-               summary_display_msg(summaryview, row, FALSE);
-
-       summaryview->display_msg = FALSE;
+       if (summaryview->display_msg) {
+               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,
@@ -4174,71 +4763,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 (!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;
-       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,
@@ -4250,7 +4775,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,
@@ -4259,6 +4785,12 @@ static void summary_add_address_cb(SummaryView *summaryview,
        summary_add_address(summaryview);
 }
 
+static void summary_create_filter_cb(SummaryView *summaryview,
+                                    guint action, GtkWidget *widget)
+{
+       summary_filter_open(summaryview, (PrefsFilterType)action);
+}
+
 static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
 {
        summary_sort(summaryview, SORT_BY_MARK);
@@ -4285,6 +4817,12 @@ static void summary_score_clicked(GtkWidget *button,
        summary_sort(summaryview, SORT_BY_SCORE);
 }
 
+static void summary_locked_clicked(GtkWidget *button,
+                                 SummaryView *summaryview)
+{
+       summary_sort(summaryview, SORT_BY_LOCKED);
+}
+
 static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
 {
        summary_sort(summaryview, SORT_BY_SIZE);
@@ -4315,14 +4853,12 @@ 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);
 
        context = gtk_drag_begin(widget, list,
-                                GDK_ACTION_MOVE, button, event);
+                                GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
 }
 
@@ -4343,7 +4879,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);
@@ -4466,6 +5002,69 @@ static gint summary_cmp_by_label(GtkCList *clist,
        return MSG_GET_COLORLABEL(msginfo1->flags) -
                MSG_GET_COLORLABEL(msginfo2->flags);
 }
+
+static void news_flag_crosspost(MsgInfo *msginfo)
+{
+       GString *line;
+       gpointer key;
+       gpointer value;
+       MsgPermFlags flags;
+       Folder *mff = msginfo->folder->folder;
+
+       if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
+               line = g_string_sized_new(128);
+               g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
+               debug_print(_("nfcp: checking <%s>"), line->str);
+               if (mff->newsart && 
+                   g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
+                       debug_print(_(" <%s>"), value);
+                       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+                               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+                               MSG_SET_COLORLABEL_VALUE(msginfo->flags, mff->account->crosspost_col);
+                       }
+                       g_hash_table_remove(mff->newsart, key);
+                       g_free(key);
+               }
+               g_string_free(line, TRUE);
+               debug_print(_("\n"));
+       }
+}
+
+static void news_process_crossposted(MsgInfo *msginfo)
+{
+       gchar **crossref;
+       gchar **crp;
+       gchar *cp;
+       gint cnt;
+       static char *read = "read";
+       Folder *mff = msginfo->folder->folder;
+
+       /* Get the Xref: line */
+       if (msginfo->xref) {
+               /* Retrieve the cross-posted groups and message ids */
+               /* Format of Xref is Xref: server message:id message:id ... */
+               crossref = g_strsplit(msginfo->xref, " ", 1024);
+               for (crp = crossref+2, cnt = 0; *crp; crp++, cnt++) {
+                       if ((cp = strchr(*crp, ':'))) {
+                               *cp = '\0';
+                               if (!strcmp(*crp, msginfo->folder->path)) continue;
+                               *cp = ':';
+
+                               /* On first pass, create a GHashTable to hold the list of
+                                * article numbers per newsgroup that have been read. */
+                               if (!mff->newsart) {
+                                       mff->newsart = g_hash_table_new(g_str_hash, g_str_equal);
+                               }
+                               /* When a summary is selected, the articles for that
+                                * newsgroup are marked based on this entry */
+                               g_hash_table_insert(mff->newsart, g_strdup(*crp), read);
+                               debug_print(_("Cross-reference %d: Hash <%s>\n"), cnt, *crp);
+                       }
+               }
+               g_strfreev(crossref);
+       }
+}
+
 static gint summary_cmp_by_score(GtkCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -4482,6 +5081,46 @@ static gint summary_cmp_by_score(GtkCList *clist,
                return summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
+static gint summary_cmp_by_locked(GtkCList *clist,
+                                 gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
+}
+
+static void summary_select_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *) data;
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       gtk_ctree_select(GTK_CTREE(ctree), row);        
+       debug_print(_("Message %d selected\n"),
+           msginfo->msgnum);
+}
+
+/* select current thread */
+void summary_select_thread(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node = summaryview->selected;
+       GList *cur;
+
+       while (GTK_CTREE_ROW(node)->parent != NULL)
+               node = GTK_CTREE_ROW(node)->parent;
+
+       if (node && node != summaryview->selected)
+               summary_select_node(summaryview, node, TRUE, FALSE);
+
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+               gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_select_thread_func), summaryview);
+       }
+       
+       summary_status_show(summaryview);
+}
+
 static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;
@@ -4501,6 +5140,7 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
            msginfo->msgnum);
 }
 
+
 static void summary_ignore_thread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -4543,6 +5183,169 @@ static void summary_unignore_thread(SummaryView *summaryview)
 
        summary_status_show(summaryview);
 }
+
+static gboolean processing_apply_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       GSList * processing;
+       SummaryView * summaryview = (SummaryView *) data;
+       
+       if (node == NULL)
+               return FALSE;
+
+       item = node->data;
+       /* prevent from the warning */
+       if (item->path == NULL)
+               return FALSE;
+       processing = item->prefs->processing;
+
+       if (processing != NULL) {
+               gchar * buf;
+               GSList * mlist;
+               GSList * cur;
+
+               buf = g_strdup_printf(_("Processing (%s)..."), item->path);
+               debug_print(buf);
+               STATUSBAR_PUSH(summaryview->mainwin, buf);
+               g_free(buf);
+
+               mlist = item->folder->get_msg_list(item->folder, item,
+                                                  TRUE);
+               
+               for(cur = mlist ; cur != NULL ; cur = cur->next) {
+                       MsgInfo * msginfo;
+                       
+                       msginfo = (MsgInfo *) cur->data;
+                       filter_message_by_msginfo(processing, msginfo, NULL);
+                       procmsg_msginfo_free(msginfo);
+               }
+
+               g_slist_free(mlist);
+               
+               STATUSBAR_POP(summaryview->mainwin);
+       }
+
+
+       return FALSE;
+}
+
+void processing_apply(SummaryView * summaryview)
+{
+       GList * cur;
+
+       for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+               Folder *folder;
+
+               folder = (Folder *) cur->data;
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                               processing_apply_func, summaryview);
+       }
+}
+
+void summary_toggle_show_read_messages(SummaryView *summaryview)
+{
+       if (summaryview->folder_item->hide_read_msgs)
+               summaryview->folder_item->hide_read_msgs = 0;
+       else
+               summaryview->folder_item->hide_read_msgs = 1;
+       summary_show(summaryview, summaryview->folder_item, FALSE);
+}
+static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
+                                            guint action)
+{
+       GtkWidget *widget;
+       widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
+                                          "/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)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCTreeNode *node;
+       GtkWidget *pixmap; 
+
+       gtk_widget_destroy(summaryview->folder_pixmap);
+
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED, &deletedxpm, &deletedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_NEW, &newxpm, &newxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD, &unreadxpm, &unreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED, &repliedxpm, &repliedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm, &forwardedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP, &clipxpm, &clipxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED, &lockedxpm, &lockedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+
+       pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
+       gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
+       gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
+       gtk_widget_show(pixmap);
+       summaryview->folder_pixmap = pixmap; 
+
+       summary_write_cache(summaryview);
+
+       folderview_unselect(summaryview->folderview);
+       folderview_select(summaryview->folderview, summaryview->folder_item);
+}
+
+/*
+ * 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.
  */