untwist file selection logic - be explicit
[claws.git] / src / summaryview.c
index 3658b78bd455de23acf7be8ef4027c18145b8b54..ac8fcb6f0c0c84faf78bd449587feca557c968fb 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
- * This program is free software; you can redistributte it and/or modify
+ * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
 #include "imap.h"
 #include "addressbook.h"
 #include "addr_compl.h"
-#include "scoring.h"
 #include "folder_item_prefs.h"
 #include "filtering.h"
 #include "string_match.h"
 #include "toolbar.h"
 #include "news.h"
-#include "matcher.h"
-#include "matcher_parser.h"
 #include "hooks.h"
 #include "description_window.h"
-#include "folder.h"
+#include "folderutils.h"
+#include "quicksearch.h"
+#include "partial_download.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
 #define SUMMARY_COL_LOCKED_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         11
 
+
 static GtkStyle *bold_style;
 static GtkStyle *bold_marked_style;
 static GtkStyle *bold_deleted_style;
@@ -203,11 +203,6 @@ static void summary_copy_row_to            (SummaryView            *summaryview,
                                         GtkCTreeNode           *row,
                                         FolderItem             *to_folder);
 
-static void summary_delete_duplicated_func
-                                       (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
-                                        SummaryView            *summaryview);
-
 static void summary_execute_move       (SummaryView            *summaryview);
 static void summary_execute_move_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
@@ -263,15 +258,6 @@ static gboolean summary_button_released    (GtkWidget              *ctree,
 static gboolean summary_key_pressed    (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static gboolean summary_searchbar_pressed
-                                       (GtkWidget              *ctree,
-                                        GdkEventKey            *event,
-                                        SummaryView            *summaryview);
-static gboolean summary_searchbar_focus_evt    (GtkWidget              *ctree,
-                                                GdkEventFocus          *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,
@@ -291,9 +277,6 @@ static void summary_col_resized             (GtkCList               *clist,
 static void summary_reply_cb           (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
-static void summary_execute_cb         (SummaryView            *summaryview,
-                                        guint                   action,
-                                        GtkWidget              *widget);
 static void summary_show_all_header_cb (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
@@ -304,6 +287,9 @@ static void summary_add_address_cb  (SummaryView            *summaryview,
 static void summary_create_filter_cb   (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+static void summary_create_processing_cb(SummaryView           *summaryview,
+                                        guint                   action,
+                                        GtkWidget              *widget);
 
 static void summary_mark_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
@@ -384,6 +370,8 @@ static gint summary_cmp_by_locked   (GtkCList               *clist,
 
 static void news_flag_crosspost                (MsgInfo *msginfo);
 
+static void quicksearch_execute_cb     (QuickSearch    *quicksearch,
+                                        gpointer        data);
 static void tog_searchbar_cb           (GtkWidget      *w,
                                         gpointer        data);
 
@@ -410,19 +398,16 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {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..."),               "<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"),               "X", summary_execute_cb,        0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
-       {N_("/_Mark/_Mark"),            "<shift>asterisk", summary_mark,        0, NULL},
-       {N_("/_Mark/_Unmark"),          "U", summary_unmark,    0, NULL},
+       {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
+       {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
        {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
-       {N_("/_Mark/Mark as unr_ead"),  "<shift>exclam", summary_mark_as_unread, 0, NULL},
+       {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 all read"),    NULL, summary_mark_all_read, 0, NULL},
        {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
@@ -431,6 +416,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Mark/Unlock"),           NULL, summary_msgs_unlock, 0, NULL},
        {N_("/Color la_bel"),           NULL, NULL,             0, NULL},
 
+       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/Add sender to address boo_k"),
                                        NULL, summary_add_address_cb, 0, NULL},
@@ -443,18 +430,21 @@ static GtkItemFactoryEntry summary_popup_entries[] =
                                        NULL, summary_create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/Create f_ilter rule/by _Subject"),
                                        NULL, summary_create_filter_cb, FILTER_BY_SUBJECT, NULL},
+       {N_("/Create processing rule"), NULL, NULL,             0, "<Branch>"},
+       {N_("/Create processing rule/_Automatically"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_AUTO, NULL},
+       {N_("/Create processing rule/by _From"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_FROM, NULL},
+       {N_("/Create processing rule/by _To"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_TO, NULL},
+       {N_("/Create processing rule/by _Subject"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_View/Open in new _window"),
                                        "<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..."),            "<control>S", summary_save_as,  0, NULL},
-       {N_("/_Print..."),              NULL, summary_print,    0, NULL},
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {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] = {
@@ -470,65 +460,6 @@ 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;
@@ -537,7 +468,6 @@ SummaryView *summary_create(void)
        GtkWidget *ctree;
        GtkWidget *hbox;
        GtkWidget *hbox_l;
-       GtkWidget *hbox_search;
        GtkWidget *statlabel_folder;
        GtkWidget *statlabel_select;
        GtkWidget *statlabel_msgs;
@@ -545,16 +475,11 @@ SummaryView *summary_create(void)
        GtkWidget *toggle_eventbox;
        GtkWidget *toggle_arrow;
        GtkWidget *popupmenu;
-       GtkWidget *search_type_opt;
-       GtkWidget *search_type;
-       GtkWidget *search_string;
-       GtkWidget *search_hbbox;
-       GtkWidget *search_description;
-       GtkWidget *menuitem;
        GtkWidget *toggle_search;
        GtkTooltips *search_tip;
        GtkItemFactory *popupfactory;
        gint n_entries;
+       QuickSearch *quicksearch;
 
        debug_print("Creating summary view...\n");
        summaryview = g_new0(SummaryView, 1);
@@ -564,9 +489,13 @@ SummaryView *summary_create(void)
        
        /* create status label */
        hbox = gtk_hbox_new(FALSE, 0);
-       
+       gtk_widget_show(hbox);
+
        search_tip = gtk_tooltips_new();
        toggle_search = gtk_toggle_button_new();
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
+                                    prefs_common.show_searchbar);
+       gtk_widget_show(toggle_search);
 
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
                             toggle_search,
@@ -575,17 +504,22 @@ SummaryView *summary_create(void)
        gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);      
 
        hbox_l = gtk_hbox_new(FALSE, 0);
+       gtk_widget_show(hbox_l);
        gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
  
        statlabel_folder = gtk_label_new("");
+       gtk_widget_show(statlabel_folder);
        gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
        statlabel_select = gtk_label_new("");
+       gtk_widget_show(statlabel_select);
        gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
  
        /* toggle view button */
        toggle_eventbox = gtk_event_box_new();
+       gtk_widget_show(toggle_eventbox);
        gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
        toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_widget_show(toggle_arrow);
        gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
        g_signal_connect(G_OBJECT(toggle_eventbox), "button_press_event",
                         G_CALLBACK(summary_toggle_pressed),
@@ -593,12 +527,15 @@ SummaryView *summary_create(void)
        
        
        statlabel_msgs = gtk_label_new("");
+       gtk_widget_show(statlabel_msgs);
        gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
 
        hbox_spc = gtk_hbox_new(FALSE, 0);
+       gtk_widget_show(hbox_spc);
        gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_widget_show(scrolledwin);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_ALWAYS);
@@ -608,6 +545,7 @@ SummaryView *summary_create(void)
                             prefs_common.summaryview_height);
 
        ctree = summary_ctree_create(summaryview);
+       gtk_widget_show(ctree);
 
        gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
                                            GTK_CLIST(ctree)->hadjustment);
@@ -619,61 +557,10 @@ SummaryView *summary_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        /* quick search */
-       hbox_search = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox_search, FALSE, FALSE, 0);
+       quicksearch = quicksearch_new();
+       gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
 
-       search_type_opt = gtk_option_menu_new();
-       gtk_widget_show(search_type_opt);
-       gtk_box_pack_start(GTK_BOX(hbox_search), search_type_opt, FALSE, FALSE, 0);
-
-       search_type = gtk_menu_new();
-       MENUITEM_ADD (search_type, menuitem, _("Subject"), S_SEARCH_SUBJECT);
-       g_signal_connect(G_OBJECT(menuitem), "activate",
-                        G_CALLBACK(summary_searchtype_changed),
-                        summaryview);
-       MENUITEM_ADD (search_type, menuitem, _("From"), S_SEARCH_FROM);
-       g_signal_connect(G_OBJECT(menuitem), "activate",
-                        G_CALLBACK(summary_searchtype_changed),
-                        summaryview);
-       MENUITEM_ADD (search_type, menuitem, _("To"), S_SEARCH_TO);
-       g_signal_connect(G_OBJECT(menuitem), "activate",
-                        G_CALLBACK(summary_searchtype_changed),
-                        summaryview);
-       MENUITEM_ADD (search_type, menuitem, _("Extended"), S_SEARCH_EXTENDED);
-       g_signal_connect(G_OBJECT(menuitem), "activate",
-                        G_CALLBACK(summary_searchtype_changed),
-                        summaryview);
-
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
-       
-       gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
-       
-       gtk_widget_show(search_type);
-       
-       search_string = gtk_entry_new();
-       
-       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);
-       g_signal_connect(G_OBJECT(search_description), "clicked",
-                        G_CALLBACK(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);
-
-       g_signal_connect(G_OBJECT(search_string), "key_press_event",
-                        G_CALLBACK(summary_searchbar_pressed),
-                        summaryview);
-
-       g_signal_connect(G_OBJECT(search_string), "focus_in_event",
-                        G_CALLBACK(summary_searchbar_focus_evt),
-                        summaryview);
-
-       g_signal_connect(G_OBJECT(search_string), "focus_out_event",
-                        G_CALLBACK(summary_searchbar_focus_evt),
-                        summaryview);
+       quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
 
        g_signal_connect (G_OBJECT(toggle_search), "toggled",
                          G_CALLBACK(tog_searchbar_cb), summaryview);
@@ -690,7 +577,6 @@ SummaryView *summary_create(void)
        summaryview->ctree = ctree;
        summaryview->hbox = hbox;
        summaryview->hbox_l = hbox_l;
-       summaryview->hbox_search = hbox_search;
        summaryview->statlabel_folder = statlabel_folder;
        summaryview->statlabel_select = statlabel_select;
        summaryview->statlabel_msgs = statlabel_msgs;
@@ -700,26 +586,33 @@ SummaryView *summary_create(void)
        summaryview->popupmenu = popupmenu;
        summaryview->popupfactory = popupfactory;
        summaryview->lock_count = 0;
-       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);
 
        summaryview->target_list = gtk_target_list_new(summary_drag_types, 1);
 
+       summaryview->quicksearch = quicksearch;
+
        /* CLAWS: need this to get the SummaryView * from
         * the CList */
-       gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
+       g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
 
        gtk_widget_show_all(vbox);
 
+       gtk_widget_show(vbox);
+
+       if (prefs_common.show_searchbar)
+               quicksearch_show(quicksearch);
+       else
+               quicksearch_hide(quicksearch);
+       
        return summaryview;
 }
 
 void summary_init(SummaryView *summaryview)
 {
+       static GdkFont *boldfont = NULL;
+       static GdkFont *smallfont = NULL;
        GtkStyle *style;
        GtkWidget *pixmap;
 
@@ -792,7 +685,6 @@ void summary_init(SummaryView *summaryview)
 
        style = gtk_style_copy(gtk_widget_get_style
                                (summaryview->statlabel_folder));
-
        gtk_widget_set_style(summaryview->statlabel_folder, style);
        gtk_widget_set_style(summaryview->statlabel_select, style);
        gtk_widget_set_style(summaryview->statlabel_msgs, style);
@@ -807,7 +699,7 @@ void summary_init(SummaryView *summaryview)
        gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
        gtk_widget_show(pixmap);
        summaryview->quick_search_pixmap = pixmap;
-       
+
        /* Init summaryview prefs */
        summaryview->sort_key = SORT_BY_NONE;
        summaryview->sort_type = SORT_ASCENDING;
@@ -822,6 +714,7 @@ void summary_init(SummaryView *summaryview)
 
 }
 
+#if 0
 GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
                                                 GtkCTreeNode *current_node)
 {
@@ -883,6 +776,7 @@ GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
        else
                return best_node;
 }
+#endif
 
 #define CURRENTLY_DISPLAYED(m) \
 ( (m->msgnum == displayed_msgnum) \
@@ -898,17 +792,18 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        guint selected_msgnum = 0;
        guint displayed_msgnum = 0;
        GSList *cur;
+        GSList *not_killed;
 
        if (summary_is_locked(summaryview)) return FALSE;
 
        inc_lock();
        summary_lock(summaryview);
 
-       if (item != summaryview->folder_item) {
-               /* changing folder, reset search */
-               gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), "");
+       if (!prefs_common.summary_quicksearch_sticky
+        && !quicksearch_is_running(summaryview->quicksearch)) {
+               quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
        }
-       
+
        /* STATUSBAR_POP(summaryview->mainwin); */
 
        is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
@@ -945,16 +840,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
-       if (!is_refresh)
-               messageview_clear(summaryview->messageview);
 
        buf = NULL;
-       if (!item || !item->path || !item->parent || item->no_select) {
+       if (!item || !item->path || !folder_item_parent(item) || item->no_select) {
                g_free(buf);
                debug_print("empty folder\n\n");
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
-               if (is_refresh)
-                       messageview_clear(summaryview->messageview);
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                gtk_clist_thaw(GTK_CLIST(ctree));
@@ -964,11 +855,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        }
        g_free(buf);
 
+       if (!is_refresh)
+               messageview_clear(summaryview->messageview);
+
        summaryview->folder_item = item;
        item->opened = TRUE;
 
-       gtk_signal_handler_block_by_data(GTK_OBJECT(ctree), summaryview);
-
        buf = g_strdup_printf(_("Scanning folder (%s)..."), item->path);
        debug_print("%s\n", buf);
        STATUSBAR_PUSH(summaryview->mainwin, buf);
@@ -984,19 +876,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        BY OTHER PROGRAMS TO THE FOLDER
 */
        mlist = folder_item_get_msg_list(item);
-#if 0
-       summary_processing(summaryview, mlist);
-#endif
-       for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
-               MsgInfo * msginfo = (MsgInfo *) cur->data;
-
-               msginfo->score = score_message(global_scoring, msginfo);
-               if (msginfo->score != MAX_SCORE &&
-                   msginfo->score != MIN_SCORE) {
-                       msginfo->score += score_message(item->prefs->scoring,
-                                                       msginfo);
-               }
-       }
 
        if (summaryview->folder_item->hide_read_msgs) {
                GSList *not_killed;
@@ -1011,7 +890,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                             || MSG_IS_LOCKED(msginfo->flags)
                             || CURRENTLY_DISPLAYED(msginfo))
                             && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                           not_killed = g_slist_prepend(not_killed, msginfo);
+                               not_killed = g_slist_prepend(not_killed, msginfo);
                        else
                                procmsg_msginfo_free(msginfo);
                }
@@ -1021,68 +900,24 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
        }
 
-       if (strlen(gtk_entry_get_text(GTK_ENTRY(summaryview->search_string))) > 0) {
+       if (quicksearch_is_active(summaryview->quicksearch)) {
                GSList *not_killed;
-               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))))));
-               const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
-               gchar *searched_header = NULL;
-               MatcherList * tmp_list = NULL;
                
-               if (search_type == S_SEARCH_EXTENDED) {
-                       char *newstr = NULL;
-
-                       newstr = expand_search_string(search_string);
-                       if (newstr) {
-                               tmp_list = matcher_parser_get_cond(newstr);
-                               g_free(newstr);
-                       }
-                       else
-                               tmp_list = NULL;
-               }
-
                not_killed = NULL;
                for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
 
-                       switch (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;
-                       case S_SEARCH_EXTENDED:
-                               break;
-                       default:
-                               debug_print("unknown search type (%d)\n", search_type);
-                               break;
-                       }
-                       if (search_type != S_SEARCH_EXTENDED) {
-                               if (searched_header && strcasestr(searched_header, search_string) != NULL)
-                                       not_killed = g_slist_prepend(not_killed, msginfo);
-                               else
-                                       procmsg_msginfo_free(msginfo);
-                       } else {
-                               if ((tmp_list != NULL) && matcherlist_match(tmp_list, msginfo))
-                                       not_killed = g_slist_prepend(not_killed, msginfo);
-                               else
-                                       procmsg_msginfo_free(msginfo);
-                       }
-               }
-               if (search_type == S_SEARCH_EXTENDED && tmp_list != NULL) {
-                       matcherlist_free(tmp_list);
-                       tmp_list = NULL;
+                       if (quicksearch_match(summaryview->quicksearch, msginfo))
+                               not_killed = g_slist_prepend(not_killed, msginfo);
+                       else
+                               procmsg_msginfo_free(msginfo);
                }
 
                g_slist_free(mlist);
                mlist = not_killed;
        }
-       
+
+#if 0  
        if ((global_scoring || item->prefs->scoring)) {
                GSList *not_killed;
                gint kill_score;
@@ -1102,6 +937,18 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                g_slist_free(mlist);
                mlist = not_killed;
        }
+#endif
+        not_killed = NULL;
+        for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+                MsgInfo * msginfo = (MsgInfo *) cur->data;
+                
+                if (!msginfo->hidden)
+                        not_killed = g_slist_prepend(not_killed, msginfo);
+                else
+                        procmsg_msginfo_free(msginfo);
+        }
+        g_slist_free(mlist);
+        mlist = not_killed;
 
        STATUSBAR_POP(summaryview->mainwin);
 
@@ -1114,8 +961,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (summaryview->sort_key != SORT_BY_NONE)
                summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
 
-       gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), summaryview);
-
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        if (is_refresh) {
@@ -1139,10 +984,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
        } else {
                /* select first unread message */
+#if 0
                if (summaryview->sort_key == SORT_BY_SCORE)
                        node = summary_find_next_important_score(summaryview,
                                                                 NULL);
                else
+#endif
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                     MSG_UNREAD, FALSE);
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
@@ -1154,7 +1001,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                if (prefs_common.open_unread_on_enter ||
                    prefs_common.always_show_msg) {
                        summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, TRUE, TRUE);
+                       summary_select_node(summaryview, node, 
+                                           messageview_is_visible(summaryview->messageview), 
+                                           TRUE);
                        summary_lock(summaryview);
                } else
                        summary_select_node(summaryview, node, FALSE, TRUE);
@@ -1223,6 +1072,7 @@ void summary_clear_list(SummaryView *summaryview)
 
 void summary_clear_all(SummaryView *summaryview)
 {
+       messageview_clear(summaryview->messageview);
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
@@ -1262,6 +1112,22 @@ SummarySelection summary_get_selection_type(SummaryView *summaryview)
        return selection;
 }
 
+/*!
+ *\return      MsgInfo * Selected message if there's one selected;
+ *             if multiple selected, or none, return NULL.
+ */ 
+MsgInfo *summary_get_selected_msg(SummaryView *summaryview)
+{
+       /* summaryview->selected may be valid when multiple 
+        * messages were selected */
+       GList *sellist = GTK_CLIST(summaryview->ctree)->selection;
+
+       if (sellist == NULL || sellist->next) 
+               return NULL;
+       
+       return GTKUT_CTREE_NODE_GET_ROW_DATA(sellist->data);
+}
+
 GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 {
        GSList *mlist = NULL;
@@ -1327,7 +1193,6 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/Copy..."                     , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Delete"                      , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
                {"/Cancel a news message"       , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
-               {"/Execute"                     , M_DELAY_EXEC},
 
                {"/Mark"                        , M_TARGET_EXIST},
                {"/Mark/Mark"                   , M_TARGET_EXIST},
@@ -1341,18 +1206,19 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
                {"/Add sender to address book"  , M_SINGLE_TARGET_EXIST},
                {"/Create filter rule"          , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/Create processing rule"      , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
 
                {"/View"                        , M_SINGLE_TARGET_EXIST},
                {"/View/Open in new window"     , M_SINGLE_TARGET_EXIST},
                {"/View/Source"                 , M_SINGLE_TARGET_EXIST},
                {"/View/All header"             , M_SINGLE_TARGET_EXIST},
-
+#if 0
                {"/Save as..."                  , M_TARGET_EXIST|M_UNLOCKED},
                {"/Print..."                    , M_TARGET_EXIST|M_UNLOCKED},
 
                {"/Select thread"               , M_SINGLE_TARGET_EXIST},
                {"/Select all"                  , M_TARGET_EXIST},
-
+#endif
                {NULL, 0}
        };
 
@@ -1370,7 +1236,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
        gtk_check_menu_item_set_active
                (GTK_CHECK_MENU_ITEM(menuitem),
-                summaryview->messageview->textview->show_all_headers);
+                summaryview->messageview->mimeview->textview->show_all_headers);
        summary_unlock(summaryview);
 }
 
@@ -1447,7 +1313,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTDEFAULT) {
-                               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
+                               g_signal_stop_emission_by_name(G_OBJECT(ctree),
                                                         "key_press_event");
                                folderview_select_next_unread(summaryview->folderview);
                                return;
@@ -1499,15 +1365,8 @@ void summary_select_next_new(SummaryView *summaryview)
                                   "Go to next folder?"),
                                 _("Yes"), _("Search again"), _("No"));
                if (val == G_ALERTDEFAULT) {
-#warning FIXME_GTK2
-#if 0
-                       if (gtk_signal_n_emissions_by_name
-                               (GTK_OBJECT(ctree), "key_press_event") > 0)
-                                       gtk_signal_emit_stop_by_name
-                                               (GTK_OBJECT(ctree),
-                                                "key_press_event");
+                       g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
                        folderview_select_next_unread(summaryview->folderview);
-#endif
                        return;
                } else if (val == G_ALERTALTERNATE)
                        node = NULL;
@@ -1885,7 +1744,8 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
 
-       if (MSG_IS_NEWS(msginfo->flags))
+       if (msginfo->folder && msginfo->folder->folder &&
+           msginfo->folder->folder->klass->type == F_NEWS)
                news_flag_crosspost(msginfo);
 
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
@@ -2164,8 +2024,7 @@ void summary_sort(SummaryView *summaryview,
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
                break;
        case SORT_BY_NONE:
-               cmp_func = NULL;
-               return;
+               break;
        default:
                return;
        }
@@ -2175,6 +2034,11 @@ void summary_sort(SummaryView *summaryview,
 
        summary_set_column_titles(summaryview);
        summary_set_menu_sensitive(summaryview);
+
+       /* allow fallback to don't sort */
+       if (summaryview->sort_key == SORT_BY_NONE)
+               return;
+
        if(cmp_func != NULL) {
                debug_print("Sorting summary...");
                STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
@@ -2359,6 +2223,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        static gchar col_score[11];
        static gchar buf[BUFFSIZE];
        gint *col_pos = summaryview->col_pos;
+       FolderType ftype = F_UNKNOWN;
 
        text[col_pos[S_COL_MARK]]   = NULL;
        text[col_pos[S_COL_STATUS]] = NULL;
@@ -2380,8 +2245,11 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
 
        text[col_pos[S_COL_FROM]] = msginfo->fromname ? msginfo->fromname :
                _("(No From)");
-       if (prefs_common.swap_from && msginfo->from && msginfo->to &&
-           !MSG_IS_NEWS(msginfo->flags)) {
+       
+       if (msginfo->folder && msginfo->folder->folder)
+               ftype = msginfo->folder->folder->klass->type; 
+               
+       if (ftype != F_NEWS && prefs_common.swap_from && msginfo->from && msginfo->to) {
                gchar *addr = NULL;
 
                Xstrdup_a(addr, msginfo->from, return);
@@ -2439,6 +2307,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
        MsgFlags flags;
+       gint val;
 
        if (!new_window) {
                if (summaryview->displayed == row)
@@ -2457,26 +2326,11 @@ static void summary_display_msg_full(SummaryView *summaryview,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (new_window || !prefs_common.mark_as_read_on_new_window) {
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags) 
-               && procmsg_msg_has_marked_parent(msginfo))
-                       summaryview->unreadmarked--;
-               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(summaryview->mainwin);
-               messageview_show(msgview, msginfo, all_headers);
+               val = messageview_show(msgview, msginfo, all_headers);
        } else {
                MessageView *msgview;
 
@@ -2485,19 +2339,32 @@ static void summary_display_msg_full(SummaryView *summaryview,
                summaryview->displayed = row;
                if (!messageview_is_visible(msgview))
                        main_window_toggle_message_view(summaryview->mainwin);
-               messageview_show(msgview, msginfo, all_headers);
-               if (msgview->type == MVIEW_TEXT ||
-                   (msgview->type == MVIEW_MIME &&
-                    (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL ||
-                     gtk_notebook_get_current_page
-                       (GTK_NOTEBOOK(msgview->mimeview->notebook)) == 0)))
+               val = messageview_show(msgview, msginfo, all_headers);
+               if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
                        gtk_widget_grab_focus(summaryview->ctree);
                GTK_EVENTS_FLUSH();
                gtkut_ctree_node_move_if_on_the_edge(ctree, row);
        }
 
+       if (val == 0 &&
+           (new_window || !prefs_common.mark_as_read_on_new_window)) {
+               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags) 
+               && procmsg_msg_has_marked_parent(msginfo))
+                       summaryview->unreadmarked--;
+               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;
+               }
+       }
+
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
+       messageview_set_menu_sensitive(summaryview->messageview);
 
        summary_unlock(summaryview);
 }
@@ -2525,9 +2392,12 @@ void summary_redisplay_msg(SummaryView *summaryview)
 void summary_open_msg(SummaryView *summaryview)
 {
        if (!summaryview->selected) return;
-
+       
+       /* CLAWS: if separate message view, don't open a new window
+        * but rather use the current separated message view */
        summary_display_msg_full(summaryview, summaryview->selected,
-                                TRUE, FALSE);
+                                prefs_common.sep_msg ? FALSE : TRUE, 
+                                FALSE);
 }
 
 void summary_view_source(SummaryView * summaryview)
@@ -2719,6 +2589,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                }
                        gtk_ctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
+#if 0
        } else if ((global_scoring ||
                  summaryview->folder_item->prefs->scoring) &&
                 (msginfo->score >= summaryview->important_score) &&
@@ -2726,6 +2597,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
                gtk_ctree_node_set_foreground(ctree, row,
                                              &summaryview->color_important);
+#endif
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }
@@ -2741,19 +2613,19 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        if (MSG_IS_SIGNED(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          gpgsignedxpm, gpgsignedxpmmask);
-       } else if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+       } else if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_ENCRYPTED(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipkeyxpm, clipkeyxpmmask);
        } else if (MSG_IS_ENCRYPTED(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          keyxpm, keyxpmmask);
-       } else if (MSG_IS_MIME(flags)) {
+       } else if (MSG_IS_WITH_ATTACHMENT(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipxpm, clipxpmmask);
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
        }
-        if (!style)
+       if (!style)
                style = small_style;
 
        gtk_ctree_node_set_row_style(ctree, row, style);
@@ -2916,8 +2788,8 @@ void summary_mark_all_read(SummaryView *summaryview)
        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);
-       gtk_clist_thaw(clist);
        folder_item_update_thaw();
+       gtk_clist_thaw(clist);
 
        summary_status_show(summaryview);
 }
@@ -2939,7 +2811,6 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
 
-       procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);
        procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
        debug_print("Message %d is marked as unread\n",
                msginfo->msgnum);
@@ -3080,20 +2951,25 @@ void summary_delete(SummaryView *summaryview)
        GtkCTreeNode *node;
 
        if (!item) return;
-#if 0
-       if (!item || item->folder->type == F_NEWS) return;
-#endif
 
        if (summary_is_locked(summaryview)) return;
 
        /* if current folder is trash, ask for confirmation */
        if (item->stype == F_TRASH) {
                AlertValue aval;
+               MsgInfo *msginfo;
 
                aval = alertpanel(_("Delete message(s)"),
                                  _("Do you really want to delete message(s) from the trash?"),
                                  _("Yes"), _("No"), NULL);
                if (aval != G_ALERTDEFAULT) return;
+
+               for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+                       GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+                       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+                       partial_mark_for_delete(msginfo);
+               }
+       
        }
 
        main_window_cursor_wait(summaryview->mainwin);
@@ -3124,57 +3000,6 @@ void summary_delete(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 }
 
-void summary_delete_duplicated(SummaryView *summaryview)
-{
-       if (!summaryview->folder_item ||
-           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
-       if (summaryview->folder_item->stype == F_TRASH) return;
-
-       main_window_cursor_wait(summaryview->mainwin);
-       debug_print("Deleting duplicated messages...");
-       STATUSBAR_PUSH(summaryview->mainwin,
-                      _("Deleting duplicated messages..."));
-
-       folder_item_update_freeze();
-       
-       gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
-                               GTK_CTREE_FUNC(summary_delete_duplicated_func),
-                               summaryview);
-
-       if (prefs_common.immediate_exec)
-               summary_execute(summaryview);
-       else
-               summary_status_show(summaryview);
-
-       folder_item_update_thaw();
-
-       debug_print("done.\n");
-       STATUSBAR_POP(summaryview->mainwin);
-       main_window_cursor_normal(summaryview->mainwin);
-}
-
-static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
-                                          SummaryView *summaryview)
-{
-       GtkCTreeNode *found;
-       MsgInfo *msginfo;
-       MsgInfo *dup_msginfo;
-
-       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
-       
-       if (!msginfo || !msginfo->msgid || !*msginfo->msgid) return;
-
-       found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
-       
-       if (found && found != node) {
-               dup_msginfo = gtk_ctree_node_get_row_data(ctree, found);
-               /* prefer to delete the unread one */
-               if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(dup_msginfo->flags))
-               ||  (MSG_IS_UNREAD(msginfo->flags) == MSG_IS_UNREAD(dup_msginfo->flags)))
-                       summary_delete_row(summaryview, node);
-       }
-}
-
 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -3439,10 +3264,10 @@ void summary_save_as(SummaryView *summaryview)
                        g_warning("summary_save_as(): faild to convert character set.");
                        filename = g_strdup(oldstr);
                }
-               dest = filesel_select_file(_("Save as"), filename);
+               dest = filesel_select_file_save(_("Save as"), filename);
                g_free(filename);
        } else
-               dest = filesel_select_file(_("Save as"), filename);
+               dest = filesel_select_file_save(_("Save as"), filename);
        filename = NULL;
        if (!dest) return;
        if (is_file_exist(dest)) {
@@ -3967,9 +3792,9 @@ void summary_collapse_threads(SummaryView *summaryview)
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 }
 
-void summary_filter(SummaryView *summaryview)
+void summary_filter(SummaryView *summaryview, gboolean selected_only)
 {
-       if (!global_processing) {
+       if (!filtering_rules) {
                alertpanel_error(_("No filter rules defined."));
                return;
        }
@@ -3984,7 +3809,7 @@ void summary_filter(SummaryView *summaryview)
 
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
-       if (global_processing == NULL) {
+       if (filtering_rules == NULL) {
                gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                        GTK_CTREE_FUNC(summary_filter_func),
                                        summaryview);
@@ -3999,10 +3824,20 @@ void summary_filter(SummaryView *summaryview)
                        summary_status_show(summaryview);
        }
        else {
-               gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
-                                       GTK_CTREE_FUNC(summary_filter_func),
-                                       summaryview);
-
+               if (selected_only) {
+                       GList *cur;
+
+                       for (cur = GTK_CLIST(summaryview->ctree)->selection;
+                            cur != NULL; cur = cur->next) {
+                               summary_filter_func(GTK_CTREE(summaryview->ctree),
+                                                   GTK_CTREE_NODE(cur->data),
+                                                   summaryview);
+                       }
+               } else {
+                       gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
+                                               GTK_CTREE_FUNC(summary_filter_func),
+                                               summaryview);
+               }
                gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        }
 
@@ -4017,7 +3852,7 @@ void summary_filter(SummaryView *summaryview)
         * CLAWS: summary_show() only valid after having a lock. ideally
         * we want the lock to be context aware...  
         */
-       if (global_processing) {
+       if (filtering_rules) {
                summary_show(summaryview, summaryview->folder_item);
        }               
 }
@@ -4027,26 +3862,51 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
 {
        MsgInfo *msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
-       filter_message_by_msginfo(global_processing, msginfo);
+       filter_message_by_msginfo(filtering_rules, msginfo);
 }
 
-void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
+void summary_msginfo_filter_open(FolderItem * item, MsgInfo *msginfo,
+                                PrefsFilterType type, gint processing_rule)
 {
-       MsgInfo *msginfo;
        gchar *header = NULL;
        gchar *key = NULL;
 
+       procmsg_get_filter_keyword(msginfo, &header, &key, type);
+       
+       if (processing_rule) {
+               if (item == NULL)
+                       prefs_filtering_open(&pre_global_processing,
+                                            _("Processing rules to apply before folder rules"),
+                                            header, key);
+               else
+                       prefs_filtering_open(&item->prefs->processing,
+                                            _("Processing configuration"),
+                                            header, key);
+       }
+       else {
+               prefs_filtering_open(&filtering_rules,
+                                    _("Filtering configuration"),
+                                      header, key);
+       }
+       
+       g_free(header);
+       g_free(key);
+}
+
+void summary_filter_open(SummaryView *summaryview, PrefsFilterType type,
+                        gint processing_rule)
+{
+       MsgInfo *msginfo;
+       FolderItem * item;
+       
        if (!summaryview->selected) return;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
-
-       procmsg_get_filter_keyword(msginfo, &header, &key, type);
-       prefs_filtering_open(NULL, header, key);
-
-       g_free(header);
-       g_free(key);
+       
+       item = summaryview->folder_item;
+       summary_msginfo_filter_open(item, msginfo, type, processing_rule);
 }
 
 /* color label */
@@ -4456,25 +4316,50 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-#define RETURN_IF_LOCKED() \
-       if (summaryview->mainwin->lock_count) return TRUE
-
 static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                   SummaryView *summaryview)
+                               SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(widget);
        GtkCTreeNode *node;
        MessageView *messageview;
        TextView *textview;
+       GtkAdjustment *adj;
 
        if (summary_is_locked(summaryview)) return TRUE;
        if (!event) return TRUE;
 
+       if (quicksearch_has_focus(summaryview->quicksearch))
+               return FALSE;
+
        switch (event->keyval) {
        case GDK_Left:          /* Move focus */
+               adj = gtk_scrolled_window_get_hadjustment
+                       (GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
+               if (adj->lower != adj->value)
+                       break;
+               /* FALLTHROUGH */       
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return TRUE;
+       case GDK_Up:
+       case GDK_Down:
+               if ((node = summaryview->selected) != NULL) {
+                       GtkCTreeNode *next = NULL;
+                       next = (event->keyval == GDK_Down)
+                                       ? gtkut_ctree_node_next(ctree, node)
+                                       : gtkut_ctree_node_prev(ctree, node);
+                       if (next) {
+                               gtk_sctree_select_with_state
+                                       (GTK_SCTREE(ctree), next, event->state);
+                               
+                               /* Deprecated - what are the non-deprecated equivalents? */
+                               if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
+                                       gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
+                                       
+                               return TRUE;
+                       }
+               }
+               break;
        default:
                break;
        }
@@ -4488,12 +4373,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 
        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;
+       textview = messageview->mimeview->textview;
 
        switch (event->keyval) {
        case GDK_space:         /* Page down or go to the next */
@@ -4521,14 +4401,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                textview_scroll_one_line
                        (textview, (event->state & GDK_MOD1_MASK) != 0);
                break;
-       case GDK_asterisk:      /* Mark */
-               summary_mark(summaryview);
-               break;
-       case GDK_exclam:        /* Mark as unread */
-               summary_mark_as_unread(summaryview);
-               break;
        case GDK_Delete:
-               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;
@@ -4538,57 +4411,23 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        return TRUE;
 }
 
-static gboolean summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
-                                         SummaryView *summaryview)
+static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
 {
-       if (event != NULL && event->keyval == GDK_Return)
-               summary_show(summaryview, summaryview->folder_item);
-       return FALSE;
-}
-
-static gboolean summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
-                               SummaryView *summaryview)
-{
-       if (event != NULL && event->in)
-               g_signal_handlers_block_by_func(G_OBJECT(summaryview->mainwin->window), 
-                                               G_CALLBACK(mainwindow_key_pressed),
-                                               summaryview->mainwin);
-       else
-               g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->mainwin->window), 
-                                                 G_CALLBACK(mainwindow_key_pressed),
-                                                 summaryview->mainwin);
-
-       return FALSE;
-}
-
-static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
-{
-       SummaryView *sw = (SummaryView *)data;
-       prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(gtk_object_get_user_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);
-       }
+       SummaryView *summaryview = data;
 
-       if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
-               summary_show(sw, sw->folder_item);
+       summary_show(summaryview, summaryview->folder_item);
 }
 
 static void tog_searchbar_cb(GtkWidget *w, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *)data;
-       GtkWidget *hbox= summaryview->hbox_search;
+
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
                prefs_common.show_searchbar = TRUE;
-               gtk_widget_show(hbox);
+               quicksearch_show(summaryview->quicksearch);
        } else {
                prefs_common.show_searchbar = FALSE;
-               gtk_widget_hide(hbox);
+               quicksearch_hide(summaryview->quicksearch);
        }
 }
 
@@ -4741,12 +4580,6 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
        g_slist_free(msginfo_list);
 }
 
-static void summary_execute_cb(SummaryView *summaryview, guint action,
-                              GtkWidget *widget)
-{
-       summary_execute(summaryview);
-}
-
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
@@ -4763,7 +4596,13 @@ static void summary_add_address_cb(SummaryView *summaryview,
 static void summary_create_filter_cb(SummaryView *summaryview,
                                     guint action, GtkWidget *widget)
 {
-       summary_filter_open(summaryview, (PrefsFilterType)action);
+       summary_filter_open(summaryview, (PrefsFilterType)action, 0);
+}
+
+static void summary_create_processing_cb(SummaryView *summaryview,
+                                        guint action, GtkWidget *widget)
+{
+       summary_filter_open(summaryview, (PrefsFilterType)action, 1);
 }
 
 static void summary_sort_by_column_click(SummaryView *summaryview,
@@ -4912,7 +4751,7 @@ CMP_FUNC_DEF(summary_cmp_by_mark,
 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))
+            MSG_IS_WITH_ATTACHMENT(msginfo1->flags) - MSG_IS_WITH_ATTACHMENT(msginfo2->flags))
 CMP_FUNC_DEF(summary_cmp_by_label,
             MSG_GET_COLORLABEL(msginfo1->flags) -
             MSG_GET_COLORLABEL(msginfo2->flags))
@@ -4943,29 +4782,29 @@ CMP_FUNC_DEF(summary_cmp_by_to, to);
 
 #undef CMP_FUNC_DEF
 
-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 subject_compare_for_sort                                  \
-               (msginfo1->subject, msginfo2->subject);                  \
+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 subject_compare_for_sort
+               (msginfo1->subject, msginfo2->subject);
 }
 
- static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
-                                gconstpointer ptr2)
- {
+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;
-       const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+       const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
        
        g_return_val_if_fail(sv, -1);
        
@@ -4979,9 +4818,9 @@ static gint summary_cmp_by_subject(GtkCList *clist,                        \
                return -1;
  
        return strcasecmp(str1, str2);
- }
+}
  
- static gint summary_cmp_by_simplified_subject
+static gint summary_cmp_by_simplified_subject
        (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
        const FolderItemPrefs *prefs;
@@ -4990,7 +4829,7 @@ static gint summary_cmp_by_subject(GtkCList *clist,                        \
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
        const MsgInfo *msginfo1 = r1->data;
        const MsgInfo *msginfo2 = r2->data;
-       const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+       const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
        
        g_return_val_if_fail(sv, -1);
        g_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
@@ -5010,7 +4849,7 @@ static gint summary_cmp_by_subject(GtkCList *clist,                        \
        if (!prefs)
                return -1;
        
-       return strcasecmp(str1, str2);
+       return subject_compare_for_sort(str1, str2);
 }
 
 static gint summary_cmp_by_score(GtkCList *clist,
@@ -5034,9 +4873,15 @@ static void news_flag_crosspost(MsgInfo *msginfo)
        GString *line;
        gpointer key;
        gpointer value;
-       Folder *mff = msginfo->folder->folder;
+       Folder *mff;
+
+       g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(msginfo->folder != NULL);
+       g_return_if_fail(msginfo->folder->folder != NULL);
+       mff = msginfo->folder->folder;
+       g_return_if_fail(mff->klass->type == F_NEWS);
 
-       if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
+       if (mff->account->mark_crosspost_read) {
                line = g_string_sized_new(128);
                g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
                debug_print("nfcp: checking <%s>", line->str);
@@ -5233,11 +5078,11 @@ static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
  
        widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
                                           "/View/Hide read messages");
-       gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
-                           GINT_TO_POINTER(1));
+       g_object_set_data(G_OBJECT(widget), "dont_toggle",
+                         GINT_TO_POINTER(1));
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
-       gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
-                           GINT_TO_POINTER(0));
+       g_object_set_data(G_OBJECT(widget), "dont_toggle",
+                         GINT_TO_POINTER(0));
 }
 
 void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
@@ -5275,6 +5120,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
 
        folderview_unselect(summaryview->folderview);
        folderview_select(summaryview->folderview, summaryview->folder_item);
+       summary_set_column_titles(summaryview);
 }
 
 /*
@@ -5340,6 +5186,7 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
        summaryview->thread_collapsed = item->thread_collapsed;
 
        /* Scoring */
+#if 0
        if (global_scoring || item->prefs->scoring) {
                summaryview->important_score = prefs_common.important_score;
                if (item->prefs->important_score >
@@ -5347,6 +5194,7 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
                        summaryview->important_score =
                                item->prefs->important_score;
        }
+#endif
 }
 
 void summary_save_prefs_to_folderitem(SummaryView *summaryview, FolderItem *item)
@@ -5407,13 +5255,11 @@ static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
                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);
+       quicksearch_set(summaryview->quicksearch, QUICK_SEARCH_EXTENDED, 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);