sync with 0.8.9cvs2
[claws.git] / src / summaryview.c
index 3d40b25cab8cf44de43483fe94821b8903a9ba8c..38d7570da6a6912e52b2ea6b851fd40ed3b4a107 100644 (file)
 #include "matcher.h"
 #include "matcher_parser.h"
 #include "hooks.h"
+#include "description_window.h"
+#include "folder.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
-#define SUMMARY_COL_UNREAD_WIDTH       13
+#define SUMMARY_COL_STATUS_WIDTH       13
 #define SUMMARY_COL_LOCKED_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         11
 
@@ -306,7 +308,7 @@ static void summary_create_filter_cb        (SummaryView            *summaryview,
 
 static void summary_mark_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
-static void summary_unread_clicked     (GtkWidget              *button,
+static void summary_status_clicked     (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_mime_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
@@ -343,7 +345,7 @@ static void summary_drag_data_get       (GtkWidget        *widget,
 static gint summary_cmp_by_mark                (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_unread      (GtkCList               *clist,
+static gint summary_cmp_by_status      (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 static gint summary_cmp_by_mime                (GtkCList               *clist,
@@ -361,28 +363,34 @@ static gint summary_cmp_by_date           (GtkCList               *clist,
 static gint summary_cmp_by_from                (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_to          (GtkCList               *clist,
-                                        gconstpointer           ptr1, 
-                                        gconstpointer           ptr2);
 static gint summary_cmp_by_subject     (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 static gint summary_cmp_by_simplified_subject
-       (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2);
+                                       (GtkCList               *clist, 
+                                        gconstpointer           ptr1, 
+                                        gconstpointer           ptr2);
 static gint summary_cmp_by_score       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_locked      (GtkCList *clist,
-                                        gconstpointer ptr1, gconstpointer ptr2);
 static gint summary_cmp_by_label       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
+static gint summary_cmp_by_to          (GtkCList               *clist,
+                                        gconstpointer           ptr1,
+                                        gconstpointer           ptr2);
+static gint summary_cmp_by_locked      (GtkCList               *clist,
+                                        gconstpointer           ptr1, 
+                                        gconstpointer           ptr2);
 
 static void news_flag_crosspost                (MsgInfo *msginfo);
 
 static void tog_searchbar_cb           (GtkWidget      *w,
                                         gpointer        data);
 
+static void summary_find_answers       (SummaryView    *summaryview, 
+                                        MsgInfo        *msg);
+
 static gboolean summary_update_msg     (gpointer source, gpointer data);
 
 GtkTargetEntry summary_drag_types[1] =
@@ -392,30 +400,30 @@ GtkTargetEntry summary_drag_types[1] =
 
 static GtkItemFactoryEntry summary_popup_entries[] =
 {
-       {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Reply"),                 "<control>R", summary_reply_cb, COMPOSE_REPLY, NULL},
        {N_("/Repl_y to"),              NULL, NULL,             0, "<Branch>"},
-       {N_("/Repl_y to/_all"),         NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/Repl_y to/_all"),         "<shift><control>R", summary_reply_cb,  COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/Repl_y to/_sender"),      NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/Repl_y to/mailing _list"),
-                                       NULL, summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+                                       "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, 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_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},
+       {N_("/_Copy..."),               "<shift><control>O", summary_copy_to,   0, NULL},
+       {N_("/_Delete"),                "<control>D", summary_delete,   0, NULL},
        {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
-       {N_("/E_xecute"),               NULL, summary_execute_cb,       0, NULL},
+       {N_("/E_xecute"),               "X", summary_execute_cb,        0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
-       {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
-       {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
+       {N_("/_Mark/_Mark"),            "<shift>asterisk", summary_mark,        0, NULL},
+       {N_("/_Mark/_Unmark"),          "U", 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 unr_ead"),  "<shift>exclam", summary_mark_as_unread, 0, NULL},
        {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
        {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
        {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
@@ -437,20 +445,20 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_View/Open in new _window"),
-                                       NULL, summary_open_msg, 0, NULL},
-       {N_("/_View/_Source"),          NULL, summary_view_source, 0, NULL},
-       {N_("/_View/All _header"),      NULL, summary_show_all_header_cb, 0, "<ToggleItem>"},
+                                       "<control><alt>N", summary_open_msg,    0, NULL},
+       {N_("/_View/_Source"),          "<control>U", summary_view_source, 0, NULL},
+       {N_("/_View/All _header"),      "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/_Save as..."),            NULL, summary_save_as,  0, NULL},
+       {N_("/_Save as..."),            "<control>S", summary_save_as,  0, NULL},
        {N_("/_Print..."),              NULL, summary_print,    0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/Select _all"),            NULL, summary_select_all, 0, NULL},
+       {N_("/Select _all"),            "<control>A", summary_select_all, 0, NULL},
        {N_("/Select t_hread"),         NULL, summary_select_thread, 0, NULL}
-};
+};  /* see also list in menu_connect_identical_items() in menu.c if this changes */
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("M"),        /* S_COL_MARK    */
-       N_("U"),        /* S_COL_UNREAD  */
+       N_("S"),        /* S_COL_STATUS  */
        "",             /* S_COL_MIME    */
        N_("Subject"),  /* S_COL_SUBJECT */
        N_("From"),     /* S_COL_FROM    */
@@ -461,6 +469,64 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("L")         /* S_COL_LOCKED  */
 };
 
+/*
+ * Strings describing how to use Extended Search
+ * 
+ * When adding new lines, remember to put 2 strings for each line
+ */
+static gchar *search_descr_strings[] = {
+       "a",     N_("all messages"),
+       "ag #",  N_("messages whose age is greather than #"),
+       "al #",  N_("messages whose age is greather than #"),
+       "b S",   N_("messages which contain S in the message body"),
+       "B S",   N_("messages which contain S in the whole message"),
+       "c S",   N_("messages carbon-copied to S"),
+       "C S",   N_("message is either to: or cc: to S"),
+       "D",     N_("deleted messages"), /** how I can filter deleted messages **/
+       "e S",   N_("messages which contain S in the Sender field"),
+       "E S",   N_("true if execute \"S\" succeeds"),
+       "f S",   N_("messages originating from user S"),
+       "F",     N_("forwarded messages"),
+       "h S",   N_("messages which contain header S"),
+       "i S",   N_("messages which contain S in Message-Id header"),
+       "I S",   N_("messages which contain S in inreplyto header"),
+       "L",     N_("locked messages"),
+       "n S",   N_("messages which are in newsgroup S"),
+       "N",     N_("new messages"),
+       "O",     N_("old messages"),
+       "r",     N_("messages which have been replied to"),
+       "R",     N_("read messages"),
+       "s S",   N_("messages which contain S in subject"),
+       "se #",  N_("messages whose score is equal to #"),
+       "sg #",  N_("messages whose score is greater than #"),
+       "sl #",  N_("messages whose score is lower than #"),
+       "Se #",  N_("messages whose size is equal to #"),
+       "Sg #",  N_("messages whose size is greater than #"),
+       "Ss #",  N_("messages whose size is smaller than #"),
+       "t S",   N_("messages which have been sent to S"),
+       "T",     N_("marked messages"),
+       "U",     N_("unread messages"),
+       "x S",   N_("messages which contain S in References header"),
+       "y S",   N_("messages which contain S in X-Label header"),
+        "",     "" ,
+       "&",     N_("logical AND operator"),
+       "|",     N_("logical OR operator"),
+       "! or ~",       N_("logical NOT operator"),
+       "%",     N_("case sensitive search"),
+       NULL,    NULL 
+};
+static DescriptionWindow search_descr = {
+       NULL, 
+       2,
+       N_("Extended Search symbols"),
+       search_descr_strings
+};
+       
+static void search_description_cb (GtkWidget *widget) {
+       description_window_create(&search_descr);
+};
+
 SummaryView *summary_create(void)
 {
        SummaryView *summaryview;
@@ -480,6 +546,8 @@ SummaryView *summary_create(void)
        GtkWidget *search_type_opt;
        GtkWidget *search_type;
        GtkWidget *search_string;
+       GtkWidget *search_hbbox;
+       GtkWidget *search_description;
        GtkWidget *menuitem;
        GtkWidget *toggle_search;
        GtkTooltips *search_tip;
@@ -584,6 +652,12 @@ SummaryView *summary_create(void)
        
        gtk_box_pack_start(GTK_BOX(hbox_search), search_string, FALSE, FALSE, 2);
        
+       gtkut_button_set_create(&search_hbbox, &search_description, _("Extended Symbols"),
+                               NULL, NULL, NULL, NULL);
+       gtk_signal_connect(GTK_OBJECT(search_description), "clicked",
+                          GTK_SIGNAL_FUNC(search_description_cb), NULL);
+       gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);
+                               
        gtk_widget_show(search_string);
        gtk_widget_show(hbox_search);
 
@@ -627,6 +701,7 @@ SummaryView *summary_create(void)
        summaryview->search_type_opt = search_type_opt;
        summaryview->search_type = search_type;
        summaryview->search_string = search_string;
+       summaryview->search_description = search_description;
        summaryview->msginfo_update_callback_id =
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
 
@@ -1066,6 +1141,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        summary_select_node(summaryview, node, FALSE, TRUE);
        }
 
+       summary_set_column_titles(summaryview);
        summary_status_show(summaryview);
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
@@ -1844,15 +1920,19 @@ static void summary_status_show(SummaryView *summaryview)
                msginfo = gtk_ctree_node_get_row_data
                        (GTK_CTREE(summaryview->ctree),
                         GTK_CTREE_NODE(cur->data));
-               sel_size += msginfo->size;
-               n_selected++;
+               if (!msginfo)
+                       g_warning("summary_status_show(): msginfo == NULL\n");
+               else {
+                       sel_size += msginfo->size;
+                       n_selected++;
+               }
        }
 
-       if (summaryview->folder_item->folder->type == F_NEWS &&
-           prefs_common.ng_abbrev_len < strlen(summaryview->folder_item->path)) {
+       if (summaryview->folder_item->folder->type == F_NEWS) {
                gchar *group;
                group = get_abbrev_newsgroup_name
-                       (g_basename(summaryview->folder_item->path), prefs_common.ng_abbrev_len);
+                       (g_basename(summaryview->folder_item->path),
+                        prefs_common.ng_abbrev_len);
                gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
                g_free(group);
        } else {
@@ -1934,7 +2014,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
 
        static FolderSortKey sort_by[N_SUMMARY_COLS] = {
                SORT_BY_MARK,
-               SORT_BY_UNREAD,
+               SORT_BY_STATUS,
                SORT_BY_MIME,
                SORT_BY_SUBJECT,
                SORT_BY_FROM,
@@ -1949,7 +2029,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                type = summaryview->col_state[pos].type;
 
                /* CLAWS: mime and unread are single char headers */
-               single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
+               single_char = (type == S_COL_MIME || type == S_COL_STATUS);
                justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
                        ? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
 
@@ -2030,8 +2110,8 @@ void summary_sort(SummaryView *summaryview,
        case SORT_BY_MARK:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
                break;
-       case SORT_BY_UNREAD:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+       case SORT_BY_STATUS:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
                break;
        case SORT_BY_MIME:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
@@ -2046,10 +2126,7 @@ void summary_sort(SummaryView *summaryview,
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
                break;
        case SORT_BY_FROM:
-               if (summaryview->folder_item && summaryview->folder_item->stype != F_OUTBOX)
-                       cmp_func = (GtkCListCompareFunc) summary_cmp_by_from;
-               else                    
-                       cmp_func = (GtkCListCompareFunc) summary_cmp_by_to;
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
                break;
        case SORT_BY_SUBJECT:
                if (summaryview->simplify_subject_preg)
@@ -2060,12 +2137,15 @@ void summary_sort(SummaryView *summaryview,
        case SORT_BY_SCORE:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
                break;
-       case SORT_BY_LOCKED:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
-               break;
        case SORT_BY_LABEL:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
                break;
+       case SORT_BY_TO:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_to;
+               break;
+       case SORT_BY_LOCKED:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+               break;
        case SORT_BY_NONE:
                cmp_func = NULL;
                return;
@@ -2180,8 +2260,6 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
                g_node_destroy(root);
 
-               folder_update_items_when_required(FALSE);
-
                summary_thread_init(summaryview);
        } else {
                gchar *text[N_SUMMARY_COLS];
@@ -2265,7 +2343,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        gint *col_pos = summaryview->col_pos;
 
        text[col_pos[S_COL_MARK]]   = NULL;
-       text[col_pos[S_COL_UNREAD]] = NULL;
+       text[col_pos[S_COL_STATUS]] = NULL;
        text[col_pos[S_COL_MIME]]   = NULL;
        text[col_pos[S_COL_LOCKED]] = NULL;
        text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
@@ -2375,7 +2453,6 @@ static void summary_display_msg_full(SummaryView *summaryview,
                if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
                        procmsg_msginfo_unset_flags
                                (msginfo, MSG_NEW | MSG_UNREAD, 0);
-                       folder_update_item(msginfo->folder, FALSE);
                        summary_set_row_marks(summaryview, row);
                        gtk_clist_thaw(GTK_CLIST(ctree));
                        summary_status_show(summaryview);
@@ -2573,22 +2650,22 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
        /* set new/unread column */
        if (MSG_IS_IGNORE_THREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          ignorethreadxpm, ignorethreadxpmmask);
        } else if (MSG_IS_NEW(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          newxpm, newxpmmask);
        } else if (MSG_IS_UNREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          unreadxpm, unreadxpmmask);
        } else if (MSG_IS_REPLIED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          repliedxpm, repliedxpmmask);
        } else if (MSG_IS_FORWARDED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          forwardedxpm, forwardedxpmmask);
        } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
                                        NULL);
        }
 
@@ -2681,51 +2758,21 @@ void summary_set_marks_selected(SummaryView *summaryview)
                summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
 }
 
-static gboolean summary_update_unread_children (SummaryView *summaryview, MsgInfo *info, gboolean newly_marked)
-{
-       GSList *children = procmsg_find_children(info);
-       GSList *cur;
-       gboolean changed = FALSE;
-       for (cur = children; cur != NULL; cur = g_slist_next(cur)) {
-               MsgInfo *tmp = (MsgInfo *)cur->data;
-               if(MSG_IS_UNREAD(tmp->flags) && !MSG_IS_IGNORE_THREAD(tmp->flags)) {
-                       if(newly_marked) 
-                               summaryview->unreadmarked++;
-                       else
-                               summaryview->unreadmarked--;
-                       changed = TRUE;
-               }
-               procmsg_msginfo_free(tmp);
-       }
-       return changed;
-}
-
 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);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       if (MSG_IS_MOVE(msginfo->flags)) {
+       if (MSG_IS_MOVE(msginfo->flags))
                summaryview->moved--;
-               changed = TRUE;
-               msginfo->to_folder->op_count--;
-               if (msginfo->to_folder->op_count == 0)
-                       folder_update_item(msginfo->to_folder, FALSE);
-       }
-       if (MSG_IS_COPY(msginfo->flags)) {
+       if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-               changed = TRUE;
-               msginfo->to_folder->op_count--;
-               if (msginfo->to_folder->op_count == 0)
-                       folder_update_item(msginfo->to_folder, FALSE);
-       }
-       changed |= summary_update_unread_children (summaryview, msginfo, TRUE);
+       procmsg_update_unread_children (msginfo, TRUE);
 
-       msginfo->to_folder = NULL;
+       procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
        procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
        summary_set_row_marks(summaryview, row);
@@ -2750,12 +2797,7 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->copied--;
                changed = TRUE;
        }
-       if (changed && !prefs_common.immediate_exec) {
-               msginfo->to_folder->op_count--;
-               if (msginfo->to_folder->op_count == 0)
-                       folder_update_item(msginfo->to_folder, FALSE);
-       }
-       msginfo->to_folder = NULL;
+       procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
        procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
        summary_set_row_marks(summaryview, row);
@@ -2804,11 +2846,12 @@ void summary_mark_as_read(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
                                         GTK_CTREE_NODE(cur->data));
-       folder_update_items_when_required(FALSE);
-
+       folder_item_update_thaw();
+       
        summary_status_show(summaryview);
 }
 
@@ -2819,6 +2862,7 @@ void summary_mark_all_read(SummaryView *summaryview)
        GtkCTreeNode *node;
 
        gtk_clist_freeze(clist);
+       folder_item_update_freeze();
        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);
@@ -2828,7 +2872,7 @@ void summary_mark_all_read(SummaryView *summaryview)
                        summary_set_row_marks(summaryview, node);
        }
        gtk_clist_thaw(clist);
-       folder_update_items_when_required(FALSE);
+       folder_item_update_thaw();
 
        summary_status_show(summaryview);
 }
@@ -2841,7 +2885,7 @@ 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;
+               procmsg_msginfo_set_to_folder(msginfo, NULL);
                procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
                summaryview->deleted--;
        }
@@ -2866,11 +2910,12 @@ void summary_mark_as_unread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_unread(summaryview,
                                           GTK_CTREE_NODE(cur->data));
-       folder_update_items_when_required(FALSE);
-
+       folder_item_update_thaw();
+       
        summary_status_show(summaryview);
 }
 
@@ -2925,7 +2970,6 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
 
 static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
-       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
@@ -2938,23 +2982,13 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 
        if (MSG_IS_DELETED(msginfo->flags)) return;
 
-       if (MSG_IS_MOVE(msginfo->flags)) {
+       if (MSG_IS_MOVE(msginfo->flags))
                summaryview->moved--;
-               changed = TRUE;
-               msginfo->to_folder->op_count--;
-               if (msginfo->to_folder->op_count == 0)
-                       folder_update_item(msginfo->to_folder, FALSE);
-       }
-       if (MSG_IS_COPY(msginfo->flags)) {
+       if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-               changed = TRUE;
-               msginfo->to_folder->op_count--;
-               if (msginfo->to_folder->op_count == 0)
-                       folder_update_item(msginfo->to_folder, FALSE);
-       }
-       changed |= summary_update_unread_children (summaryview, msginfo, FALSE);
+       procmsg_update_unread_children (msginfo, FALSE);
 
-       msginfo->to_folder = NULL;
+       procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
        procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
        summaryview->deleted++;
@@ -3022,10 +3056,12 @@ void summary_delete(SummaryView *summaryview)
 
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
+       folder_item_update_freeze();     
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
                sel_last = GTK_CTREE_NODE(cur->data);
                summary_delete_row(summaryview, sel_last);
        }
+       folder_item_update_thaw();
 
        node = summary_find_next_msg(summaryview, sel_last);
        if (!node)
@@ -3043,9 +3079,12 @@ void summary_delete(SummaryView *summaryview)
                                 FALSE);
        }
 
-       if (prefs_common.immediate_exec || item->stype == F_TRASH)
+       if (prefs_common.immediate_exec || item->stype == F_TRASH) {
                summary_execute(summaryview);
-       else
+               /* after deleting, the anchor may be at an invalid row
+                * so reset it to the node we found earlier */
+               gtk_sctree_set_anchor_row(GTK_SCTREE(ctree), node);
+       } else
                summary_status_show(summaryview);
 }
 
@@ -3096,34 +3135,19 @@ 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);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       if (MSG_IS_MOVE(msginfo->flags)) {
-               if (!prefs_common.immediate_exec) {
-                       msginfo->to_folder->op_count--;
-                       if (msginfo->to_folder->op_count == 0)
-                               folder_update_item(msginfo->to_folder, FALSE);
-               }
+       if (MSG_IS_MOVE(msginfo->flags))
                summaryview->moved--;
-               changed = TRUE;
-       }
-       if (MSG_IS_COPY(msginfo->flags)) {
-               if (!prefs_common.immediate_exec) {
-                       msginfo->to_folder->op_count--;
-                       if (msginfo->to_folder->op_count == 0)
-                               folder_update_item(msginfo->to_folder, FALSE);
-               }
+       if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-               changed = TRUE;
-       }
-       changed |= summary_update_unread_children (summaryview, msginfo, FALSE);
+       procmsg_update_unread_children (msginfo, FALSE);
 
-       msginfo->to_folder = NULL;
+       procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
        summary_set_row_marks(summaryview, row);
 
@@ -3145,43 +3169,25 @@ 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) {
-                               folder_update_item(msginfo->to_folder, FALSE);
-                               changed = TRUE;
-                       }
-               }
-       }
-       msginfo->to_folder = to_folder;
+       procmsg_msginfo_set_to_folder(msginfo, to_folder);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
        if (MSG_IS_COPY(msginfo->flags)) {
                summaryview->copied--;
-               if (!prefs_common.immediate_exec)
-                       msginfo->to_folder->op_count--;
        }
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
        if (!MSG_IS_MOVE(msginfo->flags)) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
                summaryview->moved++;
-               changed = TRUE;
        }
        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)
-                               folder_update_item(msginfo->to_folder, FALSE);
-               }
        }
 
        debug_print("Message %d is set to move to %s\n",
@@ -3214,8 +3220,6 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                summary_execute(summaryview);
        else {
                summary_status_show(summaryview);
-
-               folder_update_item(to_folder, FALSE);
        }
        
        if (!summaryview->selected) { /* this was the last message */
@@ -3242,43 +3246,25 @@ void summary_move_to(SummaryView *summaryview)
 static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                                FolderItem *to_folder)
 {
-       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        g_return_if_fail(to_folder != NULL);
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
-       if (MSG_IS_COPY(msginfo->flags)) {
-               if (!prefs_common.immediate_exec) {
-                       msginfo->to_folder->op_count--;
-                       if (msginfo->to_folder->op_count == 0) {
-                               folder_update_item(msginfo->to_folder, FALSE);
-                               changed = TRUE;
-                       }
-               }
-       }
-       msginfo->to_folder = to_folder;
+       procmsg_msginfo_set_to_folder(msginfo, to_folder);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
        if (MSG_IS_MOVE(msginfo->flags)) {
                summaryview->moved--;
-               if (!prefs_common.immediate_exec)
-                       msginfo->to_folder->op_count--;
        }
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
        if (!MSG_IS_COPY(msginfo->flags)) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
                summaryview->copied++;
-               changed = TRUE;
        }
        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)
-                               folder_update_item(msginfo->to_folder, FALSE);
-               }
        }
 
        debug_print("Message %d is set to copy to %s\n",
@@ -3311,8 +3297,6 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                summary_execute(summaryview);
        else {
                summary_status_show(summaryview);
-
-               folder_update_item(to_folder, FALSE);
        }
 }
 
@@ -3491,9 +3475,11 @@ gboolean summary_execute(SummaryView *summaryview)
        if (summaryview->threaded)
                summary_unthread_for_exec(summaryview);
 
+       folder_item_update_freeze();
        summary_execute_move(summaryview);
        summary_execute_copy(summaryview);
        summary_execute_delete(summaryview);
+       folder_item_update_thaw();
 
        node = GTK_CTREE_NODE(clist->row_list);
        while (node != NULL) {
@@ -3547,15 +3533,11 @@ static void summary_execute_move(SummaryView *summaryview)
        if (summaryview->mlist) {
                procmsg_move_messages(summaryview->mlist);
 
-               folder_update_items_when_required(FALSE);
-
                for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                        procmsg_msginfo_free((MsgInfo *)cur->data);
                g_slist_free(summaryview->mlist);
                summaryview->mlist = NULL;
        }
-
-       folder_update_item(summaryview->folder_item, FALSE);
 }
 
 static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3567,10 +3549,6 @@ static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
        msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
        if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
-               if (!prefs_common.immediate_exec &&
-                   msginfo->to_folder->op_count > 0)
-                       msginfo->to_folder->op_count--;
-
                summaryview->mlist =
                        g_slist_append(summaryview->mlist, msginfo);
                gtk_ctree_node_set_row_data(ctree, node, NULL);
@@ -3594,8 +3572,6 @@ static void summary_execute_copy(SummaryView *summaryview)
        if (summaryview->mlist) {
                procmsg_copy_messages(summaryview->mlist);
 
-               folder_update_items_when_required(FALSE);
-
                g_slist_free(summaryview->mlist);
                summaryview->mlist = NULL;
        }
@@ -3610,10 +3586,6 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
        msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
        if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
-               if (!prefs_common.immediate_exec &&
-                   msginfo->to_folder->op_count > 0)
-                       msginfo->to_folder->op_count--;
-
                summaryview->mlist =
                        g_slist_append(summaryview->mlist, msginfo);
 
@@ -3650,11 +3622,6 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        g_slist_free(summaryview->mlist);
        summaryview->mlist = NULL;
-
-       if ((summaryview->folder_item != trash) && (trash != NULL)) {
-               folder_update_item(trash, FALSE);
-       }
-       folder_update_item(summaryview->folder_item, FALSE);
 }
 
 static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3739,7 +3706,7 @@ void summary_thread_build(SummaryView *summaryview)
 
        while (node) {
                next = GTK_CTREE_NODE_NEXT(node);
-               if (prefs_common.expand_thread)
+               if (!summaryview->thread_collapsed)
                        gtk_ctree_expand(ctree, node);
                if (prefs_common.bold_unread &&
                    GTK_CTREE_ROW(node)->children)
@@ -3768,7 +3735,7 @@ static void summary_thread_init(SummaryView *summaryview)
        GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
        GtkCTreeNode *next;
 
-       if (prefs_common.expand_thread) {
+       if (!summaryview->thread_collapsed) {
                while (node) {
                        next = GTK_CTREE_ROW(node)->sibling;
                        if (GTK_CTREE_ROW(node)->children)
@@ -3901,6 +3868,8 @@ void summary_expand_threads(SummaryView *summaryview)
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
+       summaryview->thread_collapsed = FALSE;
+
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 }
 
@@ -3918,6 +3887,8 @@ void summary_collapse_threads(SummaryView *summaryview)
        }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
+       
+       summaryview->thread_collapsed = TRUE;
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 }
@@ -3957,8 +3928,6 @@ void summary_filter(SummaryView *summaryview)
                                        summaryview);
 
                gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
-               folder_update_items_when_required(FALSE);
        }
 
        debug_print("done.\n");
@@ -4429,7 +4398,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
                                           GTK_JUSTIFY_CENTER);
@@ -4443,8 +4412,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MARK],
                                   SUMMARY_COL_MARK_WIDTH);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
-                                  SUMMARY_COL_UNREAD_WIDTH);
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
+                                  SUMMARY_COL_STATUS_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
                                   SUMMARY_COL_LOCKED_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
@@ -4488,7 +4457,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                 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_STATUS , summary_status_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_SIZE   , summary_size_clicked);
@@ -4585,6 +4554,7 @@ static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        if (!event) return;
 
        if (event->button == 3) {
+               summaryview->display_msg = TRUE;
                /* right clicked */
                gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
                               NULL, NULL, event->button, event->time);
@@ -4714,6 +4684,13 @@ static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
                                   GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
                                   GTK_MENU(sw->search_type))))));
 
+       /* Show extended search description button, only when Extended is selected */
+       if (prefs_common.summary_quicksearch_type == S_SEARCH_EXTENDED) {
+               gtk_widget_show(sw->search_description);
+       } else {
+               gtk_widget_hide(sw->search_description);
+       }
+
        if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
                summary_show(sw, sw->folder_item);
 }
@@ -4782,7 +4759,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        summary_status_show(summaryview);
 
        if (GTK_CLIST(ctree)->selection &&
-            GTK_CLIST(ctree)->selection->next) {
+           GTK_CLIST(ctree)->selection->next) {
                summaryview->display_msg = FALSE;
                summary_set_menu_sensitive(summaryview);
                toolbar_main_set_sensitive(summaryview->mainwin);
@@ -4792,6 +4769,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        summaryview->selected = row;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       g_return_if_fail(msginfo != NULL);
 
        switch (column < 0 ? column : summaryview->col_state[column].type) {
        case S_COL_MARK:
@@ -4800,7 +4778,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                } else
                        summary_mark_row(summaryview, row);
                break;
-       case S_COL_UNREAD:
+       case S_COL_STATUS:
                if (MSG_IS_UNREAD(msginfo->flags)) {
                        summary_mark_row_as_read(summaryview, row);
                        summary_status_show(summaryview);
@@ -4808,6 +4786,9 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                         !MSG_IS_FORWARDED(msginfo->flags)) {
                        summary_mark_row_as_unread(summaryview, row);
                        summary_status_show(summaryview);
+               } else if (MSG_IS_REPLIED(msginfo->flags)) {
+                       summary_find_answers(summaryview, msginfo);
+                       return;
                }
                break;
        case S_COL_LOCKED:
@@ -4888,9 +4869,9 @@ static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
        summary_sort_by_column_click(summaryview, SORT_BY_MARK);
 }
 
-static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_status_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
+       summary_sort_by_column_click(summaryview, SORT_BY_STATUS);
 }
 
 static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
@@ -5003,77 +4984,59 @@ 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)
-{
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
-       return msginfo1->msgnum - msginfo2->msgnum;
-}
-
-static gint summary_cmp_by_size(GtkCList *clist,
-                               gconstpointer ptr1, gconstpointer ptr2)
-{
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
-       return msginfo1->size - msginfo2->size;
-}
-
-static gint summary_cmp_by_date(GtkCList *clist,
-                              gconstpointer ptr1, gconstpointer ptr2)
-{
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
-       return msginfo1->date_t - msginfo2->date_t;
-}
-
-static gint summary_cmp_by_from(GtkCList *clist,
-                              gconstpointer ptr1, gconstpointer ptr2)
-{
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
-       if (!msginfo1->fromname)
-               return (msginfo2->fromname != NULL);
-       if (!msginfo2->fromname)
-               return -1;
-
-       return strcasecmp(msginfo1->fromname, msginfo2->fromname);
-}
-
-static gint summary_cmp_by_to(GtkCList *clist,
-                             gconstpointer ptr1, gconstpointer ptr2)
-{
+#define CMP_FUNC_DEF(func_name, val)                                    \
+static gint func_name(GtkCList *clist,                                  \
+                     gconstpointer ptr1, gconstpointer ptr2)            \
+{                                                                       \
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;                 \
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;                 \
+                                                                        \
+       if (!msginfo1 || !msginfo2)                                      \
+               return -1;                                               \
+                                                                        \
+       return (val);                                                    \
+}
+
+CMP_FUNC_DEF(summary_cmp_by_mark,
+            MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_status,
+            MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_mime,
+            MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_label,
+            MSG_GET_COLORLABEL(msginfo1->flags) -
+            MSG_GET_COLORLABEL(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_locked,
+            MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags))
+
+CMP_FUNC_DEF(summary_cmp_by_num, msginfo1->msgnum - msginfo2->msgnum)
+CMP_FUNC_DEF(summary_cmp_by_size, msginfo1->size - msginfo2->size)
+CMP_FUNC_DEF(summary_cmp_by_date, msginfo1->date_t - msginfo2->date_t)
+
+#undef CMP_FUNC_DEF
+#define CMP_FUNC_DEF(func_name, var_name)                               \
+static gint func_name(GtkCList *clist,                                  \
+                     gconstpointer ptr1, gconstpointer ptr2)            \
+{                                                                       \
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;                 \
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;                 \
+                                                                        \
+       if (!msginfo1->var_name)                                         \
+               return (msginfo2->var_name != NULL);                     \
+       if (!msginfo2->var_name)                                         \
+               return -1;                                               \
+                                                                        \
+       return strcasecmp(msginfo1->var_name, msginfo2->var_name);       \
+}
+
+CMP_FUNC_DEF(summary_cmp_by_subject, subject);
+CMP_FUNC_DEF(summary_cmp_by_to, to);
+
+#undef CMP_FUNC_DEF
+
+ static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
+                                gconstpointer ptr2)
+ {
        const gchar *str1, *str2;
        const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
@@ -5086,33 +5049,14 @@ static gint summary_cmp_by_to(GtkCList *clist,
 
        if (!str1)
                return str2 != NULL;
-
        if (!str2)
-               return -1;
-
-       if (g_strncasecmp(str1, "-->", 3) == 0)
-               str1 += 3;
-       if (g_strncasecmp(str2, "-->", 3) == 0)
-               str2 += 3;
-
+               return -1;
        return strcasecmp(str1, str2);
-}
-
-static gint summary_cmp_by_subject(GtkCList *clist,
-                              gconstpointer ptr1, gconstpointer ptr2)
-{
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
-       if (!msginfo1->subject)
-               return (msginfo2->subject != NULL);
-       if (!msginfo2->subject)
-               return -1;
-
-       return strcasecmp(msginfo1->subject, msginfo2->subject);
-}
-
-static gint summary_cmp_by_simplified_subject
+ }
+ static gint summary_cmp_by_simplified_subject
        (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
        const PrefsFolderItem *prefs;
@@ -5144,14 +5088,20 @@ static gint summary_cmp_by_simplified_subject
        return strcasecmp(str1, str2);
 }
 
-static gint summary_cmp_by_label(GtkCList *clist,
+static gint summary_cmp_by_score(GtkCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
        MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
        MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+       int diff;
 
-       return MSG_GET_COLORLABEL(msginfo1->flags) -
-               MSG_GET_COLORLABEL(msginfo2->flags);
+       /* if score are equal, sort by date */
+
+       diff = msginfo1->threadscore - msginfo2->threadscore;
+       if (diff != 0)
+               return diff;
+       else
+               return summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
 static void news_flag_crosspost(MsgInfo *msginfo)
@@ -5170,7 +5120,6 @@ static void news_flag_crosspost(MsgInfo *msginfo)
                        debug_print(" <%s>", (gchar *)value);
                        if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
                                procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-                               folder_update_item(msginfo->folder, FALSE);
                                procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
                        }
                        g_hash_table_remove(mff->newsart, key);
@@ -5181,31 +5130,6 @@ static void news_flag_crosspost(MsgInfo *msginfo)
        }
 }
 
-static gint summary_cmp_by_score(GtkCList *clist,
-                                gconstpointer ptr1, gconstpointer ptr2)
-{
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-       int diff;
-
-       /* if score are equal, sort by date */
-
-       diff = msginfo1->threadscore - msginfo2->threadscore;
-       if (diff != 0)
-               return diff;
-       else
-               return summary_cmp_by_date(clist, ptr1, ptr2);
-}
-
-static gint summary_cmp_by_locked(GtkCList *clist,
-                                 gconstpointer ptr1, gconstpointer ptr2)
-{
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
-       return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
-}
-
 static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;
@@ -5235,7 +5159,6 @@ static void summary_ignore_thread(SummaryView *summaryview)
        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);
        }
-       folder_update_items_when_required(FALSE);
 
        summary_status_show(summaryview);
 }
@@ -5269,7 +5192,6 @@ static void summary_unignore_thread(SummaryView *summaryview)
        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);
        }
-       folder_update_items_when_required(FALSE);
 
        summary_status_show(summaryview);
 }
@@ -5456,6 +5378,7 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
 
        /* Threading */
        summaryview->threaded = item->threaded;
+       summaryview->thread_collapsed = item->thread_collapsed;
 
        /* Scoring */
        if (global_scoring || item->prefs->scoring) {
@@ -5475,9 +5398,11 @@ void summary_save_prefs_to_folderitem(SummaryView *summaryview, FolderItem *item
 
        /* Threading */
        item->threaded = summaryview->threaded;
+       item->thread_collapsed = summaryview->thread_collapsed;
 }
 
-static gboolean summary_update_msg(gpointer source, gpointer data) {
+static gboolean summary_update_msg(gpointer source, gpointer data) 
+{
        MsgInfoUpdate *msginfo_update = (MsgInfoUpdate *) source;
        SummaryView *summaryview = (SummaryView *)data;
        GtkCTreeNode *node;
@@ -5493,6 +5418,42 @@ static gboolean summary_update_msg(gpointer source, gpointer data) {
        return FALSE;
 }
 
-/*
- * End of Source.
+/*!
+ *\brief       change summaryview to display your answer(s) to a message
+ *
+ *\param       summaryview The SummaryView ;)
+ *\param       msginfo The message for which answers are searched
+ *
  */
+static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
+{
+       FolderItem *sent_folder = NULL;
+       PrefsAccount *account = NULL;
+       GtkCTreeNode *node = NULL;
+       char *buf = NULL;
+       if (msg == NULL || msg->msgid == NULL)
+               return;
+       
+       account = account_get_reply_account(msg, prefs_common.reply_account_autosel);
+       if (account == NULL) 
+               return;
+       sent_folder = account_get_special_folder
+                               (account, F_OUTBOX);
+       
+       buf = g_strdup_printf("inreplyto matchcase \"%s\"", msg->msgid);
+
+       if (sent_folder != summaryview->folder_item) {
+               folderview_select(summaryview->mainwin->folderview, sent_folder);
+       }
+       
+       gtk_option_menu_set_history(GTK_OPTION_MENU(summaryview->search_type_opt),
+                                   S_SEARCH_EXTENDED);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summaryview->toggle_search), TRUE);
+
+       gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), buf);
+       g_free(buf);
+       summary_show(summaryview, summaryview->folder_item);
+       node = gtk_ctree_node_nth(GTK_CTREE(summaryview->ctree), 0);
+       if (node)
+               summary_select_node(summaryview, node, TRUE, TRUE);
+}