2005-08-30 [colin] 1.9.13cvs73
[claws.git] / src / summaryview.c
index beb714f766f2e653c4fb29c619e24755c5f69f6a..16db4655c0ffe075e806c18f92b9ad7288b856fa 100644 (file)
@@ -48,6 +48,7 @@
 
 #include "main.h"
 #include "menu.h"
+#include "mbox.h"
 #include "mainwindow.h"
 #include "folderview.h"
 #include "summaryview.h"
@@ -84,6 +85,8 @@
 #include "folderutils.h"
 #include "quicksearch.h"
 #include "partial_download.h"
+#include "timing.h"
+#include "gedit-print.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
@@ -124,6 +127,8 @@ static GdkPixmap *clipkeyxpm;
 static GdkBitmap *clipkeyxpmmask;
 static GdkPixmap *gpgsignedxpm;
 static GdkBitmap *gpgsignedxpmmask;
+static GdkPixmap *clipgpgsignedxpm;
+static GdkBitmap *clipgpgsignedxpmmask;
 
 static void summary_free_msginfo_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
@@ -203,7 +208,7 @@ static void summary_copy_row_to             (SummaryView            *summaryview,
                                         GtkCTreeNode           *row,
                                         FolderItem             *to_folder);
 
-static void summary_execute_move       (SummaryView            *summaryview);
+static gint summary_execute_move       (SummaryView            *summaryview);
 static void summary_execute_move_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
                                         gpointer                data);
@@ -307,6 +312,8 @@ static void summary_date_clicked    (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_from_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
+static void summary_to_clicked         (GtkWidget              *button,
+                                        SummaryView            *summaryview);
 static void summary_subject_clicked    (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_score_clicked      (GtkWidget              *button,
@@ -400,7 +407,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},
        {N_("/_Copy..."),               "<shift><control>O", summary_copy_to,   0, NULL},
-       {N_("/_Delete"),                "<control>D", summary_delete,   0, NULL},
+       {N_("/Move to _trash"),         "<control>D", summary_delete_trash,     0, NULL},
+       {N_("/_Delete..."),             NULL, summary_delete, 0, NULL},
        {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
@@ -453,6 +461,7 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
        "",             /* S_COL_MIME    */
        N_("Subject"),  /* S_COL_SUBJECT */
        N_("From"),     /* S_COL_FROM    */
+       N_("To"),       /* S_COL_TO      */
        N_("Date"),     /* S_COL_DATE    */
        N_("Size"),     /* S_COL_SIZE    */
        N_("No."),      /* S_COL_NUMBER  */
@@ -460,6 +469,21 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("L")         /* S_COL_LOCKED  */
 };
 
+#define START_LONG_OPERATION(summaryview) {                    \
+       summary_lock(summaryview);                              \
+       main_window_cursor_wait(summaryview->mainwin);          \
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));        \
+       folder_item_update_freeze();                            \
+       inc_lock();                                             \
+}
+#define END_LONG_OPERATION(summaryview) {                      \
+       inc_unlock();                                           \
+       folder_item_update_thaw();                              \
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));          \
+       main_window_cursor_normal(summaryview->mainwin);        \
+       summary_unlock(summaryview);                            \
+}
+
 SummaryView *summary_create(void)
 {
        SummaryView *summaryview;
@@ -609,38 +633,11 @@ SummaryView *summary_create(void)
        return summaryview;
 }
 
-void summary_init(SummaryView *summaryview)
+static void summary_set_fonts(SummaryView *summaryview)
 {
-       GtkWidget *pixmap;
        PangoFontDescription *font_desc;
        gint size;
 
-       gtk_widget_realize(summaryview->ctree);
-       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);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
-                        &gpgsignedxpm, &gpgsignedxpmmask);
-
        font_desc = pango_font_description_from_string(NORMAL_FONT);
        gtk_widget_modify_font(summaryview->ctree, font_desc);
        pango_font_description_free(font_desc);
@@ -666,12 +663,47 @@ void summary_init(SummaryView *summaryview)
 
        font_desc = pango_font_description_new();
        size = pango_font_description_get_size
-               (summaryview->statlabel_folder->style->font_desc);
+               (summaryview->ctree->style->font_desc);
        pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
        gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
        gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
        gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
        pango_font_description_free(font_desc);
+}
+
+void summary_init(SummaryView *summaryview)
+{
+       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,
+                        &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);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+                        &gpgsignedxpm, &gpgsignedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
+                        &clipgpgsignedxpm, &clipgpgsignedxpmmask);
+
+       summary_set_fonts(summaryview);
 
        pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
@@ -792,6 +824,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        /* STATUSBAR_POP(summaryview->mainwin); */
 
        is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
+
        if (is_refresh) {
                selected_msgnum = summary_get_msgnum(summaryview,
                                                     summaryview->selected);
@@ -865,28 +898,23 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        main_window_cursor_wait(summaryview->mainwin);
 
-/*
-       mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
-
-       !!! NEW !!!
-       USE LIST FROM CACHE, WILL NOT DISPLAY ANY MESSAGES DROPED
-       BY OTHER PROGRAMS TO THE FOLDER
-*/
        mlist = folder_item_get_msg_list(item);
 
-       if (summaryview->folder_item->hide_read_msgs) {
+       if (summaryview->folder_item->hide_read_msgs &&
+           quicksearch_is_active(summaryview->quicksearch) == FALSE) {
                GSList *not_killed;
                
                summary_set_hide_read_msgs_menu(summaryview, TRUE);
                not_killed = NULL;
-               for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+               for(cur = mlist ; cur != NULL && cur->data != 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)
-                            || CURRENTLY_DISPLAYED(msginfo))
-                            && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                       if (MSG_IS_UNREAD(msginfo->flags) &&
+                           !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                               not_killed = g_slist_prepend(not_killed, msginfo);
+                       else if (is_refresh &&
+                               (msginfo->msgnum == selected_msgnum ||
+                                msginfo->msgnum == displayed_msgnum))
                                not_killed = g_slist_prepend(not_killed, msginfo);
                        else
                                procmsg_msginfo_free(msginfo);
@@ -901,7 +929,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                GSList *not_killed;
                
                not_killed = NULL;
-               for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+               for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
 
                        if (quicksearch_match(summaryview->quicksearch, msginfo))
@@ -934,7 +962,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                kill_score = prefs_common.kill_score;
                if (item->prefs->kill_score > kill_score)
                        kill_score = item->prefs->kill_score;
-               for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+               for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
 
                        if (msginfo->score > kill_score)
@@ -947,7 +975,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        }
 #endif
         not_killed = NULL;
-        for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+        for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                 MsgInfo * msginfo = (MsgInfo *) cur->data;
                 
                 if (!msginfo->hidden)
@@ -964,7 +992,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
           create the thread */
        summary_set_ctree_from_list(summaryview, mlist);
 
-
        g_slist_free(mlist);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -975,7 +1002,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                                   displayed_msgnum);
                if (!summaryview->displayed)
                        messageview_clear(summaryview->messageview);
+               summary_unlock(summaryview);
                summary_select_by_msgnum(summaryview, selected_msgnum);
+               summary_lock(summaryview);
                if (!summaryview->selected) {
                        /* no selected message - select first unread
                           message, but do not display it */
@@ -986,33 +1015,41 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                        (ctree,
                                         item->sort_type == SORT_DESCENDING
                                         ? 0 : GTK_CLIST(ctree)->rows - 1);
+                       summary_unlock(summaryview);
                        summary_select_node(summaryview, node, FALSE, TRUE);
+                       summary_lock(summaryview);
                }
        } else {
-               /* select first unread message */
-#if 0
-               if (summaryview->sort_key == SORT_BY_SCORE)
-                       node = summary_find_next_important_score(summaryview,
-                                                                NULL);
-               else
-#endif
-               node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                    MSG_UNREAD, FALSE);
+               switch (prefs_common.select_on_entry) {
+                       case SELECTONENTRY_NEW:
+                               node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    MSG_NEW, FALSE);
+                               if (node == NULL)
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    MSG_UNREAD, FALSE);
+                               break;
+                       case SELECTONENTRY_UNREAD:
+                               node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    MSG_UNREAD, FALSE);
+                               if (node == NULL)
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    MSG_NEW, FALSE);
+                               break;
+                       default:
+                               node = NULL;
+               }
+
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
                        node = gtk_ctree_node_nth
                                (ctree,
                                 item->sort_type == SORT_DESCENDING
                                 ? 0 : GTK_CLIST(ctree)->rows - 1);
                }
-               if (prefs_common.open_unread_on_enter ||
-                   prefs_common.always_show_msg) {
-                       summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, 
-                                           messageview_is_visible(summaryview->messageview), 
-                                           TRUE);
-                       summary_lock(summaryview);
-               } else
-                       summary_select_node(summaryview, node, FALSE, TRUE);
+               summary_unlock(summaryview);
+               summary_select_node(summaryview, node,
+                                   prefs_common.always_show_msg,
+                                   TRUE);
+               summary_lock(summaryview);
        }
 
        summary_set_column_titles(summaryview);
@@ -1032,6 +1069,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
 #undef CURRENTLY_DISPLAYED
 
+
 void summary_clear_list(SummaryView *summaryview)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
@@ -1140,7 +1178,7 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
        GList *cur;
        MsgInfo *msginfo;
 
-       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
             cur = cur->next) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
                mlist = g_slist_prepend(mlist, msginfo);
@@ -1197,7 +1235,8 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
                {"/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},
+               {"/Move to trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/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},
 
                {"/Mark"                        , M_TARGET_EXIST},
@@ -1299,7 +1338,8 @@ void summary_select_next_unread(SummaryView *summaryview)
        
        if (summaryview->displayed 
        &&  summaryview->selected == summaryview->displayed) {
-               debug_print("skipping cur\n");
+               debug_print("skipping cur (%p %p)\n",
+                       summaryview->displayed, summaryview->selected);
                skip_cur = TRUE;
        }
 
@@ -1384,7 +1424,7 @@ void summary_select_next_new(SummaryView *summaryview)
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
                                   "Go to next folder?"),
-                                GTK_STOCK_YES, _("Search again"),
+                                GTK_STOCK_YES, _("_Search again"),
                                 GTK_STOCK_NO);
                if (val == G_ALERTDEFAULT) {
                        g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
@@ -1532,11 +1572,13 @@ void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
                        gtk_widget_grab_focus(GTK_WIDGET(ctree));
                        gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
                }
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               summary_unselect_all(summaryview);
                if (display_msg && summaryview->displayed == node)
                        summaryview->displayed = NULL;
                summaryview->display_msg = display_msg;
                gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->selected == NULL)
+                       summaryview->selected = node;
        }
 }
 
@@ -1820,7 +1862,7 @@ static void summary_status_show(SummaryView *summaryview)
        off_t sel_size = 0;
        MsgInfo *msginfo;
        gchar *name;
-
+       
        if (!summaryview->folder_item) {
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), "");
@@ -1829,7 +1871,7 @@ static void summary_status_show(SummaryView *summaryview)
        }
 
        rowlist = GTK_CLIST(summaryview->ctree)->selection;
-       for (cur = rowlist; cur != NULL; cur = cur->next) {
+       for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
                msginfo = gtk_ctree_node_get_row_data
                        (GTK_CTREE(summaryview->ctree),
                         GTK_CTREE_NODE(cur->data));
@@ -1917,6 +1959,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                SORT_BY_MIME,
                SORT_BY_SUBJECT,
                SORT_BY_FROM,
+               SORT_BY_TO,
                SORT_BY_DATE,
                SORT_BY_SIZE,
                SORT_BY_NUMBER,
@@ -1935,6 +1978,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                switch (type) {
                case S_COL_SUBJECT:
                case S_COL_FROM:
+               case S_COL_TO:
                case S_COL_DATE:
                case S_COL_NUMBER:
                        if (prefs_common.trans_hdr)
@@ -1998,12 +2042,25 @@ static void summary_set_column_titles(SummaryView *summaryview)
        }
 }
 
+void summary_reflect_prefs(void)
+{
+       SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview;
+       bold_style = bold_marked_style = bold_deleted_style = 
+               small_style = small_marked_style = small_deleted_style = NULL;
+       summary_set_fonts(summaryview);
+       summary_set_column_titles(summaryview);
+       summary_show(summaryview, summaryview->folder_item);
+}
+
 void summary_sort(SummaryView *summaryview,
                  FolderSortKey sort_key, FolderSortType sort_type)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCListCompareFunc cmp_func = NULL;
+       g_signal_handlers_block_by_func(G_OBJECT(summaryview->ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
        switch (sort_key) {
        case SORT_BY_MARK:
@@ -2048,7 +2105,7 @@ void summary_sort(SummaryView *summaryview,
        case SORT_BY_NONE:
                break;
        default:
-               return;
+               goto unlock;
        }
 
        summaryview->sort_key = sort_key;
@@ -2059,14 +2116,15 @@ void summary_sort(SummaryView *summaryview,
 
        /* allow fallback to don't sort */
        if (summaryview->sort_key == SORT_BY_NONE)
-               return;
+               goto unlock;
 
-       if(cmp_func != NULL) {
+       if (cmp_func != NULL) {
                debug_print("Sorting summary...");
                STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
 
                main_window_cursor_wait(summaryview->mainwin);
 
+                gtk_clist_freeze(clist);
                gtk_clist_set_compare_func(clist, cmp_func);
 
                gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
@@ -2076,13 +2134,15 @@ void summary_sort(SummaryView *summaryview,
                gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 
                main_window_cursor_normal(summaryview->mainwin);
-
-               if (summaryview->threaded)
-                       summary_thread_init(summaryview);
+                gtk_clist_thaw(clist);
 
                debug_print("done.\n");
                STATUSBAR_POP(summaryview->mainwin);
        }
+unlock:
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
 }
 
 gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
@@ -2109,6 +2169,7 @@ gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
        SET_TEXT(S_COL_SIZE);
        SET_TEXT(S_COL_DATE);
        SET_TEXT(S_COL_FROM);
+       SET_TEXT(S_COL_TO);
        SET_TEXT(S_COL_SUBJECT);
 
 #undef SET_TEXT
@@ -2127,10 +2188,11 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
-               GtkCTreeNode *node = NULL;
+       GtkCTreeNode *node = NULL;
        GHashTable *msgid_table;
        GHashTable *subject_table;
        GSList * cur;
+       START_TIMING("summary_set_ctree_from_list");
        
        if (!mlist) return;
 
@@ -2139,6 +2201,9 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                       _("Setting summary from message data..."));
        gdk_flush();
 
+       g_signal_handlers_block_by_func(G_OBJECT(ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
+
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
        summaryview->msgid_table = msgid_table;
        subject_table = g_hash_table_new(g_str_hash, g_str_equal);
@@ -2147,7 +2212,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        if (prefs_common.use_addr_book)
                start_address_completion();
        
-       for (cur = mlist ; cur != NULL; cur = cur->next) {
+       for (cur = mlist ; cur != NULL && cur->data != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
                msginfo->threadscore = msginfo->score;
        }
@@ -2165,6 +2230,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                }
 
                g_node_destroy(root);
+                
+               summary_thread_init(summaryview);
        } else {
                gchar *text[N_SUMMARY_COLS];
                cur = mlist;
@@ -2214,12 +2281,28 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        }
 
        summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
+
+       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       while (prefs_common.bold_unread && node) {
+               GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+               if (GTK_CTREE_ROW(node)->children)
+                       summary_set_row_marks(summaryview, node);
+               node = next;
+       }
+
+       g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
+       END_TIMING();
 }
 
 static gchar *summary_complete_address(const gchar *addr)
 {
        gint count;
        gchar *res, *tmp, *email_addr;
+       
+       if (addr == NULL)
+               return NULL;
 
        Xstrdup_a(email_addr, addr, return NULL);
        extract_address(email_addr);
@@ -2231,8 +2314,6 @@ 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);
        }
@@ -2244,11 +2325,12 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                               MsgInfo *msginfo)
 {
        static gchar date_modified[80];
-       static gchar *to = NULL;
        static gchar col_score[11];
        static gchar buf[BUFFSIZE];
        gint *col_pos = summaryview->col_pos;
        FolderType ftype = F_UNKNOWN;
+       gchar *from_text = NULL, *to_text = NULL;
+       gboolean should_swap = FALSE;
 
        text[col_pos[S_COL_MARK]]   = NULL;
        text[col_pos[S_COL_STATUS]] = NULL;
@@ -2268,48 +2350,51 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        else
                text[col_pos[S_COL_DATE]] = _("(No Date)");
 
-       text[col_pos[S_COL_FROM]] = msginfo->fromname ? msginfo->fromname :
-               _("(No From)");
-       
-       if (msginfo->folder && msginfo->folder->folder)
-               ftype = msginfo->folder->folder->klass->type; 
-               
        if (ftype != F_NEWS && prefs_common.swap_from && msginfo->from && msginfo->to) {
                gchar *addr = NULL;
+               
+               addr = g_strdup(msginfo->from);
 
-               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);
-                               g_free(to);
-                               to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
-                               text[col_pos[S_COL_FROM]] = to;
-                               g_free(addr);
-                       }
-               } else {
+               if (addr) {
+                       extract_address(addr);
                        if (account_find_from_address(addr)) {
-                               g_free(to);
-                               to = g_strconcat("-->", msginfo->to, NULL);
-                               text[col_pos[S_COL_FROM]] = to;
+                               should_swap = TRUE;
                        }
+                       g_free(addr);
                }
        }
 
-       /*
-        * 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 = summary_complete_address(msginfo->from);
-               if (from) {
-                       g_free(to);
-                       to = from;
-                       text[col_pos[S_COL_FROM]] = to;
-               }                       
+       if (!prefs_common.use_addr_book) {
+               from_text = msginfo->fromname ? 
+                               msginfo->fromname :
+                               _("(No From)");
+       } else {
+               gchar *tmp = summary_complete_address(msginfo->from);
+               from_text = tmp ? tmp : (msginfo->fromname ?
+                                        msginfo->fromname: 
+                                               _("(No From)"));
        }
-
+       
+       to_text = msginfo->to ? msginfo->to : 
+                  (msginfo->cc ? msginfo->cc :
+                    (msginfo->newsgroups ? msginfo->newsgroups : _("(No Recipient)")
+                    )
+                  );
+
+       if (!should_swap) {
+               text[col_pos[S_COL_FROM]] = from_text;
+               text[col_pos[S_COL_TO]] = to_text;
+       } else {
+               gchar *tmp = NULL;
+               tmp = g_strconcat("-->", to_text, NULL);
+               text[col_pos[S_COL_FROM]] = tmp;
+               tmp = g_strconcat("<--", from_text, NULL);
+               text[col_pos[S_COL_TO]] = tmp;
+       }
+       
+       if (msginfo->folder && msginfo->folder->folder)
+               ftype = msginfo->folder->folder->klass->type; 
+               
        if (summaryview->simplify_subject_preg != NULL)
                text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? 
                        string_remove_match(buf, BUFFSIZE, msginfo->subject, 
@@ -2411,7 +2496,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
                gtkut_ctree_node_move_if_on_the_edge(ctree, row);
        }
 
-       if (val == 0) {
+       if (val == 0 && MSG_IS_UNREAD(msginfo->flags)) {
                if (prefs_common.mark_as_read_delay) {
                        MarkAsReadData *data = g_new0(MarkAsReadData, 1);
                        data->summaryview = summaryview;
@@ -2482,9 +2567,10 @@ void summary_reedit(SummaryView *summaryview)
 
        if (!summaryview->selected) return;
        if (!summaryview->folder_item) return;
-       if (summaryview->folder_item->stype != F_OUTBOX &&
-           summaryview->folder_item->stype != F_DRAFT  &&
-           summaryview->folder_item->stype != F_QUEUE) return;
+       if (!folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX)
+       &&  !folder_has_parent_of_type(summaryview->folder_item, F_DRAFT)
+       &&  !folder_has_parent_of_type(summaryview->folder_item, F_QUEUE))
+               return;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
@@ -2499,7 +2585,6 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
        GtkCTreeNode *node;
 
        if (summary_is_locked(summaryview)) return FALSE;
-
        if (type == GTK_SCROLL_STEP_FORWARD) {
                node = gtkut_ctree_node_next(ctree, summaryview->selected);
                if (node)
@@ -2572,7 +2657,6 @@ static gboolean summary_have_unread_children(SummaryView *summaryview,
                        return TRUE;
                node = GTK_CTREE_ROW(node)->sibling;
        }
-
        return FALSE;
 }
 
@@ -2672,7 +2756,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_SIGNED(flags)) {
+       if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         clipgpgsignedxpm, clipgpgsignedxpmmask);
+       } else if (MSG_IS_SIGNED(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          gpgsignedxpm, gpgsignedxpmmask);
        } else if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_ENCRYPTED(flags)) {
@@ -2699,10 +2786,11 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 void summary_set_marks_selected(SummaryView *summaryview)
 {
        GList *cur;
-
-       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+       summary_lock(summaryview);
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
             cur = cur->next)
                summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
+       summary_unlock(summaryview);
 }
 
 static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
@@ -2717,11 +2805,9 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, TRUE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
-       procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
-       procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
+       procmsg_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
        summary_set_row_marks(summaryview, row);
        debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
 }
@@ -2744,8 +2830,8 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
                changed = TRUE;
        }
        procmsg_msginfo_set_to_folder(msginfo, NULL);
-       procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
-       procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
+       procmsg_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
+       
        summary_set_row_marks(summaryview, row);
        debug_print("Message %d is locked\n", msginfo->msgnum);
 }
@@ -2769,14 +2855,13 @@ void summary_mark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       folder_item_set_batch(summaryview->folder_item, FALSE);
+       END_LONG_OPERATION(summaryview);
 
-       /* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
        summary_status_show(summaryview);
 }
 
@@ -2806,14 +2891,14 @@ void summary_mark_as_read(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
                                         GTK_CTREE_NODE(cur->data));
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
+       folder_item_set_batch(summaryview->folder_item, FALSE);
+       END_LONG_OPERATION(summaryview);
+       
        summary_status_show(summaryview);
 }
 
@@ -2822,13 +2907,11 @@ void summary_msgs_lock(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_lock_row(summaryview,
                                         GTK_CTREE_NODE(cur->data));
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
 }
@@ -2838,13 +2921,11 @@ void summary_msgs_unlock(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_unlock_row(summaryview,
                                   GTK_CTREE_NODE(cur->data));
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
 }
@@ -2852,22 +2933,21 @@ void summary_msgs_unlock(SummaryView *summaryview)
 void summary_mark_all_read(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCTreeNode *node;
 
-       gtk_clist_freeze(clist);
-       folder_item_update_freeze();
+       START_LONG_OPERATION(summaryview);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
        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);
+       folder_item_set_batch(summaryview->folder_item, FALSE);
        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);
        }
-       folder_item_update_thaw();
-       gtk_clist_thaw(clist);
-
+       END_LONG_OPERATION(summaryview);
+       
        summary_status_show(summaryview);
 }
 
@@ -2900,13 +2980,14 @@ void summary_mark_as_unread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
+               cur = cur->next)
                summary_mark_row_as_unread(summaryview,
                                           GTK_CTREE_NODE(cur->data));
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       folder_item_set_batch(summaryview->folder_item, FALSE);
+       END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
 }
@@ -2978,15 +3059,13 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, FALSE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
-       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
-       procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
+       procmsg_msginfo_change_flags(msginfo, MSG_DELETED, 0, MSG_MARKED, MSG_MOVE | MSG_COPY);
        summaryview->deleted++;
 
        if (!prefs_common.immediate_exec && 
-           summaryview->folder_item->stype != F_TRASH)
+           !folder_has_parent_of_type(summaryview->folder_item, F_TRASH))
                summary_set_row_marks(summaryview, row);
 
        debug_print("Message %s/%d is set to delete\n",
@@ -3028,49 +3107,52 @@ void summary_delete(SummaryView *summaryview)
        GList *cur;
        GtkCTreeNode *sel_last = NULL;
        GtkCTreeNode *node;
+       AlertValue aval;
+       MsgInfo *msginfo;
 
        if (!item) return;
 
        if (summary_is_locked(summaryview)) return;
 
-       /* if current folder is trash, ask for confirmation */
-       if (item->stype == F_TRASH) {
-               AlertValue aval;
-               MsgInfo *msginfo;
+       if (!summaryview->folder_item ||
+           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
-               aval = alertpanel(_("Delete message(s)"),
-                                 _("Do you really want to delete message(s) from the trash?"),
-                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (aval != G_ALERTDEFAULT) return;
+       aval = alertpanel(_("Delete message(s)"),
+                         _("Do you really want to delete selected message(s)?"),
+                         GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+       if (aval != G_ALERTDEFAULT) return;
 
-               for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
-                       GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-                       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
+            cur = cur->next) {
+               GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+               msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               if (msginfo->total_size != 0 && 
+                   msginfo->size != (off_t)msginfo->total_size)
                        partial_mark_for_delete(msginfo);
-               }
-       
        }
 
        main_window_cursor_wait(summaryview->mainwin);
 
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
+       summary_lock(summaryview);
        folder_item_update_freeze();
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                sel_last = GTK_CTREE_NODE(cur->data);
                summary_delete_row(summaryview, sel_last);
        }
        folder_item_update_thaw();
        gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       summary_unlock(summaryview);
 
        node = summary_find_next_msg(summaryview, sel_last);
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 
-       summary_select_node(summaryview, node, FALSE, FALSE);
+       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        
-       if (prefs_common.immediate_exec || item->stype == F_TRASH) {
+       if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
                summary_execute(summaryview);
                /* after deleting, the anchor may be at an invalid row
                 * so reset it to the node we found earlier */
@@ -3081,6 +3163,26 @@ void summary_delete(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 }
 
+void summary_delete_trash(SummaryView *summaryview)
+{
+       FolderItem *to_folder = NULL;
+       PrefsAccount *ac;
+       if (!summaryview->folder_item ||
+           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
+       
+       if (NULL != (ac = account_find_from_item(summaryview->folder_item)))
+               to_folder = account_get_special_folder(ac, F_TRASH);
+
+       if (to_folder == NULL)
+               to_folder = summaryview->folder_item->folder->trash;
+       
+       if (to_folder == NULL || to_folder == summaryview->folder_item)
+               summary_delete(summaryview);
+       else
+               summary_move_selected_to(summaryview, to_folder);
+}
+
+
 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -3093,7 +3195,6 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, FALSE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
@@ -3108,15 +3209,13 @@ void summary_unmark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
-
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
-
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
+       folder_item_set_batch(summaryview->folder_item, FALSE);
+       END_LONG_OPERATION(summaryview);
+       
        summary_status_show(summaryview);
 }
 
@@ -3129,17 +3228,22 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
        g_return_if_fail(to_folder != NULL);
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_LOCKED(msginfo->flags))
+               return;
+
        procmsg_msginfo_set_to_folder(msginfo, to_folder);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
        if (MSG_IS_COPY(msginfo->flags)) {
                summaryview->copied--;
        }
-       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
        if (!MSG_IS_MOVE(msginfo->flags)) {
-               procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
+               procmsg_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_MARKED | MSG_DELETED, MSG_COPY);
                summaryview->moved++;
+       } else {
+               procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
        }
+       
        if (!prefs_common.immediate_exec) {
                summary_set_row_marks(summaryview, row);
        }
@@ -3163,22 +3267,18 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+       START_LONG_OPERATION(summaryview);
 
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
-            cur != NULL; cur = cur->next)
+            cur != NULL && cur->data != NULL; cur = cur->next)
                summary_move_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
-       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+       END_LONG_OPERATION(summaryview);
 
-       if (prefs_common.immediate_exec)
+       if (prefs_common.immediate_exec) {
                summary_execute(summaryview);
-       else {
+       else {
                summary_status_show(summaryview);
        }
        
@@ -3186,7 +3286,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                GtkCTreeNode *node = gtk_ctree_node_nth (GTK_CTREE(summaryview->ctree), 
                                                         GTK_CLIST(summaryview->ctree)->rows - 1);
                if (node)
-                       summary_select_node(summaryview, node, TRUE, TRUE);
+                       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        }
 
 }
@@ -3218,10 +3318,12 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
        if (MSG_IS_MOVE(msginfo->flags)) {
                summaryview->moved--;
        }
-       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
+       
        if (!MSG_IS_COPY(msginfo->flags)) {
-               procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
+               procmsg_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_MARKED | MSG_DELETED, MSG_MOVE);
                summaryview->copied++;
+       } else {
+               procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
        }
        if (!prefs_common.immediate_exec) {
                summary_set_row_marks(summaryview, row);
@@ -3246,18 +3348,14 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+       START_LONG_OPERATION(summaryview);
 
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
-            cur != NULL; cur = cur->next)
+            cur != NULL && cur->data != NULL; cur = cur->next)
                summary_copy_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
-       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+       END_LONG_OPERATION(summaryview);
 
        if (prefs_common.immediate_exec)
                summary_execute(summaryview);
@@ -3296,23 +3394,18 @@ void summary_select_all(SummaryView *summaryview)
 {
        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);
-       }
-
+       summary_lock(summaryview);
        gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
-
-       if (summaryview->folder_item->total_msgs >= 500) {
-               STATUSBAR_POP(summaryview->mainwin);
-               main_window_cursor_normal(summaryview->mainwin);
-       }
+       summary_unlock(summaryview);
+       summary_status_show(summaryview);
 }
 
 void summary_unselect_all(SummaryView *summaryview)
 {
+       summary_lock(summaryview);
        gtk_sctree_unselect_all(GTK_SCTREE(summaryview->ctree));
+       summary_unlock(summaryview);
+       summary_status_show(summaryview);
 }
 
 void summary_select_thread(SummaryView *summaryview)
@@ -3355,11 +3448,11 @@ void summary_save_as(SummaryView *summaryview)
                subst_for_filename(filename);
        }
        if (g_getenv ("G_BROKEN_FILENAMES") &&
-           filename && g_utf8_validate(filename, -1, NULL)) {
+           filename && !g_utf8_validate(filename, -1, NULL)) {
                gchar *oldstr = filename;
                filename = conv_codeset_strdup(filename,
-                                              CS_UTF_8,
-                                              conv_get_locale_charset_str());
+                                              conv_get_locale_charset_str(),
+                                              CS_UTF_8);
                if (!filename) {
                        g_warning("summary_save_as(): faild to convert character set.");
                        filename = g_strdup(oldstr);
@@ -3384,10 +3477,10 @@ void summary_save_as(SummaryView *summaryview)
 
        if ( aval==0 ) { /* append */
                if (append_file(src, dest, TRUE) < 0) 
-                       alertpanel_error(_("Can't save the file `%s'."), tmp);
+                       alertpanel_error(_("Can't save the file '%s'."), tmp);
        } else { /* overwrite */
                if (copy_file(src, dest, TRUE) < 0)
-                       alertpanel_error(_("Can't save the file `%s'."), tmp);
+                       alertpanel_error(_("Can't save the file '%s'."), tmp);
        }
        g_free(src);
        
@@ -3402,7 +3495,7 @@ void summary_save_as(SummaryView *summaryview)
                        if (!msginfo) break;
                        src = procmsg_get_message_file(msginfo);
                        if (append_file(src, dest, TRUE) < 0)
-                               alertpanel_error(_("Can't save the file `%s'."), tmp);
+                               alertpanel_error(_("Can't save the file '%s'."), tmp);
                }
                g_free(src);
        }
@@ -3412,35 +3505,63 @@ void summary_save_as(SummaryView *summaryview)
 
 void summary_print(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
+#ifndef USE_GNOMEPRINT
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
-       GList *cur;
-       gchar *cmdline;
+       gchar *cmdline = NULL;
        gchar *p;
+#else
+       gboolean first = TRUE;
+       GList *tmplist;
+#endif
+       GList *cur;
 
        if (clist->selection == NULL) return;
-
+#ifndef USE_GNOMEPRINT
        cmdline = input_dialog(_("Print"),
                               _("Enter the print command line:\n"
-                                "(`%s' will be replaced with file name)"),
+                                "('%s' will be replaced with file name)"),
                               prefs_common.print_cmd);
        if (!cmdline) return;
        if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
            strchr(p + 2, '%')) {
-               alertpanel_error(_("Print command line is invalid:\n`%s'"),
+               alertpanel_error(_("Print command line is invalid:\n'%s'"),
                                 cmdline);
                g_free(cmdline);
                return;
        }
-
-       for (cur = clist->selection; cur != NULL; cur = cur->next) {
+       for (cur = clist->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                msginfo = gtk_ctree_node_get_row_data
                        (ctree, GTK_CTREE_NODE(cur->data));
                if (msginfo) procmsg_print_message(msginfo, cmdline);
        }
 
        g_free(cmdline);
+       
+#else
+       tmplist = g_list_copy(clist->selection);
+       summary_unselect_all(summaryview);
+       for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
+               GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
+               summary_select_node(summaryview, node, TRUE, TRUE);
+               if (!summaryview->messageview->mimeview 
+               ||  !summaryview->messageview->mimeview->textview
+               ||  !summaryview->messageview->mimeview->textview->text)
+                       alertpanel_warning(_("Cannot print: the message doesn't "
+                                            "contain text."));
+               gedit_print(
+                       GTK_TEXT_VIEW(summaryview->messageview->mimeview
+                                       ->textview->text));
+       }
+       for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
+               GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
+               gtk_sctree_select_with_state(
+                       GTK_SCTREE(clist), node, first ? 0:GDK_CONTROL_MASK);
+               first = FALSE;
+       }
+       g_list_free(tmplist);
+#endif
 }
 
 gboolean summary_execute(SummaryView *summaryview)
@@ -3449,6 +3570,7 @@ gboolean summary_execute(SummaryView *summaryview)
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCTreeNode *node, *next;
        GtkCTreeNode *new_selected = NULL;
+       gint move_val = -1;
 
        if (!summaryview->folder_item) return FALSE;
 
@@ -3461,12 +3583,9 @@ gboolean summary_execute(SummaryView *summaryview)
                summary_unthread_for_exec(summaryview);
 
        folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       summary_execute_move(summaryview);
+       move_val = summary_execute_move(summaryview);
        summary_execute_copy(summaryview);
        summary_execute_delete(summaryview);
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        
        node = GTK_CTREE_NODE(clist->row_list);
        for (; node != NULL; node = next) {
@@ -3484,7 +3603,7 @@ gboolean summary_execute(SummaryView *summaryview)
 
                if (!new_selected &&
                    gtkut_ctree_node_is_selected(ctree, node)) {
-                       gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+                       summary_unselect_all(summaryview);
                        new_selected = summary_find_next_msg(summaryview, node);
                        if (!new_selected)
                                new_selected = summary_find_prev_msg
@@ -3494,15 +3613,23 @@ gboolean summary_execute(SummaryView *summaryview)
                gtk_ctree_remove_node(ctree, node);
        }
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        if (new_selected) {
+               summary_unlock(summaryview);
                gtk_sctree_select
                        (GTK_SCTREE(ctree),
-                        summaryview->displayed ? summaryview->displayed
-                        : new_selected);
+                        new_selected);
+               summary_lock(summaryview);
        }
 
-       if (summaryview->threaded)
+       if (summaryview->threaded) {
+               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
                summary_thread_build(summaryview);
+               summary_thread_init(summaryview);
+               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       }
 
        summaryview->selected = clist->selection ?
                GTK_CTREE_NODE(clist->selection->data) : NULL;
@@ -3519,29 +3646,31 @@ gboolean summary_execute(SummaryView *summaryview)
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 
-       gtk_clist_thaw(clist);
-
        summary_unlock(summaryview);
+       
+       if (move_val < 0) 
+               summary_show(summaryview, summaryview->folder_item);
        return TRUE;
 }
 
-static void summary_execute_move(SummaryView *summaryview)
+static gint summary_execute_move(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GSList *cur;
-
+       gint val = -1;
        /* search moving messages and execute */
        gtk_ctree_pre_recursive(ctree, NULL, summary_execute_move_func,
                                summaryview);
 
        if (summaryview->mlist) {
-               procmsg_move_messages(summaryview->mlist);
+               val = procmsg_move_messages(summaryview->mlist);
 
-               for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
+               for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
                        procmsg_msginfo_free((MsgInfo *)cur->data);
                g_slist_free(summaryview->mlist);
                summaryview->mlist = NULL;
        }
+       return val;
 }
 
 static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3602,24 +3731,18 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
 static void summary_execute_delete(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       FolderItem *trash;
        GSList *cur;
 
-       trash = summaryview->folder_item->folder->trash;
-
        /* search deleting messages and execute */
        gtk_ctree_pre_recursive
                (ctree, NULL, summary_execute_delete_func, summaryview);
 
        if (!summaryview->mlist) return;
 
-       if (trash == NULL || summaryview->folder_item == trash)
-               folder_item_remove_msgs(summaryview->folder_item,
-                                       summaryview->mlist);
-       else
-               folder_item_move_msgs(trash, summaryview->mlist);
+       folder_item_remove_msgs(summaryview->folder_item,
+                               summaryview->mlist);
 
-       for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
+       for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
 
        g_slist_free(summaryview->mlist);
@@ -3710,16 +3833,6 @@ void summary_thread_build(SummaryView *summaryview)
                node = next;
        }
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
-       while (node) {
-               next = GTK_CTREE_NODE_NEXT(node);
-               if (prefs_common.bold_unread &&
-                   GTK_CTREE_ROW(node)->children)
-                       summary_set_row_marks(summaryview, node);
-               node = next;
-       }
-
        gtkut_ctree_set_focus_row(ctree, summaryview->selected);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -3742,20 +3855,17 @@ static void summary_thread_init(SummaryView *summaryview)
        GtkCTreeNode *next;
 
        if (!summaryview->thread_collapsed) {
+               g_signal_handlers_block_by_func(G_OBJECT(ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
                while (node) {
                        next = GTK_CTREE_ROW(node)->sibling;
                        if (GTK_CTREE_ROW(node)->children)
                                gtk_ctree_expand_recursive(ctree, node);
                        node = next;
                }
-       } else if (prefs_common.bold_unread) {
-               while (node) {
-                       next = GTK_CTREE_ROW(node)->sibling;
-                       if (GTK_CTREE_ROW(node)->children)
-                               summary_set_row_marks(summaryview, node);
-                       node = next;
-               }
-       }
+               g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
+       } 
 }
 
 void summary_unthread(SummaryView *summaryview)
@@ -3809,22 +3919,18 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
        GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       summary_lock(summaryview);
-
        debug_print("Unthreading for execution...");
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+       START_LONG_OPERATION(summaryview);
 
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
             node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
                summary_unthread_for_exec_func(ctree, node, NULL);
        }
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       END_LONG_OPERATION(summaryview);
 
        debug_print("done.\n");
-
-       summary_unlock(summaryview);
 }
 
 static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3864,15 +3970,21 @@ void summary_expand_threads(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
+       g_signal_handlers_block_by_func(G_OBJECT(ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        while (node) {
-               if (GTK_CTREE_ROW(node)->children)
+               if (GTK_CTREE_ROW(node)->children) {
                        gtk_ctree_expand(ctree, node);
+                       summary_set_row_marks(summaryview, node);
+               }
                node = GTK_CTREE_NODE_NEXT(node);
        }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
+       g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+                                        G_CALLBACK(summary_tree_expanded), summaryview);
 
        summaryview->thread_collapsed = FALSE;
 
@@ -3915,7 +4027,7 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
                GList *cur;
 
                for (cur = GTK_CLIST(summaryview->ctree)->selection;
-                    cur != NULL; cur = cur->next) {
+                    cur != NULL && cur->data != NULL; cur = cur->next) {
                        summary_filter_func(GTK_CTREE(summaryview->ctree),
                                            GTK_CTREE_NODE(cur->data),
                                            summaryview);
@@ -4066,8 +4178,8 @@ static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *r
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
-       procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
+       procmsg_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0, 
+                                       MSG_CLABEL_FLAG_MASK, 0);
 }
 
 void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
@@ -4076,15 +4188,12 @@ 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();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_set_row_colorlabel(summaryview,
                                           GTK_CTREE_NODE(cur->data), labelcolor);
-       folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-       main_window_cursor_normal(summaryview->mainwin);
+       END_LONG_OPERATION(summaryview);
 }
 
 static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
@@ -4113,7 +4222,7 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
                          GINT_TO_POINTER(1));
 
        /* clear items. get item pointers. */
-       for (n = 0, cur = menu->children; cur != NULL; cur = cur->next) {
+       for (n = 0, cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
                if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
                        gtk_check_menu_item_set_active
                                (GTK_CHECK_MENU_ITEM(cur->data), FALSE);
@@ -4246,6 +4355,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                   prefs_common.summary_col_size[S_COL_SUBJECT]);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_FROM],
                                   prefs_common.summary_col_size[S_COL_FROM]);
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_TO],
+                                  prefs_common.summary_col_size[S_COL_TO]);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_DATE],
                                   prefs_common.summary_col_size[S_COL_DATE]);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
@@ -4287,6 +4398,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE   , summary_size_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_DATE   , summary_date_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM   , summary_from_clicked);
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_TO     , summary_to_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);
@@ -4340,6 +4452,7 @@ void summary_set_column_order(SummaryView *summaryview)
        gtk_widget_destroy(summaryview->ctree);
 
        summaryview->ctree = ctree = summary_ctree_create(summaryview);
+       summary_set_fonts(summaryview);
        pixmap = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),
                                    summaryview->col_pos[S_COL_MIME], pixmap);
@@ -4354,6 +4467,7 @@ void summary_set_column_order(SummaryView *summaryview)
        summary_show(summaryview, item);
 
        summary_select_by_msgnum(summaryview, selected_msgnum);
+
        summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
        if (!summaryview->displayed)
                messageview_clear(summaryview->messageview);
@@ -4433,27 +4547,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return TRUE;
-       case GDK_Up:
-       case GDK_Down:
-               if ((node = summaryview->selected) != NULL) {
-                       GtkCTreeNode *next = NULL;
-                       do {
-                               next = (event->keyval == GDK_Down)
-                                       ? gtkut_ctree_node_next(ctree, next ? next:node)
-                                       : gtkut_ctree_node_prev(ctree, next ? next:node);
-                       } while (next && !gtk_ctree_is_viewable(ctree, next));
-
-                       if (next) {
-                               gtk_sctree_select_with_state
-                                       (GTK_SCTREE(ctree), next, event->state);
-                               
-                               /* Deprecated - what are the non-deprecated equivalents? */
-                               if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
-                                       gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
-                               summaryview->selected = next;
-                       }
-               }
-               return TRUE;
        case GDK_Home:
        case GDK_End:
                if ((node = summaryview->selected) != NULL) {
@@ -4523,7 +4616,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                break;
        case GDK_Delete:
                BREAK_ON_MODIFIER_KEY();
-               summary_delete(summaryview);
+               summary_delete_trash(summaryview);
                break;
        default:
                break;
@@ -4553,9 +4646,9 @@ static void tog_searchbar_cb(GtkWidget *w, gpointer data)
 
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
-       if (summaryview->folder_item->stype == F_OUTBOX ||
-           summaryview->folder_item->stype == F_DRAFT  ||
-           summaryview->folder_item->stype == F_QUEUE)
+       if (folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX)
+       ||  folder_has_parent_of_type(summaryview->folder_item, F_DRAFT)
+       ||  folder_has_parent_of_type(summaryview->folder_item, F_QUEUE))
                summary_reedit(summaryview);
        else
                summary_open_msg(summaryview);
@@ -4567,6 +4660,12 @@ static void summary_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
                                  SummaryView *summaryview)
 {
        summary_set_row_marks(summaryview, node);
+       while (prefs_common.bold_unread && node) {
+               GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+               if (GTK_CTREE_ROW(node)->children)
+                       summary_set_row_marks(summaryview, node);
+               node = next;
+       }
 }
 
 static void summary_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
@@ -4579,6 +4678,12 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                             gint column, SummaryView *summaryview)
 {
        MsgInfo *msginfo;
+       gboolean marked_unread = FALSE;
+
+       if (summary_is_locked(summaryview)
+       ||  GTK_SCTREE(ctree)->selecting_range) {
+               return;
+       }
 
        summary_status_show(summaryview);
 
@@ -4613,12 +4718,11 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        summary_status_show(summaryview);
                } else if (!MSG_IS_REPLIED(msginfo->flags) &&
                         !MSG_IS_FORWARDED(msginfo->flags)) {
-                       summary_mark_row_as_unread(summaryview, row);
-                       summary_status_show(summaryview);
+                       marked_unread = TRUE;
                } else if (MSG_IS_REPLIED(msginfo->flags)) {
                        summary_find_answers(summaryview, msginfo);
                        return;
-               }
+               } 
                break;
        case S_COL_LOCKED:
                if (MSG_IS_LOCKED(msginfo->flags)) {
@@ -4638,9 +4742,18 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                summaryview->display_msg = FALSE;
                if (summaryview->displayed != row) {
                        summary_display_msg(summaryview, row);
+                       if (marked_unread) {
+                               summary_mark_row_as_unread(summaryview, row);
+                               summary_status_show(summaryview);
+                       } 
                        return;
                }
        }
+       
+       if (marked_unread) {
+               summary_mark_row_as_unread(summaryview, row);
+               summary_status_show(summaryview);
+       } 
 
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
@@ -4698,6 +4811,8 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
+       summaryview->messageview->all_headers =
+                       GTK_CHECK_MENU_ITEM(widget)->active;
        summary_display_msg_selected(summaryview,
                                     GTK_CHECK_MENU_ITEM(widget)->active);
 }
@@ -4723,12 +4838,24 @@ static void summary_create_processing_cb(SummaryView *summaryview,
 static void summary_sort_by_column_click(SummaryView *summaryview,
                                         FolderSortKey sort_key)
 {
+       GtkCTreeNode *node = NULL;
+       START_TIMING("summary_sort_by_column_click");
        if (summaryview->sort_key == sort_key)
                summary_sort(summaryview, sort_key,
                             summaryview->sort_type == SORT_ASCENDING
                             ? SORT_DESCENDING : SORT_ASCENDING);
        else
                summary_sort(summaryview, sort_key, SORT_ASCENDING);
+
+       node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
+
+       while (prefs_common.bold_unread && node) {
+               GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+               if (GTK_CTREE_ROW(node)->children)
+                       summary_set_row_marks(summaryview, node);
+               node = next;
+       }
+       END_TIMING();
 }
 
 static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
@@ -4766,6 +4893,11 @@ static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
        summary_sort_by_column_click(summaryview, SORT_BY_FROM);
 }
 
+static void summary_to_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+       summary_sort_by_column_click(summaryview, SORT_BY_TO);
+}
+
 static void summary_subject_clicked(GtkWidget *button,
                                    SummaryView *summaryview)
 {
@@ -4813,7 +4945,7 @@ static void summary_drag_data_get(GtkWidget        *widget,
                gchar *mail_list = NULL, *tmp1, *tmp2;
 
                for (cur = GTK_CLIST(ctree)->selection;
-                    cur != NULL; cur = cur->next) {
+                    cur != NULL && cur->data != NULL; cur = cur->next) {
                        msginfo = gtk_ctree_node_get_row_data
                                (ctree, GTK_CTREE_NODE(cur->data));
                        tmp2 = procmsg_get_message_file(msginfo);
@@ -4877,24 +5009,6 @@ CMP_FUNC_DEF(summary_cmp_by_num, msginfo1->msgnum - msginfo2->msgnum)
 CMP_FUNC_DEF(summary_cmp_by_size, msginfo1->size - msginfo2->size)
 CMP_FUNC_DEF(summary_cmp_by_date, msginfo1->date_t - msginfo2->date_t)
 
-#undef CMP_FUNC_DEF
-#define CMP_FUNC_DEF(func_name, var_name)                               \
-static gint func_name(GtkCList *clist,                                  \
-                     gconstpointer ptr1, gconstpointer ptr2)            \
-{                                                                       \
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;                 \
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;                 \
-                                                                        \
-       if (!msginfo1->var_name)                                         \
-               return (msginfo2->var_name != NULL);                     \
-       if (!msginfo2->var_name)                                         \
-               return -1;                                               \
-                                                                        \
-       return g_utf8_collate(msginfo1->var_name, msginfo2->var_name);   \
-}
-
-CMP_FUNC_DEF(summary_cmp_by_to, to);
-
 #undef CMP_FUNC_DEF
 
 static gint summary_cmp_by_subject(GtkCList *clist,
@@ -4935,6 +5049,28 @@ static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
        return g_utf8_collate(str1, str2);
 }
  
+static gint summary_cmp_by_to(GtkCList *clist, gconstpointer ptr1,
+                               gconstpointer ptr2)
+{
+       const gchar *str1, *str2;
+       const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
+       const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+       const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
+       
+       g_return_val_if_fail(sv, -1);
+       
+       str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_TO]])->text;
+       str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_TO]])->text;
+
+       if (!str1)
+               return str2 != NULL;
+       if (!str2)
+               return -1;
+       return g_utf8_collate(str1, str2);
+}
 static gint summary_cmp_by_simplified_subject
        (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -4998,14 +5134,14 @@ static void news_flag_crosspost(MsgInfo *msginfo)
 
        if (mff->account->mark_crosspost_read) {
                line = g_string_sized_new(128);
-               g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
+               g_string_printf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
                debug_print("nfcp: checking <%s>", line->str);
                if (mff->newsart && 
                    g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
                        debug_print(" <%s>", (gchar *)value);
                        if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
-                               procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-                               procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
+                               procmsg_msginfo_change_flags(msginfo, 
+                                       mff->account->crosspost_col, 0, MSG_NEW | MSG_UNREAD, 0);
                        }
                        g_hash_table_remove(mff->newsart, key);
                        g_free(key);
@@ -5025,8 +5161,7 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
        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);
+       procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
 
        summary_set_row_marks(summaryview, row);
        debug_print("Message %d is marked as ignore thread\n",
@@ -5038,16 +5173,14 @@ static void summary_ignore_thread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != 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();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-       
+       END_LONG_OPERATION(summaryview);
+
        summary_status_show(summaryview);
 }
 
@@ -5073,15 +5206,14 @@ static void summary_unignore_thread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       START_LONG_OPERATION(summaryview);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != 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();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       END_LONG_OPERATION(summaryview);
+
        summary_status_show(summaryview);
 }
 
@@ -5104,7 +5236,7 @@ void summary_toggle_ignore_thread(SummaryView *summaryview)
        GList *cur;
        gint found_ignore = 0;
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
                                        GTK_CTREE_FUNC(summary_check_ignore_thread_func),
                                        &found_ignore);
@@ -5142,12 +5274,8 @@ static gboolean processing_apply_func(GNode *node, gpointer data)
                STATUSBAR_PUSH(summaryview->mainwin, buf);
                g_free(buf);
 
-/*
-               mlist = item->folder->get_msg_list(item->folder, item,
-                                                  TRUE);
-*/             
                mlist = folder_item_get_msg_list(item);
-               for(cur = mlist ; cur != NULL ; cur = cur->next) {
+               for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = cur->next) {
                        MsgInfo * msginfo;
                        
                        msginfo = (MsgInfo *) cur->data;
@@ -5168,7 +5296,7 @@ void processing_apply(SummaryView * summaryview)
 {
        GList * cur;
 
-       for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+       for (cur = folder_get_list() ; cur != NULL && cur->data != NULL ; cur = g_list_next(cur)) {
                Folder *folder;
 
                folder = (Folder *) cur->data;
@@ -5220,6 +5348,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        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);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm, &clipgpgsignedxpmmask);
 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
@@ -5250,7 +5379,7 @@ void summary_harvest_address(SummaryView *summaryview)
        MsgInfo *msginfo;
 
        msgList = NULL;
-       for( cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next ) {
+       for( cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != 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 ) );
        }
@@ -5395,3 +5524,18 @@ void summaryview_export_mbox_list(SummaryView *summaryview)
        g_free(mbox);
        
 }
+
+void summaryview_lock(SummaryView *summaryview, FolderItem *item)
+{
+       if (!summaryview || !summaryview->folder_item || !item) {
+               return;
+       }
+
+       if (summaryview->folder_item->folder == item->folder) {
+               gtk_widget_set_sensitive(summaryview->ctree, FALSE);
+       }
+}
+void summaryview_unlock(SummaryView *summaryview, FolderItem *item)
+{
+       gtk_widget_set_sensitive(summaryview->ctree, TRUE);
+}