sync with sylpheed 0.6.3cvs7
[claws.git] / src / summaryview.c
index 5c862051f578b1dc2d4c698d883f949d42a4d0f7..00e18678bec2cf631818f069000a4a7151c57cd0 100644 (file)
@@ -45,6 +45,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "intl.h"
 #include "main.h"
@@ -70,6 +71,8 @@
 #include "statusbar.h"
 #include "filter.h"
 #include "folder.h"
+#include "colorlabel.h"
+#include "inc.h"
 #include "addressbook.h"
 #include "addr_compl.h"
 #include "scoring.h"
 #define SUMMARY_COL_UNREAD_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         10
 
+static GdkFont *boldfont;
 static GdkFont *smallfont;
 
+static GtkStyle *bold_style;
+static GtkStyle *bold_marked_style;
+static GtkStyle *bold_deleted_style;
+static GtkStyle *small_style;
+static GtkStyle *small_marked_style;
+static GtkStyle *small_deleted_style;
+
 static GdkPixmap *folderxpm;
 static GdkBitmap *folderxpmmask;
 
@@ -139,23 +150,36 @@ static void summary_write_cache_func      (GtkCTree               *ctree,
 
 static void summary_set_menu_sensitive (SummaryView            *summaryview);
 
+static guint summary_get_msgnum                (SummaryView            *summaryview,
+                                        GtkCTreeNode           *node);
+
+static GtkCTreeNode *summary_find_prev_msg
+                                       (SummaryView            *summaryview,
+                                        GtkCTreeNode           *current_node);
+static GtkCTreeNode *summary_find_next_msg
+                                       (SummaryView            *summaryview,
+                                        GtkCTreeNode           *current_node);
+static GtkCTreeNode *summary_find_prev_unread_msg
+                                       (SummaryView            *summaryview,
+                                        GtkCTreeNode           *current_node);
 static GtkCTreeNode *summary_find_next_unread_msg
                                        (SummaryView            *summaryview,
                                         GtkCTreeNode           *current_node);
+static GtkCTreeNode *summary_find_prev_marked_msg
+                                       (SummaryView            *summaryview,
+                                        GtkCTreeNode           *current_node);
 static GtkCTreeNode *summary_find_next_marked_msg
                                        (SummaryView            *summaryview,
                                         GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_prev_marked_msg
+static GtkCTreeNode *summary_find_prev_labeled_msg
+                                       (SummaryView            *summaryview,
+                                        GtkCTreeNode           *current_node);
+static GtkCTreeNode *summary_find_next_labeled_msg
                                        (SummaryView            *summaryview,
                                         GtkCTreeNode           *current_node);
 static GtkCTreeNode *summary_find_msg_by_msgnum
                                        (SummaryView            *summaryview,
                                         guint                   msgnum);
-#if 0
-static GtkCTreeNode *summary_find_prev_unread_msg
-                                       (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-#endif
 
 static void summary_update_status      (SummaryView            *summaryview);
 
@@ -163,7 +187,8 @@ static void summary_update_status   (SummaryView            *summaryview);
 static void summary_status_show                (SummaryView            *summaryview);
 static void summary_set_ctree_from_list        (SummaryView            *summaryview,
                                         GSList                 *mlist);
-static void summary_set_header         (gchar                  *text[],
+static void summary_set_header         (SummaryView            *summaryview,
+                                        gchar                  *text[],
                                         MsgInfo                *msginfo);
 static void summary_display_msg                (SummaryView            *summaryview,
                                         GtkCTreeNode           *row,
@@ -207,16 +232,11 @@ static void summary_execute_delete        (SummaryView            *summaryview);
 static void summary_execute_delete_func        (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
                                         gpointer                data);
+
+static void summary_thread_init                (SummaryView            *summaryview);
 static void summary_ignore_thread(SummaryView *summaryview);
 static void summary_unignore_thread(SummaryView *summaryview);
 
-/* thread functions */
-static void summary_thread_func                        (GtkCTree       *ctree,
-                                                GtkCTreeNode   *node,
-                                                gpointer        data);
-static void summary_unthread_func              (GtkCTree       *ctree,
-                                                GtkCTreeNode   *node,
-                                                gpointer        data);
 static void summary_unthread_for_exec          (SummaryView    *summaryview);
 static void summary_unthread_for_exec_func     (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
@@ -226,6 +246,14 @@ static void summary_filter_func            (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
                                         gpointer                data);
 
+static void summary_colorlabel_menu_item_activate_cb
+                                         (GtkWidget    *widget,
+                                          gpointer      data);
+static void summary_colorlabel_menu_item_activate_item_cb
+                                         (GtkMenuItem  *label_menu_item,
+                                          gpointer      data);
+static void summary_colorlabel_menu_create(SummaryView *summaryview);
+
 /* callback functions */
 static void summary_toggle_pressed     (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
@@ -241,6 +269,12 @@ static void summary_key_pressed            (GtkWidget              *ctree,
                                         SummaryView            *summaryview);
 static void summary_open_row           (GtkSCTree              *sctree,
                                         SummaryView            *summaryview);
+static void summary_tree_expanded      (GtkCTree               *ctree,
+                                        GtkCTreeNode           *node,
+                                        SummaryView            *summaryview);
+static void summary_tree_collapsed     (GtkCTree               *ctree,
+                                        GtkCTreeNode           *node,
+                                        SummaryView            *summaryview);
 static void summary_selected           (GtkCTree               *ctree,
                                         GtkCTreeNode           *row,
                                         gint                    column,
@@ -252,13 +286,23 @@ static void summary_col_resized           (GtkCList               *clist,
 static void summary_reply_cb           (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+static void summary_execute_cb         (SummaryView            *summaryview,
+                                        guint                   action,
+                                        GtkWidget              *widget);
 static void summary_show_all_header_cb (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
-static void summary_add_sender_to_cb (SummaryView                      *summaryview,
+
+static void summary_add_address_cb     (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
 
+static void summary_mark_clicked       (GtkWidget              *button,
+                                        SummaryView            *summaryview);
+static void summary_unread_clicked     (GtkWidget              *button,
+                                        SummaryView            *summaryview);
+static void summary_mime_clicked       (GtkWidget              *button,
+                                        SummaryView            *summaryview);
 static void summary_num_clicked                (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_score_clicked       (GtkWidget *button,
@@ -271,8 +315,6 @@ static void summary_from_clicked    (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_subject_clicked    (GtkWidget              *button,
                                         SummaryView            *summaryview);
-static void summary_mark_clicked       (GtkWidget              *button,
-                                        SummaryView            *summaryview);
 
 static void summary_start_drag         (GtkWidget        *widget, 
                                         int button,
@@ -287,6 +329,15 @@ static void summary_drag_data_get       (GtkWidget        *widget,
 
 /* custom compare functions for sorting */
 
+static gint summary_cmp_by_mark                (GtkCList               *clist,
+                                        gconstpointer           ptr1,
+                                        gconstpointer           ptr2);
+static gint summary_cmp_by_unread      (GtkCList               *clist,
+                                        gconstpointer           ptr1,
+                                        gconstpointer           ptr2);
+static gint summary_cmp_by_mime                (GtkCList               *clist,
+                                        gconstpointer           ptr1,
+                                        gconstpointer           ptr2);
 static gint summary_cmp_by_num         (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
@@ -309,6 +360,10 @@ static gint summary_cmp_by_label   (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 
+#if MARK_ALL_READ
+static void summary_mark_all_read (SummaryView *summaryview);                                   
+#endif
+
 GtkTargetEntry summary_drag_types[1] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
@@ -316,32 +371,41 @@ GtkTargetEntry summary_drag_types[1] =
 
 static GtkItemFactoryEntry summary_popup_entries[] =
 {
+       {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/Repl_y to sender"),       NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+       {N_("/Reply to a_ll"),          NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/Forward as a_ttachment"),
+                                       NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
+       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/M_ove..."),               NULL, summary_move_to,  0, NULL},
        {N_("/_Copy..."),               NULL, summary_copy_to,  0, NULL},
        {N_("/_Delete"),                NULL, summary_delete,   0, NULL},
-       {N_("/E_xecute"),               NULL, summary_execute,  0, NULL},
+       {N_("/E_xecute"),               NULL, summary_execute_cb,       0, NULL},
+       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
        {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
        {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark/Mark as unr_ead"),  NULL, summary_mark_as_unread, 0, NULL},
        {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
+       {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_("/Color la_bel"),           NULL, NULL,             0, NULL},
 
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
-       {N_("/Repl_y to sender"),       NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
-       {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
-       {N_("/Reply to a_ll"),          NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/Forward as a_ttachment"),
-                                       NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/Add sender to address boo_k"),
+                                       NULL, summary_add_address_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/Open in new _window"),    NULL, summary_open_msg, 0, NULL},
-       {N_("/View so_urce"),           NULL, summary_view_source, 0, NULL},
-       {N_("/Show all _header"),       NULL, summary_show_all_header_cb, 0, NULL},
-       {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
+       {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
+       {N_("/_View/Open in new _window"),
+                                       NULL, summary_open_msg, 0, NULL},
+       {N_("/_View/_Source"),          NULL, summary_view_source, 0, NULL},
+       {N_("/_View/All _header"),      NULL, summary_show_all_header_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            NULL, summary_save_as,  0, NULL},
        {N_("/_Print..."),              NULL, summary_print,    0, NULL},
@@ -349,288 +413,35 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Select _all"),            NULL, summary_select_all, 0, NULL}
 };
 
-/* L A B E L   C O L O R   S T U F F */
-
-static struct 
-{
-       GdkColor         color;
-       gchar           *label;
-       
-       GdkPixmap       *xpm;
-       GdkBitmap       *xbm;
-       GtkPixmap       *pixmap;
-}
-label_colors[] = 
-{
-       { { 0, 0xffff, (0x99 << 8), 0x0 },              N_("Orange"),   NULL, NULL, NULL },
-       { { 0, 0xffff, 0, 0 },                          N_("Red"),      NULL, NULL, NULL },
-       { { 0, 0xffff, (0x66 << 8), 0xffff },           N_("Pink"),     NULL, NULL, NULL },
-       { { 0, 0x0, (0xcc << 8), 0xffff },              N_("Sky blue"), NULL, NULL, NULL },
-       { { 0, 0x0, 0x0, 0xffff },                      N_("Blue"),     NULL, NULL, NULL },
-       { { 0, 0x0, 0x99 << 8, 0x0 },                   N_("Green"),    NULL, NULL, NULL },
-       { { 0, 0x66 << 8, 0x33 << 8, 0x33 << 8 },       N_("Brown"),    NULL, NULL, NULL }
+static const gchar *const col_label[N_SUMMARY_COLS] = {
+       N_("M"),        /* S_COL_MARK    */
+       N_("U"),        /* S_COL_UNREAD  */
+       "",             /* S_COL_MIME    */
+       N_("No."),      /* S_COL_NUMBER  */
+       N_("Score"),    /* S_COL_SCORE   */
+       N_("Size"),     /* S_COL_SIZE    */
+       N_("Date"),     /* S_COL_DATE    */
+       N_("From"),     /* S_COL_FROM    */
+       N_("Subject")   /* S_COL_SUBJECT */
 };
 
-#define LABEL_COLORS_ELEMS (sizeof label_colors / sizeof label_colors[0])
-
-static void label_menu_item_activate_cb(GtkWidget *widget, gpointer data)
-{
-       guint color = GPOINTER_TO_UINT(data);
-       SummaryView *view = gtk_object_get_data(GTK_OBJECT(widget), "view");
-
-       g_return_if_fail(view);
-
-       /* "dont_toggle" state set? */
-       if (gtk_object_get_data(GTK_OBJECT(view->label_menu), "dont_toggle"))
-               return;
-               
-       color <<= 7;
-
-       summary_set_label(view, color, NULL);
-}
-
-/* summary_set_label_color() - labelcolor parameter is the color *flag*
- * for the messsage; not the color index */
-void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
-                            guint labelcolor)
-{
-       GdkColor  color;
-       GtkStyle *style, *prev_style, *ctree_style;
-       MsgInfo  *msginfo;
-       gint     color_index = ((gint)(labelcolor >> 7)) - 1;
-
-       ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
-
-       prev_style = gtk_ctree_node_get_row_style(ctree, node);
-
-       if (!prev_style)
-               prev_style = ctree_style;
-
-       style = gtk_style_copy(prev_style);
-
-       if (color_index < 0 || color_index >= LABEL_COLORS_ELEMS) {
-               labelcolor = 0;
-               color.red = ctree_style->fg[GTK_STATE_NORMAL].red;
-               color.green = ctree_style->fg[GTK_STATE_NORMAL].green;
-               color.blue = ctree_style->fg[GTK_STATE_NORMAL].blue;
-               style->fg[GTK_STATE_NORMAL] = color;
-
-               color.red = ctree_style->fg[GTK_STATE_SELECTED].red;
-               color.green = ctree_style->fg[GTK_STATE_SELECTED].green;
-               color.blue = ctree_style->fg[GTK_STATE_SELECTED].blue;
-               style->fg[GTK_STATE_SELECTED] = color;
-               gtk_ctree_node_set_row_style(ctree, node, style);
-       }
-       else
-               color = label_colors[color_index].color;
-
-       msginfo = gtk_ctree_node_get_row_data(ctree, node);
-
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_LABEL);
-       MSG_SET_FLAGS(msginfo->flags, labelcolor);
-
-       if ( style ) {
-               style->fg[GTK_STATE_NORMAL] = color;
-               style->fg[GTK_STATE_SELECTED] = color;
-               gtk_ctree_node_set_row_style(ctree, node, style);
-       }
-}
-
-void summary_set_label(SummaryView *summaryview, guint labelcolor, GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
-       GList *cur;
-  
-       for (cur = clist->selection; cur != NULL; cur = cur->next)
-               summary_set_label_color(ctree, GTK_CTREE_NODE(cur->data), labelcolor);
-}
-
-/* summary_create_label_pixmaps() - creates label pixmaps. perhaps a little 
- * bit contrived. */
-static gboolean summary_create_label_pixmaps(SummaryView *summaryview)
-{
-       const char *FMT = "+      c #%2.2X%2.2X%2.2X";
-       char buf[40];
-       char * dummy_xpm[] = {
-               "16 16 3 1",
-               "       c None",
-               ".      c #000000",
-               "+      c #000000",
-               "................",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               ".++++++++++++++.",
-               "................"
-       };
-
-       gint n;
-
-       for (n = 0; n < LABEL_COLORS_ELEMS; n++) {
-               GdkBitmap *xpmmask;
-               GdkPixmap *xpm;
-               GtkPixmap *pixmap;
-
-               /* put correct color in xpm data */
-               sprintf(buf, FMT, label_colors[n].color.red >> 8,
-                       label_colors[n].color.green >> 8, 
-                       label_colors[n].color.blue >> 8);
-               dummy_xpm[3] = buf;                             
-
-               /* create pixmaps */
-               xpm = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(summaryview->scrolledwin)->window, &xpmmask, NULL, 
-                                                  (gchar **) &dummy_xpm);
-               pixmap = GTK_PIXMAP(gtk_pixmap_new(xpm, xpmmask)); 
-
-               /* store it somewhere */
-               label_colors[n].xpm = xpm;
-               label_colors[n].xbm = xpmmask;
-               label_colors[n].pixmap = pixmap;
-       }
-}
-
-static void label_menu_item_activate_item_cb(GtkMenuItem *label_menu_item, gpointer data)
-{
-       SummaryView  *summaryview;
-       GtkMenuShell *label_menu;
-       GtkCheckMenuItem **items;
-       int  n;
-       GList *cur, *sel;
-
-       summaryview = (SummaryView *) data;
-       g_return_if_fail(summaryview);
-       if (NULL == (sel = GTK_CLIST(summaryview->ctree)->selection))
-               return;
-       
-       label_menu = GTK_MENU_SHELL(summaryview->label_menu);
-       g_return_if_fail(label_menu);
-
-       items = alloca( (LABEL_COLORS_ELEMS + 1) * sizeof(GtkWidget *));
-       g_return_if_fail(items);
-
-       /* NOTE: don't return prematurely because we set the "dont_toggle" state
-        * for check menu items */
-       gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(1));
-
-       /* clear items. get item pointers. */
-       for (n = 0, cur = label_menu->children; cur != NULL; cur = cur->next) {
-               if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
-                       gtk_check_menu_item_set_state(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
-                       items[n] = GTK_CHECK_MENU_ITEM(cur->data);
-                       n++;
-               }
-       }
-
-       if (n == (LABEL_COLORS_ELEMS + 1)) {
-               /* iterate all messages and set the state of the appropriate items */
-               for (; sel != NULL; sel = sel->next) {
-                       MsgInfo *msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                               GTK_CTREE_NODE(sel->data));
-                       gint menu_item;                         
-                       if (msginfo) {
-                               menu_item = ((msginfo->flags & MSG_LABEL) >> 7);
-                               if (!items[menu_item]->active)
-                                       gtk_check_menu_item_set_state(items[menu_item], TRUE);
-                       }
-               }
-       }
-       else 
-               g_warning("invalid number of color elements (%d)\n", n);
-       
-       /* reset "dont_toggle" state */
-       gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(0));
-}
-
-static void summary_create_label_menu(SummaryView *summaryview)
-{
-       const gint LABEL_MENU_POS = 5;
-       GtkWidget *label_menu_item;
-       GtkWidget *label_menu;
-       GtkWidget *item;
-       gint       i;
-
-       summary_create_label_pixmaps(summaryview);
-       
-       label_menu_item = gtk_menu_item_new_with_label(_("Label"));
-       gtk_menu_insert(GTK_MENU(summaryview->popupmenu), label_menu_item, LABEL_MENU_POS);
-       gtk_signal_connect(GTK_OBJECT(label_menu_item), "activate",
-               GTK_SIGNAL_FUNC(label_menu_item_activate_item_cb), summaryview);
-               
-       gtk_widget_show(label_menu_item);
-       summaryview->label_menu_item = label_menu_item;
-
-       label_menu = gtk_menu_new();
-
-       /* create sub items. for the menu item activation callback we pass the 
-        * index of label_colors[] as data parameter. for the None color we pass
-        * an invalid (high) value. also we attach a data pointer so we can
-        * always get back the SummaryView pointer. */
-       item = gtk_check_menu_item_new_with_label(_("None"));
-       gtk_menu_append(GTK_MENU(label_menu), item);
-       gtk_signal_connect(GTK_OBJECT(item), "activate",  
-               GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
-               GUINT_TO_POINTER(-1));
-       gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);     
-       gtk_widget_show(item);
-       
-       item = gtk_menu_item_new();
-       gtk_menu_append(GTK_MENU(label_menu), item);
-       gtk_widget_show(item);
-
-       /* create pixmap/label menu items */
-       for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
-               GtkWidget *label, *hbox, *align, *pixmap;
-               item = gtk_check_menu_item_new();
-               
-               label = gtk_label_new(label_colors[i].label);
-               gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-               gtk_widget_show(label);
-               hbox = gtk_hbox_new(FALSE, 0);
-               gtk_widget_show(hbox);
-               gtk_container_add(GTK_CONTAINER(item), hbox);
-
-               align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
-               gtk_widget_show(align);
-               gtk_container_set_border_width (GTK_CONTAINER(align), 1);
-
-               pixmap = GTK_WIDGET(label_colors[i].pixmap);
-               
-               gtk_container_add (GTK_CONTAINER (align), pixmap);
-                gtk_widget_set_usize (align, 16, 16);
-               gtk_widget_show(pixmap);
-
-               gtk_box_pack_start(GTK_BOX (hbox), align, FALSE, FALSE, 0);
-               gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
-
-               gtk_menu_append(GTK_MENU(label_menu), item);
-               gtk_signal_connect(GTK_OBJECT(item), "activate", 
-                                  GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
-                                  GUINT_TO_POINTER(i + 1));
-               gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);
-               gtk_widget_show(item);
-
-       }
-       
-       gtk_widget_show(label_menu);
-       gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menu_item), label_menu);
-       summaryview->label_menu = label_menu;   
-}
-
 SummaryView *summary_create(void)
 {
        SummaryView *summaryview;
-       gchar *titles[N_SUMMARY_COLS] = {_("M"), _("U")};
+       SummaryColumnState *col_state;
+       gint *col_pos;
+       SummaryColumnType col_default[N_SUMMARY_COLS] = {
+               S_COL_MARK,
+               S_COL_UNREAD,
+               S_COL_MIME,
+               S_COL_NUMBER,
+               S_COL_SCORE,
+               S_COL_SIZE,
+               S_COL_DATE,
+               S_COL_FROM,
+               S_COL_SUBJECT
+       };
+       const gchar *titles[N_SUMMARY_COLS];
        GtkWidget *vbox;
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
@@ -659,56 +470,69 @@ SummaryView *summary_create(void)
                             prefs_common.summaryview_width,
                             prefs_common.summaryview_height);
 
-       if (prefs_common.trans_hdr) {
-               titles[S_COL_NUMBER]  = _("No.");
-               titles[S_COL_DATE]    = _("Date");
-               titles[S_COL_FROM]    = _("From");
-               titles[S_COL_SUBJECT] = _("Subject");
-       } else {
-               titles[S_COL_NUMBER]  = "No.";
-               titles[S_COL_DATE]    = "Date";
-               titles[S_COL_FROM]    = "From";
-               titles[S_COL_SUBJECT] = "Subject";
+       col_state = summaryview->col_state;
+       col_pos = summaryview->col_pos;
+
+       for (i = 0; i < N_SUMMARY_COLS; i++) {
+               SummaryColumnType type;
+
+               type = col_state[i].type = col_default[i];
+               col_state[i].visible = TRUE;
+               col_pos[i] = i;
+               switch (type) {
+               case S_COL_SCORE:
+               case S_COL_SIZE:
+               case S_COL_NUMBER:
+               case S_COL_DATE:
+               case S_COL_FROM:
+               case S_COL_SUBJECT:
+                       if (prefs_common.trans_hdr)
+                               titles[i] = gettext(col_label[type]);
+                       else
+                               titles[i] = col_label[type];
+                       break;
+               default:
+                       titles[i] = gettext(col_label[type]);
+               }
        }
-       titles[S_COL_SIZE]  = _("Size");
-       titles[S_COL_SCORE] = _("Score");
 
-       ctree = gtk_sctree_new_with_titles(N_SUMMARY_COLS, S_COL_SUBJECT, titles);
+       ctree = gtk_sctree_new_with_titles
+               (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], (gchar **)titles);
        gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
                                            GTK_CLIST(ctree)->hadjustment);
        gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
                                            GTK_CLIST(ctree)->vadjustment);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_MARK,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_UNREAD,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_MIME,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_NUMBER,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_NUMBER],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SCORE,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SIZE,
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_MARK,
+       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), S_COL_UNREAD,
+       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), S_COL_MIME,
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                   SUMMARY_COL_MIME_WIDTH);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_NUMBER,
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_NUMBER],
                                   prefs_common.summary_col_number);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SCORE,
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
                                   prefs_common.summary_col_score);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SIZE,
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
                                   prefs_common.summary_col_size);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_DATE,
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_DATE],
                                   prefs_common.summary_col_date);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_FROM,
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_FROM],
                                   prefs_common.summary_col_from);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SUBJECT,
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SUBJECT],
                                   prefs_common.summary_col_subject);
        gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
@@ -727,41 +551,24 @@ SummaryView *summary_create(void)
                                       GTK_CAN_FOCUS);
 
        /* connect signal to the buttons for sorting */
-       gtk_signal_connect
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_NUMBER].button),
-                "clicked",
-                GTK_SIGNAL_FUNC(summary_num_clicked),
-                summaryview);
-       gtk_signal_connect
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SCORE].button),
-                "clicked",
-                GTK_SIGNAL_FUNC(summary_score_clicked),
-                summaryview);
-       gtk_signal_connect
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SIZE].button),
-                "clicked",
-                GTK_SIGNAL_FUNC(summary_size_clicked),
-                summaryview);
-       gtk_signal_connect
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_DATE].button),
-                "clicked",
-                GTK_SIGNAL_FUNC(summary_date_clicked),
-                summaryview);
-       gtk_signal_connect
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_FROM].button),
-                "clicked",
-                GTK_SIGNAL_FUNC(summary_from_clicked),
-                summaryview);
-       gtk_signal_connect
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SUBJECT].button),
-                "clicked",
-                GTK_SIGNAL_FUNC(summary_subject_clicked),
-                summaryview);
-       gtk_signal_connect
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_MARK].button),
-                "clicked",
-                GTK_SIGNAL_FUNC(summary_mark_clicked),
-                summaryview);
+#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
+       gtk_signal_connect \
+               (GTK_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
+                "clicked", \
+                GTK_SIGNAL_FUNC(func), \
+                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_MIME   , summary_mime_clicked);
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE  , summary_score_clicked);
+       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_SUBJECT, summary_subject_clicked);
+
+#undef CLIST_BUTTON_SIGNAL_CONNECT
 
        /* create status label */
        hbox = gtk_hbox_new(FALSE, 0);
@@ -803,6 +610,21 @@ SummaryView *summary_create(void)
                           GTK_SIGNAL_FUNC(summary_col_resized), summaryview);
         gtk_signal_connect(GTK_OBJECT(ctree), "open_row",
                           GTK_SIGNAL_FUNC(summary_open_row), summaryview);
+
+       gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
+                                GTK_SIGNAL_FUNC(summary_tree_expanded),
+                                summaryview);
+       gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_collapse",
+                                GTK_SIGNAL_FUNC(summary_tree_collapsed),
+                                summaryview);
+
+       gtk_signal_connect(GTK_OBJECT(ctree), "start_drag",
+                          GTK_SIGNAL_FUNC(summary_start_drag),
+                          summaryview);
+       gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
+                          GTK_SIGNAL_FUNC(summary_drag_data_get),
+                          summaryview);
+
        gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
                           GTK_SIGNAL_FUNC(summary_toggle_pressed),
                           summaryview);
@@ -819,11 +641,10 @@ SummaryView *summary_create(void)
        summaryview->popupmenu = popupmenu;
        summaryview->popupfactory = popupfactory;
        summaryview->msg_is_toggled_on = TRUE;
+       summaryview->lock_count = 0;
        summaryview->sort_mode = SORT_BY_NONE;
        summaryview->sort_type = GTK_SORT_ASCENDING;
 
-//     summary_create_label_menu(summaryview);
-
        summary_change_display_item(summaryview);
 
        gtk_widget_show_all(vbox);
@@ -849,19 +670,43 @@ void summary_init(SummaryView *summaryview)
                      ignorethread_xpm);
        PIXMAP_CREATE(summaryview->ctree, clipxpm, clipxpmmask, clip_xpm);
        PIXMAP_CREATE(summaryview->hbox, folderxpm, folderxpmmask,
-                     DIRECTORY_OPEN_XPM);
+                     dir_open_xpm);
 
        pixmap = gtk_pixmap_new(clipxpm, clipxpmmask);
        gtk_clist_set_column_widget(GTK_CLIST(summaryview->ctree),
-                                   S_COL_MIME, pixmap);
+                                   summaryview->col_pos[S_COL_MIME], pixmap);
        gtk_widget_show(pixmap);
 
-       if (!smallfont)
-               smallfont = gdk_fontset_load(SMALL_FONT);
+       if (!small_style) {
+               small_style = gtk_style_copy
+                       (gtk_widget_get_style(summaryview->ctree));
+               if (!smallfont)
+                       smallfont = gdk_fontset_load(SMALL_FONT);
+               small_style->font = smallfont;
+               small_marked_style = gtk_style_copy(small_style);
+               small_marked_style->fg[GTK_STATE_NORMAL] =
+                       summaryview->color_marked;
+               small_deleted_style = gtk_style_copy(small_style);
+               small_deleted_style->fg[GTK_STATE_NORMAL] =
+                       summaryview->color_dim;
+       }
+       if (!bold_style) {
+               bold_style = gtk_style_copy
+                       (gtk_widget_get_style(summaryview->ctree));
+               if (!boldfont)
+                       boldfont = gdk_fontset_load(BOLD_FONT);
+               bold_style->font = boldfont;
+               bold_marked_style = gtk_style_copy(bold_style);
+               bold_marked_style->fg[GTK_STATE_NORMAL] =
+                       summaryview->color_marked;
+               bold_deleted_style = gtk_style_copy(bold_style);
+               bold_deleted_style->fg[GTK_STATE_NORMAL] =
+                       summaryview->color_dim;
+       }
 
        style = gtk_style_copy(gtk_widget_get_style
                                (summaryview->statlabel_folder));
-       if (smallfont) style->font = smallfont;
+
        gtk_widget_set_style(summaryview->statlabel_folder, style);
        gtk_widget_set_style(summaryview->statlabel_select, style);
        gtk_widget_set_style(summaryview->statlabel_msgs, style);
@@ -872,8 +717,8 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_show(pixmap);
 
        summary_clear_list(summaryview);
+       summary_colorlabel_menu_create(summaryview);
        summary_set_menu_sensitive(summaryview);
-       summary_create_label_menu(summaryview);
 
 }
 
@@ -947,24 +792,34 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        GSList *mlist = NULL;
        gchar *buf;
        gboolean is_refresh;
-       guint prev_msgnum = 0;
+       guint selected_msgnum = 0;
+       guint displayed_msgnum = 0;
        GtkCTreeNode *selected_node = summaryview->folderview->selected;
        GSList *cur;
        gint sort_mode;
        gint sort_type;
+        static gboolean locked = FALSE;
+
+       if (summary_is_locked(summaryview)) return FALSE;
+
+       inc_lock();
+       summary_lock(summaryview);
 
        STATUSBAR_POP(summaryview->mainwin);
 
        is_refresh = (!prefs_common.open_inbox_on_inc &&
-                     item == summaryview->folder_item) ? TRUE : FALSE;
+                     item == summaryview->folder_item &&
+                     update_cache == FALSE) ? TRUE : FALSE;
        if (is_refresh) {
-               prev_msgnum = summary_get_current_msgnum(summaryview);
-               if (prev_msgnum < 1)
-                       is_refresh = FALSE;
+               selected_msgnum = summary_get_msgnum(summaryview,
+                                                    summaryview->selected);
+               displayed_msgnum = summary_get_msgnum(summaryview,
+                                                     summaryview->displayed);
        }
 
        /* process the marks if any */
-       if (summaryview->moved > 0 || summaryview->copied > 0) {
+       if (summaryview->mainwin->lock_count == 0 &&
+           (summaryview->moved > 0 || summaryview->copied > 0)) {
                AlertValue val;
 
                val = alertpanel(_("Process mark"),
@@ -974,10 +829,18 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        summary_execute(summaryview);
                else if (G_ALERTALTERNATE == val)
                        summary_write_cache(summaryview);
-               else
+               else {
+                       summary_unlock(summaryview);
+                       inc_unlock();
                        return FALSE;
-       } else
+               }
+               folder_update_op_count();
+       }
+       else if (!summaryview->filtering_happened) {
                summary_write_cache(summaryview);
+       }
+
+       summaryview->filtering_happened = FALSE;
 
        summaryview->folderview->opened = selected_node;
 
@@ -985,7 +848,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
-       messageview_clear(summaryview->messageview);
+       if (!is_refresh)
+               messageview_clear(summaryview->messageview);
 
        buf = NULL;
        if (!item || !item->path || !item->parent || item->no_select ||
@@ -994,16 +858,20 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
              change_dir(buf) < 0))) {
                g_free(buf);
                debug_print(_("empty folder\n\n"));
+               if (is_refresh)
+                       messageview_clear(summaryview->messageview);
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                gtk_clist_thaw(GTK_CLIST(ctree));
+               summary_unlock(summaryview);
+               inc_unlock();
                return TRUE;
        }
        g_free(buf);
 
        summaryview->folder_item = item;
 
-       gtk_signal_disconnect_by_data(GTK_OBJECT(ctree), summaryview);
+       gtk_signal_handler_block_by_data(GTK_OBJECT(ctree), summaryview);
 
        buf = g_strdup_printf(_("Scanning folder (%s)..."), item->path);
        debug_print("%s\n", buf);
@@ -1059,30 +927,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        summary_write_cache(summaryview);
 
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-                          GTK_SIGNAL_FUNC(summary_selected), summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
-                          GTK_SIGNAL_FUNC(summary_button_pressed),
-                          summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_release_event",
-                          GTK_SIGNAL_FUNC(summary_button_released),
-                          summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
-                          GTK_SIGNAL_FUNC(summary_key_pressed), summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
-                          GTK_SIGNAL_FUNC(summary_col_resized), summaryview);
-        gtk_signal_connect(GTK_OBJECT(ctree), "open_row",
-                          GTK_SIGNAL_FUNC(summary_open_row), summaryview);
-
-       /*connect drag and drop signal*/
-       gtk_signal_connect(GTK_OBJECT (ctree),"start_drag",
-                          GTK_SIGNAL_FUNC (summary_start_drag),
-                          summaryview);
-       gtk_signal_connect(GTK_OBJECT (ctree),"drag_data_get",
-                          GTK_SIGNAL_FUNC (summary_drag_data_get),
-                          summaryview);
+       gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), summaryview);
 
-        gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_clist_thaw(GTK_CLIST(ctree));
 
        /* sort before */
        sort_mode = prefs_folder_item_get_sort_mode(item);
@@ -1099,7 +946,21 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        }
 
        if (is_refresh) {
-               summary_select_by_msgnum(summaryview, prev_msgnum);
+               summaryview->displayed =
+                       summary_find_msg_by_msgnum(summaryview,
+                                                  displayed_msgnum);
+               if (!summaryview->displayed)
+                       messageview_clear(summaryview->messageview);
+               summary_select_by_msgnum(summaryview, selected_msgnum);
+               if (!summaryview->selected) {
+                       /* no selected message - select first unread
+                          message, but do not display it */
+                       node = summary_find_next_unread_msg(summaryview, NULL);
+                       if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
+                               node = gtk_ctree_node_nth
+                                       (ctree, GTK_CLIST(ctree)->rows - 1);
+                       summary_select_node(summaryview, node, FALSE);
+               }
        } else {
                /* select first unread message */
                if (sort_mode == SORT_BY_SCORE)
@@ -1108,29 +969,31 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                else
                        node = summary_find_next_unread_msg(summaryview, NULL);
 
-               if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
-                       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
-               if (node) {
-                       GTK_EVENTS_FLUSH();
-                       gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
-                       gtk_widget_grab_focus(GTK_WIDGET(ctree));
-                       if (prefs_common.open_unread_on_enter)
-                               summaryview->display_msg = TRUE;
-                       gtk_sctree_select(GTK_SCTREE(ctree), node);
-               }
+               if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
+                       /* Get the last visible node on screen */
+                       /* FIXME: huh, what happens if node is null? that allowed?? */
+                       node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+               }       
+               if (prefs_common.open_unread_on_enter) {
+                       summary_unlock(summaryview);
+                       summary_select_node(summaryview, node, TRUE);
+                       summary_lock(summaryview);
+               } else
+                       summary_select_node(summaryview, node, FALSE);
        }
 
        summary_status_show(summaryview);
 
        summary_set_menu_sensitive(summaryview);
 
-       main_window_set_toolbar_sensitive
-               (summaryview->mainwin, summaryview->selected ? TRUE : FALSE);
+       main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        debug_print("\n");
-       STATUSBAR_PUSH(summaryview->mainwin, _("done."));
+       STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
 
        main_window_cursor_normal(summaryview->mainwin);
+       summary_unlock(summaryview);
+       inc_unlock();
 
        return TRUE;
 }
@@ -1182,8 +1045,13 @@ void summary_clear_list(SummaryView *summaryview)
        summaryview->sort_type = GTK_SORT_ASCENDING;
 
        gtk_clist_clear(clist);
-       optimal_width = gtk_clist_optimal_column_width(clist, S_COL_SUBJECT);
-       gtk_clist_set_column_width(clist, S_COL_SUBJECT, optimal_width);
+       if (summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
+               optimal_width = gtk_clist_optimal_column_width
+                       (clist, summaryview->col_pos[S_COL_SUBJECT]);
+               gtk_clist_set_column_width
+                       (clist, summaryview->col_pos[S_COL_SUBJECT],
+                        optimal_width);
+       }
 
        gtk_clist_thaw(clist);
 }
@@ -1192,15 +1060,29 @@ void summary_clear_all(SummaryView *summaryview)
 {
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
-       main_window_set_toolbar_sensitive(summaryview->mainwin, FALSE);
+       main_window_set_toolbar_sensitive(summaryview->mainwin);
        summary_status_show(summaryview);
 }
 
-static void summary_set_menu_sensitive(SummaryView *summaryview)
+void summary_lock(SummaryView *summaryview)
+{
+       summaryview->lock_count++;
+}
+
+void summary_unlock(SummaryView *summaryview)
+{
+       if (summaryview->lock_count)
+               summaryview->lock_count--;
+}
+
+gboolean summary_is_locked(SummaryView *summaryview)
+{
+       return summaryview->lock_count > 0;
+}
+
+SummarySelection summary_get_selection_type(SummaryView *summaryview)
 {
-       GtkItemFactory *ifactory = summaryview->popupfactory;
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
-       gboolean sens;
        SummarySelection selection;
 
        if (!clist->row_list)
@@ -1212,7 +1094,17 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        else
                selection = SUMMARY_SELECTED_MULTIPLE;
 
-       main_window_set_menu_sensitive(summaryview->mainwin, selection);
+       return selection;
+}
+
+static void summary_set_menu_sensitive(SummaryView *summaryview)
+{
+       GtkItemFactory *ifactory = summaryview->popupfactory;
+       SummarySelection selection;
+       gboolean sens;
+
+       selection = summary_get_selection_type(summaryview);
+       main_window_set_menu_sensitive(summaryview->mainwin);
 
        if (selection == SUMMARY_NONE) {
                GtkWidget *submenu;
@@ -1223,28 +1115,41 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));
                return;
-       } 
+       }
 
        if (summaryview->folder_item->folder->type != F_NEWS) {
-               if (summaryview->folder_item->stype != F_TRASH)
-                       menu_set_sensitive(ifactory, "/Delete", TRUE);
                menu_set_sensitive(ifactory, "/Move...", TRUE);
                menu_set_sensitive(ifactory, "/Copy...", TRUE);
+               menu_set_sensitive(ifactory, "/Delete", TRUE);
        }
 
-       gtk_widget_set_sensitive(summaryview->label_menu_item, 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 sender",          sens);
        menu_set_sensitive(ifactory, "/Reply to all",             sens);
        menu_set_sensitive(ifactory, "/Forward",                  TRUE);
        menu_set_sensitive(ifactory, "/Forward as attachment",    TRUE);
-       
-       menu_set_sensitive(ifactory, "/Open in new window", sens);
-       menu_set_sensitive(ifactory, "/View source", sens);
-       menu_set_sensitive(ifactory, "/Show all header", sens);
+
+       menu_set_sensitive(ifactory, "/Add sender to address book", 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_DRAFT) ||
            (summaryview->folder_item->stype == F_OUTBOX) ||
            (summaryview->folder_item->stype == F_QUEUE))
@@ -1253,16 +1158,6 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menu_set_sensitive(ifactory, "/Save as...", sens);
        menu_set_sensitive(ifactory, "/Print...",   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/Ignore thread",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
-
        menu_set_sensitive(ifactory, "/Select all", TRUE);
 
        if (summaryview->folder_item->folder->account)
@@ -1273,32 +1168,84 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
 }
 
-void summary_select_next_unread(SummaryView *summaryview)
+void summary_select_prev_unread(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       node = summary_find_next_unread_msg(summaryview,
-                                           summaryview->selected);
+       node = summary_find_prev_unread_msg(summaryview, summaryview->selected);
 
-       if (node) {
+       if (!node) {
+               AlertValue val;
+
+               switch (prefs_common.next_unread_msg_dialog) {
+                       case NEXTUNREADMSGDIALOG_ALWAYS:
+                               val = alertpanel(_("No more unread messages"),
+                                                _("No unread message found. "
+                                                  "Search from the end?"),
+                                                _("Yes"), _("No"), NULL);
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_YES:
+                               val = G_ALERTDEFAULT;
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_NO:
+                               val = !G_ALERTDEFAULT;
+                               break;
+                       default:
+                               debug_print(
+                                       _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+               }
+               if (val != G_ALERTDEFAULT) return;
+               node = summary_find_prev_unread_msg(summaryview, NULL);
+       }
+
+       if (!node) {
+               alertpanel_notice(_("No unread messages."));
+       } else {
+               gtkut_ctree_expand_parent_all(ctree, node);
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
                gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->displayed == node)
+                       summaryview->displayed = NULL;
+               summary_display_msg(summaryview, node, FALSE);
+       }
+}
 
-               /* BUGFIX: select next unread message 
-                * REVERT: causes incorrect folder stats
-                * gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0); 
-                */
+void summary_select_next_unread(SummaryView *summaryview)
+{
+       GtkCTreeNode *node;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+       node = summary_find_next_unread_msg(summaryview, summaryview->selected);
 
+       if (node) {
+               gtkut_ctree_expand_parent_all(ctree, node);
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;
                summary_display_msg(summaryview, node, FALSE);
        } else {
                AlertValue val;
 
-               val = alertpanel(_("No unread message"),
-                                _("No unread message found. Go to next folder?"),
-                                _("Yes"), _("No"), NULL);
+               switch (prefs_common.next_unread_msg_dialog) {
+                       case NEXTUNREADMSGDIALOG_ALWAYS:
+                               val = alertpanel(_("No more unread messages"),
+                                                _("No unread message found. "
+                                                  "Go to next folder?"),
+                                                _("Yes"), _("No"), NULL);
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_YES:
+                               val = G_ALERTDEFAULT;
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_NO:
+                               val = !G_ALERTDEFAULT;
+                               break;
+                       default:
+                               debug_print(
+                                       _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+               }
+
                if (val == G_ALERTDEFAULT) {
                        if (gtk_signal_n_emissions_by_name
                                (GTK_OBJECT(ctree), "key_press_event") > 0)
@@ -1310,28 +1257,28 @@ void summary_select_next_unread(SummaryView *summaryview)
        }
 }
 
-void summary_select_next_marked(SummaryView *summaryview)
+void summary_select_prev_marked(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       node = summary_find_next_marked_msg(summaryview,
-                                           summaryview->selected);
+       node = summary_find_prev_marked_msg(summaryview, summaryview->selected);
 
        if (!node) {
                AlertValue val;
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
-                                  "Search from the beginning?"),
+                                  "Search from the end?"),
                                 _("Yes"), _("No"), NULL);
                if (val != G_ALERTDEFAULT) return;
-               node = summary_find_next_marked_msg(summaryview,
-                                                   NULL);
+               node = summary_find_prev_marked_msg(summaryview, NULL);
        }
+
        if (!node) {
                alertpanel_notice(_("No marked messages."));
        } else {
+               gtkut_ctree_expand_parent_all(ctree, node);
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
                gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
@@ -1340,28 +1287,28 @@ void summary_select_next_marked(SummaryView *summaryview)
        }
 }
 
-void summary_select_prev_marked(SummaryView *summaryview)
+void summary_select_next_marked(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       node = summary_find_prev_marked_msg(summaryview,
-                                           summaryview->selected);
+       node = summary_find_next_marked_msg(summaryview, summaryview->selected);
 
        if (!node) {
                AlertValue val;
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
-                                  "Search from the end?"),
+                                  "Search from the beginning?"),
                                 _("Yes"), _("No"), NULL);
                if (val != G_ALERTDEFAULT) return;
-               node = summary_find_prev_marked_msg(summaryview,
-                                                   NULL);
+               node = summary_find_next_marked_msg(summaryview, NULL);
        }
+
        if (!node) {
                alertpanel_notice(_("No marked messages."));
        } else {
+               gtkut_ctree_expand_parent_all(ctree, node);
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
                gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
@@ -1370,36 +1317,169 @@ void summary_select_prev_marked(SummaryView *summaryview)
        }
 }
 
-void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
+void summary_select_prev_labeled(SummaryView *summaryview)
+{
+       GtkCTreeNode *node;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+       node = summary_find_prev_labeled_msg(summaryview, summaryview->selected);
+
+       if (!node) {
+               AlertValue val;
+
+               val = alertpanel(_("No more labeled messages"),
+                                _("No labeled message found. "
+                                  "Search from the end?"),
+                                _("Yes"), _("No"), NULL);
+               if (val != G_ALERTDEFAULT) return;
+               node = summary_find_prev_labeled_msg(summaryview, NULL);
+       }
+
+       if (!node) {
+               alertpanel_notice(_("No labeled messages."));
+       } else {
+               gtkut_ctree_expand_parent_all(ctree, node);
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->displayed == node)
+                       summaryview->displayed = NULL;
+               summary_display_msg(summaryview, node, FALSE);
+       }
+}
+
+void summary_select_next_labeled(SummaryView *summaryview)
+{
+       GtkCTreeNode *node;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+       node = summary_find_next_labeled_msg(summaryview, summaryview->selected);
+
+       if (!node) {
+               AlertValue val;
+
+               val = alertpanel(_("No more labeled messages"),
+                                _("No labeled message found. "
+                                  "Search from the beginning?"),
+                                _("Yes"), _("No"), NULL);
+               if (val != G_ALERTDEFAULT) return;
+               node = summary_find_next_labeled_msg(summaryview, NULL);
+       }
+
+       if (!node) {
+               alertpanel_notice(_("No labeled messages."));
+       } else {
+               gtkut_ctree_expand_parent_all(ctree, node);
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->displayed == node)
+                       summaryview->displayed = NULL;
+               summary_display_msg(summaryview, node, FALSE);
+       }
+}
+
+void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
+{
+       GtkCTreeNode *node;
+
+       node = summary_find_msg_by_msgnum(summaryview, msgnum);
+       summary_select_node(summaryview, node, FALSE);
+}
+
+/**
+ * summary_select_node:
+ * @summaryview: Summary view.
+ * @node: Summary tree node.
+ * @display_msg: TRUE to display the selected message.
+ *
+ * Select @node (bringing it into view by scrolling and expanding its
+ * thread, if necessary) and unselect all others.  If @display_msg is
+ * TRUE, display the corresponding message in the message view.
+ **/
+void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
+                        gboolean display_msg)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+       if (node) {
+               GTK_EVENTS_FLUSH();
+               gtkut_ctree_expand_parent_all(ctree, node);
+               gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+               gtk_widget_grab_focus(GTK_WIDGET(ctree));
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               summaryview->display_msg = display_msg;
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+       }
+}
+
+static guint summary_get_msgnum(SummaryView *summaryview, GtkCTreeNode *node)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       if (!node)
+               return 0;
+       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       return msginfo->msgnum;
+}
+
+static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
+                                          GtkCTreeNode *current_node)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+
+       if (current_node)
+               node = current_node;
+       else
+               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+
+       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (!MSG_IS_DELETED(msginfo->flags)) break;
+       }
+
+       return node;
+}
+
+static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
+                                          GtkCTreeNode *current_node)
 {
-       GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
 
-       node = summary_find_msg_by_msgnum(summaryview, msgnum);
+       if (current_node)
+               node = current_node;
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-       if (node) {
-               GTK_EVENTS_FLUSH();
-               gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
-               gtk_widget_grab_focus(GTK_WIDGET(ctree));
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->msg_is_toggled_on) {
-                       if (summaryview->displayed == node)
-                               summaryview->displayed = NULL;
-                       summary_display_msg(summaryview, node, FALSE);
-               }
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (!MSG_IS_DELETED(msginfo->flags)) break;
        }
+
+       return node;
 }
 
-guint summary_get_current_msgnum(SummaryView *summaryview)
+static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
+                                                 GtkCTreeNode *current_node)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
        MsgInfo *msginfo;
 
-       if (!summaryview->selected)
-               return 0;
-       msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
-       return msginfo->msgnum;
+       if (current_node)
+               node = current_node;
+       else
+               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+
+       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
+       }
+
+       return node;
 }
 
 static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
@@ -1411,11 +1491,10 @@ static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
 
        if (current_node)
                node = current_node;
-               /*node = GTK_CTREE_NODE_NEXT(current_node);*/
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
                if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
        }
@@ -1423,7 +1502,7 @@ static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
        return node;
 }
 
-static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
+static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
                                                  GtkCTreeNode *current_node)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -1431,11 +1510,11 @@ static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        if (current_node)
-               node = GTK_CTREE_NODE_NEXT(current_node);
+               node = GTK_CTREE_NODE_PREV(current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
                if (MSG_IS_MARKED(msginfo->flags)) break;
        }
@@ -1443,7 +1522,7 @@ static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
        return node;
 }
 
-static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
+static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
                                                  GtkCTreeNode *current_node)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -1451,11 +1530,11 @@ static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        if (current_node)
-               node = GTK_CTREE_NODE_PREV(current_node);
+               node = gtkut_ctree_node_next(ctree, current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
                if (MSG_IS_MARKED(msginfo->flags)) break;
        }
@@ -1463,45 +1542,62 @@ static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
        return node;
 }
 
-static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
-                                               guint msgnum)
+static GtkCTreeNode *summary_find_prev_labeled_msg(SummaryView *summaryview,
+                                                  GtkCTreeNode *current_node)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
        MsgInfo *msginfo;
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       if (current_node)
+               node = GTK_CTREE_NODE_PREV(current_node);
+       else
+               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (msginfo->msgnum == msgnum) break;
+               if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
        }
 
        return node;
 }
 
-#if 0
-static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
-                                                 GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_next_labeled_msg(SummaryView *summaryview,
+                                                  GtkCTreeNode *current_node)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node)
-               node = current_node;
-               /*node = GTK_CTREE_NODE_PREV(current_node);*/
+               node = gtkut_ctree_node_next(ctree, current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (MSG_IS_UNREAD(msginfo->flags)) break;
+               if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+       }
+
+       return node;
+}
+
+static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
+                                               guint msgnum)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+
+       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (msginfo->msgnum == msgnum) break;
        }
 
        return node;
 }
-#endif
 
 static guint attract_hash_func(gconstpointer key)
 {
@@ -1631,12 +1727,12 @@ static void summary_update_status(SummaryView *summaryview)
        summaryview->deleted = summaryview->moved = summaryview->copied = 0;
 
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-            node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+            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))
+               if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
                        summaryview->unread++;
                if (MSG_IS_DELETED(msginfo->flags))
                        summaryview->deleted++;
@@ -1720,7 +1816,7 @@ static void summary_status_show(SummaryView *summaryview)
        g_free(cp);
 
        if (summaryview->folder_item &&
-           summaryview->folder_item->folder->type == F_MH) {
+           FOLDER_IS_LOCAL(summaryview->folder_item->folder)) {
                str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
                                      summaryview->newmsgs,
                                      summaryview->unread,
@@ -1752,6 +1848,15 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
                return;
 
        switch (type) {
+       case SORT_BY_MARK:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
+               break;
+       case SORT_BY_UNREAD:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+               break;
+       case SORT_BY_MIME:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
+               break;
        case SORT_BY_NUMBER:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
                break;
@@ -1810,6 +1915,44 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        main_window_cursor_normal(summaryview->mainwin);
 }
 
+gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
+                                  GtkCTreeNode *cnode, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *)data;
+       MsgInfo *msginfo = (MsgInfo *)gnode->data;
+       gchar *text[N_SUMMARY_COLS];
+       gint *col_pos = summaryview->col_pos;
+       const gchar *msgid = msginfo->msgid;
+       GHashTable *msgid_table = summaryview->msgid_table;
+
+       summary_set_header(summaryview, text, msginfo);
+
+       gtk_ctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
+                               NULL, NULL, NULL, NULL, FALSE,
+                               gnode->parent->parent ? TRUE : FALSE);
+#define SET_TEXT(col) \
+       gtk_ctree_node_set_text(ctree, cnode, col_pos[col], \
+                               text[col_pos[col]])
+
+       SET_TEXT(S_COL_NUMBER);
+       SET_TEXT(S_COL_SCORE);
+       SET_TEXT(S_COL_SIZE);
+       SET_TEXT(S_COL_DATE);
+       SET_TEXT(S_COL_FROM);
+       SET_TEXT(S_COL_SUBJECT);
+
+#undef SET_TEXT
+
+       GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
+       summary_set_marks_func(ctree, cnode, summaryview);
+
+       if (msgid)
+       //if (msgid && g_hash_table_lookup(msgid_table, msgid) == NULL)
+               g_hash_table_insert(msgid_table, (gchar *)msgid, cnode);
+
+       return TRUE;
+}
+
 static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
                                           gchar * subject)
 {
@@ -1835,8 +1978,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        MsgInfo *msginfo;
        MsgInfo *parentinfo;
        MsgInfo *cur_msginfo;
-       GtkCTreeNode *node, *parent;
-       gchar *text[N_SUMMARY_COLS];
+       GtkCTreeNode *node = NULL;
        GHashTable *msgid_table;
        GHashTable *subject_table;
        GSList * cur;
@@ -1847,6 +1989,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        debug_print(_("\tSetting summary from message data..."));
        STATUSBAR_PUSH(summaryview->mainwin,
                       _("Setting summary from message data..."));
+       gdk_flush();
 
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
        summaryview->msgid_table = msgid_table;
@@ -1856,8 +1999,6 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        if (prefs_common.use_addr_book)
                start_address_completion();
        
-       main_window_set_thread_option(summaryview->mainwin);
-
        for (cur = mlist ; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
                msginfo->threadscore = msginfo->score;
@@ -1871,132 +2012,51 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                summaryview->folder_item->prefs->important_score;
        }
        
-       /*      if (prefs_common.enable_thread) { */
-       if (summaryview->folder_item->prefs->enable_thread) {
-               for (; mlist != NULL; mlist = mlist->next) {
-                       msginfo = (MsgInfo *)mlist->data;
-                       parent = NULL;
-
-                       summary_set_header(text, msginfo);
-
-                       /* search parent node for threading */
-                       if (msginfo->inreplyto && *msginfo->inreplyto) {
-                               parent = g_hash_table_lookup
-                                       (msgid_table, msginfo->inreplyto);
-                       }
-                       if (parent == NULL && msginfo->subject &&
-                           g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
-                               parent = subject_table_lookup
-                                       (subject_table, msginfo->subject);
-                       }
-                       if(parent) {
-                               parentinfo = gtk_ctree_node_get_row_data(ctree, parent);
-                               if(parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
-/*
-                                       if (MSG_IS_NEW(msginfo->flags))
-                                               summaryview->newmsgs--;
-                                       if (MSG_IS_UNREAD(msginfo->flags))
-                                               summaryview->unread--;
-*/
-                                       MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
-                               }
-                       }
-
-                       node = gtk_ctree_insert_node
-                               (ctree, parent, NULL, text, 2,
-                                NULL, NULL, NULL, NULL, FALSE, TRUE);
-                       GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
+       if (summaryview->folder_item->threaded) {
+               GNode *root, *gnode;
 
-                       summary_set_marks_func(ctree, node, summaryview);
-                       
-                       if ( MSG_GET_LABEL(msginfo->flags) )
-                         summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
-
-                       /* preserve previous node if the message is
-                          duplicated */
-                       if (msginfo->msgid && *msginfo->msgid &&
-                           g_hash_table_lookup(msgid_table, msginfo->msgid)
-                           == NULL)
-                               g_hash_table_insert(msgid_table,
-                                                   msginfo->msgid, node);
-                       if (msginfo->subject &&
-                           subject_table_lookup(subject_table,
-                                                msginfo->subject) == NULL) {
-                               subject_table_insert(subject_table,
-                                                    msginfo->subject, node);
-                       }
+               root = procmsg_get_thread_tree(mlist);
 
-                       cur_parent = parent;
-                       cur_msginfo = msginfo;
-                       while (cur_parent != NULL) {
-                               parentinfo = gtk_ctree_node_get_row_data(ctree, cur_parent);
-
-                               if (!parentinfo)
-                                       break;
-                               
-                               if (parentinfo->threadscore <
-                                   cur_msginfo->threadscore) {
-                                       gchar * s;
-                                       parentinfo->threadscore =
-                                               cur_msginfo->threadscore;
-#if 0
-                                       s = itos(parentinfo->threadscore);
-                                       gtk_ctree_node_set_text(ctree, cur_parent, S_COL_SCORE, s);
-#endif
-                               }
-                               else break;
-                               
-                               cur_msginfo = parentinfo;
-                               if (cur_msginfo->inreplyto &&
-                                   *cur_msginfo->inreplyto) {
-                                       cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
-                               }
-                               if (cur_parent == NULL &&
-                                   cur_msginfo->subject &&
-                                   g_strncasecmp(cur_msginfo->subject,
-                                                 "Re: ", 4) == 0) {
-                                       cur_parent = subject_table_lookup(subject_table, cur_msginfo->subject);
-                               }
-                       }
+               for (gnode = root->children; gnode != NULL;
+                    gnode = gnode->next) {
+                       node = gtk_ctree_insert_gnode
+                               (ctree, NULL, node, gnode,
+                                summary_insert_gnode_func, summaryview);
                }
 
-               /* complete the thread */
-               summary_thread_build(summaryview);
+               g_node_destroy(root);
+
+               summary_thread_init(summaryview);
        } else {
+               gchar *text[N_SUMMARY_COLS];
+
+               mlist = g_slist_reverse(mlist);
                for (; mlist != NULL; mlist = mlist->next) {
                        msginfo = (MsgInfo *)mlist->data;
 
-                       summary_set_header(text, msginfo);
+                       summary_set_header(summaryview, text, msginfo);
 
                        node = gtk_ctree_insert_node
-                               (ctree, NULL, NULL, text, 2,
-                                NULL, NULL, NULL, NULL, FALSE, TRUE);
+                               (ctree, NULL, node, text, 2,
+                                NULL, NULL, NULL, NULL, FALSE, FALSE);
                        GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
                        summary_set_marks_func(ctree, node, summaryview);
 
-                       if ( MSG_GET_LABEL(msginfo->flags) )
-                         summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
-
-                       if (msginfo->msgid && *msginfo->msgid &&
-                           g_hash_table_lookup(msgid_table, msginfo->msgid)
-                           == NULL)
+                       if (msginfo->msgid)
                                g_hash_table_insert(msgid_table,
                                                    msginfo->msgid, node);
-
-                       if (msginfo->subject &&
-                           subject_table_lookup(subject_table,
-                                                msginfo->subject) == NULL)
-                               subject_table_insert(subject_table,
-                                                    msginfo->subject, node);
                }
+               mlist = g_slist_reverse(mlist);
        }
 
-       if (prefs_common.enable_hscrollbar) {
+       if (prefs_common.enable_hscrollbar &&
+           summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
                gint optimal_width;
 
                optimal_width = gtk_clist_optimal_column_width
-                       (GTK_CLIST(ctree), S_COL_SUBJECT);
-               gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SUBJECT,
+                       (GTK_CLIST(ctree), summaryview->col_pos[S_COL_SUBJECT]);
+               gtk_clist_set_column_width(GTK_CLIST(ctree),
+                                          summaryview->col_pos[S_COL_SUBJECT],
                                           optimal_width);
        }
 
@@ -2027,6 +2087,8 @@ gint summary_write_cache(SummaryView *summaryview)
        gchar *buf;
        gchar *cachefile, *markfile;
        GSList * cur;
+       gint filemode = 0;
+       PrefsFolderItem *prefs;
 
        if (!summaryview->folder_item || !summaryview->folder_item->path)
                return -1;
@@ -2043,6 +2105,20 @@ gint summary_write_cache(SummaryView *summaryview)
        }
        if (change_file_mode_rw(fps.cache_fp, cachefile) < 0)
                FILE_OP_ERROR(cachefile, "chmod");
+
+       prefs = summaryview->folder_item->prefs;
+        if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+               /* for cache file */
+               filemode = prefs->folder_chmod;
+               if (filemode & S_IRGRP) filemode |= S_IWGRP;
+               if (filemode & S_IROTH) filemode |= S_IWOTH;
+#if HAVE_FCHMOD
+               fchmod(fileno(fps.cache_fp), filemode);
+#else
+               chmod(cachefile, filemode);
+#endif
+        }
+
        g_free(cachefile);
 
        markfile = folder_item_get_mark_file(summaryview->folder_item);
@@ -2054,6 +2130,14 @@ gint summary_write_cache(SummaryView *summaryview)
        }
        if (change_file_mode_rw(fps.mark_fp, markfile) < 0)
                FILE_OP_ERROR(markfile, "chmod");
+        if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+#if HAVE_FCHMOD
+               fchmod(fileno(fps.mark_fp), filemode);
+#else
+               chmod(markfile, filemode);
+#endif
+        }
+
        g_free(markfile);
 
        buf = g_strdup_printf(_("Writing summary cache (%s)..."),
@@ -2097,34 +2181,37 @@ static void summary_write_cache_func(GtkCTree *ctree, GtkCTreeNode *node,
        procmsg_write_flags(msginfo, fps->mark_fp);
 }
 
-static void summary_set_header(gchar *text[], MsgInfo *msginfo)
+static void summary_set_header(SummaryView *summaryview, gchar *text[],
+                              MsgInfo *msginfo)
 {
        static gchar date_modified[80];
        static gchar *to = NULL;
        static gchar *from_name = NULL;
        static gchar col_number[11];
        static gchar col_score[11];
+       gint *col_pos = summaryview->col_pos;
+
+       text[col_pos[S_COL_MARK]]   = NULL;
+       text[col_pos[S_COL_UNREAD]] = NULL;
+       text[col_pos[S_COL_MIME]]   = NULL;
+       text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
+       text[col_pos[S_COL_SIZE]]   = to_human_readable(msginfo->size);
 
-       text[S_COL_MARK]   = NULL;
-       text[S_COL_UNREAD] = NULL;
-       text[S_COL_MIME]   = NULL;
-       text[S_COL_NUMBER] = itos_buf(col_number, msginfo->msgnum);
-       text[S_COL_SIZE]   = to_human_readable(msginfo->size);
 #if 0
-       text[S_COL_SCORE]  = itos_buf(col_score, msginfo->threadscore);
+       text[col_pos[S_COL_SCORE]]  = itos_buf(col_score, msginfo->threadscore);
 #else
-       text[S_COL_SCORE]  = itos_buf(col_score, msginfo->score);
+       text[col_pos[S_COL_SCORE]]  = itos_buf(col_score, msginfo->score);
 #endif
 
        if (msginfo->date_t) {
                procheader_date_get_localtime(date_modified,
                                              sizeof(date_modified),
                                              msginfo->date_t);
-               text[S_COL_DATE] = date_modified;
+               text[col_pos[S_COL_DATE]] = date_modified;
        } else if (msginfo->date)
-               text[S_COL_DATE] = msginfo->date;
+               text[col_pos[S_COL_DATE]] = msginfo->date;
        else
-               text[S_COL_DATE] = _("(No Date)");
+               text[col_pos[S_COL_DATE]] = _("(No Date)");
 
        text[S_COL_FROM] = msginfo->fromname ? msginfo->fromname :
                _("(No From)");
@@ -2135,10 +2222,10 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
                Xalloca(from, strlen(msginfo->from) + 1, return);
                strcpy(from, msginfo->from);
                extract_address(from);
-               if (account_find_mail_from_address(from)) {
+               if (account_find_from_address(from)) {
                        g_free(to);
                        to = g_strconcat("-->", msginfo->to, NULL);
-                       text[S_COL_FROM] = to;
+                       text[col_pos[S_COL_FROM]] = to;
                }
        }
 
@@ -2150,17 +2237,19 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
                Xalloca(from, strlen(msginfo->from) + 1, return);
                strcpy(from, msginfo->from);
                extract_address(from);
-               count = complete_address(from);
-               if (count > 1) {
-                       g_free(from_name);
-                       from = get_complete_address(1);
-                       from_name = procheader_get_fromname(from);
-                       g_free(from);
-                       text[S_COL_FROM] = from_name;
+               if (*from) {
+                       count = complete_address(from);
+                       if (count > 1) {
+                               g_free(from_name);
+                               from = get_complete_address(1);
+                               from_name = procheader_get_fromname(from);
+                               g_free(from);
+                               text[S_COL_FROM] = from_name;
+                       }
                }
        }
 
-       text[S_COL_SUBJECT] = msginfo->subject ? msginfo->subject :
+       text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
                _("(No Subject)");
 }
 
@@ -2178,21 +2267,21 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gchar *filename;
-       static gboolean lock = FALSE;
 
        if (!new_window && summaryview->displayed == row) return;
        g_return_if_fail(row != NULL);
 
-       if (lock) return;
-       lock = TRUE;
+       if (summary_is_locked(summaryview)) return;
+       summary_lock(summaryview);
 
        STATUSBAR_POP(summaryview->mainwin);
+       GTK_EVENTS_FLUSH();
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
        filename = procmsg_get_message_file(msginfo);
        if (!filename) {
-               lock = FALSE;
+               summary_unlock(summaryview);
                return;
        }
        g_free(filename);
@@ -2202,10 +2291,8 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->unread--;
        if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
                CHANGE_FLAGS(msginfo);
-
                summary_set_row_marks(summaryview, row);
                gtk_clist_thaw(GTK_CLIST(ctree));
                summary_status_show(summaryview);
@@ -2236,7 +2323,7 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
                header_window_show(summaryview->headerwin, msginfo);
 
-       lock = FALSE;
+       summary_unlock(summaryview);
 }
 
 void summary_redisplay_msg(SummaryView *summaryview)
@@ -2292,9 +2379,16 @@ void summary_step(SummaryView *summaryview, GtkScrollType type)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
+       if (type == GTK_SCROLL_STEP_FORWARD) {
+               GtkCTreeNode *node;
+               node = gtkut_ctree_node_next(ctree, summaryview->selected);
+               if (node)
+                       gtkut_ctree_expand_parent_all(ctree, node);
+       }
+
        gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
                                type, 0.0);
-
+       
        if (summaryview->msg_is_toggled_on)
                summary_display_msg(summaryview, summaryview->selected, FALSE);
 }
@@ -2340,11 +2434,53 @@ static void summary_toggle_view(SummaryView *summaryview)
        gtk_widget_grab_focus(summaryview->ctree);
 }
 
+static gboolean summary_search_unread_recursive(GtkCTree *ctree,
+                                               GtkCTreeNode *node)
+{
+       MsgInfo *msginfo;
+
+       if (node) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (msginfo && MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                       return TRUE;
+               node = GTK_CTREE_ROW(node)->children;
+       } else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       while (node) {
+               if (summary_search_unread_recursive(ctree, node) == TRUE)
+                       return TRUE;
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       return FALSE;
+}
+
+static gboolean summary_have_unread_children(SummaryView *summaryview,
+                                            GtkCTreeNode *node)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+       if (!node) return FALSE;
+
+       node = GTK_CTREE_ROW(node)->children;
+
+       while (node) {
+               if (summary_search_unread_recursive(ctree, node) == TRUE)
+                       return TRUE;
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       return FALSE;
+}
+
 static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkStyle *style = NULL;
        MsgInfo *msginfo;
        MsgFlags flags;
+       gint *col_pos = summaryview->col_pos;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
        if (!msginfo) return;
@@ -2355,60 +2491,90 @@ 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, S_COL_UNREAD,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
                                          ignorethreadxpm, ignorethreadxpmmask);
        } else if (MSG_IS_NEW(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
                                          newxpm, newxpmmask);
        } else if (MSG_IS_UNREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
                                          unreadxpm, unreadxpmmask);
        } else if (MSG_IS_REPLIED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
                                          repliedxpm, repliedxpmmask);
        } else if (MSG_IS_FORWARDED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
                                          forwardedxpm, forwardedxpmmask);
        } else {
-               gtk_ctree_node_set_text(ctree, row, S_COL_UNREAD, NULL);
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+                                       NULL);
        }
 
+       if (prefs_common.bold_unread &&
+           ((MSG_IS_UNREAD(flags) && !MSG_IS_IGNORE_THREAD(flags)) ||
+            (!GTK_CTREE_ROW(row)->expanded &&
+             GTK_CTREE_ROW(row)->children &&
+             summary_have_unread_children(summaryview, row))))
+               style = bold_style;
+
        /* set mark column */
        if (MSG_IS_DELETED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_MARK,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          deletedxpm, deletedxpmmask);
-               gtk_ctree_node_set_foreground(ctree, row,
-                                             &summaryview->color_dim);
+               if (style)
+                       style = bold_deleted_style;
+               else {
+                       style = small_deleted_style;
+               }
+                       gtk_ctree_node_set_foreground
+                               (ctree, row, &summaryview->color_dim);
        } else if (MSG_IS_MARKED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_MARK,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          markxpm, markxpmmask);
        } else if (MSG_IS_MOVE(flags)) {
-               gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "o");
-               gtk_ctree_node_set_foreground(ctree, row,
-                                             &summaryview->color_marked);
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "o");
+               if (style)
+                       style = bold_marked_style;
+               else {
+                       style = small_marked_style;
+               }
+                       gtk_ctree_node_set_foreground
+                               (ctree, row, &summaryview->color_marked);
        } else if (MSG_IS_COPY(flags)) {
-               gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "O");
-               gtk_ctree_node_set_foreground(ctree, row,
-                                             &summaryview->color_marked);
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "O");
+               if (style)
+                       style = bold_marked_style;
+               else {
+                       style = small_marked_style;
+               }
+                       gtk_ctree_node_set_foreground
+                               (ctree, row, &summaryview->color_marked);
        }
        else if ((global_scoring ||
                  summaryview->folder_item->prefs->scoring) &&
                 (msginfo->score >= summaryview->important_score) &&
-                ((msginfo->flags &
-                  (MSG_MARKED | MSG_MOVE | MSG_COPY)) == 0)) {
+                (MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
                gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
                gtk_ctree_node_set_foreground(ctree, row,
                                              &summaryview->color_important);
        } else {
-               gtk_ctree_node_set_text(ctree, row, S_COL_MARK, NULL);
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }
 
        if (MSG_IS_MIME(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_MIME,
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipxpm, clipxpmmask);
        } else {
-               gtk_ctree_node_set_text(ctree, row, S_COL_MIME, NULL);
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
        }
+        if (!style)
+               style = small_style;
+
+       gtk_ctree_node_set_row_style(ctree, row, style);
+
+        if (MSG_GET_COLORLABEL(flags))
+               summary_set_colorlabel_color(ctree, row,
+                                            MSG_GET_COLORLABEL_VALUE(flags));
 }
 
 void summary_set_marks_selected(SummaryView *summaryview)
@@ -2418,22 +2584,31 @@ void summary_set_marks_selected(SummaryView *summaryview)
 
 static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
+       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
-       msginfo->to_folder = NULL;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       if (MSG_IS_MOVE(msginfo->flags))
+       if (MSG_IS_MOVE(msginfo->flags)) {
                summaryview->moved--;
-       if (MSG_IS_COPY(msginfo->flags))
+               changed = TRUE;
+       }
+       if (MSG_IS_COPY(msginfo->flags)) {
                summaryview->copied--;
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED | MSG_MOVE | MSG_COPY);
-       MSG_SET_FLAGS(msginfo->flags, MSG_MARKED);
-
+               changed = TRUE;
+       }
+       if (changed && !prefs_common.immediate_exec) {
+               msginfo->to_folder->op_count--;
+               if (msginfo->to_folder->op_count == 0)
+                       folderview_update_item(msginfo->to_folder, 0);
+       }
+       msginfo->to_folder = NULL;
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
        CHANGE_FLAGS(msginfo);
-
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked\n"), msginfo->msgnum);
 }
@@ -2463,10 +2638,8 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
                summaryview->unread--;
        if (MSG_IS_NEW(msginfo->flags) ||
            MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
                CHANGE_FLAGS(msginfo);
-               
                summary_set_row_marks(summaryview, row);
                debug_print(_("Message %d is marked as read\n"),
                            msginfo->msgnum);
@@ -2485,6 +2658,26 @@ void summary_mark_as_read(SummaryView *summaryview)
        summary_status_show(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);
+       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);
+
+       summary_status_show(summaryview);
+}
+
 static void summary_mark_row_as_unread(SummaryView *summaryview,
                                       GtkCTreeNode *row)
 {
@@ -2494,14 +2687,12 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
        if (MSG_IS_DELETED(msginfo->flags)) {
                msginfo->to_folder = NULL;
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
                summaryview->deleted--;
        }
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
        if (!MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_SET_FLAGS(msginfo->flags, MSG_UNREAD);
-               gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
-                                         unreadxpm, unreadxpmmask);
+               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
                summaryview->unread++;
                debug_print(_("Message %d is marked as unread\n"),
                            msginfo->msgnum);
@@ -2526,6 +2717,7 @@ void summary_mark_as_unread(SummaryView *summaryview)
 
 static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
+       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
@@ -2533,22 +2725,28 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 
        if (MSG_IS_DELETED(msginfo->flags)) return;
 
-       msginfo->to_folder = NULL;
-       if (MSG_IS_MOVE(msginfo->flags))
+       if (MSG_IS_MOVE(msginfo->flags)) {
                summaryview->moved--;
-       if (MSG_IS_COPY(msginfo->flags))
+               changed = TRUE;
+       }
+       if (MSG_IS_COPY(msginfo->flags)) {
                summaryview->copied--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED |
-                       MSG_MOVE |
-                       MSG_COPY);
-       MSG_SET_FLAGS(msginfo->flags, MSG_DELETED);
-
+               changed = TRUE;
+       }
+       if (changed && !prefs_common.immediate_exec) {
+               msginfo->to_folder->op_count--;
+               if (msginfo->to_folder->op_count == 0)
+                       folderview_update_item(msginfo->to_folder, 0);
+       }
+       msginfo->to_folder = NULL;
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
        CHANGE_FLAGS(msginfo);
-
        summaryview->deleted++;
 
-       if (!prefs_common.immediate_exec)
+       if (!prefs_common.immediate_exec && 
+           summaryview->folder_item->stype != F_TRASH)
                summary_set_row_marks(summaryview, row);
 
        debug_print(_("Message %s/%d is set to delete\n"),
@@ -2558,23 +2756,45 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 void summary_delete(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       FolderItem *item = summaryview->folder_item;
        GList *cur;
+       GtkCTreeNode *sel_last = NULL;
+       GtkCTreeNode *node;
 
-       if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return;
+       if (!item || item->folder->type == F_NEWS) return;
 
-       /* if current folder is trash, don't delete */
-       if (summaryview->folder_item->stype == F_TRASH) {
-               alertpanel_notice(_("Current folder is Trash."));
-               return;
+       if (summary_is_locked(summaryview)) return;
+
+       /* if current folder is trash, ask for confirmation */
+       if (item->stype == F_TRASH) {
+               AlertValue aval;
+
+               aval = alertpanel(_("Delete message(s)"),
+                                 _("Do you really want to delete message(s) from the trash?"),
+                                 _("Yes"), _("No"), NULL);
+               if (aval != G_ALERTDEFAULT) return;
        }
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
-               summary_delete_row(summaryview, GTK_CTREE_NODE(cur->data));
+       /* next code sets current row focus right. We need to find a row
+        * that is not deleted. */
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+               sel_last = GTK_CTREE_NODE(cur->data);
+               summary_delete_row(summaryview, sel_last);
+       }
 
-       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+       node = summary_find_next_msg(summaryview, sel_last);
+       if (!node)
+               node = summary_find_prev_msg(summaryview, sel_last);
+       if (node == gtkut_ctree_node_next(ctree, sel_last))
+               summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+       else if (node == GTK_CTREE_NODE_PREV(sel_last))
+               summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
+       else
+               summary_select_node
+                       (summaryview, node,
+                        summaryview->msg_is_toggled_on);
 
-       if (prefs_common.immediate_exec)
+       if (prefs_common.immediate_exec || item->stype == F_TRASH)
                summary_execute(summaryview);
        else
                summary_status_show(summaryview);
@@ -2621,25 +2841,30 @@ static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
+       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
-       msginfo->to_folder = NULL;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       if (MSG_IS_MOVE(msginfo->flags))
+       if (MSG_IS_MOVE(msginfo->flags)) {
                summaryview->moved--;
-       if (MSG_IS_COPY(msginfo->flags))
+               changed = TRUE;
+       }
+       if (MSG_IS_COPY(msginfo->flags)) {
                summaryview->copied--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED |
-                       MSG_DELETED |
-                       MSG_MOVE |
-                       MSG_COPY);
-
+               changed = TRUE;
+       }
+       if (changed && !prefs_common.immediate_exec) {
+               msginfo->to_folder->op_count--;
+               if (msginfo->to_folder->op_count == 0)
+                       folderview_update_item(msginfo->to_folder, 0);
+       }
+       msginfo->to_folder = NULL;
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
        CHANGE_FLAGS(msginfo);
-
        summary_set_row_marks(summaryview, row);
 
        debug_print(_("Message %s/%d is unmarked\n"),
@@ -2661,24 +2886,45 @@ void summary_unmark(SummaryView *summaryview)
 static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                                FolderItem *to_folder)
 {
+       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        g_return_if_fail(to_folder != NULL);
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_MOVE(msginfo->flags)) {
+               if (!prefs_common.immediate_exec) {
+                       msginfo->to_folder->op_count--;
+                       if (msginfo->to_folder->op_count == 0) {
+                               folderview_update_item(msginfo->to_folder, 0);
+                               changed = TRUE;
+                       }
+               }
+       }
        msginfo->to_folder = to_folder;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED | MSG_DELETED | MSG_COPY);
+       if (MSG_IS_COPY(msginfo->flags)) {
+               summaryview->copied--;
+               if (!prefs_common.immediate_exec)
+                       msginfo->to_folder->op_count--;
+       }
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
        if (!MSG_IS_MOVE(msginfo->flags)) {
-               MSG_SET_FLAGS(msginfo->flags, MSG_MOVE);
+               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
                summaryview->moved++;
+               changed = TRUE;
        }
-
-       if (!prefs_common.immediate_exec)
+       if (!prefs_common.immediate_exec) {
                summary_set_row_marks(summaryview, row);
+               if (changed) {
+                       msginfo->to_folder->op_count++;
+                       if (msginfo->to_folder->op_count == 1)
+                               folderview_update_item(msginfo->to_folder, 0);
+               }
+       }
 
        debug_print(_("Message %d is set to move to %s\n"),
                    msginfo->msgnum, to_folder->path);
@@ -2691,6 +2937,9 @@ 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;
+
+       if (summary_is_locked(summaryview)) return;
+
        if (summaryview->folder_item == to_folder) {
                alertpanel_notice(_("Destination is same as current folder."));
                return;
@@ -2705,8 +2954,11 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 
        if (prefs_common.immediate_exec)
                summary_execute(summaryview);
-       else
+       else {
                summary_status_show(summaryview);
+
+               folderview_update_item(to_folder, 0);
+       }
 }
 
 void summary_move_to(SummaryView *summaryview)
@@ -2723,24 +2975,45 @@ void summary_move_to(SummaryView *summaryview)
 static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                                FolderItem *to_folder)
 {
+       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        g_return_if_fail(to_folder != NULL);
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_COPY(msginfo->flags)) {
+               if (!prefs_common.immediate_exec) {
+                       msginfo->to_folder->op_count--;
+                       if (msginfo->to_folder->op_count == 0) {
+                               folderview_update_item(msginfo->to_folder, 0);
+                               changed = TRUE;
+                       }
+               }
+       }
        msginfo->to_folder = to_folder;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED | MSG_DELETED | MSG_MOVE);
+       if (MSG_IS_MOVE(msginfo->flags)) {
+               summaryview->moved--;
+               if (!prefs_common.immediate_exec)
+                       msginfo->to_folder->op_count--;
+       }
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
        if (!MSG_IS_COPY(msginfo->flags)) {
-               MSG_SET_FLAGS(msginfo->flags, MSG_COPY);
+               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_COPY);
                summaryview->copied++;
+               changed = TRUE;
        }
-
-       if (!prefs_common.immediate_exec)
+       if (!prefs_common.immediate_exec) {
                summary_set_row_marks(summaryview, row);
+               if (changed) {
+                       msginfo->to_folder->op_count++;
+                       if (msginfo->to_folder->op_count == 1)
+                               folderview_update_item(msginfo->to_folder, 0);
+               }
+       }
 
        debug_print(_("Message %d is set to copy to %s\n"),
                    msginfo->msgnum, to_folder->path);
@@ -2753,6 +3026,9 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        if (!to_folder) return;
        if (!summaryview->folder_item ||
            summaryview->folder_item->folder->type == F_NEWS) return;
+
+       if (summary_is_locked(summaryview)) return;
+
        if (summaryview->folder_item == to_folder) {
                alertpanel_notice
                        (_("Destination to copy is same as current folder."));
@@ -2768,8 +3044,11 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 
        if (prefs_common.immediate_exec)
                summary_execute(summaryview);
-       else
+       else {
                summary_status_show(summaryview);
+
+               folderview_update_item(to_folder, 0);
+       }
 }
 
 void summary_copy_to(SummaryView *summaryview)
@@ -2783,6 +3062,21 @@ void summary_copy_to(SummaryView *summaryview)
        summary_copy_selected_to(summaryview, to_folder);
 }
 
+void summary_add_address(SummaryView *summaryview)
+{
+       MsgInfo *msginfo;
+       gchar *from;
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       Xstrdup_a(from, msginfo->from, return);
+       eliminate_address_comment(from);
+       extract_address(from);
+       addressbook_add_contact(msginfo->fromname, from, NULL);
+}
+
 void summary_select_all(SummaryView *summaryview)
 {
        if (summaryview->messages >= 500) {
@@ -2859,23 +3153,25 @@ void summary_print(SummaryView *summaryview)
                        (ctree, GTK_CTREE_NODE(cur->data));
                if (msginfo) procmsg_print_message(msginfo, cmdline);
        }
-       
+
        g_free(cmdline);
 }
 
-void summary_execute(SummaryView *summaryview)
+gboolean summary_execute(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCTreeNode *node, *next;
 
        if (!summaryview->folder_item ||
-           summaryview->folder_item->folder->type == F_NEWS) return;
+           summaryview->folder_item->folder->type == F_NEWS) return FALSE;
+
+       if (summary_is_locked(summaryview)) return FALSE;
+       summary_lock(summaryview);
 
        gtk_clist_freeze(clist);
 
-       if (summaryview->folder_item->prefs->enable_thread)
-               /*      if (prefs_common.enable_thread) */
+       if (summaryview->folder_item->threaded)
                summary_unthread_for_exec(summaryview);
 
        summary_execute_move(summaryview);
@@ -2884,7 +3180,7 @@ void summary_execute(SummaryView *summaryview)
 
        node = GTK_CTREE_NODE(clist->row_list);
        while (node != NULL) {
-               next = GTK_CTREE_NODE_NEXT(node);
+               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);
@@ -2898,8 +3194,7 @@ void summary_execute(SummaryView *summaryview)
                node = next;
        }
 
-       if (summaryview->folder_item->prefs->enable_thread)
-               /*      if (prefs_common.enable_thread) */
+       if (summaryview->folder_item->threaded)
                summary_thread_build(summaryview);
 
        summaryview->selected = clist->selection ?
@@ -2920,6 +3215,9 @@ void summary_execute(SummaryView *summaryview)
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 
        gtk_clist_thaw(clist);
+
+       summary_unlock(summaryview);
+       return TRUE;
 }
 
 static void summary_execute_move(SummaryView *summaryview)
@@ -3012,8 +3310,7 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
                summaryview->mlist =
                        g_slist_append(summaryview->mlist, msginfo);
 
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_COPY);
-               
+               MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
                summary_set_row_marks(summaryview, node);
        }
 }
@@ -3028,7 +3325,6 @@ static void summary_execute_delete(SummaryView *summaryview)
        if (summaryview->folder_item->folder->type == F_MH) {
                g_return_if_fail(trash != NULL);
        }
-       if (summaryview->folder_item == trash) return;
 
        /* search deleting messages and execute */
        gtk_ctree_pre_recursive
@@ -3036,12 +3332,10 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        if (!summaryview->mlist) return;
 
-       for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
-               MsgInfo * msginfo = cur->data;
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
-       }
-
-       folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+       if (summaryview->folder_item != trash)
+               folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+       else
+               folder_item_remove_msgs(trash, summaryview->mlist);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
@@ -3049,8 +3343,10 @@ static void summary_execute_delete(SummaryView *summaryview)
        g_slist_free(summaryview->mlist);
        summaryview->mlist = NULL;
 
-       folder_item_scan(trash);
-       folderview_update_item(trash, FALSE);
+       if (summaryview->folder_item != trash) {
+               folder_item_scan(trash);
+               folderview_update_item(trash, FALSE);
+       }
 }
 
 static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3085,45 +3381,136 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 void summary_thread_build(SummaryView *summaryview)
 {
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       GtkCTreeNode *next;
+       GtkCTreeNode *parent;
+       MsgInfo *msginfo;
+
+       summary_lock(summaryview);
+
        debug_print(_("Building threads..."));
        STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
        main_window_cursor_wait(summaryview->mainwin);
 
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
+                                        summary_tree_expanded, summaryview);
+       gtk_clist_freeze(GTK_CLIST(ctree));
+
+       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       while (node) {
+               next = GTK_CTREE_ROW(node)->sibling;
+
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+
+               /* alfons - claws seems to prefer subject threading before
+                * inreplyto threading. we should look more deeply in this,
+                * because inreplyto should have precedence... */
+               if (msginfo && msginfo->inreplyto) {
+                       parent = g_hash_table_lookup(summaryview->msgid_table,
+                                                    msginfo->inreplyto);
+                       if (parent && parent != node) {
+                               gtk_ctree_move(ctree, node, parent, NULL);
+                               gtk_ctree_expand(ctree, node);
+                       }
+               }
+               else if (msginfo && msginfo->subject) {
+                       parent = g_hash_table_lookup
+                                       (summaryview->subject_table, msginfo->subject);
+                       if (parent && parent != node) {
+                               gtk_ctree_move(ctree, node, parent, NULL);
+                               gtk_ctree_expand(ctree, node);
+                       }
+               }
 
-       gtk_ctree_pre_recursive_to_depth
-               (GTK_CTREE(summaryview->ctree), NULL, 1,
-                GTK_CTREE_FUNC(summary_thread_func),
-                summaryview);
+               node = next;
+       }
+
+       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       while (node) {
+               next = GTK_CTREE_NODE_NEXT(node);
+               if (prefs_common.expand_thread)
+                       gtk_ctree_expand(ctree, node);
+               if (prefs_common.bold_unread &&
+                   GTK_CTREE_ROW(node)->children)
+                       summary_set_row_marks(summaryview, node);
+               node = next;
+       }
 
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
+                                          summary_tree_expanded, summaryview);
 
        debug_print(_("done.\n"));
        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
+
+       summary_unlock(summaryview);
+}
+
+static void summary_thread_init(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       GtkCTreeNode *next;
+
+       if (prefs_common.expand_thread) {
+               while (node) {
+                       next = GTK_CTREE_ROW(node)->sibling;
+                       if (GTK_CTREE_ROW(node)->children)
+                               gtk_ctree_expand(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;
+               }
+       }
 }
 
 void summary_unthread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       GtkCTreeNode *child;
+       GtkCTreeNode *sibling;
+       GtkCTreeNode *next_child;
+
+       summary_lock(summaryview);
 
        debug_print(_("Unthreading..."));
        STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
        main_window_cursor_wait(summaryview->mainwin);
 
+       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
+                                        summary_tree_collapsed, summaryview);
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
             node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
-               summary_unthread_func(ctree, node, NULL);
+               child = GTK_CTREE_ROW(node)->children;
+               sibling = GTK_CTREE_ROW(node)->sibling;
+
+               while (child != NULL) {
+                       next_child = GTK_CTREE_ROW(child)->sibling;
+                       gtk_ctree_move(ctree, child, NULL, sibling);
+                       child = next_child;
+               }
        }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
+                                          summary_tree_collapsed, summaryview);
 
        debug_print(_("done.\n"));
        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
+
+       summary_unlock(summaryview);
 }
 
 static void summary_unthread_for_exec(SummaryView *summaryview)
@@ -3131,6 +3518,8 @@ 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));
@@ -3143,52 +3532,8 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        debug_print(_("done.\n"));
-}
-
-static void summary_thread_func(GtkCTree *ctree, GtkCTreeNode *node,
-                               gpointer data)
-{
-       MsgInfo *msginfo;
-       GtkCTreeNode *parent = NULL;
-       
-       SummaryView * summaryview = (SummaryView *) data;
-       GHashTable *msgid_table = summaryview->msgid_table;
-       GHashTable *subject_table = summaryview->subject_table;
-
-       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
-
-       if (!msginfo) return;
-
-       if(msginfo->inreplyto) {
-           parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
-       }
-       if (parent == NULL && msginfo->subject &&
-           g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
-               parent = subject_table_lookup(subject_table, msginfo->subject);
-       }
 
-       if (parent && parent != node) {
-               gtk_ctree_move(ctree, node, parent, NULL);
-               gtk_ctree_expand(ctree, parent);
-       }
-}
-
-static void summary_unthread_func(GtkCTree *ctree, GtkCTreeNode *node,
-                                 gpointer data)
-{
-       GtkCTreeNode *child;
-       GtkCTreeNode *sibling;
-
-       child = GTK_CTREE_ROW(node)->children;
-       sibling = GTK_CTREE_ROW(node)->sibling;
-
-       while (child != NULL) {
-               GtkCTreeNode *next_child;
-
-               next_child = GTK_CTREE_ROW(child)->sibling;
-               gtk_ctree_move(ctree, child, NULL, sibling);
-               child = next_child;
-       }
+       summary_unlock(summaryview);
 }
 
 static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3227,6 +3572,8 @@ void summary_filter(SummaryView *summaryview)
 {
        if (!prefs_common.fltlist) return;
 
+       summary_lock(summaryview);
+
        debug_print(_("filtering..."));
        STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
        main_window_cursor_wait(summaryview->mainwin);
@@ -3239,10 +3586,12 @@ void summary_filter(SummaryView *summaryview)
                                        summaryview);
                
                gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
-               if (prefs_common.immediate_exec)
+               
+               if (prefs_common.immediate_exec) {
+                       summary_unlock(summaryview);
                        summary_execute(summaryview);
-               else
+                       summary_lock(summaryview);
+               } else
                        summary_status_show(summaryview);
        }
        else {
@@ -3266,6 +3615,8 @@ void summary_filter(SummaryView *summaryview)
        debug_print(_("done.\n"));
        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
+
+       summary_unlock(summaryview);
 }
 
 static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3291,6 +3642,191 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                                              summaryview->folder_table);
 }
 
+/* color label */
+
+#define N_COLOR_LABELS colorlabel_get_color_count()
+
+static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
+                                                    gpointer data)
+{
+       guint color = GPOINTER_TO_UINT(data);
+       SummaryView *summaryview;
+
+       summaryview = gtk_object_get_data(GTK_OBJECT(widget), "summaryview");
+       g_return_if_fail(summaryview != NULL);
+
+       /* "dont_toggle" state set? */
+       if (gtk_object_get_data(GTK_OBJECT(summaryview->colorlabel_menu),
+                               "dont_toggle"))
+               return;
+
+       summary_set_colorlabel(summaryview, color, NULL);
+}
+
+/* summary_set_colorlabel_color() - labelcolor parameter is the color *flag*
+ * for the messsage; not the color index */
+void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
+                                 guint labelcolor)
+{
+       GdkColor color;
+       GtkStyle *style, *prev_style, *ctree_style;
+       MsgInfo *msginfo;
+       gint color_index;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_CLABEL_FLAG_MASK);
+       MSG_SET_COLORLABEL_VALUE(msginfo->flags, labelcolor);
+
+       color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
+       ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
+       prev_style = gtk_ctree_node_get_row_style(ctree, node);
+
+       if (color_index < 0 || color_index >= N_COLOR_LABELS) {
+               if (!prev_style) return;
+               style = gtk_style_copy(prev_style);
+               color = ctree_style->fg[GTK_STATE_NORMAL];
+               style->fg[GTK_STATE_NORMAL] = color;
+               color = ctree_style->fg[GTK_STATE_SELECTED];
+               style->fg[GTK_STATE_SELECTED] = color;
+       } else {
+               if (prev_style)
+                       style = gtk_style_copy(prev_style);
+               else
+                       style = gtk_style_copy(ctree_style);
+               color = colorlabel_get_color(color_index);
+               style->fg[GTK_STATE_NORMAL] = color;
+               /* get the average of label color and selected fg color
+                  for visibility */
+               style->fg[GTK_STATE_SELECTED].red   = (color.red   + ctree_style->fg[GTK_STATE_SELECTED].red  ) / 2;
+               style->fg[GTK_STATE_SELECTED].green = (color.green + ctree_style->fg[GTK_STATE_SELECTED].green) / 2;
+               style->fg[GTK_STATE_SELECTED].blue  = (color.blue  + ctree_style->fg[GTK_STATE_SELECTED].blue ) / 2;
+       }
+
+       gtk_ctree_node_set_row_style(ctree, node, style);
+}
+
+void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
+                           GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GList *cur;
+
+       for (cur = clist->selection; cur != NULL; cur = cur->next)
+               summary_set_colorlabel_color(ctree, GTK_CTREE_NODE(cur->data),
+                                            labelcolor);
+}
+
+static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
+                                                         gpointer data)
+{
+       SummaryView *summaryview;
+       GtkMenuShell *menu;
+       GtkCheckMenuItem **items;
+       gint n;
+       GList *cur, *sel;
+
+       summaryview = (SummaryView *)data;
+       g_return_if_fail(summaryview != NULL);
+
+       sel = GTK_CLIST(summaryview->ctree)->selection;
+       if (!sel) return;
+
+       menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
+       g_return_if_fail(menu != NULL);
+
+       Xalloca(items, (N_COLOR_LABELS + 1) * sizeof(GtkWidget *), return);
+
+       /* NOTE: don't return prematurely because we set the "dont_toggle"
+        * state for check menu items */
+       gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
+                           GINT_TO_POINTER(1));
+
+       /* clear items. get item pointers. */
+       for (n = 0, cur = menu->children; cur != NULL; cur = cur->next) {
+               if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
+                       gtk_check_menu_item_set_state
+                               (GTK_CHECK_MENU_ITEM(cur->data), FALSE);
+                       items[n] = GTK_CHECK_MENU_ITEM(cur->data);
+                       n++;
+               }
+       }
+
+       if (n == (N_COLOR_LABELS + 1)) {
+               /* iterate all messages and set the state of the appropriate
+                * items */
+               for (; sel != NULL; sel = sel->next) {
+                       MsgInfo *msginfo;
+                       gint clabel;
+
+                       msginfo = gtk_ctree_node_get_row_data
+                               (GTK_CTREE(summaryview->ctree),
+                                GTK_CTREE_NODE(sel->data));
+                       if (msginfo) {
+                               clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
+                               if (!items[clabel]->active)
+                                       gtk_check_menu_item_set_state
+                                               (items[clabel], TRUE);
+                       }
+               }
+       } else
+               g_warning("invalid number of color elements (%d)\n", n);
+
+       /* reset "dont_toggle" state */
+       gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
+                           GINT_TO_POINTER(0));
+}
+
+static void summary_colorlabel_menu_create(SummaryView *summaryview)
+{
+       GtkWidget *label_menuitem;
+       GtkWidget *menu;
+       GtkWidget *item;
+       gint i;
+
+       label_menuitem = gtk_item_factory_get_item(summaryview->popupfactory,
+                                                  "/Color label");
+       gtk_signal_connect(GTK_OBJECT(label_menuitem), "activate",
+                          GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_item_cb),
+                          summaryview);
+       gtk_widget_show(label_menuitem);
+
+       menu = gtk_menu_new();
+
+       /* create sub items. for the menu item activation callback we pass the
+        * index of label_colors[] as data parameter. for the None color we
+        * pass an invalid (high) value. also we attach a data pointer so we
+        * can always get back the SummaryView pointer. */
+
+       item = gtk_check_menu_item_new_with_label(_("None"));
+       gtk_menu_append(GTK_MENU(menu), item);
+       gtk_signal_connect(GTK_OBJECT(item), "activate",
+                          GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
+                          GUINT_TO_POINTER(0));
+       gtk_object_set_data(GTK_OBJECT(item), "summaryview", summaryview);
+       gtk_widget_show(item);
+
+       item = gtk_menu_item_new();
+       gtk_menu_append(GTK_MENU(menu), item);
+       gtk_widget_show(item);
+
+       /* create pixmap/label menu items */
+       for (i = 0; i < N_COLOR_LABELS; i++) {
+               item = colorlabel_create_check_color_menu_item(i);
+               gtk_menu_append(GTK_MENU(menu), item);
+               gtk_signal_connect(GTK_OBJECT(item), "activate",
+                                  GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
+                                  GUINT_TO_POINTER(i + 1));
+               gtk_object_set_data(GTK_OBJECT(item), "summaryview",
+                                   summaryview);
+               gtk_widget_show(item);
+       }
+
+       gtk_widget_show(menu);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
+       summaryview->colorlabel_menu = menu;
+}
+
 /* callback functions */
 
 static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
@@ -3311,8 +3847,8 @@ static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        if (!event) return;
 
        if (event->button == 3) {
-               /* right clicked */
-               summary_add_sender_to_cb(summaryview, 0, 0);    
+               /* Right button clicked */
+               /* summary_set_add_sender_menu(summaryview); */
                gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
                               NULL, NULL, event->button, event->time);
        } else if (event->button == 2) {
@@ -3337,6 +3873,9 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
+#define RETURN_IF_LOCKED() \
+       if (summaryview->mainwin->lock_count) return
+
 #define KEY_PRESS_EVENT_STOP() \
        if (gtk_signal_n_emissions_by_name \
                (GTK_OBJECT(ctree), "key_press_event") > 0) { \
@@ -3351,11 +3890,13 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        GtkCTreeNode *node;
        FolderItem *to_folder;
 
+       if (summary_is_locked(summaryview)) return;
        if (!event) return;
 
        switch (event->keyval) {
        case GDK_g:             /* Go */
        case GDK_G:
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                to_folder = foldersel_folder_sel(NULL, NULL);
@@ -3373,16 +3914,18 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                compose_new_with_recipient
                                        (ac, summaryview->folder_item->path);
                        else
-                               compose_new(ac);
+                               compose_new_with_folderitem(ac, summaryview->folder_item);
                } else
                        compose_new(NULL);
                return;
        case GDK_D:             /* Empty trash */
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                main_window_empty_trash(summaryview->mainwin, TRUE);
                return;
        case GDK_Q:             /* Quit */
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
 
                if (prefs_common.confirm_on_exit) {
@@ -3463,6 +4006,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_mark_as_unread(summaryview);
                break;
        case GDK_d:             /* Delete */
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;
@@ -3472,15 +4016,18 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_unmark(summaryview);
                break;
        case GDK_o:             /* Move */
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_move_to(summaryview);
                break;
        case GDK_O:             /* Copy */
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_copy_to(summaryview);
                break;
        case GDK_x:             /* Execute */
        case GDK_X:
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                summary_execute(summaryview);
@@ -3513,11 +4060,14 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 }
 
 #undef BREAK_ON_MODIFIER_KEY
+#undef RETURN_IF_LOCKED
 #undef KEY_PRESS_EVENT_STOP
 
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
-       if (summaryview->folder_item->stype == F_DRAFT)
+       if (summaryview->folder_item->stype == F_DRAFT  ||
+           summaryview->folder_item->stype == F_OUTBOX ||
+            summaryview->folder_item->stype == F_QUEUE)
                summary_reedit(summaryview);
        else
                summary_open_msg(summaryview);
@@ -3525,6 +4075,18 @@ static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
        summaryview->display_msg = FALSE;
 }
 
+static void summary_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
+                                 SummaryView *summaryview)
+{
+       summary_set_row_marks(summaryview, node);
+}
+
+static void summary_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
+                                  SummaryView *summaryview)
+{
+       summary_set_row_marks(summaryview, node);
+}
+
 static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                             gint column, SummaryView *summaryview)
 {
@@ -3543,13 +4105,11 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       switch (column) {
+       switch (column < 0 ? column : summaryview->col_state[column].type) {
        case S_COL_MARK:
                if (MSG_IS_MARKED(msginfo->flags)) {
-                       MSG_UNSET_FLAGS(msginfo->flags, MSG_MARKED);
-
+                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
                        CHANGE_FLAGS(msginfo);
-                       
                        summary_set_row_marks(summaryview, row);
                } else
                        summary_mark_row(summaryview, row);
@@ -3577,7 +4137,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 static void summary_col_resized(GtkCList *clist, gint column, gint width,
                                SummaryView *summaryview)
 {
-       switch (column) {
+       switch (summaryview->col_state[column].type) {
        case S_COL_MARK:
                prefs_common.summary_col_mark = width;
                break;
@@ -3620,7 +4180,7 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                                              summaryview->selected);
        if (!msginfo) return;
 
-       switch ((ComposeReplyMode)action) {
+       switch ((ComposeMode)action) {
        case COMPOSE_REPLY:
                compose_reply(msginfo, prefs_common.reply_with_quote,
                              FALSE, FALSE);
@@ -3648,7 +4208,7 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE);
+                             TRUE, TRUE);
                break;
        case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
                compose_reply(msginfo, TRUE, TRUE, FALSE);
@@ -3680,69 +4240,37 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
        summary_set_marks_selected(summaryview);
 }
 
+static void summary_execute_cb(SummaryView *summaryview, guint action,
+                              GtkWidget *widget)
+{
+       summary_execute(summaryview);
+}
+
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
        header_window_show_cb(summaryview->mainwin, action, widget);
 }
 
-static void summary_add_sender_to_cb (SummaryView                      *summaryview,
-                                        guint                   action,
-                                        GtkWidget              *widget_)
-{
-       const gint       ADD_SENDER_TO_ADDRESSBOOK_MENU_POS = 13;
-       GtkWidget       *submenu;                                               
-       GList           *groups, *tmp;
-       GtkMenuShell    *menushell;
-       GtkWidget       *menu;
-       GtkWidget       *menuitem;
-       GList           *child;
-       gboolean        found = FALSE;
-       MsgInfo        *msginfo;
-       gchar          *from_address;
-
-       menushell = GTK_MENU_SHELL(summaryview->popupmenu);
-       g_return_if_fail(menushell != NULL);
-       child = menushell->children;
-       g_return_if_fail(child);
-
-       /* we're iterating each menu item searching for the one with 
-        * a "contacts" object data. if not found add the menu,
-        * else update it */
-       for (child = g_list_first(menushell->children); child; child = g_list_next(child)) {
-               if (gtk_object_get_data(GTK_OBJECT(child->data), "contacts")) {
-                       found = TRUE;
-                       break;
-               }
-       }
+static void summary_add_address_cb(SummaryView *summaryview,
+                                  guint action, GtkWidget *widget)
+{
+       summary_add_address(summaryview);
+}
 
-       /* add item to default context menu if not present */
-       if (!found) {
-               submenu = gtk_menu_item_new_with_label(_("Add sender to address book"));
-               gtk_object_set_data(GTK_OBJECT(submenu), "contacts", (gpointer)1);
-               gtk_menu_insert(GTK_MENU(summaryview->popupmenu), submenu, ADD_SENDER_TO_ADDRESSBOOK_MENU_POS);
-               gtk_widget_show(submenu);
-       }
-       else {
-               submenu = (GtkWidget *) child->data;
-       }
+static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+       summary_sort(summaryview, SORT_BY_MARK);
+}
 
-       /* get the address info from the summary view */
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                                                                                  summaryview->selected);
-
-       if (msginfo != NULL && msginfo->fromname != NULL && msginfo->from != NULL) {
-               gtk_widget_set_sensitive(GTK_WIDGET(submenu), TRUE);
-               from_address = g_strdup(msginfo->from);
-               eliminate_address_comment(from_address);
-               extract_address(from_address);
-               log_message("adding %s %s\n", msginfo->fromname, from_address);
-               addressbook_add_contact_by_menu(submenu, msginfo->fromname, from_address, NULL);
-               g_free(from_address);
-       }               
-       else {
-               gtk_widget_set_sensitive(GTK_WIDGET(submenu), FALSE);
-       }
+static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+       summary_sort(summaryview, SORT_BY_UNREAD);
+}
+
+static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+       summary_sort(summaryview, SORT_BY_MIME);
 }
 
 static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)
@@ -3777,31 +4305,29 @@ static void summary_subject_clicked(GtkWidget *button,
        summary_sort(summaryview, SORT_BY_SUBJECT);
 }
 
-static void summary_mark_clicked(GtkWidget *button,
-                                SummaryView *summaryview)
-{
-       summary_sort(summaryview, SORT_BY_LABEL);
-}
-
 void summary_change_display_item(SummaryView *summaryview)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
 
-       gtk_clist_set_column_visibility(clist, S_COL_MARK, prefs_common.show_mark);
-       gtk_clist_set_column_visibility(clist, S_COL_UNREAD, prefs_common.show_unread);
-       gtk_clist_set_column_visibility(clist, S_COL_MIME, prefs_common.show_mime);
-       gtk_clist_set_column_visibility(clist, S_COL_NUMBER, prefs_common.show_number);
-       gtk_clist_set_column_visibility(clist, S_COL_SCORE, prefs_common.show_score);
-       gtk_clist_set_column_visibility(clist, S_COL_SIZE, prefs_common.show_size);
-       gtk_clist_set_column_visibility(clist, S_COL_DATE, prefs_common.show_date);
-       gtk_clist_set_column_visibility(clist, S_COL_FROM, prefs_common.show_from);
-       gtk_clist_set_column_visibility(clist, S_COL_SUBJECT, prefs_common.show_subject);
+#define SET_VISIBLE(col, visible) \
+       gtk_clist_set_column_visibility(clist, summaryview->col_pos[col], \
+                                       prefs_common.visible)
+
+       SET_VISIBLE(S_COL_MARK   , show_mark);
+       SET_VISIBLE(S_COL_UNREAD , show_unread);
+       SET_VISIBLE(S_COL_MIME   , show_mime);
+       SET_VISIBLE(S_COL_NUMBER , show_number);
+       SET_VISIBLE(S_COL_SCORE  , show_score);
+       SET_VISIBLE(S_COL_SIZE   , show_size);
+       SET_VISIBLE(S_COL_DATE   , show_date);
+       SET_VISIBLE(S_COL_FROM   , show_from);
+       SET_VISIBLE(S_COL_SUBJECT, show_subject);
+
+#undef SET_VISIBLE
 }
 
-static void summary_start_drag (GtkWidget   *widget,
-                               gint         button,
-                               GdkEvent    *event,
-                               SummaryView *summaryview)
+static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
+                              SummaryView *summaryview)
 {
        GtkTargetList *list;
        GdkDragContext *context;
@@ -3869,6 +4395,33 @@ static void summary_drag_data_get(GtkWidget        *widget,
 
 /* custom compare functions for sorting */
 
+static gint summary_cmp_by_mark(GtkCList *clist,
+                               gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       return MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags);
+}
+
+static gint summary_cmp_by_unread(GtkCList *clist,
+                                 gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       return MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags);
+}
+
+static gint summary_cmp_by_mime(GtkCList *clist,
+                               gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       return MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags);
+}
+
 static gint summary_cmp_by_num(GtkCList *clist,
                               gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -3930,9 +4483,9 @@ static gint summary_cmp_by_label(GtkCList *clist,
        MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
        MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
 
-       return MSG_GET_LABEL(msginfo1->flags) - MSG_GET_LABEL(msginfo2->flags);
+       return MSG_GET_COLORLABEL(msginfo1->flags) -
+               MSG_GET_COLORLABEL(msginfo2->flags);
 }
-
 static gint summary_cmp_by_score(GtkCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -3959,10 +4512,10 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
                summaryview->newmsgs--;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread--;
-       MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
 
        CHANGE_FLAGS(msginfo);
-               
+
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked as ignore thread\n"),
            msginfo->msgnum);
@@ -3990,7 +4543,7 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
                summaryview->newmsgs++;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread++;
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
 
        CHANGE_FLAGS(msginfo);
                
@@ -4010,4 +4563,7 @@ static void summary_unignore_thread(SummaryView *summaryview)
 
        summary_status_show(summaryview);
 }
+/*
+ * End of Source.
+ */