* src/summaryview.c
[claws.git] / src / summaryview.c
index 4dd9b9112feef49a8a67d4b6aebcaf03599164cf..2f810f300094c1138d3441d12b475c653ad227c6 100644 (file)
@@ -264,9 +264,8 @@ static void summary_key_pressed             (GtkWidget              *ctree,
 static void summary_searchbar_pressed  (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static void summary_searchtype_changed (GtkWidget              *ctree,
-                                        GdkEventAny            *event,
-                                        SummaryView            *summaryview);
+static void summary_searchtype_changed (GtkMenuItem            *widget, 
+                                        gpointer                data);
 static void summary_open_row           (GtkSCTree              *sctree,
                                         SummaryView            *summaryview);
 static void summary_tree_expanded      (GtkCTree               *ctree,
@@ -357,6 +356,9 @@ 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);
@@ -373,6 +375,10 @@ static gint summary_cmp_by_label   (GtkCList               *clist,
 
 static void news_flag_crosspost                (MsgInfo *msginfo);
 
+static void tog_searchbar_cb           (GtkWidget      *w,
+                                        gpointer        data);
+
+
 GtkTargetEntry summary_drag_types[1] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
@@ -381,20 +387,22 @@ GtkTargetEntry summary_drag_types[1] =
 static GtkItemFactoryEntry summary_popup_entries[] =
 {
        {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
-       {N_("/Repl_y to sender"),       NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/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/_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},
        {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_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Forward"),               NULL, 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_("/Select _thread"),         NULL, summary_select_thread, 0, NULL},
-       {N_("/Select _all"),            NULL, summary_select_all, 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_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
        {N_("/E_xecute"),               NULL, summary_execute_cb,       0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
@@ -429,6 +437,9 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            NULL, 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 t_hread"),         NULL, summary_select_thread, 0, NULL}
 };
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
@@ -464,6 +475,8 @@ SummaryView *summary_create(void)
        GtkWidget *search_type;
        GtkWidget *search_string;
        GtkWidget *menuitem;
+       GtkWidget *toggle_search;
+       GtkTooltips *search_tip;
        GtkItemFactory *popupfactory;
        gint n_entries;
 
@@ -474,15 +487,24 @@ SummaryView *summary_create(void)
        
        /* create status label */
        hbox = gtk_hbox_new(FALSE, 0);
+       
+       search_tip = gtk_tooltips_new();
+       toggle_search = gtk_toggle_button_new();
+
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
+                            toggle_search,
+                            _("Toggle quick-search bar"), NULL);
+       
+       gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);      
 
        hbox_l = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
-
        statlabel_folder = gtk_label_new("");
        gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
        statlabel_select = gtk_label_new("");
        gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
-
        /* toggle view button */
        toggle_eventbox = gtk_event_box_new();
        gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
@@ -491,7 +513,8 @@ SummaryView *summary_create(void)
        gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
                           GTK_SIGNAL_FUNC(summary_toggle_pressed),
                           summaryview);
-
+       
+       
        statlabel_msgs = gtk_label_new("");
        gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
 
@@ -554,6 +577,9 @@ SummaryView *summary_create(void)
                           GTK_SIGNAL_FUNC(summary_searchbar_pressed),
                           summaryview);
 
+       gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
+                        GTK_SIGNAL_FUNC(tog_searchbar_cb), hbox_search);
+
        /* create popup menu */
        n_entries = sizeof(summary_popup_entries) /
                sizeof(summary_popup_entries[0]);
@@ -572,6 +598,7 @@ SummaryView *summary_create(void)
        summaryview->statlabel_msgs = statlabel_msgs;
        summaryview->toggle_eventbox = toggle_eventbox;
        summaryview->toggle_arrow = toggle_arrow;
+       summaryview->toggle_search = toggle_search;
        summaryview->popupmenu = popupmenu;
        summaryview->popupfactory = popupfactory;
        summaryview->lock_count = 0;
@@ -656,6 +683,10 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_show(pixmap);
        summaryview->folder_pixmap = pixmap;
 
+       pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+       gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
+       gtk_widget_show(pixmap);
+       
        /* Init summaryview prefs */
        summaryview->sort_key = SORT_BY_NONE;
        summaryview->sort_type = SORT_ASCENDING;
@@ -755,8 +786,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        
        STATUSBAR_POP(summaryview->mainwin);
 
-       is_refresh = (!prefs_common.open_inbox_on_inc &&
-                     item == summaryview->folder_item) ? TRUE : FALSE;
+       is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
        if (is_refresh) {
                selected_msgnum = summary_get_msgnum(summaryview,
                                                     summaryview->selected);
@@ -873,39 +903,33 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                gint search_type = GPOINTER_TO_INT(gtk_object_get_user_data(
                                   GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
                                   GTK_MENU(summaryview->search_type))))));
-               gchar *search_string = g_strdup(gtk_entry_get_text(
-                                      GTK_ENTRY(summaryview->search_string)));
+               gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
                gchar *searched_header = NULL;
                
                not_killed = NULL;
-               g_strdown(search_string);
-
-               for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+               for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
+
                        switch (search_type) {
-                               case S_SEARCH_SUBJECT:
-                                       searched_header = g_strdup(msginfo->subject);
-                                       break;
-                               case S_SEARCH_FROM:
-                                       searched_header = g_strdup(msginfo->from);
-                                       break;
-                               case S_SEARCH_TO:
-                                       searched_header = g_strdup(msginfo->to);
-                                       break;
-                               default:
-                                       printf("bug in search_type (=%d)\n",search_type);
+                       case S_SEARCH_SUBJECT:
+                               searched_header = msginfo->subject;
+                               break;
+                       case S_SEARCH_FROM:
+                               searched_header = msginfo->from;
+                               break;
+                       case S_SEARCH_TO:
+                               searched_header = msginfo->to;
+                               break;
+                       default:
+                               debug_print("unknown search type (%d)\n", search_type);
+                               break;
                        }
-                       
-                       g_strdown(searched_header);
-                       if (searched_header != NULL
-                           && strstr(searched_header, search_string) != NULL)
+                       if (searched_header && strcasestr(searched_header, search_string) != NULL)
                                not_killed = g_slist_append(not_killed, msginfo);
                        else
                                procmsg_msginfo_free(msginfo);
                }
                g_slist_free(mlist);
-               g_free(search_string);
-               g_free(searched_header);
                mlist = not_killed;
        }
        
@@ -1115,8 +1139,9 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        else
                menu_set_sensitive(ifactory, "/Move...", FALSE);
 
+#if 0
        menu_set_sensitive(ifactory, "/Delete", TRUE);
-       menu_set_sensitive(ifactory, "/Select all", TRUE);
+#endif
        menu_set_sensitive(ifactory, "/Copy...", TRUE);
        menu_set_sensitive(ifactory, "/Execute", TRUE);
 
@@ -1134,8 +1159,10 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
        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, "/Reply to",                 sens);
+       menu_set_sensitive(ifactory, "/Reply to/all",             sens);
+       menu_set_sensitive(ifactory, "/Reply to/sender",          sens);
+       menu_set_sensitive(ifactory, "/Reply to/mailing list",    sens);
        menu_set_sensitive(ifactory, "/Forward",                  TRUE);
        menu_set_sensitive(ifactory, "/Redirect",                 sens);
 
@@ -1153,16 +1180,20 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        else
                menu_set_sensitive(ifactory, "/Re-edit", FALSE);
 
-       menu_set_sensitive(ifactory, "/Select thread", sens);
-       menu_set_sensitive(ifactory, "/Save as...", sens);
+       menu_set_sensitive(ifactory, "/Save as...", TRUE);
        menu_set_sensitive(ifactory, "/Print...",   TRUE);
 
+       menu_set_sensitive(ifactory, "/Select all", TRUE);
+       menu_set_sensitive(ifactory, "/Select thread", sens);
        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);
+       menu_set_sensitive(ifactory, "/Cancel a news message", sens);
+       menu_set_sensitive(ifactory, "/Delete", !sens);
+
        summary_lock(summaryview);
        menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
        gtk_check_menu_item_set_active
@@ -1953,7 +1984,10 @@ void summary_sort(SummaryView *summaryview,
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
                break;
        case SORT_BY_FROM:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_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;
                break;
        case SORT_BY_SUBJECT:
                if (summaryview->simplify_subject_preg)
@@ -2170,7 +2204,6 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
 {
        static gchar date_modified[80];
        static gchar *to = NULL;
-       static gchar *from = NULL;
        static gchar col_score[11];
        static gchar buf[BUFFSIZE];
        gint *col_pos = summaryview->col_pos;
@@ -2208,6 +2241,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                                g_free(to);
                                to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
                                text[col_pos[S_COL_FROM]] = to;
+                               g_free(addr);
                        }
                } else {
                        if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
@@ -2224,10 +2258,12 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
         * the --> in sent boxes) was executed.
         */
        if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
-               g_free(from);
-               from = summary_complete_address(msginfo->from);
-               if (from)
-                       text[col_pos[S_COL_FROM]] = from;
+               gchar *from = summary_complete_address(msginfo->from);
+               if (from) {
+                       g_free(to);
+                       to = from;
+                       text[col_pos[S_COL_FROM]] = to;
+               }                       
        }
 
        if (summaryview->simplify_subject_preg != NULL)
@@ -2280,22 +2316,26 @@ static void summary_display_msg_full(SummaryView *summaryview,
        }
        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--;
-
-       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-       summary_set_row_marks(summaryview, row);
-       gtk_clist_thaw(GTK_CLIST(ctree));
-       summary_status_show(summaryview);
-
-       flags = msginfo->flags;
+       if (new_window || !prefs_common.mark_as_read_on_new_window) {
+               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)) {
+                       procmsg_msginfo_unset_flags
+                               (msginfo, MSG_NEW | MSG_UNREAD, 0);
+                       summary_set_row_marks(summaryview, row);
+                       gtk_clist_thaw(GTK_CLIST(ctree));
+                       summary_status_show(summaryview);
+                       
+                       flags = msginfo->flags;
+               }
+       }
 
        if (new_window) {
                MessageView *msgview;
 
-               msgview = messageview_create_with_new_window();
+               msgview = messageview_create_with_new_window(summaryview->mainwin);
                messageview_show(msgview, msginfo, all_headers);
        } else {
                MessageView *msgview;
@@ -2834,6 +2874,34 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                    msginfo->folder->path, msginfo->msgnum);
 }
 
+void summary_cancel(SummaryView *summaryview)
+{
+       MsgInfo * msginfo;
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       if (!check_permission(summaryview, msginfo))
+               return;
+
+       news_cancel_article(summaryview->folder_item->folder, msginfo);
+       
+       if (summary_is_locked(summaryview)) return;
+
+       summary_lock(summaryview);
+
+       gtk_clist_freeze(clist);
+
+       summary_update_status(summaryview);
+       summary_status_show(summaryview);
+
+       gtk_clist_thaw(clist);
+
+       summary_unlock(summaryview);
+}
+
 void summary_delete(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -3181,6 +3249,27 @@ void summary_unselect_all(SummaryView *summaryview)
        gtk_sctree_unselect_all(GTK_SCTREE(summaryview->ctree));
 }
 
+void summary_select_thread(SummaryView *summaryview)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCTreeNode *node = summaryview->selected;
+
+       if (!node) return;
+
+       while (GTK_CTREE_ROW(node)->parent != NULL)
+               node = GTK_CTREE_ROW(node)->parent;
+
+       if (node != summaryview->selected)
+               summary_select_node
+                       (summaryview, node,
+                        messageview_is_visible(summaryview->messageview),
+                        FALSE);
+
+       gtk_ctree_select_recursive(ctree, node);
+
+       summary_status_show(summaryview);
+}
+
 void summary_save_as(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -3188,6 +3277,8 @@ void summary_save_as(SummaryView *summaryview)
        gchar *filename = NULL;
        gchar *src, *dest;
 
+       AlertValue aval;
+
        if (!summaryview->selected) return;
        msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
        if (!msginfo) return;
@@ -3199,20 +3290,41 @@ void summary_save_as(SummaryView *summaryview)
        dest = filesel_select_file(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
-               AlertValue aval;
-
-               aval = alertpanel(_("Overwrite"),
-                                 _("Overwrite existing file?"),
-                                 _("OK"), _("Cancel"), NULL);
-               if (G_ALERTDEFAULT != aval) return;
+               aval = alertpanel(_("Append or Overwrite"),
+                                 _("Append or overwrite existing file?"),
+                                 _("Append"), _("Overwrite"), _("Cancel"));
+               if (aval!=0 && aval!=1) return;
        }
 
        src = procmsg_get_message_file(msginfo);
-       if (copy_file(src, dest, TRUE) < 0) {
-               alertpanel_error(_("Can't save the file `%s'."),
-                                g_basename(dest));
+       if ( aval==0 ) { /* append */
+               if (append_file(src, dest, TRUE) < 0) 
+                       alertpanel_error(_("Can't save the file `%s'."),
+                                        g_basename(dest));
+       } else { /* overwrite */
+               if (copy_file(src, dest, TRUE) < 0)
+                       alertpanel_error(_("Can't save the file `%s'."),
+                                        g_basename(dest));
        }
        g_free(src);
+
+       
+       /*
+        * If two or more msgs are selected,
+        * append them to the output file.
+        */
+       if (GTK_CLIST(ctree)->selection->next) {
+               GList *item;
+               for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) {
+                       msginfo = gtk_ctree_node_get_row_data(ctree, (GtkCTreeNode*)item->data);
+                       if (!msginfo) break;
+                       src = procmsg_get_message_file(msginfo);
+                       if (append_file(src, dest, TRUE) < 0)
+                               alertpanel_error(_("Can't save the file `%s'."),
+                                                g_basename(dest));
+               }
+               g_free(src);
+       }
 }
 
 void summary_print(SummaryView *summaryview)
@@ -3929,17 +4041,17 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode)
        switch (mode) {
        case COMPOSE_REPLY:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE, text);
+                             FALSE, FALSE, FALSE, text);
                break;
        case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE, text);
+               compose_reply(msginfo, TRUE, FALSE, FALSE, FALSE, text);
                break;
        case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE, NULL);
+               compose_reply(msginfo, FALSE, FALSE, FALSE, FALSE, NULL);
                break;
        case COMPOSE_REPLY_TO_SENDER:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE, text);
+                             FALSE, FALSE, TRUE, text);
                break;
        case COMPOSE_FOLLOWUP_AND_REPLY_TO:
                compose_followup_and_reply_to(msginfo,
@@ -3947,20 +4059,30 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode)
                                              FALSE, TRUE, text);
                break;
        case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE, text);
+               compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, text);
                break;
        case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE, NULL);
+               compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
                break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE, text);
+                             TRUE, FALSE, FALSE, text);
                break;
        case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, FALSE, text);
+               compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, text);
                break;
        case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, FALSE, NULL);
+               compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
+               break;
+       case COMPOSE_REPLY_TO_LIST:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE, FALSE, text);
+               break;
+       case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
+               break;
+       case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
                break;
        case COMPOSE_FORWARD:
                if (prefs_common.forward_as_attachment) {
@@ -4398,6 +4520,8 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 {
        GtkCTree *ctree = GTK_CTREE(widget);
        GtkCTreeNode *node;
+       MessageView *messageview;
+       TextView *textview;
 
        if (summary_is_locked(summaryview)) return;
        if (!event) return;
@@ -4419,6 +4543,14 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        return;
        }
 
+       messageview = summaryview->messageview;
+       if (messageview->type == MVIEW_MIME &&
+           gtk_notebook_get_current_page
+               (GTK_NOTEBOOK(messageview->mimeview->notebook)) == 1)
+               textview = messageview->mimeview->textview;
+       else
+               textview = messageview->textview;
+
        switch (event->keyval) {
        case GDK_space:         /* Page down or go to the next */
                if (summaryview->displayed != summaryview->selected) {
@@ -4426,12 +4558,11 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                            summaryview->selected);
                        break;
                }
-               if (!textview_scroll_page(summaryview->messageview->textview,
-                                         FALSE))
+               if (!textview_scroll_page(textview, FALSE))
                        summary_select_next_unread(summaryview);
                break;
        case GDK_BackSpace:     /* Page up */
-               textview_scroll_page(summaryview->messageview->textview, TRUE);
+               textview_scroll_page(textview, TRUE);
                break;
        case GDK_Return:        /* Scroll up/down one line */
                if (summaryview->displayed != summaryview->selected) {
@@ -4439,8 +4570,8 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                            summaryview->selected);
                        break;
                }
-               textview_scroll_one_line(summaryview->messageview->textview,
-                                        (event->state & GDK_MOD1_MASK) != 0);
+               textview_scroll_one_line
+                       (textview, (event->state & GDK_MOD1_MASK) != 0);
                break;
        case GDK_asterisk:      /* Mark */
                summary_mark(summaryview);
@@ -4465,11 +4596,22 @@ static void summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_show(summaryview, summaryview->folder_item);
 }
 
-static void summary_searchtype_changed(GtkWidget *widget, GdkEventAny *event,
-                               SummaryView *summaryview)
+static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
 {
-       if (gtk_entry_get_text(GTK_ENTRY(summaryview->search_string)))
-               summary_show(summaryview, summaryview->folder_item);
+       SummaryView *sw = (SummaryView *)data;
+       if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
+               summary_show(sw, sw->folder_item);
+}
+
+static void tog_searchbar_cb(GtkWidget *w, gpointer data)
+{
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
+               prefs_common.show_searchbar = TRUE;
+               gtk_widget_show(GTK_WIDGET(data));
+       } else {
+               prefs_common.show_searchbar = FALSE;
+               gtk_widget_hide(GTK_WIDGET(data));
+       }
 }
 
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
@@ -4794,6 +4936,33 @@ static gint summary_cmp_by_from(GtkCList *clist,
        return strcasecmp(msginfo1->fromname, msginfo2->fromname);
 }
 
+static gint summary_cmp_by_to(GtkCList *clist,
+                             gconstpointer ptr1, gconstpointer ptr2)
+{
+       const gchar *str1, *str2;
+       const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
+       const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+       const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+       
+       g_return_val_if_fail(sv, -1);
+       
+       str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_FROM]])->text;
+       str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_FROM]])->text;
+
+       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 strcasecmp(str1, str2);
+}
+
 static gint summary_cmp_by_subject(GtkCList *clist,
                               gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -4901,35 +5070,6 @@ static gint summary_cmp_by_locked(GtkCList *clist,
        return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
 }
 
-static void summary_select_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
-{
-       MsgInfo *msginfo;
-
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
-       gtk_ctree_select(GTK_CTREE(ctree), row);        
-       debug_print("Message %d selected\n", msginfo->msgnum);
-}
-
-/* select current thread */
-void summary_select_thread(SummaryView *summaryview)
-{
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = summaryview->selected;
-       GList *cur;
-
-       while (GTK_CTREE_ROW(node)->parent != NULL)
-               node = GTK_CTREE_ROW(node)->parent;
-
-       if (node && node != summaryview->selected)
-               summary_select_node(summaryview, node, TRUE, FALSE);
-
-       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_select_thread_func), summaryview);
-       }
-       
-       summary_status_show(summaryview);
-}
-
 static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;
@@ -5099,7 +5239,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
-       gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
+       gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 1); /* search_toggle before */
        gtk_widget_show(pixmap);
        summaryview->folder_pixmap = pixmap;