fixed segfault
[claws.git] / src / summaryview.c
index 912c26884e0fcdc2f182b0e9c6780f0ac47bc275..a43e010d869fad60565e67b65b8671d31a7f710e 100644 (file)
@@ -75,6 +75,7 @@
 #include "scoring.h"
 #include "prefs_folder_item.h"
 #include "filtering.h"
+#include "labelcolors.h"
 
 #include "pixmaps/dir-open.xpm"
 #include "pixmaps/mark.xpm"
@@ -84,6 +85,7 @@
 #include "pixmaps/replied.xpm"
 #include "pixmaps/forwarded.xpm"
 #include "pixmaps/clip.xpm"
+#include "pixmaps/ignorethread.xpm"
 
 #define STATUSBAR_PUSH(mainwin, str) \
 { \
@@ -120,6 +122,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;
@@ -204,6 +208,8 @@ 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,
@@ -266,6 +272,8 @@ static void summary_from_clicked    (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_subject_clicked    (GtkWidget              *button,
                                         SummaryView            *summaryview);
+static void summary_mark_clicked       (GtkWidget              *button,
+                                        SummaryView            *summaryview);
 
 static void summary_start_drag         (GtkWidget        *widget, 
                                         int button,
@@ -298,6 +306,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] =
 {
@@ -315,11 +330,17 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
        {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark/Mark as unr_ead"),  NULL, summary_mark_as_unread, 0, NULL},
-       {N_("/_Mark/Mark as rea_d"),
-                                       NULL, summary_mark_as_read, 0, NULL},
+       {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
+#if MARK_ALL_READ      
+       {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
+#endif 
+       {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
+       {N_("/_Mark/Unignore thread"),  NULL, summary_unignore_thread, 0, NULL},
+
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
        {N_("/Repl_y to sender"),       NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/Reply to a_ll"),          NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/Forward as a_ttachment"),
@@ -336,6 +357,185 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Select _all"),            NULL, summary_select_all, 0, NULL}
 };
 
+#define LABEL_COLORS_ELEMS labelcolors_get_color_count() 
+
+static void label_menu_item_activate_cb(GtkWidget *widget, gpointer data)
+{
+       guint color = GPOINTER_TO_UINT(data);
+       SummaryView *view = gtk_object_get_data(GTK_OBJECT(widget), "view");
+
+       g_return_if_fail(view);
+
+       /* "dont_toggle" state set? */
+       if (gtk_object_get_data(GTK_OBJECT(view->label_menu), "dont_toggle"))
+               return;
+
+       summary_set_label(view, color, NULL);
+}
+
+/* summary_set_label_color() - labelcolor parameter is the color *flag*
+ * for the messsage; not the color index */
+void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
+                            guint labelcolor)
+{
+       GdkColor  color;
+       GtkStyle *style, *prev_style, *ctree_style;
+       MsgInfo  *msginfo;
+       gint     color_index;
+
+       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 (!prev_style)
+               prev_style = ctree_style;
+
+       style = gtk_style_copy(prev_style);
+
+       if (color_index < 0 || color_index >= LABEL_COLORS_ELEMS) {
+               color_index = 0;
+               color.red = ctree_style->fg[GTK_STATE_NORMAL].red;
+               color.green = ctree_style->fg[GTK_STATE_NORMAL].green;
+               color.blue = ctree_style->fg[GTK_STATE_NORMAL].blue;
+               style->fg[GTK_STATE_NORMAL] = color;
+
+               color.red = ctree_style->fg[GTK_STATE_SELECTED].red;
+               color.green = ctree_style->fg[GTK_STATE_SELECTED].green;
+               color.blue = ctree_style->fg[GTK_STATE_SELECTED].blue;
+               style->fg[GTK_STATE_SELECTED] = color;
+               gtk_ctree_node_set_row_style(ctree, node, style);
+       }
+       else {
+               color = labelcolors_get_color(color_index);
+       }               
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LABEL);
+       MSG_SET_LABEL_VALUE(msginfo->flags, labelcolor);
+
+       if ( style ) {
+               style->fg[GTK_STATE_NORMAL] = color;
+               style->fg[GTK_STATE_SELECTED] = color;
+               gtk_ctree_node_set_row_style(ctree, node, style);
+       }
+}
+
+void summary_set_label(SummaryView *summaryview, guint labelcolor, GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GList *cur;
+  
+       for (cur = clist->selection; cur != NULL; cur = cur->next)
+               summary_set_label_color(ctree, GTK_CTREE_NODE(cur->data), labelcolor);
+}
+
+static void label_menu_item_activate_item_cb(GtkMenuItem *label_menu_item, gpointer data)
+{
+       SummaryView  *summaryview;
+       GtkMenuShell *label_menu;
+       GtkCheckMenuItem **items;
+       int  n;
+       GList *cur, *sel;
+
+       summaryview = (SummaryView *) data;
+       g_return_if_fail(summaryview);
+       if (NULL == (sel = GTK_CLIST(summaryview->ctree)->selection))
+               return;
+       
+       label_menu = GTK_MENU_SHELL(summaryview->label_menu);
+       g_return_if_fail(label_menu);
+
+       items = alloca( (LABEL_COLORS_ELEMS + 1) * sizeof(GtkWidget *));
+       g_return_if_fail(items);
+
+       /* NOTE: don't return prematurely because we set the "dont_toggle" state
+        * for check menu items */
+       gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(1));
+
+       /* clear items. get item pointers. */
+       for (n = 0, cur = label_menu->children; cur != NULL; cur = cur->next) {
+               if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
+                       gtk_check_menu_item_set_state(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
+                       items[n] = GTK_CHECK_MENU_ITEM(cur->data);
+                       n++;
+               }
+       }
+
+       if (n == (LABEL_COLORS_ELEMS + 1)) {
+               /* iterate all messages and set the state of the appropriate items */
+               for (; sel != NULL; sel = sel->next) {
+                       MsgInfo *msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                               GTK_CTREE_NODE(sel->data));
+                       gint menu_item;                         
+                       if (msginfo) {
+                               menu_item = MSG_GET_LABEL_VALUE(msginfo->flags);
+                               if (!items[menu_item]->active)
+                                       gtk_check_menu_item_set_state(items[menu_item], TRUE);
+                       }
+               }
+       }
+       else 
+               g_warning("invalid number of color elements (%d)\n", n);
+       
+       /* reset "dont_toggle" state */
+       gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(0));
+}
+
+static void summary_create_label_menu(SummaryView *summaryview)
+{
+       const gint LABEL_MENU_POS = 5;
+       GtkWidget *label_menu_item;
+       GtkWidget *label_menu;
+       GtkWidget *item;
+       gint       i;
+
+       label_menu_item = gtk_menu_item_new_with_label(_("Label"));
+       gtk_menu_insert(GTK_MENU(summaryview->popupmenu), label_menu_item, LABEL_MENU_POS);
+       gtk_signal_connect(GTK_OBJECT(label_menu_item), "activate",
+               GTK_SIGNAL_FUNC(label_menu_item_activate_item_cb), summaryview);
+               
+       gtk_widget_show(label_menu_item);
+       summaryview->label_menu_item = label_menu_item;
+
+       label_menu = gtk_menu_new();
+
+       /* create sub items. for the menu item activation callback we pass the 
+        * index of label_colors[] as data parameter. for the None color we pass
+        * an invalid (high) value. also we attach a data pointer so we can
+        * always get back the SummaryView pointer. */
+        
+       item = gtk_check_menu_item_new_with_label(_("None"));
+       gtk_menu_append(GTK_MENU(label_menu), item);
+       gtk_signal_connect(GTK_OBJECT(item), "activate",  
+               GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
+               GUINT_TO_POINTER(0));
+       gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);     
+       gtk_widget_show(item);
+       
+       item = gtk_menu_item_new();
+       gtk_menu_append(GTK_MENU(label_menu), item);
+       gtk_widget_show(item);
+
+       /* create pixmap/label menu items */
+       for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
+               item = labelcolors_create_check_color_menu_item(i);
+               gtk_menu_append(GTK_MENU(label_menu), item);
+               gtk_signal_connect(GTK_OBJECT(item), "activate", 
+                                  GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
+                                  GUINT_TO_POINTER(i + 1));
+               gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);
+               gtk_widget_show(item);
+       }
+       
+       gtk_widget_show(label_menu);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menu_item), label_menu);
+       summaryview->label_menu = label_menu;   
+}
+
 SummaryView *summary_create(void)
 {
        SummaryView *summaryview;
@@ -466,6 +666,11 @@ SummaryView *summary_create(void)
                 "clicked",
                 GTK_SIGNAL_FUNC(summary_subject_clicked),
                 summaryview);
+       gtk_signal_connect
+               (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_MARK].button),
+                "clicked",
+                GTK_SIGNAL_FUNC(summary_mark_clicked),
+                summaryview);
 
        /* create status label */
        hbox = gtk_hbox_new(FALSE, 0);
@@ -547,6 +752,8 @@ 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);
@@ -573,6 +780,8 @@ void summary_init(SummaryView *summaryview)
 
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
+       summary_create_label_menu(summaryview);
+
 }
 
 GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
@@ -585,7 +794,7 @@ GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
        GtkCTreeNode *best_node = NULL;
 
        if (current_node)
-               //node = current_node;
+               /*node = current_node;*/
                node = GTK_CTREE_NODE_NEXT(current_node);
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
@@ -616,7 +825,7 @@ GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
        GtkCTreeNode *best_node = NULL;
 
        if (current_node)
-               //node = current_node;
+               /*node = current_node;*/
                node = GTK_CTREE_NODE_PREV(current_node);
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
@@ -642,8 +851,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
-       GSList *mlist = NULL;
-       gchar *buf;
+       GSList *mlist = NULL; gchar *buf;
        gboolean is_refresh;
        guint prev_msgnum = 0;
        GtkCTreeNode *selected_node = summaryview->folderview->selected;
@@ -655,6 +863,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        is_refresh = (!prefs_common.open_inbox_on_inc &&
                      item == summaryview->folder_item) ? TRUE : FALSE;
+
        if (is_refresh) {
                prev_msgnum = summary_get_current_msgnum(summaryview);
                if (prev_msgnum < 1)
@@ -674,8 +883,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        summary_write_cache(summaryview);
                else
                        return FALSE;
-       } else
+       }
+       else if (!summaryview->filtering_happened) {
                summary_write_cache(summaryview);
+       }
+
+       summaryview->filtering_happened = FALSE;
 
        summaryview->folderview->opened = selected_node;
 
@@ -686,7 +899,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        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))) {
@@ -780,7 +993,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                           GTK_SIGNAL_FUNC (summary_drag_data_get),
                           summaryview);
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+        gtk_clist_thaw(GTK_CLIST(ctree));
 
        /* sort before */
        sort_mode = prefs_folder_item_get_sort_mode(item);
@@ -826,7 +1039,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                (summaryview->mainwin, summaryview->selected ? TRUE : FALSE);
 
        debug_print("\n");
-       STATUSBAR_PUSH(summaryview->mainwin, _("done."));
+       STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
 
        main_window_cursor_normal(summaryview->mainwin);
 
@@ -867,6 +1080,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);
@@ -925,15 +1142,17 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                menu_set_sensitive(ifactory, "/Move...", TRUE);
                menu_set_sensitive(ifactory, "/Copy...", TRUE);
        }
+
+       gtk_widget_set_sensitive(summaryview->label_menu_item, TRUE);
        menu_set_sensitive(ifactory, "/Execute", 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 attachment",    sens);
-
+       menu_set_sensitive(ifactory, "/Forward",                  TRUE);
+       menu_set_sensitive(ifactory, "/Forward as attachment",    TRUE);
+       
        menu_set_sensitive(ifactory, "/Open in new window", sens);
        menu_set_sensitive(ifactory, "/View source", sens);
        menu_set_sensitive(ifactory, "/Show all header", sens);
@@ -950,10 +1169,22 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        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/Make as read",          TRUE);
+       menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
+       menu_set_sensitive(ifactory, "/Mark/Mark as read",   TRUE);
+#if MARK_ALL_READ      
+       menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
+#endif 
+       menu_set_sensitive(ifactory, "/Mark/Ignore thread",   TRUE);
+       menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
 
        menu_set_sensitive(ifactory, "/Select all", TRUE);
+
+       if (summaryview->folder_item->folder->account)
+               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_next_unread(SummaryView *summaryview)
@@ -967,6 +1198,12 @@ void summary_select_next_unread(SummaryView *summaryview)
        if (node) {
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
                gtk_sctree_select(GTK_SCTREE(ctree), node);
+
+               /* BUGFIX: select next unread message 
+                * REVERT: causes incorrect folder stats
+                * gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0); 
+                */
+
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;
                summary_display_msg(summaryview, node, FALSE);
@@ -1055,11 +1292,16 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
        node = summary_find_msg_by_msgnum(summaryview, msgnum);
 
        if (node) {
+               GTK_EVENTS_FLUSH();
+               gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+               gtk_widget_grab_focus(GTK_WIDGET(ctree));
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
                gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               if (summaryview->msg_is_toggled_on) {
+                       if (summaryview->displayed == node)
+                               summaryview->displayed = NULL;
+                       summary_display_msg(summaryview, node, FALSE);
+               }
        }
 }
 
@@ -1071,6 +1313,8 @@ guint summary_get_current_msgnum(SummaryView *summaryview)
        if (!summaryview->selected)
                return 0;
        msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
+       if (!msginfo)
+               return 0;
        return msginfo->msgnum;
 }
 
@@ -1083,13 +1327,13 @@ static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
 
        if (current_node)
                node = current_node;
-               //node = GTK_CTREE_NODE_NEXT(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 (MSG_IS_UNREAD(msginfo->flags)) break;
+               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
        }
 
        return node;
@@ -1162,7 +1406,7 @@ static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
 
        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);
 
@@ -1279,9 +1523,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++;
@@ -1306,9 +1550,9 @@ static void summary_update_status(SummaryView *summaryview)
             node != NULL; node = GTK_CTREE_NODE_NEXT(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++;
@@ -1442,6 +1686,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;
        }
@@ -1466,7 +1713,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,
@@ -1479,6 +1726,24 @@ 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)
 {
@@ -1489,6 +1754,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        GtkCTreeNode *node, *parent;
        gchar *text[N_SUMMARY_COLS];
        GHashTable *msgid_table;
+       GHashTable *subject_table;
        GSList * cur;
        GtkCTreeNode *cur_parent;
 
@@ -1500,6 +1766,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
        summaryview->msgid_table = msgid_table;
+       subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+       summaryview->subject_table = subject_table;
 
        if (prefs_common.use_addr_book)
                start_address_completion();
@@ -1525,13 +1793,30 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        msginfo = (MsgInfo *)mlist->data;
                        parent = NULL;
 
+                       summary_set_header(text, msginfo);
+
                        /* search parent node for threading */
                        if (msginfo->inreplyto && *msginfo->inreplyto) {
                                parent = g_hash_table_lookup
                                        (msgid_table, msginfo->inreplyto);
                        }
-
-                       summary_set_header(text, msginfo);
+                       if (parent == NULL && msginfo->subject &&
+                           g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
+                               parent = subject_table_lookup
+                                       (subject_table, msginfo->subject);
+                       }
+                       if(parent) {
+                               parentinfo = gtk_ctree_node_get_row_data(ctree, parent);
+                               if(parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
+/*
+                                       if (MSG_IS_NEW(msginfo->flags))
+                                               summaryview->newmsgs--;
+                                       if (MSG_IS_UNREAD(msginfo->flags))
+                                               summaryview->unread--;
+*/
+                                       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+                               }
+                       }
 
                        node = gtk_ctree_insert_node
                                (ctree, parent, NULL, text, 2,
@@ -1539,6 +1824,9 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
 
                        summary_set_marks_func(ctree, node, summaryview);
+                       
+                       if (MSG_GET_LABEL(msginfo->flags))
+                               summary_set_label_color(ctree, node, MSG_GET_LABEL_VALUE(msginfo->flags));
 
                        /* preserve previous node if the message is
                           duplicated */
@@ -1547,6 +1835,12 @@ 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;
@@ -1573,6 +1867,12 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                    *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);
+                               }
                        }
                }
 
@@ -1590,11 +1890,20 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
                        summary_set_marks_func(ctree, node, summaryview);
 
+                       if ( MSG_GET_LABEL(msginfo->flags) )
+                         summary_set_label_color(ctree, node, MSG_GET_LABEL_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);
                }
        }
 
@@ -1612,9 +1921,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
@@ -1711,7 +2023,7 @@ 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
@@ -1733,14 +2045,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_mail_from_address(from)) {
                        g_free(to);
                        to = g_strconcat("-->", msginfo->to, NULL);
                        text[S_COL_FROM] = to;
@@ -1755,13 +2066,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;
+                       }
                }
        }
 
@@ -1802,6 +2115,18 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        }
        g_free(filename);
 
+       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+               summaryview->newmsgs--;
+       if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+               summaryview->unread--;
+       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+               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);
+       }
+
        if (new_window) {
                MessageView *msgview;
 
@@ -1824,20 +2149,6 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                gtkut_ctree_node_move_if_on_the_edge(ctree, row);
        }
 
-       if (MSG_IS_NEW(msginfo->flags))
-               summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags))
-               summaryview->unread--;
-       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_UNSET_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);
-       }
-
        if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
                header_window_show(summaryview->headerwin, msginfo);
 
@@ -1956,10 +2267,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)) {
@@ -1996,8 +2310,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        else if ((global_scoring ||
                  summaryview->folder_item->prefs->scoring) &&
                 (msginfo->score >= summaryview->important_score) &&
-                ((msginfo->flags &
-                  (MSG_MARKED | MSG_MOVE | MSG_COPY)) == 0)) {
+                (MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
                gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
                gtk_ctree_node_set_foreground(ctree, row,
                                              &summaryview->color_important);
@@ -2031,11 +2344,10 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        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);
-
+       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);
 }
@@ -2059,18 +2371,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);
        }
 }
@@ -2087,6 +2397,15 @@ void summary_mark_as_read(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
+#if MARK_ALL_READ
+static void summary_mark_all_read(SummaryView *summaryview)
+{
+       summary_select_all(summaryview);
+       summary_mark_as_read(summaryview);
+       summary_unselect_all(summaryview);
+}
+#endif
+
 static void summary_mark_row_as_unread(SummaryView *summaryview,
                                       GtkCTreeNode *row)
 {
@@ -2096,13 +2415,12 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
        if (MSG_IS_DELETED(msginfo->flags)) {
                msginfo->to_folder = NULL;
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
                summaryview->deleted--;
        }
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
        if (!MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_SET_FLAGS(msginfo->flags, MSG_UNREAD);
-
+               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
                gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
                                          unreadxpm, unreadxpmmask);
                summaryview->unread++;
@@ -2141,14 +2459,10 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        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);
-
+       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)
@@ -2235,14 +2549,9 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED |
-                       MSG_DELETED |
-                       MSG_MOVE |
-                       MSG_COPY);
-
+       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"),
@@ -2273,13 +2582,12 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
        msginfo->to_folder = to_folder;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED | MSG_DELETED | MSG_COPY);
+       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++;
        }
-
        if (!prefs_common.immediate_exec)
                summary_set_row_marks(summaryview, row);
 
@@ -2319,7 +2627,7 @@ 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);
 }
 
@@ -2335,13 +2643,12 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
        msginfo->to_folder = to_folder;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED | MSG_DELETED | MSG_MOVE);
+       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++;
        }
-
        if (!prefs_common.immediate_exec)
                summary_set_row_marks(summaryview, row);
 
@@ -2382,7 +2689,7 @@ 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);
 }
 
@@ -2462,7 +2769,7 @@ void summary_print(SummaryView *summaryview)
                        (ctree, GTK_CTREE_NODE(cur->data));
                if (msginfo) procmsg_print_message(msginfo, cmdline);
        }
-       
+
        g_free(cmdline);
 }
 
@@ -2615,8 +2922,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);
        }
 }
@@ -2641,7 +2947,7 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo = cur->data;
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
        }
 
        folder_item_move_msgs_with_dest(trash, summaryview->mlist);
@@ -2674,6 +2980,13 @@ 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);
+               }                       
        }
 }
 
@@ -2690,7 +3003,7 @@ void summary_thread_build(SummaryView *summaryview)
        gtk_ctree_pre_recursive_to_depth
                (GTK_CTREE(summaryview->ctree), NULL, 1,
                 GTK_CTREE_FUNC(summary_thread_func),
-                summaryview->msgid_table);
+                summaryview);
 
        gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
@@ -2745,14 +3058,23 @@ static void summary_thread_func(GtkCTree *ctree, GtkCTreeNode *node,
                                gpointer data)
 {
        MsgInfo *msginfo;
-       GtkCTreeNode *parent;
-       GHashTable *msgid_table = (GHashTable *)data;
+       GtkCTreeNode *parent = NULL;
+       
+       SummaryView * summaryview = (SummaryView *) data;
+       GHashTable *msgid_table = summaryview->msgid_table;
+       GHashTable *subject_table = summaryview->subject_table;
 
        msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
-       if (!msginfo || !msginfo->inreplyto) return;
+       if (!msginfo) return;
 
-       parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
+       if(msginfo->inreplyto) {
+           parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
+       }
+       if (parent == NULL && msginfo->subject &&
+           g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
+               parent = subject_table_lookup(subject_table, msginfo->subject);
+       }
 
        if (parent && parent != node) {
                gtk_ctree_move(ctree, node, parent, NULL);
@@ -2924,6 +3246,13 @@ 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 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)
 {
@@ -2937,13 +3266,8 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_g:             /* Go */
        case GDK_G:
                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);
@@ -2951,17 +3275,20 @@ 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(ac);
+               } else
                        compose_new(NULL);
                return;
        case GDK_D:             /* Empty trash */
                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 */
@@ -2983,6 +3310,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return;
        default:
+               break;
        }
 
        if (!summaryview->selected) {
@@ -3063,6 +3391,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_x:             /* Execute */
        case GDK_X:
                BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
                summary_execute(summaryview);
                break;
        case GDK_a:             /* Reply to the message */
@@ -3088,9 +3417,13 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_save_as(summaryview);
                break;
        default:
+               break;
        }
 }
 
+#undef BREAK_ON_MODIFIER_KEY
+#undef KEY_PRESS_EVENT_STOP
+
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
        if (summaryview->folder_item->stype == F_DRAFT)
@@ -3122,10 +3455,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);
@@ -3141,6 +3472,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                }
                break;
        default:
+               break;
        }
 
        if (summaryview->display_msg)
@@ -3181,6 +3513,7 @@ static void summary_col_resized(GtkCList *clist, gint column, gint width,
                prefs_common.summary_col_subject = width;
                break;
        default:
+               break;
        }
 }
 
@@ -3188,6 +3521,7 @@ 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);
@@ -3208,6 +3542,11 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                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;
@@ -3225,10 +3564,21 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                compose_reply(msginfo, FALSE, TRUE, FALSE);
                break;
        case COMPOSE_FORWARD:
-               compose_forward(NULL, msginfo, FALSE);
-               break;
+               if (!sel->next) {
+                       compose_forward(NULL, msginfo, FALSE);
+                       break;
+               }
+               /* if (sel->next) FALL THROUGH */
        case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward(NULL, 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:
                g_warning("summary_reply_cb(): invalid action: %d\n", action);
@@ -3247,15 +3597,16 @@ static void summary_add_sender_to_cb (SummaryView                       *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget_)
 {
-       GtkWidget               *submenu;                                               
-       GList                   *groups, *tmp;
+       const gint       ADD_SENDER_TO_ADDRESSBOOK_MENU_POS = 13;
+       GtkWidget       *submenu;                                               
+       GList           *groups, *tmp;
        GtkMenuShell    *menushell;
-       GtkWidget               *menu;
-       GtkWidget               *menuitem;
-       GList                   *child;
-       gboolean                found = FALSE;
-       MsgInfo                 *msginfo;
-       gchar                   *from_address;
+       GtkWidget       *menu;
+       GtkWidget       *menuitem;
+       GList           *child;
+       gboolean        found = FALSE;
+       MsgInfo        *msginfo;
+       gchar          *from_address;
 
        menushell = GTK_MENU_SHELL(summaryview->popupmenu);
        g_return_if_fail(menushell != NULL);
@@ -3276,7 +3627,7 @@ static void summary_add_sender_to_cb (SummaryView                 *summaryview,
        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_menu_insert(GTK_MENU(summaryview->popupmenu), submenu, ADD_SENDER_TO_ADDRESSBOOK_MENU_POS);
                gtk_widget_show(submenu);
        }
        else {
@@ -3333,6 +3684,12 @@ static void summary_subject_clicked(GtkWidget *button,
        summary_sort(summaryview, SORT_BY_SUBJECT);
 }
 
+static void summary_mark_clicked(GtkWidget *button,
+                                SummaryView *summaryview)
+{
+       summary_sort(summaryview, SORT_BY_LABEL);
+}
+
 void summary_change_display_item(SummaryView *summaryview)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
@@ -3474,6 +3831,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_LABEL(msginfo1->flags) - MSG_GET_LABEL(msginfo2->flags);
+}
+
 static gint summary_cmp_by_score(GtkCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -3489,3 +3855,66 @@ static gint summary_cmp_by_score(GtkCList *clist,
        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);
+}
+