more label colouring rewrite
[claws.git] / src / summaryview.c
index dcdf73fe632f51ef16720aaa475481a6d75e2985..2383e9cb4d35d6f0848757e5b6b051d4bcbfee4b 100644 (file)
@@ -84,6 +84,7 @@
 #include "pixmaps/replied.xpm"
 #include "pixmaps/forwarded.xpm"
 #include "pixmaps/clip.xpm"
+#include "pixmaps/ignorethread.xpm"
 
 #define STATUSBAR_PUSH(mainwin, str) \
 { \
@@ -120,6 +121,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 +207,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 +271,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 +305,9 @@ 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);
 
 GtkTargetEntry summary_drag_types[1] =
 {
@@ -315,8 +325,10 @@ 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},
+       {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},
@@ -337,6 +349,224 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Select _all"),            NULL, summary_select_all, 0, NULL}
 };
 
+/* L A B E L   C O L O R   S T U F F */
+
+static struct 
+{
+       GdkColor         color;
+       gchar           *label;
+       
+       GdkPixmap       *xpm;
+       GdkBitmap       *xbm;
+       GtkPixmap       *pixmap;
+}
+label_colors[] = 
+{
+       { { 0, 0xffff, (0x99 << 8), 0x0 },              N_("Orange"),   NULL, NULL, NULL },
+       { { 0, 0xffff, 0, 0 },                          N_("Red"),      NULL, NULL, NULL },
+       { { 0, 0xffff, (0x66 << 8), 0xffff },           N_("Pink"),     NULL, NULL, NULL },
+       { { 0, 0x0, (0xcc << 8), 0xffff },              N_("Sky blue"), NULL, NULL, NULL },
+       { { 0, 0x0, 0x0, 0xffff },                      N_("Blue"),     NULL, NULL, NULL },
+       { { 0, 0x0, 0x99 << 8, 0x0 },                   N_("Green"),    NULL, NULL, NULL },
+       { { 0, 0x66 << 8, 0x33 << 8, 0x33 << 8 },       N_("Brown"),    NULL, NULL, NULL }
+};
+
+#define LABEL_COLORS_ELEMS (sizeof label_colors / sizeof label_colors[0])
+
+static void label_menu_item_activate_cb(GtkWidget *widget, gpointer data)
+{
+       guint color = GPOINTER_TO_UINT(data);
+       SummaryView *view = gtk_object_get_data(GTK_OBJECT(widget), "view");
+
+       g_return_if_fail(view);
+       color <<= 7;
+       summary_set_label(view, color, NULL);
+}
+
+/* summary_set_label_color() - labelcolor parameter is the color *flag*
+ * for the messsage; not the color index */
+void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
+                            guint labelcolor)
+{
+       GdkColor  color;
+       GtkStyle *style, *prev_style, *ctree_style;
+       MsgInfo  *msginfo;
+       gint      color_index = ((gint)(labelcolor >> 7)) - 1;
+
+       ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
+
+       prev_style = gtk_ctree_node_get_row_style(ctree, node);
+
+       if (!prev_style)
+               prev_style = ctree_style;
+
+       style = gtk_style_copy(prev_style);
+
+       if (color_index < 0 || color_index >= LABEL_COLORS_ELEMS) {
+               labelcolor = MSG_LABEL;
+               color.red = ctree_style->fg[GTK_STATE_NORMAL].red;
+               color.green = ctree_style->fg[GTK_STATE_NORMAL].green;
+               color.blue = ctree_style->fg[GTK_STATE_NORMAL].blue;
+               style->fg[GTK_STATE_NORMAL] = color;
+
+               color.red = ctree_style->fg[GTK_STATE_SELECTED].red;
+               color.green = ctree_style->fg[GTK_STATE_SELECTED].green;
+               color.blue = ctree_style->fg[GTK_STATE_SELECTED].blue;
+               style->fg[GTK_STATE_SELECTED] = color;
+               gtk_ctree_node_set_row_style(ctree, node, style);
+       }
+       else
+               color = label_colors[color_index].color;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+
+       MSG_UNSET_FLAGS(msginfo->flags, MSG_LABEL);
+       MSG_SET_FLAGS(msginfo->flags, labelcolor);
+
+       if ( style ) {
+               style->fg[GTK_STATE_NORMAL] = color;
+               style->fg[GTK_STATE_SELECTED] = color;
+               gtk_ctree_node_set_row_style(ctree, node, style);
+       }
+}
+
+void summary_set_label(SummaryView *summaryview, guint labelcolor, GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GList *cur;
+  
+       for (cur = clist->selection; cur != NULL; cur = cur->next)
+               summary_set_label_color(ctree, GTK_CTREE_NODE(cur->data), labelcolor);
+}
+
+/* summary_create_label_pixmaps() - creates label pixmaps. perhaps a little 
+ * bit contrived. */
+static gboolean summary_create_label_pixmaps(SummaryView *summaryview)
+{
+       const char *FMT = "+      c #%2.2X%2.2X%2.2X";
+       char buf[40];
+       char * dummy_xpm[] = {
+               "16 16 3 1",
+               "       c None",
+               ".      c #000000",
+               "+      c #000000",
+               "................",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               ".++++++++++++++.",
+               "................"
+       };
+
+       gint n;
+
+       for (n = 0; n < LABEL_COLORS_ELEMS; n++) {
+               GdkBitmap *xpmmask;
+               GdkPixmap *xpm;
+               GtkPixmap *pixmap;
+
+               /* put correct color in xpm data */
+               sprintf(buf, FMT, label_colors[n].color.red >> 8,
+                       label_colors[n].color.green >> 8, 
+                       label_colors[n].color.blue >> 8);
+               g_print("%s\n", buf);                   
+               dummy_xpm[3] = buf;                             
+
+               /* create pixmaps */
+               xpm = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(summaryview->scrolledwin)->window, &xpmmask, NULL, 
+                                                  (gchar **) &dummy_xpm);
+               pixmap = GTK_PIXMAP(gtk_pixmap_new(xpm, xpmmask)); 
+
+               /* store it somewhere */
+               label_colors[n].xpm = xpm;
+               label_colors[n].xbm = xpmmask;
+               label_colors[n].pixmap = pixmap;
+       }
+}
+
+static void summary_create_label_menu(SummaryView *summaryview)
+{
+       const gint LABEL_MENU_POS = 5;
+       GtkWidget *label_menu_item;
+       GtkWidget *label_menu;
+       GtkWidget *item;
+       gint       i;
+
+       summary_create_label_pixmaps(summaryview);
+       
+       label_menu_item = gtk_menu_item_new_with_label(_("Label"));
+       gtk_menu_insert(GTK_MENU(summaryview->popupmenu), label_menu_item, LABEL_MENU_POS);
+       gtk_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_menu_item_new_with_label(_("None"));
+       gtk_menu_append(GTK_MENU(label_menu), item);
+       gtk_signal_connect(GTK_OBJECT(item), "activate",  
+               GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
+               GUINT_TO_POINTER(-1));
+       gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);     
+       gtk_widget_show(item);
+       
+       item = gtk_menu_item_new();
+       gtk_menu_append(GTK_MENU(label_menu), item);
+       gtk_widget_show(item);
+
+       /* create pixmap/label menu items */
+       for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
+               GtkWidget *label, *hbox, *align, *pixmap;
+               item = gtk_menu_item_new();
+               
+               label = gtk_label_new(label_colors[i].label);
+               gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+               gtk_widget_show(label);
+               hbox = gtk_hbox_new(FALSE, 0);
+               gtk_widget_show(hbox);
+               gtk_container_add(GTK_CONTAINER(item), hbox);
+
+               align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
+               gtk_widget_show(align);
+               gtk_container_set_border_width (GTK_CONTAINER(align), 1);
+
+               pixmap = GTK_WIDGET(label_colors[i].pixmap);
+               
+               gtk_container_add (GTK_CONTAINER (align), pixmap);
+                gtk_widget_set_usize (align, 16, 16);
+               gtk_widget_show(pixmap);
+
+               gtk_box_pack_start(GTK_BOX (hbox), align, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
+
+               gtk_menu_append(GTK_MENU(label_menu), item);
+               gtk_signal_connect(GTK_OBJECT(item), "activate", 
+                                  GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
+                                  GUINT_TO_POINTER(i + 1));
+               gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);
+               gtk_widget_show(item);
+
+       }
+       
+       gtk_widget_show(label_menu);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menu_item), label_menu);
+       summaryview->label_menu = label_menu;   
+}
+
 SummaryView *summary_create(void)
 {
        SummaryView *summaryview;
@@ -467,6 +697,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);
@@ -527,6 +762,8 @@ SummaryView *summary_create(void)
        summaryview->sort_mode = SORT_BY_NONE;
        summaryview->sort_type = GTK_SORT_ASCENDING;
 
+//     summary_create_label_menu(summaryview);
+
        summary_change_display_item(summaryview);
 
        gtk_widget_show_all(vbox);
@@ -548,6 +785,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);
@@ -574,6 +813,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,
@@ -922,7 +1163,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));
                return;
-       }
+       } 
 
        if (summaryview->folder_item->folder->type != F_NEWS) {
                if (summaryview->folder_item->stype != F_TRASH)
@@ -930,6 +1171,8 @@ 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;
@@ -957,6 +1200,8 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
        menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
        menu_set_sensitive(ifactory, "/Mark/Mark as read",   TRUE);
+       menu_set_sensitive(ifactory, "/Mark/Ignore thread",   TRUE);
+       menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
 
        menu_set_sensitive(ifactory, "/Select all", TRUE);
 
@@ -979,7 +1224,12 @@ void summary_select_next_unread(SummaryView *summaryview)
        if (node) {
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
                gtk_sctree_select(GTK_SCTREE(ctree), node);
-               gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0);
+
+               /* 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);
@@ -1107,7 +1357,7 @@ static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
 
        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;
@@ -1297,9 +1547,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++;
@@ -1324,9 +1574,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++;
@@ -1460,6 +1710,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;
        }
@@ -1571,10 +1824,23 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                parent = g_hash_table_lookup
                                        (msgid_table, msginfo->inreplyto);
                        }
-                       if (parent == NULL && msginfo->subject) {
+                       if (parent == NULL && msginfo->subject &&
+                           g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
                                parent = subject_table_lookup
                                        (subject_table, msginfo->subject);
                        }
+                       if(parent) {
+                               parentinfo = gtk_ctree_node_get_row_data(ctree, parent);
+                               if(parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
+/*
+                                       if (MSG_IS_NEW(msginfo->flags))
+                                               summaryview->newmsgs--;
+                                       if (MSG_IS_UNREAD(msginfo->flags))
+                                               summaryview->unread--;
+*/
+                                       MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+                               }
+                       }
 
                        node = gtk_ctree_insert_node
                                (ctree, parent, NULL, text, 2,
@@ -1582,6 +1848,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, (msginfo->flags & MSG_LABEL));
 
                        /* preserve previous node if the message is
                           duplicated */
@@ -1622,7 +1891,10 @@ 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) {
+                               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);
                                }
                        }
@@ -1642,6 +1914,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, (msginfo->flags & MSG_LABEL));
+
                        if (msginfo->msgid && *msginfo->msgid &&
                            g_hash_table_lookup(msgid_table, msginfo->msgid)
                            == NULL)
@@ -1862,9 +2137,9 @@ 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);
@@ -2016,10 +2291,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)) {
@@ -2119,9 +2397,9 @@ 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)) {
@@ -2824,7 +3102,8 @@ static void summary_thread_func(GtkCTree *ctree, GtkCTreeNode *node,
        if(msginfo->inreplyto) {
            parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
        }
-       if (parent == NULL && msginfo->subject) {
+       if (parent == NULL && msginfo->subject &&
+           g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
                parent = subject_table_lookup(subject_table, msginfo->subject);
        }
 
@@ -3351,15 +3630,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);
@@ -3380,7 +3660,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 {
@@ -3437,6 +3717,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);
@@ -3578,6 +3864,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)
 {
@@ -3593,3 +3888,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_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_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);
+}
+