comment out menu entry not existing in claws
[claws.git] / src / summaryview.c
index 1be2859413cd370bff359466ebe434fb8111dace..ba3c52bac616d77ec6e77bf9e4a1ad7dd0c0ba92 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkpixmap.h>
@@ -46,6 +45,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "intl.h"
 #include "main.h"
 #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"
 #include "prefs_folder_item.h"
+#include "filtering.h"
 
 #include "pixmaps/dir-open.xpm"
 #include "pixmaps/mark.xpm"
@@ -84,6 +87,7 @@
 #include "pixmaps/replied.xpm"
 #include "pixmaps/forwarded.xpm"
 #include "pixmaps/clip.xpm"
+#include "pixmaps/ignorethread.xpm"
 
 #define STATUSBAR_PUSH(mainwin, str) \
 { \
 #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;
 
@@ -120,6 +132,8 @@ static GdkPixmap *repliedxpm;
 static GdkBitmap *repliedxpmmask;
 static GdkPixmap *forwardedxpm;
 static GdkBitmap *forwardedxpmmask;
+static GdkPixmap *ignorethreadxpm;
+static GdkBitmap *ignorethreadxpmmask;
 
 static GdkPixmap *clipxpm;
 static GdkBitmap *clipxpmmask;
@@ -136,23 +150,34 @@ static void summary_write_cache_func      (GtkCTree               *ctree,
 
 static void summary_set_menu_sensitive (SummaryView            *summaryview);
 
+static void summary_select_node                (SummaryView            *summaryview,
+                                        GtkCTreeNode           *node,
+                                        gboolean                display_msg);
+
+static guint summary_get_msgnum                (SummaryView            *summaryview,
+                                        GtkCTreeNode           *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);
 
@@ -204,14 +229,9 @@ static void summary_execute_delete (SummaryView            *summaryview);
 static void summary_execute_delete_func        (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
                                         gpointer                data);
+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,
@@ -221,6 +241,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,
@@ -236,6 +264,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,
@@ -250,10 +284,17 @@ static void summary_reply_cb              (SummaryView            *summaryview,
 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,
@@ -280,6 +321,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);
@@ -298,6 +348,13 @@ static gint summary_cmp_by_subject (GtkCList               *clist,
 static gint summary_cmp_by_score       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
+static gint summary_cmp_by_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] =
 {
@@ -306,28 +363,39 @@ 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_("/---"),                    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/Make it as _being read"),
-                                       NULL, summary_mark_as_read, 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_("/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 an a_ttachment"),
-                                       NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/Add sender to address _book"),
+                                       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_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            NULL, summary_save_as,  0, NULL},
        {N_("/_Print..."),              NULL, summary_print,    0, NULL},
@@ -350,7 +418,6 @@ SummaryView *summary_create(void)
        GtkWidget *toggle_arrow;
        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
-       GtkBindingSet *binding_set;
        gint n_entries;
        gint i;
 
@@ -436,36 +503,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);
+#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
+       gtk_signal_connect \
+               (GTK_OBJECT(GTK_CLIST(ctree)->column[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);
@@ -492,20 +547,6 @@ SummaryView *summary_create(void)
                                      "<SummaryView>", &popupfactory,
                                      summaryview);
 
-       /* bind keys */
-       binding_set = gtk_binding_set_by_class
-               (GTK_CLIST_CLASS(GTK_OBJECT(ctree)->klass));
-
-       gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
-                                    "scroll_vertical", 2,
-                                    GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                    GTK_TYPE_FLOAT, 0.0);
-       gtk_binding_entry_add_signal(binding_set, GDK_p, GDK_CONTROL_MASK,
-                                    "scroll_vertical", 2,
-                                    GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                    GTK_TYPE_FLOAT, 0.0);
-       gtk_binding_entry_clear(binding_set, GDK_space, 0);
-
        /* connect signals */
        gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
                           GTK_SIGNAL_FUNC(summary_selected), summaryview);
@@ -521,6 +562,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);
@@ -561,21 +617,47 @@ void summary_init(SummaryView *summaryview)
                      replied_xpm);
        PIXMAP_CREATE(summaryview->ctree, forwardedxpm, forwardedxpmmask,
                      forwarded_xpm);
+       PIXMAP_CREATE(summaryview->ctree, ignorethreadxpm, ignorethreadxpmmask,
+                     ignorethread_xpm);
        PIXMAP_CREATE(summaryview->ctree, clipxpm, clipxpmmask, clip_xpm);
        PIXMAP_CREATE(summaryview->hbox, folderxpm, folderxpmmask,
-                     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);
        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);
@@ -586,7 +668,71 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_show(pixmap);
 
        summary_clear_list(summaryview);
+       summary_colorlabel_menu_create(summaryview);
        summary_set_menu_sensitive(summaryview);
+
+}
+
+GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
+                                                GtkCTreeNode *current_node)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+       gint best_score = MIN_SCORE;
+       GtkCTreeNode *best_node = NULL;
+
+       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)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (msginfo->score >= summaryview->important_score)
+                       break;
+               if (msginfo->score > best_score) {
+                       best_score = msginfo->score;
+                       best_node = node;
+               }
+       }
+
+       if (node != NULL)
+               return node;
+       else
+               return best_node;
+}
+
+GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
+                                                GtkCTreeNode *current_node)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+       gint best_score = MIN_SCORE;
+       GtkCTreeNode *best_node = NULL;
+
+       if (current_node)
+               /*node = current_node;*/
+               node = GTK_CTREE_NODE_PREV(current_node);
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (msginfo->score >= summaryview->important_score)
+                       break;
+               if (msginfo->score > best_score) {
+                       best_score = msginfo->score;
+                       best_node = node;
+               }
+       }
+
+       if (node != NULL)
+               return node;
+       else
+               return best_node;
 }
 
 gboolean summary_show(SummaryView *summaryview, FolderItem *item,
@@ -597,24 +743,35 @@ 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 (locked)
+               return FALSE;
+
+       inc_lock();
+       locked = TRUE;
 
        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);
        }
 
-#if 0
        /* process the marks if any */
-       if (summaryview->deleted > 0 || summaryview->moved > 0) {
+       if (summaryview->mainwin->lock_count == 0 &&
+           (summaryview->moved > 0 || summaryview->copied > 0)) {
                AlertValue val;
 
                val = alertpanel(_("Process mark"),
@@ -624,35 +781,49 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        summary_execute(summaryview);
                else if (G_ALERTALTERNATE == val)
                        summary_write_cache(summaryview);
-               else
-                       return FALSE;
-       } else
-#endif
+               else {
+                       locked = FALSE;
+                       inc_unlock();
+                        return FALSE;
+               }
+               folder_update_op_count();
+       }
+       else if (!summaryview->filtering_happened) {
                summary_write_cache(summaryview);
+       }
+
+       summaryview->filtering_happened = FALSE;
+
+       summaryview->folderview->opened = selected_node;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        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 ||
+       if (!item || !item->path || !item->parent || item->no_select ||
            (item->folder->type == F_MH &&
             ((buf = folder_item_get_path(item)) == NULL ||
              change_dir(buf) < 0))) {
                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));
+               locked = FALSE;
+               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);
@@ -666,7 +837,36 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
                MsgInfo * msginfo = (MsgInfo *) cur->data;
 
-               msginfo->score = score_message(prefs_scoring, msginfo);
+               msginfo->score = score_message(global_scoring, msginfo);
+               if (msginfo->score != MAX_SCORE &&
+                   msginfo->score != MIN_SCORE) {
+                       msginfo->score += score_message(item->prefs->scoring,
+                                                       msginfo);
+               }
+       }
+
+       summaryview->killed_messages = NULL;
+       if ((global_scoring || item->prefs->scoring) &&
+           (item->folder->type == F_NEWS)) {
+               GSList *not_killed;
+               gint kill_score;
+
+               not_killed = NULL;
+               kill_score = prefs_common.kill_score;
+               if (item->prefs->kill_score > kill_score)
+                       kill_score = item->prefs->kill_score;
+               for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+                       MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+                       if (MSG_IS_NEWS(msginfo->flags) &&
+                           (msginfo->score <= kill_score))
+                               summaryview->killed_messages = g_slist_append(summaryview->killed_messages, msginfo);
+                       else
+                               not_killed = g_slist_append(not_killed,
+                                                           msginfo);
+               }
+               g_slist_free(mlist);
+               mlist = not_killed;
        }
 
        STATUSBAR_POP(summaryview->mainwin);
@@ -679,73 +879,66 @@ 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);
+       gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), 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_clist_thaw(GTK_CLIST(ctree));
 
+       /* sort before */
+       sort_mode = prefs_folder_item_get_sort_mode(item);
+       sort_type = prefs_folder_item_get_sort_type(item);
+
+       if (sort_mode != SORT_BY_NONE) {
+               summaryview->sort_mode = sort_mode;
+               if (sort_type == GTK_SORT_DESCENDING)
+                       summaryview->sort_type = GTK_SORT_ASCENDING;
+               else
+                       summaryview->sort_type = GTK_SORT_DESCENDING;
+
+               summary_sort(summaryview, sort_mode);
+       }
+
        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
+                                       (GTK_CLIST(ctree)->row_list_end);
+                       summary_select_node(summaryview, node, FALSE);
+               }
        } else {
                /* select first unread message */
-               node = summary_find_next_unread_msg(summaryview, NULL);
+               if (sort_mode == SORT_BY_SCORE)
+                       node = summary_find_next_important_score(summaryview,
+                                                                NULL);
+               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);
-               }
+               summary_select_node(summaryview, node,
+                                   prefs_common.open_unread_on_enter);
        }
 
        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);
-
-       /* sort before */
-       sort_mode = prefs_folder_item_get_sort_mode(item);
-       sort_type = prefs_folder_item_get_sort_type(item);
-
-       if (sort_mode != SORT_BY_NONE) {
-               summaryview->sort_mode = sort_mode;
-               if (sort_type == GTK_SORT_DESCENDING)
-                       summaryview->sort_type = GTK_SORT_ASCENDING;
-               else
-                       summaryview->sort_type = GTK_SORT_DESCENDING;
-
-               summary_sort(summaryview, sort_mode);
-       }
+       locked = FALSE;
+       inc_unlock();
 
        return TRUE;
 }
@@ -754,9 +947,19 @@ void summary_clear_list(SummaryView *summaryview)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        gint optimal_width;
+       GSList * cur;
 
        gtk_clist_freeze(clist);
 
+       for(cur = summaryview->killed_messages ; cur != NULL ; 
+           cur = g_slist_next(cur)) {
+               MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+               procmsg_msginfo_free(msginfo);
+       }
+       g_slist_free(summaryview->killed_messages);
+       summaryview->killed_messages = NULL;
+
        gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
                                NULL, summary_free_msginfo_func, NULL);
 
@@ -774,6 +977,10 @@ void summary_clear_list(SummaryView *summaryview)
                g_hash_table_destroy(summaryview->msgid_table);
                summaryview->msgid_table = NULL;
        }
+       if (summaryview->subject_table) {
+               g_hash_table_destroy(summaryview->subject_table);
+               summaryview->subject_table = NULL;
+       }
        summaryview->mlist = NULL;
        if (summaryview->folder_table) {
                g_hash_table_destroy(summaryview->folder_table);
@@ -793,15 +1000,13 @@ 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)
+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)
@@ -813,7 +1018,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;
@@ -827,37 +1042,84 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        }
 
        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);
+               if (summaryview->folder_item->stype != F_TRASH)
+                       menu_set_sensitive(ifactory, "/Delete", 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",                  sens);
-       menu_set_sensitive(ifactory, "/Forward as an attachment", sens);
+       menu_set_sensitive(ifactory, "/Forward",                  TRUE);
+       menu_set_sensitive(ifactory, "/Forward as attachment",    TRUE);
+
+       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);
-       if (summaryview->folder_item->stype == F_DRAFT)
-               menu_set_sensitive(ifactory, "/Reedit", sens);
+       if ((summaryview->folder_item->stype == F_DRAFT) ||
+           (summaryview->folder_item->stype == F_OUTBOX) ||
+           (summaryview->folder_item->stype == F_QUEUE))
+               menu_set_sensitive(ifactory, "/Re-edit", sens);
 
        menu_set_sensitive(ifactory, "/Save as...", sens);
        menu_set_sensitive(ifactory, "/Print...",   TRUE);
 
-       menu_set_sensitive(ifactory, "/Mark", TRUE);
+       menu_set_sensitive(ifactory, "/Select all", TRUE);
 
-       menu_set_sensitive(ifactory, "/Mark/Mark",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
+       if (summaryview->folder_item->folder->account)
+               sens = summaryview->folder_item->folder->account->protocol
+                       == A_NNTP;
+       else
+               sens = FALSE;
+       menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
+}
+
+void summary_select_prev_unread(SummaryView *summaryview)
+{
+       GtkCTreeNode *node;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       menu_set_sensitive(ifactory, "/Mark/Mark as unread",        TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Make it as being read", TRUE);
+       node = summary_find_prev_unread_msg(summaryview, summaryview->selected);
 
-       menu_set_sensitive(ifactory, "/Select all", TRUE);
+       if (!node) {
+               AlertValue val;
+
+               val = alertpanel(_("No more unread messages"),
+                                _("No unread message found. "
+                                  "Search from the end?"),
+                                _("Yes"), _("No"), NULL);
+               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);
+       }
 }
 
 void summary_select_next_unread(SummaryView *summaryview)
@@ -865,10 +1127,10 @@ void summary_select_next_unread(SummaryView *summaryview)
        GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       node = summary_find_next_unread_msg(summaryview,
-                                           summaryview->selected);
+       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)
@@ -877,8 +1139,9 @@ void summary_select_next_unread(SummaryView *summaryview)
        } else {
                AlertValue val;
 
-               val = alertpanel(_("No unread message"),
-                                _("No unread message found. Go to next folder?"),
+               val = alertpanel(_("No more unread messages"),
+                                _("No unread message found. "
+                                  "Go to next folder?"),
                                 _("Yes"), _("No"), NULL);
                if (val == G_ALERTDEFAULT) {
                        if (gtk_signal_n_emissions_by_name
@@ -891,28 +1154,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)
@@ -921,28 +1184,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)
@@ -951,14 +1214,28 @@ 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_msg_by_msgnum(summaryview, msgnum);
+       node = summary_find_prev_labeled_msg(summaryview, summaryview->selected);
 
-       if (node) {
+       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)
@@ -967,39 +1244,102 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
        }
 }
 
-guint summary_get_current_msgnum(SummaryView *summaryview)
+void summary_select_next_labeled(SummaryView *summaryview)
 {
+       GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       MsgInfo *msginfo;
-
-       if (!summaryview->selected)
-               return 0;
-       msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
-       return msginfo->msgnum;
-}
 
-static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
-                                                 GtkCTreeNode *current_node)
-{
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
-       MsgInfo *msginfo;
+       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.
+ **/
+static 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_unread_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_NEXT(current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
 
-       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_UNREAD(msginfo->flags)) break;
+               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
        }
 
        return node;
 }
 
-static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
+static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
                                                  GtkCTreeNode *current_node)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -1007,13 +1347,13 @@ static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        if (current_node)
-               node = GTK_CTREE_NODE_NEXT(current_node);
+               node = 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_MARKED(msginfo->flags)) break;
+               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
        }
 
        return node;
@@ -1039,45 +1379,82 @@ 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_next_marked_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 = gtkut_ctree_node_next(ctree, 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 (msginfo->msgnum == msgnum) break;
+               if (MSG_IS_MARKED(msginfo->flags)) break;
        }
 
        return node;
 }
 
-#if 0
-static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
-                                                 GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_prev_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 = GTK_CTREE_NODE_PREV(current_node);
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(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_next_labeled_msg(SummaryView *summaryview,
+                                                  GtkCTreeNode *current_node)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+
+       if (current_node)
+               node = gtkut_ctree_node_next(ctree, 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_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)
 {
@@ -1183,9 +1560,9 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
 
-       if (MSG_IS_NEW(msginfo->flags))
+       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->newmsgs++;
-       if (MSG_IS_UNREAD(msginfo->flags))
+       if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->unread++;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
@@ -1207,12 +1584,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))
+               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                        summaryview->newmsgs++;
-               if (MSG_IS_UNREAD(msginfo->flags))
+               if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
                        summaryview->unread++;
                if (MSG_IS_DELETED(msginfo->flags))
                        summaryview->deleted++;
@@ -1296,7 +1673,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,
@@ -1324,7 +1701,19 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCListCompareFunc cmp_func;
 
+       if (!summaryview->folder_item)
+               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;
@@ -1343,6 +1732,9 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        case SORT_BY_SCORE:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
                break;
+       case SORT_BY_LABEL:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
+               break;
        default:
                return;
        }
@@ -1367,7 +1759,7 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        gtk_ctree_sort_node(ctree, NULL);
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
-       //gtkut_ctree_set_focus_row(ctree, summaryview->selected);
+       /*gtkut_ctree_set_focus_row(ctree, summaryview->selected);*/
 
        prefs_folder_item_set_config(summaryview->folder_item,
                                     summaryview->sort_type,
@@ -1380,31 +1772,70 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        main_window_cursor_normal(summaryview->mainwin);
 }
 
+static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
+                                          gchar * subject)
+{
+       if (g_strncasecmp(subject, "Re: ", 4) == 0)
+               return g_hash_table_lookup(subject_table, subject + 4);
+       else
+               return g_hash_table_lookup(subject_table, subject);
+}
+
+static void subject_table_insert(GHashTable *subject_table, gchar * subject,
+                                GtkCTreeNode * node)
+{
+       if (g_strncasecmp(subject, "Re: ", 4) == 0)
+               g_hash_table_insert(subject_table, subject + 4, node);
+       else
+               g_hash_table_insert(subject_table, subject, node);
+}
+
 static void summary_set_ctree_from_list(SummaryView *summaryview,
                                        GSList *mlist)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
+       MsgInfo *parentinfo;
+       MsgInfo *cur_msginfo;
        GtkCTreeNode *node, *parent;
        gchar *text[N_SUMMARY_COLS];
        GHashTable *msgid_table;
+       GHashTable *subject_table;
+       GSList * cur;
+       GtkCTreeNode *cur_parent;
 
        if (!mlist) return;
 
        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;
+       subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+       summaryview->subject_table = subject_table;
 
        if (prefs_common.use_addr_book)
                start_address_completion();
        
-       main_window_set_thread_option(summaryview->mainwin);
+       /*main_window_set_thread_option(summaryview->mainwin)*/;
 
-       /*      if (prefs_common.enable_thread) { */
-       if (summaryview->folder_item->prefs->enable_thread) {
+       for (cur = mlist ; cur != NULL; cur = cur->next) {
+               msginfo = (MsgInfo *)cur->data;
+               msginfo->threadscore = msginfo->score;
+       }
+
+       if (global_scoring || summaryview->folder_item->prefs->scoring) {
+               summaryview->important_score = prefs_common.important_score;
+               if (summaryview->folder_item->prefs->important_score >
+                   summaryview->important_score)
+                       summaryview->important_score =
+                               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;
@@ -1412,15 +1843,31 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        summary_set_header(text, msginfo);
 
                        /* search parent node for threading */
-                       if (msginfo->inreplyto && *msginfo->inreplyto)
+                       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);
+                               }
+                       }
 
                        node = gtk_ctree_insert_node
                                (ctree, parent, NULL, text, 2,
-                                NULL, NULL, NULL, NULL, FALSE, TRUE);
+                                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 */
@@ -1429,10 +1876,49 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                            == 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);
+                       }
+
+                       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);
+                               }
+                       }
                }
 
                /* complete the thread */
-               summary_thread_build(summaryview);
+               summary_thread_build(summaryview, TRUE);
        } else {
                for (; mlist != NULL; mlist = mlist->next) {
                        msginfo = (MsgInfo *)mlist->data;
@@ -1441,15 +1927,24 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
                        node = gtk_ctree_insert_node
                                (ctree, NULL, NULL, text, 2,
-                                NULL, NULL, NULL, NULL, FALSE, TRUE);
+                                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)
                                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);
                }
        }
 
@@ -1467,9 +1962,12 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
        debug_print(_("done.\n"));
        STATUSBAR_POP(summaryview->mainwin);
-       if (debug_mode)
+       if (debug_mode) {
                debug_print("\tmsgid hash table size = %d\n",
                            g_hash_table_size(msgid_table));
+               debug_print("\tsubject hash table size = %d\n",
+                           g_hash_table_size(subject_table));
+       }
 }
 
 struct wcachefp
@@ -1485,10 +1983,16 @@ gint summary_write_cache(SummaryView *summaryview)
        gint ver = CACHE_VERSION;
        gchar *buf;
        gchar *cachefile, *markfile;
+       GSList * cur;
+       gint filemode = 0;
+       PrefsFolderItem *prefs;
 
        if (!summaryview->folder_item || !summaryview->folder_item->path)
                return -1;
 
+       if (summaryview->folder_item->folder->update_mark != NULL)
+               summaryview->folder_item->folder->update_mark(summaryview->folder_item->folder, summaryview->folder_item);
+
        cachefile = folder_item_get_cache_file(summaryview->folder_item);
        g_return_val_if_fail(cachefile != NULL, -1);
        if ((fps.cache_fp = fopen(cachefile, "w")) == NULL) {
@@ -1498,6 +2002,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);
@@ -1509,6 +2027,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)..."),
@@ -1523,6 +2049,14 @@ gint summary_write_cache(SummaryView *summaryview)
 
        gtk_ctree_pre_recursive(ctree, NULL, summary_write_cache_func, &fps);
 
+       for(cur = summaryview->killed_messages ; cur != NULL ;
+           cur = g_slist_next(cur)) {
+               MsgInfo *msginfo = (MsgInfo *) cur->data;
+
+               procmsg_write_cache(msginfo, fps.cache_fp);
+               procmsg_write_flags(msginfo, fps.mark_fp);
+       }
+
        fclose(fps.cache_fp);
        fclose(fps.mark_fp);
 
@@ -1554,10 +2088,14 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
 
        text[S_COL_MARK]   = NULL;
        text[S_COL_UNREAD] = NULL;
-       text[S_COL_MIME] = 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);
+#else
        text[S_COL_SCORE]  = itos_buf(col_score, msginfo->score);
+#endif
 
        if (msginfo->date_t) {
                procheader_date_get_localtime(date_modified,
@@ -1572,14 +2110,13 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
        text[S_COL_FROM] = msginfo->fromname ? msginfo->fromname :
                _("(No From)");
        if (prefs_common.swap_from && msginfo->from && msginfo->to &&
-           cur_account && cur_account->address &&
            !MSG_IS_NEWS(msginfo->flags)) {
                gchar *from;
 
                Xalloca(from, strlen(msginfo->from) + 1, return);
                strcpy(from, msginfo->from);
                extract_address(from);
-               if (!strcmp(from, cur_account->address)) {
+               if (account_find_from_address(from)) {
                        g_free(to);
                        to = g_strconcat("-->", msginfo->to, NULL);
                        text[S_COL_FROM] = to;
@@ -1594,13 +2131,15 @@ 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;
+                       }
                }
        }
 
@@ -1608,6 +2147,14 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
                _("(No Subject)");
 }
 
+#define CHANGE_FLAGS(msginfo) \
+{ \
+if (msginfo->folder->folder->change_flags != NULL) \
+msginfo->folder->folder->change_flags(msginfo->folder->folder, \
+                                     msginfo->folder, \
+                                     msginfo); \
+}
+
 static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                                gboolean new_window)
 {
@@ -1623,6 +2170,7 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        lock = TRUE;
 
        STATUSBAR_POP(summaryview->mainwin);
+       GTK_EVENTS_FLUSH();
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
@@ -1633,12 +2181,13 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        }
        g_free(filename);
 
-       if (MSG_IS_NEW(msginfo->flags))
+       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags))
+       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);
@@ -1710,7 +2259,9 @@ void summary_reedit(SummaryView *summaryview)
 
        if (!summaryview->selected) return;
        if (!summaryview->folder_item ||
-           summaryview->folder_item->stype != F_DRAFT) return;
+           (summaryview->folder_item->stype != F_DRAFT &&
+            summaryview->folder_item->stype != F_OUTBOX &&
+            summaryview->folder_item->stype != F_QUEUE)) return;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
@@ -1723,6 +2274,13 @@ 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);
 
@@ -1771,9 +2329,50 @@ 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;
 
@@ -1782,10 +2381,13 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
        flags = msginfo->flags;
 
-       gtk_ctree_node_set_foreground(ctree, row, &summaryview->color_normal);
+       gtk_ctree_node_set_foreground(ctree, row, NULL);
 
        /* set new/unread column */
-       if (MSG_IS_NEW(flags)) {
+       if (MSG_IS_IGNORE_THREAD(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+                                         ignorethreadxpm, ignorethreadxpmmask);
+       } else if (MSG_IS_NEW(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
                                          newxpm, newxpmmask);
        } else if (MSG_IS_UNREAD(flags)) {
@@ -1801,23 +2403,53 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, 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,
                                          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, 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);
+               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");
+                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) &&
+                (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_marked);
+                                             &summaryview->color_important);
        } else {
                gtk_ctree_node_set_text(ctree, row, S_COL_MARK, NULL);
        }
@@ -1828,6 +2460,14 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        } else {
                gtk_ctree_node_set_text(ctree, row, 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)
@@ -1837,19 +2477,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);
 }
@@ -1863,6 +2515,7 @@ void summary_mark(SummaryView *summaryview)
                summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
 
        /* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
+       summary_status_show(summaryview);
 }
 
 static void summary_mark_row_as_read(SummaryView *summaryview,
@@ -1872,15 +2525,16 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
-       if (MSG_IS_NEW(msginfo->flags))
+       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags))
+       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);
-               debug_print(_("Message %d is marked as being read\n"),
+               debug_print(_("Message %d is marked as read\n"),
                            msginfo->msgnum);
        }
 }
@@ -1897,6 +2551,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)
 {
@@ -1906,18 +2580,19 @@ 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);
        }
+
+       CHANGE_FLAGS(msginfo);
+
        summary_set_row_marks(summaryview, row);
 }
 
@@ -1935,6 +2610,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;
 
@@ -1942,16 +2618,24 @@ 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)
@@ -2027,22 +2711,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"),
@@ -2064,23 +2756,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);
@@ -2107,8 +2821,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)
@@ -2118,30 +2835,52 @@ void summary_move_to(SummaryView *summaryview)
        if (!summaryview->folder_item ||
            summaryview->folder_item->folder->type == F_NEWS) return;
 
-       to_folder = foldersel_folder_sel(NULL);
+       to_folder = foldersel_folder_sel(NULL, NULL);
        summary_move_selected_to(summaryview, to_folder);
 }
 
 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);
@@ -2169,8 +2908,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)
@@ -2180,14 +2922,29 @@ void summary_copy_to(SummaryView *summaryview)
        if (!summaryview->folder_item ||
            summaryview->folder_item->folder->type == F_NEWS) return;
 
-       to_folder = foldersel_folder_sel(NULL);
+       to_folder = foldersel_folder_sel(NULL, NULL);
        summary_copy_selected_to(summaryview, to_folder);
 }
 
-void summary_select_all(SummaryView *summaryview)
+void summary_add_address(SummaryView *summaryview)
 {
-       if (summaryview->messages >= 500) {
-               STATUSBAR_PUSH(summaryview->mainwin,
+       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) {
+               STATUSBAR_PUSH(summaryview->mainwin,
                               _("Selecting all messages..."));
                main_window_cursor_wait(summaryview->mainwin);
        }
@@ -2260,7 +3017,7 @@ void summary_print(SummaryView *summaryview)
                        (ctree, GTK_CTREE_NODE(cur->data));
                if (msginfo) procmsg_print_message(msginfo, cmdline);
        }
-       
+
        g_free(cmdline);
 }
 
@@ -2275,7 +3032,8 @@ void summary_execute(SummaryView *summaryview)
 
        gtk_clist_freeze(clist);
 
-       if (prefs_common.enable_thread)
+       /*if (summaryview->folder_item->prefs->enable_thread) */
+                       if (prefs_common.enable_thread)
                summary_unthread_for_exec(summaryview);
 
        summary_execute_move(summaryview);
@@ -2284,7 +3042,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);
@@ -2298,8 +3056,9 @@ void summary_execute(SummaryView *summaryview)
                node = next;
        }
 
-       if (prefs_common.enable_thread)
-               summary_thread_build(summaryview);
+       /*if (summaryview->folder_item->prefs->enable_thread) */
+       if (prefs_common.enable_thread) 
+               summary_thread_build(summaryview, FALSE);
 
        summaryview->selected = clist->selection ?
                GTK_CTREE_NODE(clist->selection->data) : NULL;
@@ -2411,7 +3170,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);
        }
 }
@@ -2434,6 +3193,11 @@ 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);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
@@ -2464,25 +3228,86 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
                                                msginfo->msgid))
                        g_hash_table_remove(summaryview->msgid_table,
                                            msginfo->msgid);
+
+               if (msginfo->subject && 
+                   node == subject_table_lookup(summaryview->subject_table, 
+                                               msginfo->subject)) {
+                       gchar *s = msginfo->subject + (g_strncasecmp(msginfo->subject, "Re: ", 4) == 0 ? 4 : 0);
+                       g_hash_table_remove(summaryview->subject_table, s);
+               }                       
        }
 }
 
 /* thread functions */
 
-void summary_thread_build(SummaryView *summaryview)
+void summary_thread_build(SummaryView *summaryview, gboolean init)
 {
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       GtkCTreeNode *next;
+       GtkCTreeNode *parent;
+       MsgInfo *msginfo;
+
        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));
 
-       gtk_ctree_pre_recursive_to_depth
-               (GTK_CTREE(summaryview->ctree), NULL, 1,
-                GTK_CTREE_FUNC(summary_thread_func),
-                summaryview->msgid_table);
+       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       while (node) {
+               next = GTK_CTREE_ROW(node)->sibling;
 
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+               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);
+                       }
+               }
+
+               node = next;
+       }
+
+       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;
+               }
+       }
+
+       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);
@@ -2491,21 +3316,35 @@ void summary_thread_build(SummaryView *summaryview)
 
 void summary_unthread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node;
+       GtkCTreeNode *child;
+       GtkCTreeNode *sibling;
+       GtkCTreeNode *next_child;
 
        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);
@@ -2531,43 +3370,6 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
        debug_print(_("done.\n"));
 }
 
-static void summary_thread_func(GtkCTree *ctree, GtkCTreeNode *node,
-                               gpointer data)
-{
-       MsgInfo *msginfo;
-       GtkCTreeNode *parent;
-       GHashTable *msgid_table = (GHashTable *)data;
-
-       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
-
-       if (!msginfo || !msginfo->inreplyto) return;
-
-       parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
-
-       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;
-       }
-}
-
 static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
                                           gpointer data)
 {
@@ -2610,16 +3412,35 @@ void summary_filter(SummaryView *summaryview)
 
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
-       gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
-                               GTK_CTREE_FUNC(summary_filter_func),
-                               summaryview);
+       if (prefs_filtering == NULL) {
+               gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
+                                       GTK_CTREE_FUNC(summary_filter_func),
+                                       summaryview);
+               
+               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+               if (prefs_common.immediate_exec)
+                       summary_execute(summaryview);
+               else
+                       summary_status_show(summaryview);
+       }
+       else {
+               summaryview->folder_table = g_hash_table_new(NULL, NULL);
 
-       if (prefs_common.immediate_exec)
-               summary_execute(summaryview);
-       else
-               summary_status_show(summaryview);
+               gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
+                                       GTK_CTREE_FUNC(summary_filter_func),
+                                       summaryview);
+
+               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
+               folder_item_scan_foreach(summaryview->folder_table);
+               folderview_update_item_foreach(summaryview->folder_table);
+
+               g_hash_table_destroy(summaryview->folder_table);
+               summaryview->folder_table = NULL;
+
+               summary_show(summaryview, summaryview->folder_item, FALSE);
+       }
 
        debug_print(_("done.\n"));
        STATUSBAR_POP(summaryview->mainwin);
@@ -2634,13 +3455,205 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
        gchar *file;
        FolderItem *dest;
 
-       file = procmsg_get_message_file_path(msginfo);
-       dest = filter_get_dest_folder(prefs_common.fltlist, file);
-       g_free(file);
+       if (prefs_filtering == NULL) {
+               /* old filtering */
+               file = procmsg_get_message_file_path(msginfo);
+               dest = filter_get_dest_folder(prefs_common.fltlist, file);
+               g_free(file);
+
+               if (dest && strcmp2(dest->path, FILTER_NOT_RECEIVE) != 0 &&
+                   summaryview->folder_item != dest)
+                       summary_move_row_to(summaryview, node, dest);
+       }
+       else
+               filter_msginfo_move_or_delete(prefs_filtering, msginfo,
+                                             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));
+}
 
-       if (dest && strcmp2(dest->path, FILTER_NOT_RECEIVE) != 0 &&
-           summaryview->folder_item != dest)
-               summary_move_row_to(summaryview, node, dest);
+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 */
@@ -2663,8 +3676,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) {
@@ -2689,6 +3702,16 @@ 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) { \
+               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
+                                            "key_press_event"); \
+       }
+
 static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
@@ -2701,14 +3724,10 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        switch (event->keyval) {
        case GDK_g:             /* Go */
        case GDK_G:
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
-
-               if (gtk_signal_n_emissions_by_name
-                       (GTK_OBJECT(ctree), "key_press_event") > 0)
-                       gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
-                                                    "key_press_event");
-
-               to_folder = foldersel_folder_sel(NULL);
+               KEY_PRESS_EVENT_STOP();
+               to_folder = foldersel_folder_sel(NULL, NULL);
                if (to_folder) {
                        debug_print(_("Go to %s\n"), to_folder->path);
                        folderview_select(summaryview->folderview, to_folder);
@@ -2716,20 +3735,25 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return;
        case GDK_w:             /* Write new message */
                BREAK_ON_MODIFIER_KEY();
-               if (summaryview->folder_item)
-                       compose_new(summaryview->folder_item->folder->account);
-               else
+               if (summaryview->folder_item) {
+                       PrefsAccount *ac;
+                       ac = summaryview->folder_item->folder->account;
+                       if (ac && ac->protocol == A_NNTP)
+                               compose_new_with_recipient
+                                       (ac, summaryview->folder_item->path);
+                       else
+                               compose_new_with_folderitem(ac, summaryview->folder_item);
+               } else
                        compose_new(NULL);
                return;
        case GDK_D:             /* Empty trash */
+               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
-               if (gtk_signal_n_emissions_by_name
-                       (GTK_OBJECT(ctree), "key_press_event") > 0)
-                       gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
-                                                    "key_press_event");
+               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) {
@@ -2748,6 +3772,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return;
        default:
+               break;
        }
 
        if (!summaryview->selected) {
@@ -2809,6 +3834,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;
@@ -2818,16 +3844,20 @@ 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);
                break;
        case GDK_a:             /* Reply to the message */
@@ -2853,12 +3883,19 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_save_as(summaryview);
                break;
        default:
+               break;
        }
 }
 
+#undef BREAK_ON_MODIFIER_KEY
+#undef RETURN_IF_LOCKED
+#undef KEY_PRESS_EVENT_STOP
+
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
-       if (summaryview->folder_item->stype == F_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);
@@ -2866,6 +3903,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)
 {
@@ -2887,7 +3936,8 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        switch (column) {
        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);
@@ -2903,6 +3953,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                }
                break;
        default:
+               break;
        }
 
        if (summaryview->display_msg)
@@ -2943,6 +3994,7 @@ static void summary_col_resized(GtkCList *clist, gint column, gint width,
                prefs_common.summary_col_subject = width;
                break;
        default:
+               break;
        }
 }
 
@@ -2950,38 +4002,67 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                             GtkWidget *widget)
 {
        MsgInfo *msginfo;
+       GList  *sel = GTK_CLIST(summaryview->ctree)->selection;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
 
-       switch ((ComposeReplyMode)action) {
+       switch ((ComposeMode)action) {
        case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE);
                break;
        case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE);
+               compose_reply(msginfo, TRUE, FALSE, FALSE);
                break;
        case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE);
+               compose_reply(msginfo, FALSE, FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE);
+               break;
+       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+               compose_followup_and_reply_to(msginfo,
+                                             prefs_common.reply_with_quote,
+                                             FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, TRUE);
                break;
        case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote, TRUE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             TRUE, FALSE);
                break;
        case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE);
+               compose_reply(msginfo, TRUE, TRUE, FALSE);
                break;
        case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE);
+               compose_reply(msginfo, FALSE, TRUE, FALSE);
                break;
        case COMPOSE_FORWARD:
-               compose_forward(msginfo, FALSE);
-               break;
+               if (!sel->next) {
+                       compose_forward(NULL, msginfo, FALSE);
+                       break;
+               }
+               /* if (sel->next) FALL THROUGH */
        case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward(msginfo, TRUE);
+               {
+                       GSList *msginfo_list = NULL;
+                       for ( ; sel != NULL; sel = sel->next)
+                               msginfo_list = g_slist_append(msginfo_list, 
+                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                               GTK_CTREE_NODE(sel->data)));
+                       compose_forward_multiple(NULL, msginfo_list);
+                       g_slist_free(msginfo_list);
+               }                       
                break;
        default:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               g_warning("summary_reply_cb(): invalid action: %d\n", action);
        }
 
        summary_set_marks_selected(summaryview);
@@ -2993,56 +4074,25 @@ static void summary_show_all_header_cb(SummaryView *summaryview,
        header_window_show_cb(summaryview->mainwin, action, widget);
 }
 
-static void summary_add_sender_to_cb (SummaryView                      *summaryview,
-                                        guint                   action,
-                                        GtkWidget              *widget_)
-{
-       GtkWidget               *submenu;                                               
-       GList                   *groups, *tmp;
-       GtkMenuShell    *menushell;
-       GtkWidget               *menu;
-       GtkWidget               *menuitem;
-       GList                   *child = menushell->children;
-       gboolean                found = FALSE;
-       MsgInfo                 *msginfo;
-       gchar                   *from_address;
-
-       menushell = GTK_MENU_SHELL(summaryview->popupmenu);
-       g_return_if_fail(GTK_MENU_SHELL(summaryview->popupmenu));
-
-       /* 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, 12);
-               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);
-       g_return_if_fail(msginfo != NULL);
-
-       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);
-       
+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)
@@ -3092,10 +4142,8 @@ void summary_change_display_item(SummaryView *summaryview)
        gtk_clist_set_column_visibility(clist, S_COL_SUBJECT, prefs_common.show_subject);
 }
 
-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;
@@ -3163,6 +4211,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)
 {
@@ -3218,6 +4293,15 @@ static gint summary_cmp_by_subject(GtkCList *clist,
        return strcasecmp(msginfo1->subject, msginfo2->subject);
 }
 
+static gint summary_cmp_by_label(GtkCList *clist,
+                                gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       return MSG_GET_COLORLABEL(msginfo1->flags) -
+               MSG_GET_COLORLABEL(msginfo2->flags);
+}
 static gint summary_cmp_by_score(GtkCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -3227,9 +4311,75 @@ static gint summary_cmp_by_score(GtkCList *clist,
 
        /* if score are equal, sort by date */
 
-       diff = msginfo1->score - msginfo2->score;
+       diff = msginfo1->threadscore - msginfo2->threadscore;
        if (diff != 0)
                return diff;
        else
                return summary_cmp_by_date(clist, ptr1, ptr2);
 }
+
+static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *) data;
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_NEW(msginfo->flags))
+               summaryview->newmsgs--;
+       if (MSG_IS_UNREAD(msginfo->flags))
+               summaryview->unread--;
+       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);
+}
+
+static void summary_ignore_thread(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GList *cur;
+
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+               gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_ignore_thread_func), summaryview);
+       }
+
+       summary_status_show(summaryview);
+}
+
+static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *) data;
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_NEW(msginfo->flags))
+               summaryview->newmsgs++;
+       if (MSG_IS_UNREAD(msginfo->flags))
+               summaryview->unread++;
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+
+       CHANGE_FLAGS(msginfo);
+               
+       summary_set_row_marks(summaryview, row);
+       debug_print(_("Message %d is marked as unignore thread\n"),
+           msginfo->msgnum);
+}
+
+static void summary_unignore_thread(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GList *cur;
+
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+               gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_unignore_thread_func), summaryview);
+       }
+
+       summary_status_show(summaryview);
+}
+/*
+ * End of Source.
+ */
+