sync with 0.9.5cvs2
[claws.git] / src / summaryview.c
index b96e0877c73c11b9534e843d4a8b8bd5941d0be3..3dcb70186d05fb8ed7e4e3282b2ed0fb01c5646f 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
@@ -44,9 +44,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <regex.h>
 
 #include "intl.h"
 #include "main.h"
@@ -78,7 +75,7 @@
 #include "addressbook.h"
 #include "addr_compl.h"
 #include "scoring.h"
-#include "prefs_folder_item.h"
+#include "folder_item_prefs.h"
 #include "filtering.h"
 #include "string_match.h"
 #include "toolbar.h"
 #include "matcher_parser.h"
 #include "hooks.h"
 #include "description_window.h"
+#include "folder.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
-#define SUMMARY_COL_UNREAD_WIDTH       13
+#define SUMMARY_COL_STATUS_WIDTH       13
 #define SUMMARY_COL_LOCKED_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         11
 
@@ -127,6 +125,8 @@ static GdkPixmap *keyxpm;
 static GdkBitmap *keyxpmmask;
 static GdkPixmap *clipkeyxpm;
 static GdkBitmap *clipkeyxpmmask;
+static GdkPixmap *gpgsignedxpm;
+static GdkBitmap *gpgsignedxpmmask;
 
 static void summary_free_msginfo_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
@@ -189,6 +189,8 @@ static void summary_mark_row                (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
 static void summary_lock_row           (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
+static void summary_unlock_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,
@@ -223,8 +225,8 @@ static void summary_execute_delete_func     (GtkCTree               *ctree,
                                         gpointer                data);
 
 static void summary_thread_init                (SummaryView            *summaryview);
-static void summary_ignore_thread      (SummaryView            *summaryview);
-static void summary_unignore_thread    (SummaryView            *summaryview);
+static void summary_ignore_thread      (SummaryView            *summaryview);
+static void summary_unignore_thread     (SummaryView            *summaryview);
 
 static void summary_unthread_for_exec          (SummaryView    *summaryview);
 static void summary_unthread_for_exec_func     (GtkCTree       *ctree,
@@ -252,7 +254,7 @@ static void summary_colorlabel_menu_create(SummaryView      *summaryview);
 static GtkWidget *summary_ctree_create (SummaryView    *summaryview);
 
 /* callback functions */
-static void summary_toggle_pressed     (GtkWidget              *eventbox,
+static gint summary_toggle_pressed     (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
 static void summary_button_pressed     (GtkWidget              *ctree,
@@ -261,10 +263,10 @@ static void summary_button_pressed        (GtkWidget              *ctree,
 static void summary_button_released    (GtkWidget              *ctree,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
-static void summary_key_pressed                (GtkWidget              *ctree,
+static gint summary_key_pressed                (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static void summary_searchbar_pressed  (GtkWidget              *ctree,
+static gint summary_searchbar_pressed  (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
 static void summary_searchbar_focus_evt        (GtkWidget              *ctree,
@@ -307,7 +309,7 @@ static void summary_create_filter_cb        (SummaryView            *summaryview,
 
 static void summary_mark_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
-static void summary_unread_clicked     (GtkWidget              *button,
+static void summary_status_clicked     (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_mime_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
@@ -344,7 +346,7 @@ static void summary_drag_data_get       (GtkWidget        *widget,
 static gint summary_cmp_by_mark                (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_unread      (GtkCList               *clist,
+static gint summary_cmp_by_status      (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 static gint summary_cmp_by_mime                (GtkCList               *clist,
@@ -362,9 +364,6 @@ static gint summary_cmp_by_date             (GtkCList               *clist,
 static gint summary_cmp_by_from                (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_subject     (GtkCList               *clist,
-                                        gconstpointer           ptr1,
-                                        gconstpointer           ptr2);
 static gint summary_cmp_by_simplified_subject
                                        (GtkCList               *clist, 
                                         gconstpointer           ptr1, 
@@ -378,6 +377,9 @@ static gint summary_cmp_by_label    (GtkCList               *clist,
 static gint summary_cmp_by_to          (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
+static gint summary_cmp_by_subject     (GtkCList               *clist,
+                                        gconstpointer           ptr1,
+                                        gconstpointer           ptr2);
 static gint summary_cmp_by_locked      (GtkCList               *clist,
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
@@ -427,6 +429,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
        {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
        {N_("/_Mark/Unignore thread"),  NULL, summary_unignore_thread, 0, NULL},
+       {N_("/_Mark/Lock"),             NULL, summary_msgs_lock, 0, NULL},
+       {N_("/_Mark/Unlock"),           NULL, summary_msgs_unlock, 0, NULL},
        {N_("/Color la_bel"),           NULL, NULL,             0, NULL},
 
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
@@ -457,7 +461,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("M"),        /* S_COL_MARK    */
-       N_("U"),        /* S_COL_UNREAD  */
+       N_("S"),        /* S_COL_STATUS  */
        "",             /* S_COL_MIME    */
        N_("Subject"),  /* S_COL_SUBJECT */
        N_("From"),     /* S_COL_FROM    */
@@ -522,7 +526,8 @@ static DescriptionWindow search_descr = {
        search_descr_strings
 };
        
-static void search_description_cb (GtkWidget *widget) {
+static void search_description_cb(GtkWidget *widget)
+{
        description_window_create(&search_descr);
 };
 
@@ -704,6 +709,8 @@ SummaryView *summary_create(void)
        summaryview->msginfo_update_callback_id =
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
 
+       summaryview->target_list = gtk_target_list_new(summary_drag_types, 1);
+
        /* CLAWS: need this to get the SummaryView * from
         * the CList */
        gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
@@ -718,6 +725,7 @@ void summary_init(SummaryView *summaryview)
        GtkStyle *style;
        GtkWidget *pixmap;
 
+       gtk_widget_realize(summaryview->ctree);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
                         &markxpm, &markxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
@@ -740,6 +748,8 @@ void summary_init(SummaryView *summaryview)
                         &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
                         &keyxpm, &keyxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+                        &gpgsignedxpm, &gpgsignedxpmmask);
 
        if (!small_style) {
                small_style = gtk_style_copy
@@ -923,19 +933,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
-       if (!is_refresh)
-               messageview_clear(summaryview->messageview);
 
        buf = NULL;
-       if (!item || !item->path || !item->parent || item->no_select ||
-           (item->folder->type == F_MH &&
-            ((buf = folder_item_get_path(item)) == NULL ||
-             change_dir(buf) < 0))) {
+       if (!item || !item->path || !item->parent || item->no_select) {
                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);
                summaryview->folder_item = item;
                gtk_clist_thaw(GTK_CLIST(ctree));
@@ -945,6 +948,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        }
        g_free(buf);
 
+       if (!is_refresh)
+               messageview_clear(summaryview->messageview);
+
        summaryview->folder_item = item;
        item->opened = TRUE;
 
@@ -992,7 +998,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                             || MSG_IS_LOCKED(msginfo->flags)
                             || CURRENTLY_DISPLAYED(msginfo))
                             && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                           not_killed = g_slist_append(not_killed, msginfo);
+                           not_killed = g_slist_prepend(not_killed, msginfo);
                        else
                                procmsg_msginfo_free(msginfo);
                }
@@ -1045,12 +1051,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        }
                        if (search_type != S_SEARCH_EXTENDED) {
                                if (searched_header && strcasestr(searched_header, search_string) != NULL)
-                                       not_killed = g_slist_append(not_killed, msginfo);
+                                       not_killed = g_slist_prepend(not_killed, msginfo);
                                else
                                        procmsg_msginfo_free(msginfo);
                        } else {
                                if ((tmp_list != NULL) && matcherlist_match(tmp_list, msginfo))
-                                       not_killed = g_slist_append(not_killed, msginfo);
+                                       not_killed = g_slist_prepend(not_killed, msginfo);
                                else
                                        procmsg_msginfo_free(msginfo);
                        }
@@ -1076,7 +1082,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
 
                        if (msginfo->score > kill_score)
-                               not_killed = g_slist_append(not_killed, msginfo);
+                               not_killed = g_slist_prepend(not_killed, msginfo);
                        else
                                procmsg_msginfo_free(msginfo);
                }
@@ -1086,8 +1092,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        STATUSBAR_POP(summaryview->mainwin);
 
-       /* set ctree and hash table from the msginfo list
-          creating thread, and count the number of messages */
+       /* set ctree and hash table from the msginfo list, and
+          create the thread */
        summary_set_ctree_from_list(summaryview, mlist);
 
        g_slist_free(mlist);
@@ -1132,7 +1138,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                 item->sort_type == SORT_DESCENDING
                                 ? 0 : GTK_CLIST(ctree)->rows - 1);
                }
-               if (prefs_common.open_unread_on_enter) {
+               if (prefs_common.open_unread_on_enter ||
+                   prefs_common.always_show_msg) {
                        summary_unlock(summaryview);
                        summary_select_node(summaryview, node, TRUE, TRUE);
                        summary_lock(summaryview);
@@ -1174,12 +1181,11 @@ void summary_clear_list(SummaryView *summaryview)
 
        summaryview->display_msg = FALSE;
 
-       summaryview->selected  = NULL;
+       summaryview->selected = NULL;
        summaryview->displayed = NULL;
-       summaryview->newmsgs   = summaryview->unread     = 0;
-       summaryview->messages  = summaryview->total_size = 0;
-       summaryview->deleted   = summaryview->moved      = 0;
-       summaryview->copied    = 0;
+       summaryview->total_size = 0;
+       summaryview->deleted = summaryview->moved = 0;
+       summaryview->copied = 0;
        if (summaryview->msgid_table) {
                g_hash_table_destroy(summaryview->msgid_table);
                summaryview->msgid_table = NULL;
@@ -1204,6 +1210,7 @@ void summary_clear_list(SummaryView *summaryview)
 
 void summary_clear_all(SummaryView *summaryview)
 {
+       messageview_clear(summaryview->messageview);
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
@@ -1243,86 +1250,109 @@ SummarySelection summary_get_selection_type(SummaryView *summaryview)
        return selection;
 }
 
+GSList *summary_get_selected_msg_list(SummaryView *summaryview)
+{
+       GSList *mlist = NULL;
+       GList *cur;
+       MsgInfo *msginfo;
+
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+            cur = cur->next) {
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
+               mlist = g_slist_prepend(mlist, msginfo);
+       }
+
+       mlist = g_slist_reverse(mlist);
+
+       return mlist;
+}
+
+GSList *summary_get_msg_list(SummaryView *summaryview)
+{
+       GSList *mlist = NULL;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+
+       ctree = GTK_CTREE(summaryview->ctree);
+
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+            node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+               mlist = g_slist_prepend(mlist, msginfo);
+       }
+
+       mlist = g_slist_reverse(mlist);
+
+       return mlist;
+}
+
 static void summary_set_menu_sensitive(SummaryView *summaryview)
 {
        GtkItemFactory *ifactory = summaryview->popupfactory;
-       SummarySelection selection;
+       SensitiveCond state;
+       gboolean sensitive;
        GtkWidget *menuitem;
-       gboolean sens;
+       gint i;
+
+       static const struct {
+               gchar *const entry;
+               SensitiveCond cond;
+       } entry[] = {
+               {"/Reply"                       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/all"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/sender"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/mailing list"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Follow-up and reply to"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
+
+               {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"/Redirect"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+
+               {"/Re-edit"                     , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+
+               {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Copy..."                     , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Delete"                      , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Cancel a news message"       , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+               {"/Execute"                     , M_DELAY_EXEC},
+
+               {"/Mark"                        , M_TARGET_EXIST},
+               {"/Mark/Mark"                   , M_TARGET_EXIST},
+               {"/Mark/Unmark"                 , M_TARGET_EXIST},
+               {"/Mark/Mark as unread"         , M_TARGET_EXIST},
+               {"/Mark/Mark all read"          , M_TARGET_EXIST},
+               {"/Mark/Ignore thread"          , M_TARGET_EXIST},
+               {"/Mark/Lock"                   , M_TARGET_EXIST},
+               {"/Mark/Unlock"                 , M_TARGET_EXIST},
+               {"/Color label"                 , M_TARGET_EXIST},
+
+               {"/Add sender to address book"  , M_SINGLE_TARGET_EXIST},
+               {"/Create filter rule"          , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+
+               {"/View"                        , M_SINGLE_TARGET_EXIST},
+               {"/View/Open in new window"     , M_SINGLE_TARGET_EXIST},
+               {"/View/Source"                 , M_SINGLE_TARGET_EXIST},
+               {"/View/All header"             , M_SINGLE_TARGET_EXIST},
+
+               {"/Save as..."                  , M_TARGET_EXIST|M_UNLOCKED},
+               {"/Print..."                    , M_TARGET_EXIST|M_UNLOCKED},
+
+               {"/Select thread"               , M_SINGLE_TARGET_EXIST},
+               {"/Select all"                  , M_TARGET_EXIST},
+
+               {NULL, 0}
+       };
 
-       selection = summary_get_selection_type(summaryview);
        main_window_set_menu_sensitive(summaryview->mainwin);
 
-       if (selection == SUMMARY_NONE) {
-               GtkWidget *submenu;
+       state = main_window_get_current_state(summaryview->mainwin);
 
-               submenu = gtk_item_factory_get_widget
-                       (summaryview->popupfactory, "/Mark");
-               menu_set_insensitive_all(GTK_MENU_SHELL(submenu));
-               menu_set_insensitive_all
-                       (GTK_MENU_SHELL(summaryview->popupmenu));
-               return;
+       for (i = 0; entry[i].entry != NULL; i++) {
+               sensitive = ((entry[i].cond & state) == entry[i].cond);
+               menu_set_sensitive(ifactory, entry[i].entry, sensitive);
        }
 
-       if (summaryview->folder_item->folder->type != F_NEWS)
-               menu_set_sensitive(ifactory, "/Move...", TRUE);
-       else
-               menu_set_sensitive(ifactory, "/Move...", FALSE);
-
-#if 0
-       menu_set_sensitive(ifactory, "/Delete", TRUE);
-#endif
-       menu_set_sensitive(ifactory, "/Copy...", TRUE);
-       menu_set_sensitive(ifactory, "/Execute", TRUE);
-
-       menu_set_sensitive(ifactory, "/Mark", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
-
-       menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark as read",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Ignore thread",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
-
-       menu_set_sensitive(ifactory, "/Color label", TRUE);
-
-       sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
-       menu_set_sensitive(ifactory, "/Reply",                    sens);
-       menu_set_sensitive(ifactory, "/Reply to",                 sens);
-       menu_set_sensitive(ifactory, "/Reply to/all",             sens);
-       menu_set_sensitive(ifactory, "/Reply to/sender",          sens);
-       menu_set_sensitive(ifactory, "/Reply to/mailing list",    sens);
-       menu_set_sensitive(ifactory, "/Forward",                  TRUE);
-       menu_set_sensitive(ifactory, "/Redirect",                 sens);
-
-       menu_set_sensitive(ifactory, "/Add sender to address book", sens);
-       menu_set_sensitive(ifactory, "/Create filter rule",         sens);
-
-       menu_set_sensitive(ifactory, "/View", sens);
-       menu_set_sensitive(ifactory, "/View/Open in new window", sens);
-       menu_set_sensitive(ifactory, "/View/Source", sens);
-       menu_set_sensitive(ifactory, "/View/All header", sens);
-       if (summaryview->folder_item->stype == F_OUTBOX ||
-           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...", TRUE);
-       menu_set_sensitive(ifactory, "/Print...",   TRUE);
-
-       menu_set_sensitive(ifactory, "/Select all", TRUE);
-       menu_set_sensitive(ifactory, "/Select thread", sens);
-       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);
-       menu_set_sensitive(ifactory, "/Cancel a news message", sens);
-       menu_set_sensitive(ifactory, "/Delete", !sens);
 
        summary_lock(summaryview);
        menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
@@ -1642,7 +1672,7 @@ static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (!MSG_IS_DELETED(msginfo->flags)) break;
+               if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
        }
 
        return node;
@@ -1662,7 +1692,7 @@ 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 (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
        }
 
        return node;
@@ -1687,7 +1717,7 @@ static GtkCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if ((msginfo->flags.perm_flags & flags) != 0) break;
+               if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
        }
 
        return node;
@@ -1715,7 +1745,7 @@ static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
                /* Find msg with matching flags but ignore messages with
                   ignore flags, if searching for new or unread messages */
                if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) && 
-                       ((msginfo->flags.perm_flags & flags) != 0))
+                       (msginfo && (msginfo->flags.perm_flags & flags) != 0))
                        break;
        }
 
@@ -1733,7 +1763,7 @@ static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (msginfo->msgnum == msgnum) break;
+               if (msginfo && msginfo->msgnum == msgnum) break;
        }
 
        return node;
@@ -1846,10 +1876,6 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *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))
-               summaryview->unread++;
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
@@ -1857,7 +1883,6 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
 
-       summaryview->messages++;
        summaryview->total_size += msginfo->size;
 
        summary_set_row_marks(summaryview, node);
@@ -1869,18 +1894,13 @@ static void summary_update_status(SummaryView *summaryview)
        GtkCTreeNode *node;
        MsgInfo *msginfo;
 
-       summaryview->newmsgs = summaryview->unread =
-       summaryview->messages = summaryview->total_size =
+       summaryview->total_size =
        summaryview->deleted = summaryview->moved = summaryview->copied = 0;
 
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
             node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
-               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->newmsgs++;
-               if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->unread++;
                if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
                && procmsg_msg_has_marked_parent(msginfo))
                        summaryview->unreadmarked++;
@@ -1890,7 +1910,6 @@ static void summary_update_status(SummaryView *summaryview)
                        summaryview->moved++;
                if (MSG_IS_COPY(msginfo->flags))
                        summaryview->copied++;
-               summaryview->messages++;
                summaryview->total_size += msginfo->size;
        }
 }
@@ -1906,6 +1925,7 @@ static void summary_status_show(SummaryView *summaryview)
        guint n_selected = 0;
        off_t sel_size = 0;
        MsgInfo *msginfo;
+       gchar *name;
 
        if (!summaryview->folder_item) {
                gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
@@ -1919,21 +1939,17 @@ static void summary_status_show(SummaryView *summaryview)
                msginfo = gtk_ctree_node_get_row_data
                        (GTK_CTREE(summaryview->ctree),
                         GTK_CTREE_NODE(cur->data));
-               sel_size += msginfo->size;
-               n_selected++;
+               if (!msginfo)
+                       g_warning("summary_status_show(): msginfo == NULL\n");
+               else {
+                       sel_size += msginfo->size;
+                       n_selected++;
+               }
        }
 
-       if (summaryview->folder_item->folder->type == F_NEWS) {
-               gchar *group;
-               group = get_abbrev_newsgroup_name
-                       (g_basename(summaryview->folder_item->path),
-                        prefs_common.ng_abbrev_len);
-               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);
-       }
+       name = folder_item_get_name(summaryview->folder_item);
+       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), name);
+       g_free(name);
 
        if (summaryview->deleted)
                del = g_strdup_printf(_("%d deleted"), summaryview->deleted);
@@ -1979,18 +1995,12 @@ static void summary_status_show(SummaryView *summaryview)
        g_free(cp);
        g_free(itstr);
 
-       if (FOLDER_IS_LOCAL(summaryview->folder_item->folder)) {
-               str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
-                                     summaryview->newmsgs,
-                                     summaryview->unread,
-                                     summaryview->messages,
+       str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
+
+                                     summaryview->folder_item->new_msgs,
+                                     summaryview->folder_item->unread_msgs,
+                                     summaryview->folder_item->total_msgs,
                                      to_human_readable(summaryview->total_size));
-       } else {
-               str = g_strdup_printf(_("%d new, %d unread, %d total"),
-                                     summaryview->newmsgs,
-                                     summaryview->unread,
-                                     summaryview->messages);
-       }
        gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
 }
@@ -2009,7 +2019,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
 
        static FolderSortKey sort_by[N_SUMMARY_COLS] = {
                SORT_BY_MARK,
-               SORT_BY_UNREAD,
+               SORT_BY_STATUS,
                SORT_BY_MIME,
                SORT_BY_SUBJECT,
                SORT_BY_FROM,
@@ -2024,7 +2034,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                type = summaryview->col_state[pos].type;
 
                /* CLAWS: mime and unread are single char headers */
-               single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
+               single_char = (type == S_COL_MIME || type == S_COL_STATUS);
                justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
                        ? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
 
@@ -2105,8 +2115,8 @@ void summary_sort(SummaryView *summaryview,
        case SORT_BY_MARK:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
                break;
-       case SORT_BY_UNREAD:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+       case SORT_BY_STATUS:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
                break;
        case SORT_BY_MIME:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
@@ -2258,8 +2268,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                summary_thread_init(summaryview);
        } else {
                gchar *text[N_SUMMARY_COLS];
-
-               mlist = g_slist_reverse(mlist);
+               cur = mlist;
                for (; mlist != NULL; mlist = mlist->next) {
                        msginfo = (MsgInfo *)mlist->data;
 
@@ -2279,7 +2288,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                             msginfo->subject,
                                             node);
                }
-               mlist = g_slist_reverse(mlist);
+               mlist = cur;
        }
 
        if (prefs_common.enable_hscrollbar &&
@@ -2321,10 +2330,12 @@ static gchar *summary_complete_address(const gchar *addr)
        res = NULL;
        if (1 < (count = complete_address(email_addr))) {
                tmp = get_complete_address(1);
+/*     tmp = addressbook_lookup_name( email_addr );
+       if( tmp ) { */
                res = procheader_get_fromname(tmp);
-               g_free(tmp);    
+               g_free(tmp);
        }
-       
+
        return res;
 }
 
@@ -2338,7 +2349,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        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_STATUS]] = NULL;
        text[col_pos[S_COL_MIME]]   = NULL;
        text[col_pos[S_COL_LOCKED]] = NULL;
        text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
@@ -2363,7 +2374,6 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
 
                Xstrdup_a(addr, msginfo->from, return);
                extract_address(addr);
-
                if (prefs_common.use_addr_book) {
                        if (account_find_from_address(addr)) {
                                addr = summary_complete_address(msginfo->to);
@@ -2373,7 +2383,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                                g_free(addr);
                        }
                } else {
-                       if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
+                       if (account_find_from_address(addr)) {
                                g_free(to);
                                to = g_strconcat("-->", msginfo->to, NULL);
                                text[col_pos[S_COL_FROM]] = to;
@@ -2417,9 +2427,14 @@ static void summary_display_msg_full(SummaryView *summaryview,
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
        MsgFlags flags;
-       gchar *filename;
 
-       if (!new_window && summaryview->displayed == row) return;
+       if (!new_window) {
+               if (summaryview->displayed == row)
+                       return;
+               else
+                       summaryview->messageview->filtered = FALSE;
+       }                       
+       
        g_return_if_fail(row != NULL);
 
        if (summary_is_locked(summaryview)) return;
@@ -2430,18 +2445,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       filename = procmsg_get_message_file(msginfo);
-       if (!filename) {
-               summary_unlock(summaryview);
-               return;
-       }
-       g_free(filename);
-
        if (new_window || !prefs_common.mark_as_read_on_new_window) {
-               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->newmsgs--;
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->unread--;
                if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags) 
                && procmsg_msg_has_marked_parent(msginfo))
                        summaryview->unreadmarked--;
@@ -2645,22 +2649,22 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
        /* set new/unread column */
        if (MSG_IS_IGNORE_THREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          ignorethreadxpm, ignorethreadxpmmask);
        } else if (MSG_IS_NEW(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          newxpm, newxpmmask);
        } else if (MSG_IS_UNREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          unreadxpm, unreadxpmmask);
        } else if (MSG_IS_REPLIED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          repliedxpm, repliedxpmmask);
        } else if (MSG_IS_FORWARDED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          forwardedxpm, forwardedxpmmask);
        } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
                                        NULL);
        }
 
@@ -2703,8 +2707,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                }
                        gtk_ctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
-       }
-       else if ((global_scoring ||
+       } else if ((global_scoring ||
                  summaryview->folder_item->prefs->scoring) &&
                 (msginfo->score >= summaryview->important_score) &&
                 (MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
@@ -2723,7 +2726,10 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
        }
 
-       if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+       if (MSG_IS_SIGNED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         gpgsignedxpm, gpgsignedxpmmask);
+       } else 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)) {
@@ -2776,7 +2782,6 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
 
 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;
@@ -2799,6 +2804,20 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
        debug_print("Message %d is locked\n", msginfo->msgnum);
 }
 
+static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (!MSG_IS_LOCKED(msginfo->flags))
+               return;
+       procmsg_msginfo_set_to_folder(msginfo, NULL);
+       procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
+       summary_set_row_marks(summaryview, row);
+       debug_print("Message %d is unlocked\n", msginfo->msgnum);
+}
+
 void summary_mark(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -2819,13 +2838,9 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if(!MSG_IS_NEW(msginfo->flags) && !MSG_IS_UNREAD(msginfo->flags))
+       if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
                return;
 
-       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->unread--;
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked--;
@@ -2841,10 +2856,40 @@ void summary_mark_as_read(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
                                         GTK_CTREE_NODE(cur->data));
+       folder_item_update_thaw();
+       
+       summary_status_show(summaryview);
+}
+
+void summary_msgs_lock(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GList *cur;
 
+       folder_item_update_freeze();
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+               summary_lock_row(summaryview,
+                                        GTK_CTREE_NODE(cur->data));
+       folder_item_update_thaw();
+       
+       summary_status_show(summaryview);
+}
+
+void summary_msgs_unlock(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GList *cur;
+
+       folder_item_update_freeze();
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+               summary_unlock_row(summaryview,
+                                  GTK_CTREE_NODE(cur->data));
+       folder_item_update_thaw();
+       
        summary_status_show(summaryview);
 }
 
@@ -2855,15 +2900,12 @@ void summary_mark_all_read(SummaryView *summaryview)
        GtkCTreeNode *node;
 
        gtk_clist_freeze(clist);
+       folder_item_update_freeze();
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
-            node = gtkut_ctree_node_next(ctree, node)) {
-               if (!GTK_CTREE_ROW(node)->expanded)
-                       summary_set_row_marks(summaryview, node);
-       }
        gtk_clist_thaw(clist);
+       folder_item_update_thaw();
 
        summary_status_show(summaryview);
 }
@@ -2881,9 +2923,6 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
                summaryview->deleted--;
        }
 
-       if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->unread++;
-
        if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
@@ -2901,10 +2940,12 @@ void summary_mark_as_unread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_unread(summaryview,
                                           GTK_CTREE_NODE(cur->data));
-
+       folder_item_update_thaw();
+       
        summary_status_show(summaryview);
 }
 
@@ -2913,7 +2954,7 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
        GList * cur;
        gboolean found;
 
-       switch (summaryview->folder_item->folder->type) {
+       switch (FOLDER_TYPE(summaryview->folder_item->folder)) {
 
        case F_NEWS:
 
@@ -3043,6 +3084,8 @@ void summary_delete(SummaryView *summaryview)
                if (aval != G_ALERTDEFAULT) return;
        }
 
+       main_window_cursor_wait(summaryview->mainwin);
+
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
        folder_item_update_freeze();     
@@ -3056,18 +3099,8 @@ void summary_delete(SummaryView *summaryview)
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 
-       if (node) {
-               if (sel_last && node == gtkut_ctree_node_next(ctree, sel_last))
-                       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-               else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
-                       summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
-               else
-                       summary_select_node
-                               (summaryview, node,
-                                messageview_is_visible(summaryview->messageview),
-                                FALSE);
-       }
-
+       summary_select_node(summaryview, node, FALSE, FALSE);
+       
        if (prefs_common.immediate_exec || item->stype == F_TRASH) {
                summary_execute(summaryview);
                /* after deleting, the anchor may be at an invalid row
@@ -3075,12 +3108,14 @@ void summary_delete(SummaryView *summaryview)
                gtk_sctree_set_anchor_row(GTK_SCTREE(ctree), node);
        } else
                summary_status_show(summaryview);
+               
+       main_window_cursor_normal(summaryview->mainwin);
 }
 
 void summary_delete_duplicated(SummaryView *summaryview)
 {
        if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return;
+           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
        if (summaryview->folder_item->stype == F_TRASH) return;
 
        main_window_cursor_wait(summaryview->mainwin);
@@ -3088,6 +3123,8 @@ void summary_delete_duplicated(SummaryView *summaryview)
        STATUSBAR_PUSH(summaryview->mainwin,
                       _("Deleting duplicated messages..."));
 
+       folder_item_update_freeze();
+       
        gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                GTK_CTREE_FUNC(summary_delete_duplicated_func),
                                summaryview);
@@ -3097,6 +3134,8 @@ void summary_delete_duplicated(SummaryView *summaryview)
        else
                summary_status_show(summaryview);
 
+       folder_item_update_thaw();
+
        debug_print("done.\n");
        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
@@ -3106,10 +3145,12 @@ static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
                                           SummaryView *summaryview)
 {
        GtkCTreeNode *found;
-       MsgInfo *msginfo = GTK_CTREE_ROW(node)->row.data;
+       MsgInfo *msginfo;
        MsgInfo *dup_msginfo;
+
+       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
        
-       if (!msginfo->msgid || !*msginfo->msgid) return;
+       if (!msginfo || !msginfo->msgid || !*msginfo->msgid) return;
 
        found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
        
@@ -3189,7 +3230,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 
        if (!to_folder) return;
        if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return;
+           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
        if (summary_is_locked(summaryview)) return;
 
@@ -3225,7 +3266,7 @@ void summary_move_to(SummaryView *summaryview)
        FolderItem *to_folder;
 
        if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return;
+           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
        to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
                                         FOLDER_SEL_MOVE, NULL);
@@ -3317,7 +3358,9 @@ void summary_add_address(SummaryView *summaryview)
 
 void summary_select_all(SummaryView *summaryview)
 {
-       if (summaryview->messages >= 500) {
+       if (!summaryview->folder_item) return;
+
+       if (summaryview->folder_item->total_msgs >= 500) {
                STATUSBAR_PUSH(summaryview->mainwin,
                               _("Selecting all messages..."));
                main_window_cursor_wait(summaryview->mainwin);
@@ -3325,7 +3368,7 @@ void summary_select_all(SummaryView *summaryview)
 
        gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
 
-       if (summaryview->messages >= 500) {
+       if (summaryview->folder_item->total_msgs >= 500) {
                STATUSBAR_POP(summaryview->mainwin);
                main_window_cursor_normal(summaryview->mainwin);
        }
@@ -3453,6 +3496,7 @@ gboolean summary_execute(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCTreeNode *node, *next;
+       GtkCTreeNode *new_selected = NULL;
 
        if (!summaryview->folder_item) return FALSE;
 
@@ -3471,19 +3515,36 @@ gboolean summary_execute(SummaryView *summaryview)
        folder_item_update_thaw();
 
        node = GTK_CTREE_NODE(clist->row_list);
-       while (node != NULL) {
+       for (; node != NULL; node = next) {
                next = gtkut_ctree_node_next(ctree, node);
-               if (gtk_ctree_node_get_row_data(ctree, node) == NULL) {
-                       if (node == summaryview->displayed) {
-                               messageview_clear(summaryview->messageview);
-                               summaryview->displayed = NULL;
-                       }
-                       if (GTK_CTREE_ROW(node)->children != NULL)
-                               g_warning("summary_execute(): children != NULL\n");
-                       else
-                               gtk_ctree_remove_node(ctree, node);
+               if (gtk_ctree_node_get_row_data(ctree, node) != NULL) continue;
+
+               if (node == summaryview->displayed) {
+                       messageview_clear(summaryview->messageview);
+                       summaryview->displayed = NULL;
                }
-               node = next;
+               if (GTK_CTREE_ROW(node)->children != NULL) {
+                       g_warning("summary_execute(): children != NULL\n");
+                       continue;
+               }
+
+               if (!new_selected &&
+                   gtkut_ctree_node_is_selected(ctree, node)) {
+                       gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+                       new_selected = summary_find_next_msg(summaryview, node);
+                       if (!new_selected)
+                               new_selected = summary_find_prev_msg
+                                       (summaryview, node);
+               }
+
+               gtk_ctree_remove_node(ctree, node);
+       }
+
+       if (new_selected) {
+               gtk_sctree_select
+                       (GTK_SCTREE(ctree),
+                        summaryview->displayed ? summaryview->displayed
+                        : new_selected);
        }
 
        if (summaryview->threaded)
@@ -3539,7 +3600,7 @@ static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
                summaryview->mlist =
-                       g_slist_append(summaryview->mlist, msginfo);
+                       g_slist_prepend(summaryview->mlist, msginfo);
                gtk_ctree_node_set_row_data(ctree, node, NULL);
 
                if (msginfo->msgid && *msginfo->msgid &&
@@ -3559,6 +3620,7 @@ static void summary_execute_copy(SummaryView *summaryview)
                                summaryview);
 
        if (summaryview->mlist) {
+               summaryview->mlist = g_slist_reverse(summaryview->mlist);
                procmsg_copy_messages(summaryview->mlist);
 
                g_slist_free(summaryview->mlist);
@@ -3576,7 +3638,7 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
                summaryview->mlist =
-                       g_slist_append(summaryview->mlist, msginfo);
+                       g_slist_prepend(summaryview->mlist, msginfo);
 
                procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
                summary_set_row_marks(summaryview, node);
@@ -3590,9 +3652,6 @@ 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);
-       }
 
        /* search deleting messages and execute */
        gtk_ctree_pre_recursive
@@ -3604,7 +3663,7 @@ static void summary_execute_delete(SummaryView *summaryview)
                folder_item_remove_msgs(summaryview->folder_item,
                                        summaryview->mlist);
        else
-               folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+               folder_item_move_msgs(trash, summaryview->mlist);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
@@ -3677,7 +3736,7 @@ void summary_thread_build(SummaryView *summaryview)
                                                     msginfo->inreplyto);
                }
 
-               if (parent == NULL) {
+               if (prefs_common.thread_by_subject && parent == NULL) {
                        parent = subject_table_lookup
                                (summaryview->subject_table,
                                 msginfo->subject);
@@ -3695,7 +3754,7 @@ void summary_thread_build(SummaryView *summaryview)
 
        while (node) {
                next = GTK_CTREE_NODE_NEXT(node);
-               if (!summaryview->folder_item->thread_collapsed)
+               if (!summaryview->thread_collapsed)
                        gtk_ctree_expand(ctree, node);
                if (prefs_common.bold_unread &&
                    GTK_CTREE_ROW(node)->children)
@@ -3724,7 +3783,7 @@ static void summary_thread_init(SummaryView *summaryview)
        GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
        GtkCTreeNode *next;
 
-       if (!summaryview->folder_item->thread_collapsed) {
+       if (!summaryview->thread_collapsed) {
                while (node) {
                        next = GTK_CTREE_ROW(node)->sibling;
                        if (GTK_CTREE_ROW(node)->children)
@@ -3891,6 +3950,8 @@ void summary_filter(SummaryView *summaryview)
 
        summary_lock(summaryview);
 
+       folder_item_update_freeze();
+       
        debug_print("filtering...");
        STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
        main_window_cursor_wait(summaryview->mainwin);
@@ -3919,6 +3980,7 @@ void summary_filter(SummaryView *summaryview)
                gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        }
 
+       folder_item_update_thaw();
        debug_print("done.\n");
        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
@@ -3944,42 +4006,9 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 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;
 
@@ -3987,186 +4016,11 @@ void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
                                              summaryview->selected);
        if (!msginfo) return;
 
-       header_offset = 1;
-       hentry_offset = 5;
-
-       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.  
-        */
-
+       procmsg_get_filter_keyword(msginfo, &header, &key, type);
        prefs_filtering_open(NULL, header, key);
-}
-
-void summary_reply(SummaryView *summaryview, ComposeMode mode)
-{
-       GList *sel = GTK_CLIST(summaryview->ctree)->selection;
-       MsgInfo *msginfo;
-       gchar *text;
-
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                             summaryview->selected);
-       if (!msginfo) return;
 
-       text = gtkut_editable_get_selection
-               (GTK_EDITABLE(summaryview->messageview->textview->text));
-
-       if (!text && summaryview->messageview->type == MVIEW_MIME
-           && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
-           && summaryview->messageview->mimeview->textview
-           && !summaryview->messageview->mimeview->textview->default_text) {
-               text = gtkut_editable_get_selection (GTK_EDITABLE 
-                        (summaryview->messageview->mimeview->textview->text));   
-       }
-       
-       switch (mode) {
-       case COMPOSE_REPLY:
-               if (prefs_common.default_reply_list)
-                       compose_reply(msginfo, prefs_common.reply_with_quote,
-                                     FALSE, TRUE, FALSE, text);
-               else
-                       compose_reply(msginfo, prefs_common.reply_with_quote,
-                                     FALSE, FALSE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_WITH_QUOTE:
-               if (prefs_common.default_reply_list)
-                       compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
-               else
-                       compose_reply(msginfo, TRUE, FALSE, FALSE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_WITHOUT_QUOTE:
-               if (prefs_common.default_reply_list)
-                       compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
-               else
-                       compose_reply(msginfo, FALSE, FALSE, FALSE, FALSE, NULL);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, 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, FALSE, TRUE, text);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
-               break;
-       case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
-               break;
-       case COMPOSE_REPLY_TO_LIST:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
-               break;
-       case COMPOSE_FORWARD:
-               if (prefs_common.forward_as_attachment) {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
-                       return;
-               } else {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, NULL);
-                       return;
-               }
-               break;
-       case COMPOSE_FORWARD_INLINE:
-               if (!sel->next) {
-                       compose_forward(NULL, msginfo, FALSE, text);
-                       break;
-               }
-               /* if (sel->next) FALL THROUGH */
-       case COMPOSE_FORWARD_AS_ATTACH:
-               {
-                       GSList *msginfo_list = NULL;
-                       for ( ; sel != NULL; sel = sel->next)
-                               msginfo_list = g_slist_append(msginfo_list, 
-                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                               GTK_CTREE_NODE(sel->data)));
-                       compose_forward_multiple(NULL, msginfo_list);
-                       g_slist_free(msginfo_list);
-               }                       
-               break;
-       case COMPOSE_REDIRECT:
-               compose_redirect(NULL, msginfo);
-               break;
-       default:
-               g_warning("summary_reply_cb(): invalid action: %d\n", mode);
-       }
-
-       summary_set_marks_selected(summaryview);
-       g_free(text);
+       g_free(header);
+       g_free(key);
 }
 
 /* color label */
@@ -4230,7 +4084,7 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
        gtk_ctree_node_set_row_style(ctree, node, style);
 }
 
-static void summary_set_row_colorlable(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
+static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
@@ -4247,9 +4101,13 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       main_window_cursor_wait(summaryview->mainwin);
+       folder_item_update_freeze();
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
-               summary_set_row_colorlable(summaryview,
+               summary_set_row_colorlabel(summaryview,
                                           GTK_CTREE_NODE(cur->data), labelcolor);
+       folder_item_update_thaw();
+       main_window_cursor_normal(summaryview->mainwin);
 }
 
 static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
@@ -4387,7 +4245,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        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_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
                                           GTK_JUSTIFY_CENTER);
@@ -4401,8 +4259,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MARK],
                                   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_STATUS],
+                                  SUMMARY_COL_STATUS_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],
@@ -4446,7 +4304,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                 summaryview)
 
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK   , summary_mark_clicked);
-       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_UNREAD , summary_unread_clicked);
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_STATUS , summary_status_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MIME   , summary_mime_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE   , summary_size_clicked);
@@ -4529,12 +4387,12 @@ void summary_set_column_order(SummaryView *summaryview)
 
 /* callback functions */
 
-static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
+static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
                                   SummaryView *summaryview)
 {
-       if (!event) return;
-
-       summary_toggle_view(summaryview);
+       if (event)  
+               summary_toggle_view(summaryview);
+       return TRUE;
 }
 
 static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
@@ -4570,9 +4428,9 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
 #define RETURN_IF_LOCKED() \
-       if (summaryview->mainwin->lock_count) return
+       if (summaryview->mainwin->lock_count) return TRUE
 
-static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(widget);
@@ -4580,14 +4438,14 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        MessageView *messageview;
        TextView *textview;
 
-       if (summary_is_locked(summaryview)) return;
-       if (!event) return;
+       if (summary_is_locked(summaryview)) return TRUE;
+       if (!event) return TRUE;
 
        switch (event->keyval) {
        case GDK_Left:          /* Move focus */
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
-               return;
+               return TRUE;
        default:
                break;
        }
@@ -4597,7 +4455,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                if (node)
                        gtk_sctree_select(GTK_SCTREE(ctree), node);
                else
-                       return;
+                       return TRUE;
        }
 
        messageview = summaryview->messageview;
@@ -4610,13 +4468,17 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_space:         /* Page down or go to the next */
-               if (summaryview->displayed != summaryview->selected) {
-                       summary_display_msg(summaryview,
-                                           summaryview->selected);
-                       break;
-               }
-               if (!textview_scroll_page(textview, FALSE))
-                       summary_select_next_unread(summaryview);
+               if (event->state & GDK_SHIFT_MASK) 
+                       textview_scroll_page(textview, TRUE);
+               else {
+                       if (summaryview->displayed != summaryview->selected) {
+                               summary_display_msg(summaryview,
+                                                   summaryview->selected);
+                               break;
+                       }
+                       if (!textview_scroll_page(textview, FALSE))
+                               summary_select_next_unread(summaryview);
+               }                               
                break;
        case GDK_BackSpace:     /* Page up */
                textview_scroll_page(textview, TRUE);
@@ -4644,13 +4506,15 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        default:
                break;
        }
+       return TRUE;
 }
 
-static void summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
+static gint summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        if (event != NULL && event->keyval == GDK_Return)
                summary_show(summaryview, summaryview->folder_item);
+       return TRUE;            
 }
 
 static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
@@ -4688,31 +4552,12 @@ static void tog_searchbar_cb(GtkWidget *w, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *)data;
        GtkWidget *hbox= summaryview->hbox_search;
-       GtkAllocation size = hbox->allocation;
-       GtkAllocation msgview_size = summaryview->messageview->vbox->allocation;
-       GtkAllocation parent_size = summaryview->vbox->allocation;
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
                prefs_common.show_searchbar = TRUE;
                gtk_widget_show(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        } else {
                prefs_common.show_searchbar = FALSE;
                gtk_widget_hide(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        }
 }
 
@@ -4748,7 +4593,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        summary_status_show(summaryview);
 
        if (GTK_CLIST(ctree)->selection &&
-            GTK_CLIST(ctree)->selection->next) {
+           GTK_CLIST(ctree)->selection->next) {
                summaryview->display_msg = FALSE;
                summary_set_menu_sensitive(summaryview);
                toolbar_main_set_sensitive(summaryview->mainwin);
@@ -4758,15 +4603,21 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        summaryview->selected = row;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       g_return_if_fail(msginfo != NULL);
 
        switch (column < 0 ? column : summaryview->col_state[column].type) {
        case S_COL_MARK:
-               if (MSG_IS_MARKED(msginfo->flags)) {
-                       summary_unmark_row(summaryview, row);
-               } else
-                       summary_mark_row(summaryview, row);
+               if (!MSG_IS_DELETED(msginfo->flags) &&
+                   !MSG_IS_MOVE(msginfo->flags) &&
+                   !MSG_IS_COPY(msginfo->flags)) {
+                       if (MSG_IS_MARKED(msginfo->flags)) {
+                               summary_unmark_row(summaryview, row);
+                       } else {
+                               summary_mark_row(summaryview, row);
+                       }
+               }
                break;
-       case S_COL_UNREAD:
+       case S_COL_STATUS:
                if (MSG_IS_UNREAD(msginfo->flags)) {
                        summary_mark_row_as_read(summaryview, row);
                        summary_status_show(summaryview);
@@ -4792,14 +4643,17 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        if (summaryview->display_msg ||
-           (prefs_common.show_msg_with_cursor_key &&
+           (prefs_common.always_show_msg &&
             messageview_is_visible(summaryview->messageview))) {
-               summary_display_msg(summaryview, row);
                summaryview->display_msg = FALSE;
-       } else {
-               summary_set_menu_sensitive(summaryview);
-               toolbar_main_set_sensitive(summaryview->mainwin);
+               if (summaryview->displayed != row) {
+                       summary_display_msg(summaryview, row);
+                       return;
+               }
        }
+
+       summary_set_menu_sensitive(summaryview);
+       toolbar_main_set_sensitive(summaryview->mainwin);
 }
 
 static void summary_col_resized(GtkCList *clist, gint column, gint width,
@@ -4810,10 +4664,50 @@ static void summary_col_resized(GtkCList *clist, gint column, gint width,
        prefs_common.summary_col_size[type] = width;
 }
 
+
+/*
+ * \brief get List of msginfo selected in SummaryView
+ *
+ * \param summaryview
+ *
+ * \return GSList holding MsgInfo
+ */
+GSList *summary_get_selection(SummaryView *summaryview)
+{
+       GList *sel = NULL;
+       GSList *msginfo_list = NULL;
+       
+       g_return_val_if_fail(summaryview != NULL, NULL);
+
+       sel = GTK_CLIST(summaryview->ctree)->selection;
+
+       g_return_val_if_fail(sel != NULL, 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)));
+       return msginfo_list;
+}
+
 static void summary_reply_cb(SummaryView *summaryview, guint action,
                             GtkWidget *widget)
 {
-       summary_reply(summaryview, (ComposeMode)action);
+       MessageView *msgview = (MessageView*)summaryview->messageview;
+       GSList *msginfo_list;
+       gchar *body;
+
+       g_return_if_fail(msgview != NULL);
+
+       msginfo_list = summary_get_selection(summaryview);
+       g_return_if_fail(msginfo_list != NULL);
+
+       body = messageview_get_selection(msgview);
+
+       compose_reply_mode((ComposeMode)action, msginfo_list, body);
+       g_free(body);
+       g_slist_free(msginfo_list);
 }
 
 static void summary_execute_cb(SummaryView *summaryview, guint action,
@@ -4857,9 +4751,9 @@ static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
        summary_sort_by_column_click(summaryview, SORT_BY_MARK);
 }
 
-static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_status_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
+       summary_sort_by_column_click(summaryview, SORT_BY_STATUS);
 }
 
 static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
@@ -4908,7 +4802,6 @@ static void summary_locked_clicked(GtkWidget *button,
 static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                               SummaryView *summaryview)
 {
-       GtkTargetList *list;
        GdkDragContext *context;
 
        g_return_if_fail(summaryview != NULL);
@@ -4916,9 +4809,7 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
        g_return_if_fail(summaryview->folder_item->folder != NULL);
        if (summaryview->selected == NULL) return;
 
-       list = gtk_target_list_new(summary_drag_types, 1);
-
-       context = gtk_drag_begin(widget, list,
+       context = gtk_drag_begin(widget, summaryview->target_list,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
 }
@@ -4987,7 +4878,7 @@ static gint func_name(GtkCList *clist,                                     \
 
 CMP_FUNC_DEF(summary_cmp_by_mark,
             MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags))
-CMP_FUNC_DEF(summary_cmp_by_unread,
+CMP_FUNC_DEF(summary_cmp_by_status,
             MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
 CMP_FUNC_DEF(summary_cmp_by_mime,
             MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags))
@@ -5017,11 +4908,26 @@ static gint func_name(GtkCList *clist,                                   \
        return strcasecmp(msginfo1->var_name, msginfo2->var_name);       \
 }
 
-CMP_FUNC_DEF(summary_cmp_by_subject, subject);
 CMP_FUNC_DEF(summary_cmp_by_to, to);
 
 #undef CMP_FUNC_DEF
 
+static gint summary_cmp_by_subject(GtkCList *clist,                     \
+                                  gconstpointer ptr1,                   \
+                                  gconstpointer ptr2)                   \
+{                                                                       \
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;                 \
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;                 \
+                                                                        \
+       if (!msginfo1->subject)                                          \
+               return (msginfo2->subject != NULL);                      \
+       if (!msginfo2->subject)                                          \
+               return -1;                                               \
+                                                                        \
+       return subject_compare_for_sort                                  \
+               (msginfo1->subject, msginfo2->subject);                  \
+}
+
  static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
                                 gconstpointer ptr2)
  {
@@ -5047,7 +4953,7 @@ CMP_FUNC_DEF(summary_cmp_by_to, to);
  static gint summary_cmp_by_simplified_subject
        (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
-       const PrefsFolderItem *prefs;
+       const FolderItemPrefs *prefs;
        const gchar *str1, *str2;
        const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
@@ -5125,13 +5031,10 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (MSG_IS_NEW(msginfo->flags))
-               summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags))
-               summaryview->unread--;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked--;
 
+       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
        procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
        summary_set_row_marks(summaryview, row);
@@ -5144,9 +5047,14 @@ static void summary_ignore_thread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       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_ignore_thread_func), summaryview);
-       }
+       folder_item_update_freeze();
+
+       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_ignore_thread_func), 
+                                       summaryview);
+
+       folder_item_update_thaw();
 
        summary_status_show(summaryview);
 }
@@ -5158,10 +5066,6 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (MSG_IS_NEW(msginfo->flags))
-               summaryview->newmsgs++;
-       if (MSG_IS_UNREAD(msginfo->flags))
-               summaryview->unread++;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
 
@@ -5177,13 +5081,48 @@ static void summary_unignore_thread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       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_unignore_thread_func), summaryview);
-       }
+       folder_item_update_freeze();
+
+       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_unignore_thread_func), 
+                                       summaryview);
+
+       folder_item_update_thaw();
 
        summary_status_show(summaryview);
 }
 
+static void summary_check_ignore_thread_func
+               (GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+       MsgInfo *msginfo;
+       gint *found_ignore = (gint *) data;
+
+       if (*found_ignore) return;
+       else {
+               msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               *found_ignore = MSG_IS_IGNORE_THREAD(msginfo->flags);
+       }               
+}
+
+void summary_toggle_ignore_thread(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GList *cur;
+       gint found_ignore = 0;
+
+       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_check_ignore_thread_func),
+                                       &found_ignore);
+
+       if (found_ignore) 
+               summary_unignore_thread(summaryview);
+       else 
+               summary_ignore_thread(summaryview);
+}
+
 #if 0 /* OLD PROCESSING */
 static gboolean processing_apply_func(GNode *node, gpointer data)
 {
@@ -5288,6 +5227,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
@@ -5398,10 +5338,12 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
        g_return_val_if_fail(msginfo_update != NULL, TRUE);
        g_return_val_if_fail(summaryview != NULL, FALSE);
 
-       node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
-       
-       if (node) 
-               summary_set_row_marks(summaryview, node);
+       if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
+
+               if (node) 
+                       summary_set_row_marks(summaryview, node);
+       }
 
        return FALSE;
 }