sync with sylpheed 0.6.3cvs7
[claws.git] / src / summaryview.c
index 58eeaa182f17aca2efc7618f12258796fcca7240..6769e223abd6a25591084d1e2bb697b6709f6a3e 100644 (file)
@@ -153,6 +153,12 @@ 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);
@@ -181,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,
@@ -225,6 +232,8 @@ 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);
 
@@ -277,6 +286,9 @@ 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);
@@ -372,7 +384,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {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},
@@ -386,12 +398,14 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Color la_bel"),           NULL, NULL,             0, NULL},
 
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/Add sender to address _book"),
-                                       NULL, summary_add_address_cb,           0, 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_("/_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},
@@ -399,10 +413,35 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Select _all"),            NULL, summary_select_all, 0, 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 */
+};
+
 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;
@@ -431,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),
@@ -501,7 +553,7 @@ SummaryView *summary_create(void)
        /* connect signal to the buttons for sorting */
 #define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
        gtk_signal_connect \
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[col].button), \
+               (GTK_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
                 "clicked", \
                 GTK_SIGNAL_FUNC(func), \
                 summaryview)
@@ -589,6 +641,7 @@ 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;
 
@@ -621,7 +674,7 @@ void summary_init(SummaryView *summaryview)
 
        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 (!small_style) {
@@ -747,11 +800,10 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        gint sort_type;
         static gboolean locked = FALSE;
 
-       if (locked)
-               return FALSE;
+       if (summary_is_locked(summaryview)) return FALSE;
 
        inc_lock();
-       locked = TRUE;
+       summary_lock(summaryview);
 
        STATUSBAR_POP(summaryview->mainwin);
 
@@ -778,9 +830,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                else if (G_ALERTALTERNATE == val)
                        summary_write_cache(summaryview);
                else {
-                       locked = FALSE;
+                       summary_unlock(summaryview);
                        inc_unlock();
-                        return FALSE;
+                       return FALSE;
                }
                folder_update_op_count();
        }
@@ -811,7 +863,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                gtk_clist_thaw(GTK_CLIST(ctree));
-               locked = FALSE;
+               summary_unlock(summaryview);
                inc_unlock();
                return TRUE;
        }
@@ -905,8 +957,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                           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
-                                       (GTK_CLIST(ctree)->row_list_end);
+                               node = gtk_ctree_node_nth
+                                       (ctree, GTK_CLIST(ctree)->rows - 1);
                        summary_select_node(summaryview, node, FALSE);
                }
        } else {
@@ -917,10 +969,17 @@ 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);
-               summary_select_node(summaryview, node,
-                                   prefs_common.open_unread_on_enter);
+               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);
@@ -933,7 +992,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
 
        main_window_cursor_normal(summaryview->mainwin);
-       locked = FALSE;
+       summary_unlock(summaryview);
        inc_unlock();
 
        return TRUE;
@@ -986,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);
 }
@@ -1000,6 +1064,22 @@ void summary_clear_all(SummaryView *summaryview)
        summary_status_show(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)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
@@ -1040,8 +1120,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        if (summaryview->folder_item->folder->type != F_NEWS) {
                menu_set_sensitive(ifactory, "/Move...", TRUE);
                menu_set_sensitive(ifactory, "/Copy...", TRUE);
-               if (summaryview->folder_item->stype != F_TRASH)
-                       menu_set_sensitive(ifactory, "/Delete", TRUE);
+               menu_set_sensitive(ifactory, "/Delete", TRUE);
        }
 
        menu_set_sensitive(ifactory, "/Execute", TRUE);
@@ -1067,9 +1146,10 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
        menu_set_sensitive(ifactory, "/Add sender to address book", sens);
 
-       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, "/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))
@@ -1098,10 +1178,23 @@ void summary_select_prev_unread(SummaryView *summaryview)
        if (!node) {
                AlertValue val;
 
-               val = alertpanel(_("No more unread messages"),
-                                _("No unread message found. "
-                                  "Search from the end?"),
-                                _("Yes"), _("No"), NULL);
+               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);
        }
@@ -1135,10 +1228,24 @@ void summary_select_next_unread(SummaryView *summaryview)
        } else {
                AlertValue val;
 
-               val = alertpanel(_("No more unread messages"),
-                                _("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)
@@ -1315,6 +1422,46 @@ static guint summary_get_msgnum(SummaryView *summaryview, GtkCTreeNode *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)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+
+       if (current_node)
+               node = current_node;
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (!MSG_IS_DELETED(msginfo->flags)) break;
+       }
+
+       return node;
+}
+
 static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
                                                  GtkCTreeNode *current_node)
 {
@@ -1325,7 +1472,7 @@ static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
        if (current_node)
                node = current_node;
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               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);
@@ -1365,7 +1512,7 @@ static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
        if (current_node)
                node = GTK_CTREE_NODE_PREV(current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               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);
@@ -1405,7 +1552,7 @@ static GtkCTreeNode *summary_find_prev_labeled_msg(SummaryView *summaryview,
        if (current_node)
                node = GTK_CTREE_NODE_PREV(current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               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);
@@ -1768,6 +1915,43 @@ 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)
+               g_hash_table_insert(msgid_table, (gchar *)msgid, cnode);
+
+       return TRUE;
+}
+
 static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
                                           gchar * subject)
 {
@@ -1793,8 +1977,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;
@@ -1829,124 +2012,50 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        }
        
        if (summaryview->folder_item->threaded) {
-               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(!MSG_IS_IGNORE_THREAD(msginfo->flags) && parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
-                                       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
-                               }
-                       }
+               GNode *root, *gnode;
 
-                       node = gtk_ctree_insert_node
-                               (ctree, parent, NULL, text, 2,
-                                NULL, NULL, NULL, NULL, FALSE,
-                                parent ? TRUE : FALSE);
-                       GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
-                       summary_set_marks_func(ctree, node, summaryview);
-                       
-                       if (MSG_GET_COLORLABEL(msginfo->flags))
-                               summary_set_colorlabel_color(ctree, node, MSG_GET_COLORLABEL_VALUE(msginfo->flags));
-
-                       /* 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, TRUE);
+               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,
+                               (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_COLORLABEL(msginfo->flags) )
-                         summary_set_colorlabel_color(ctree, node, MSG_GET_COLORLABEL_VALUE(msginfo->flags));
-
-                       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);
        }
 
@@ -2071,34 +2180,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)");
@@ -2112,7 +2224,7 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
                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;
                }
        }
 
@@ -2136,7 +2248,7 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
                }
        }
 
-       text[S_COL_SUBJECT] = msginfo->subject ? msginfo->subject :
+       text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
                _("(No Subject)");
 }
 
@@ -2154,13 +2266,12 @@ 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();
@@ -2169,7 +2280,7 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
 
        filename = procmsg_get_message_file(msginfo);
        if (!filename) {
-               lock = FALSE;
+               summary_unlock(summaryview);
                return;
        }
        g_free(filename);
@@ -2211,7 +2322,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)
@@ -2276,7 +2387,7 @@ void summary_step(SummaryView *summaryview, GtkScrollType type)
 
        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);
 }
@@ -2368,6 +2479,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        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;
@@ -2378,22 +2490,23 @@ 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 &&
@@ -2405,7 +2518,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
        /* 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);
                if (style)
                        style = bold_deleted_style;
@@ -2415,10 +2528,10 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                        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_text(ctree, row, col_pos[S_COL_MARK], "o");
                if (style)
                        style = bold_marked_style;
                else {
@@ -2427,8 +2540,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                        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");
-                if (style)
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "O");
+               if (style)
                        style = bold_marked_style;
                else {
                        style = small_marked_style;
@@ -2444,14 +2557,14 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                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;
@@ -2631,7 +2744,8 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
        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"),
@@ -2641,23 +2755,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);
@@ -2800,6 +2936,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;
@@ -2886,6 +3025,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."));
@@ -3014,14 +3156,17 @@ void summary_print(SummaryView *summaryview)
        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);
 
@@ -3049,7 +3194,7 @@ void summary_execute(SummaryView *summaryview)
        }
 
        if (summaryview->folder_item->threaded)
-               summary_thread_build(summaryview, FALSE);
+               summary_thread_build(summaryview);
 
        summaryview->selected = clist->selection ?
                GTK_CTREE_NODE(clist->selection->data) : NULL;
@@ -3069,6 +3214,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)
@@ -3176,7 +3324,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
@@ -3184,12 +3331,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_PERM_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);
@@ -3197,8 +3342,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,
@@ -3231,7 +3378,7 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 /* thread functions */
 
-void summary_thread_build(SummaryView *summaryview, gboolean init)
+void summary_thread_build(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
@@ -3239,6 +3386,8 @@ void summary_thread_build(SummaryView *summaryview, gboolean init)
        GtkCTreeNode *parent;
        MsgInfo *msginfo;
 
+       summary_lock(summaryview);
+
        debug_print(_("Building threads..."));
        STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
        main_window_cursor_wait(summaryview->mainwin);
@@ -3278,34 +3427,14 @@ void summary_thread_build(SummaryView *summaryview, gboolean init)
 
        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-       /* for optimization */
-       if (init) {
-               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;
-                       }
-               }
-       } else {
-               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;
-               }
+       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(ctree));
@@ -3315,6 +3444,31 @@ void summary_thread_build(SummaryView *summaryview, gboolean init)
        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)
@@ -3325,6 +3479,8 @@ void summary_unthread(SummaryView *summaryview)
        GtkCTreeNode *sibling;
        GtkCTreeNode *next_child;
 
+       summary_lock(summaryview);
+
        debug_print(_("Unthreading..."));
        STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
        main_window_cursor_wait(summaryview->mainwin);
@@ -3352,6 +3508,8 @@ void summary_unthread(SummaryView *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)
@@ -3359,6 +3517,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));
@@ -3371,6 +3531,8 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        debug_print(_("done.\n"));
+
+       summary_unlock(summaryview);
 }
 
 static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3409,6 +3571,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);
@@ -3421,10 +3585,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 {
@@ -3448,6 +3614,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,
@@ -3620,7 +3788,6 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview)
        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();
@@ -3722,6 +3889,7 @@ 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) {
@@ -3936,7 +4104,7 @@ 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_PERM_FLAGS(msginfo->flags, MSG_MARKED);
@@ -3968,7 +4136,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;
@@ -4039,7 +4207,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);
@@ -4071,6 +4239,12 @@ 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)
 {
@@ -4134,15 +4308,21 @@ 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,