* src/summaryview.c
[claws.git] / src / summaryview.c
index 4b70d754cf0e7dc4af0b329c19bc10d4aa483e9c..c63e67be069d69a7a9b47cec2d4c72a84e6180c1 100644 (file)
@@ -74,8 +74,7 @@
 #include "imap.h"
 #include "addressbook.h"
 #include "addr_compl.h"
-#include "scoring.h"
-#include "prefs_folder_item.h"
+#include "folder_item_prefs.h"
 #include "filtering.h"
 #include "string_match.h"
 #include "toolbar.h"
 #include "matcher_parser.h"
 #include "hooks.h"
 #include "description_window.h"
-#include "folder.h"
+#include "folderutils.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 GdkFont *boldfont;
-static GdkFont *smallfont;
 
 static GtkStyle *bold_style;
 static GtkStyle *bold_marked_style;
@@ -206,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,
@@ -254,7 +246,7 @@ static void summary_colorlabel_menu_create(SummaryView      *summaryview);
 static GtkWidget *summary_ctree_create (SummaryView    *summaryview);
 
 /* callback functions */
-static void summary_toggle_pressed     (GtkWidget              *eventbox,
+static gint summary_toggle_pressed     (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
 static void summary_button_pressed     (GtkWidget              *ctree,
@@ -263,10 +255,10 @@ static void summary_button_pressed        (GtkWidget              *ctree,
 static void summary_button_released    (GtkWidget              *ctree,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
-static void summary_key_pressed                (GtkWidget              *ctree,
+static gint summary_key_pressed                (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static void summary_searchbar_pressed  (GtkWidget              *ctree,
+static gint summary_searchbar_pressed  (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
 static void summary_searchbar_focus_evt        (GtkWidget              *ctree,
@@ -306,6 +298,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);
@@ -445,6 +440,15 @@ 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"),
@@ -479,8 +483,8 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
  */
 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 #"),
+       "ag #",  N_("messages whose age is greater than #"),
+       "al #",  N_("messages whose age is less 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"),
@@ -510,6 +514,7 @@ static gchar *search_descr_strings[] = {
        "T",     N_("marked messages"),
        "U",     N_("unread messages"),
        "x S",   N_("messages which contain S in References header"),
+       "X cmd", N_("messages returning 0 when passed to command"),
        "y S",   N_("messages which contain S in X-Label header"),
         "",     "" ,
        "&",     N_("logical AND operator"),
@@ -526,7 +531,8 @@ static DescriptionWindow search_descr = {
        search_descr_strings
 };
        
-static void search_description_cb (GtkWidget *widget) {
+static void search_description_cb(GtkWidget *widget)
+{
        description_window_create(&search_descr);
 };
 
@@ -708,6 +714,8 @@ SummaryView *summary_create(void)
        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);
+
        /* CLAWS: need this to get the SummaryView * from
         * the CList */
        gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
@@ -719,9 +727,12 @@ SummaryView *summary_create(void)
 
 void summary_init(SummaryView *summaryview)
 {
+       static GdkFont *boldfont = NULL;
+       static GdkFont *smallfont = NULL;
        GtkStyle *style;
        GtkWidget *pixmap;
 
+       gtk_widget_realize(summaryview->ctree);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
                         &markxpm, &markxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
@@ -747,25 +758,13 @@ void summary_init(SummaryView *summaryview)
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
                         &gpgsignedxpm, &gpgsignedxpmmask);
 
-       if (!small_style) {
-               small_style = gtk_style_copy
-                       (gtk_widget_get_style(summaryview->ctree));
-               if (!smallfont)
-                       smallfont = gtkut_font_load(SMALL_FONT);
-               small_style->font = smallfont;
-               small_marked_style = gtk_style_copy(small_style);
-               small_marked_style->fg[GTK_STATE_NORMAL] =
-                       summaryview->color_marked;
-               small_deleted_style = gtk_style_copy(small_style);
-               small_deleted_style->fg[GTK_STATE_NORMAL] =
-                       summaryview->color_dim;
-       }
        if (!bold_style) {
                bold_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
                if (!boldfont)
                        boldfont = gtkut_font_load(BOLD_FONT);
-               bold_style->font = boldfont;
+               if (boldfont)
+                       bold_style->font = boldfont;
                bold_marked_style = gtk_style_copy(bold_style);
                bold_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -773,10 +772,28 @@ void summary_init(SummaryView *summaryview)
                bold_deleted_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_dim;
        }
+       
+       if (!small_style) {
+               small_style = gtk_style_copy
+                       (gtk_widget_get_style(summaryview->ctree));
+               if (!smallfont)
+                       smallfont = gtkut_font_load(SMALL_FONT);
+               if (smallfont)
+                       small_style->font = smallfont;
+               small_marked_style = gtk_style_copy(small_style);
+               small_marked_style->fg[GTK_STATE_NORMAL] =
+                       summaryview->color_marked;
+               small_deleted_style = gtk_style_copy(small_style);
+               small_deleted_style->fg[GTK_STATE_NORMAL] =
+                       summaryview->color_dim;
+
+               gtk_widget_set_style(summaryview->ctree, small_style);
+       }
 
        style = gtk_style_copy(gtk_widget_get_style
                                (summaryview->statlabel_folder));
-
+       if (smallfont)
+               style->font = smallfont;
        gtk_widget_set_style(summaryview->statlabel_folder, style);
        gtk_widget_set_style(summaryview->statlabel_select, style);
        gtk_widget_set_style(summaryview->statlabel_msgs, style);
@@ -806,6 +823,7 @@ void summary_init(SummaryView *summaryview)
 
 }
 
+#if 0
 GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
                                                 GtkCTreeNode *current_node)
 {
@@ -867,6 +885,7 @@ GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
        else
                return best_node;
 }
+#endif
 
 #define CURRENTLY_DISPLAYED(m) \
 ( (m->msgnum == displayed_msgnum) \
@@ -882,6 +901,7 @@ 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;
 
@@ -929,16 +949,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));
@@ -948,6 +964,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        }
        g_free(buf);
 
+       if (!is_refresh)
+               messageview_clear(summaryview->messageview);
+
        summaryview->folder_item = item;
        item->opened = TRUE;
 
@@ -968,19 +987,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;
@@ -1066,7 +1072,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                g_slist_free(mlist);
                mlist = not_killed;
        }
-       
+
+#if 0  
        if ((global_scoring || item->prefs->scoring)) {
                GSList *not_killed;
                gint kill_score;
@@ -1086,12 +1093,23 @@ 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);
 
-       /* set ctree and hash table from the msginfo list
-          creating thread, and count the number of messages */
-       
+       /* set ctree and hash table from the msginfo list, and
+          create the thread */
        summary_set_ctree_from_list(summaryview, mlist);
 
        g_slist_free(mlist);
@@ -1124,10 +1142,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) {
@@ -1139,7 +1159,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);
@@ -1179,12 +1201,11 @@ void summary_clear_list(SummaryView *summaryview)
 
        summaryview->display_msg = FALSE;
 
-       summaryview->selected  = NULL;
+       summaryview->selected = NULL;
        summaryview->displayed = NULL;
-       summaryview->newmsgs   = summaryview->unread     = 0;
-       summaryview->messages  = summaryview->total_size = 0;
-       summaryview->deleted   = summaryview->moved      = 0;
-       summaryview->copied    = 0;
+       summaryview->total_size = 0;
+       summaryview->deleted = summaryview->moved = 0;
+       summaryview->copied = 0;
        if (summaryview->msgid_table) {
                g_hash_table_destroy(summaryview->msgid_table);
                summaryview->msgid_table = NULL;
@@ -1209,6 +1230,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);
@@ -1251,15 +1273,32 @@ SummarySelection summary_get_selection_type(SummaryView *summaryview)
 GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 {
        GSList *mlist = NULL;
-       GList *row_list;
        GList *cur;
        MsgInfo *msginfo;
 
-       row_list = GTK_CLIST(summaryview->ctree)->selection;
-       for (cur = row_list; cur != NULL; cur = cur->next) {
-               msginfo = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(summaryview->ctree),
-                        GTK_CTREE_NODE(cur->data));
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+            cur = cur->next) {
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
+               mlist = g_slist_prepend(mlist, msginfo);
+       }
+
+       mlist = g_slist_reverse(mlist);
+
+       return mlist;
+}
+
+GSList *summary_get_msg_list(SummaryView *summaryview)
+{
+       GSList *mlist = NULL;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+
+       ctree = GTK_CTREE(summaryview->ctree);
+
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+            node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
                mlist = g_slist_prepend(mlist, msginfo);
        }
 
@@ -1271,91 +1310,76 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 static void summary_set_menu_sensitive(SummaryView *summaryview)
 {
        GtkItemFactory *ifactory = summaryview->popupfactory;
-       SummarySelection selection;
+       SensitiveCond state;
+       gboolean sensitive;
        GtkWidget *menuitem;
-       gboolean sens;
+       gint i;
+
+       static const struct {
+               gchar *const entry;
+               SensitiveCond cond;
+       } entry[] = {
+               {"/Reply"                       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/all"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/sender"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/mailing list"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Follow-up and reply to"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
+
+               {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"/Redirect"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+
+               {"/Re-edit"                     , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+
+               {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/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},
+               {"/Mark/Unmark"                 , M_TARGET_EXIST},
+               {"/Mark/Mark as unread"         , M_TARGET_EXIST},
+               {"/Mark/Mark all read"          , M_TARGET_EXIST},
+               {"/Mark/Ignore thread"          , M_TARGET_EXIST},
+               {"/Mark/Lock"                   , M_TARGET_EXIST},
+               {"/Mark/Unlock"                 , M_TARGET_EXIST},
+               {"/Color label"                 , M_TARGET_EXIST},
+
+               {"/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},
+
+               {"/Save as..."                  , M_TARGET_EXIST|M_UNLOCKED},
+               {"/Print..."                    , M_TARGET_EXIST|M_UNLOCKED},
+
+               {"/Select thread"               , M_SINGLE_TARGET_EXIST},
+               {"/Select all"                  , M_TARGET_EXIST},
+
+               {NULL, 0}
+       };
 
-       selection = summary_get_selection_type(summaryview);
        main_window_set_menu_sensitive(summaryview->mainwin);
 
-       if (selection == SUMMARY_NONE) {
-               GtkWidget *submenu;
+       state = main_window_get_current_state(summaryview->mainwin);
 
-               submenu = gtk_item_factory_get_widget
-                       (summaryview->popupfactory, "/Mark");
-               menu_set_insensitive_all(GTK_MENU_SHELL(submenu));
-               menu_set_insensitive_all
-                       (GTK_MENU_SHELL(summaryview->popupmenu));
-               return;
+       for (i = 0; entry[i].entry != NULL; i++) {
+               sensitive = ((entry[i].cond & state) == entry[i].cond);
+               menu_set_sensitive(ifactory, entry[i].entry, sensitive);
        }
 
-       if (FOLDER_TYPE(summaryview->folder_item->folder) != F_NEWS)
-               menu_set_sensitive(ifactory, "/Move...", TRUE);
-       else
-               menu_set_sensitive(ifactory, "/Move...", FALSE);
-
-#if 0
-       menu_set_sensitive(ifactory, "/Delete", TRUE);
-#endif
-       menu_set_sensitive(ifactory, "/Copy...", TRUE);
-       menu_set_sensitive(ifactory, "/Execute", TRUE);
-
-       menu_set_sensitive(ifactory, "/Mark", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
-
-       menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark as read",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Ignore thread",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Lock", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unlock", TRUE);
-
-       menu_set_sensitive(ifactory, "/Color label", TRUE);
-
-       sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
-       menu_set_sensitive(ifactory, "/Reply",                    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);
-
-       menu_set_sensitive(ifactory, "/Add sender to address book", sens);
-       menu_set_sensitive(ifactory, "/Create filter rule",         sens);
-
-       menu_set_sensitive(ifactory, "/View", sens);
-       menu_set_sensitive(ifactory, "/View/Open in new window", sens);
-       menu_set_sensitive(ifactory, "/View/Source", sens);
-       menu_set_sensitive(ifactory, "/View/All header", sens);
-       if (summaryview->folder_item->stype == F_OUTBOX ||
-           summaryview->folder_item->stype == F_DRAFT  ||
-           summaryview->folder_item->stype == F_QUEUE)
-               menu_set_sensitive(ifactory, "/Re-edit", sens);
-       else
-               menu_set_sensitive(ifactory, "/Re-edit", FALSE);
-
-       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
                (GTK_CHECK_MENU_ITEM(menuitem),
-                summaryview->messageview->textview->show_all_headers);
+                summaryview->messageview->mimeview->textview->show_all_headers);
        summary_unlock(summaryview);
 }
 
@@ -1870,13 +1894,10 @@ 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_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_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
@@ -1884,7 +1905,6 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
 
-       summaryview->messages++;
        summaryview->total_size += msginfo->size;
 
        summary_set_row_marks(summaryview, node);
@@ -1896,18 +1916,13 @@ static void summary_update_status(SummaryView *summaryview)
        GtkCTreeNode *node;
        MsgInfo *msginfo;
 
-       summaryview->newmsgs = summaryview->unread =
-       summaryview->messages = summaryview->total_size =
+       summaryview->total_size =
        summaryview->deleted = summaryview->moved = summaryview->copied = 0;
 
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
             node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
-               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_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
                && procmsg_msg_has_marked_parent(msginfo))
                        summaryview->unreadmarked++;
@@ -1917,7 +1932,6 @@ static void summary_update_status(SummaryView *summaryview)
                        summaryview->moved++;
                if (MSG_IS_COPY(msginfo->flags))
                        summaryview->copied++;
-               summaryview->messages++;
                summaryview->total_size += msginfo->size;
        }
 }
@@ -2004,11 +2018,11 @@ static void summary_status_show(SummaryView *summaryview)
        g_free(itstr);
 
        str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
-                             summaryview->newmsgs,
-                             summaryview->unread,
-                             summaryview->messages,
-                             to_human_readable(summaryview->total_size));
 
+                                     summaryview->folder_item->new_msgs,
+                                     summaryview->folder_item->unread_msgs,
+                                     summaryview->folder_item->total_msgs,
+                                     to_human_readable(summaryview->total_size));
        gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
 }
@@ -2160,8 +2174,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;
        }
@@ -2171,6 +2184,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..."));
@@ -2376,8 +2394,7 @@ 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 (prefs_common.swap_from && msginfo->from && msginfo->to) {
                gchar *addr = NULL;
 
                Xstrdup_a(addr, msginfo->from, return);
@@ -2435,7 +2452,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
        MsgFlags flags;
-       gchar *filename;
+       gint val;
 
        if (!new_window) {
                if (summaryview->displayed == row)
@@ -2454,37 +2471,11 @@ static void summary_display_msg_full(SummaryView *summaryview,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       filename = procmsg_get_message_file(msginfo);
-       if (!filename) {
-               summary_unlock(summaryview);
-               return;
-       }
-       g_free(filename);
-
-       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_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;
 
@@ -2493,17 +2484,29 @@ 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);
 
@@ -2533,9 +2536,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)
@@ -2727,14 +2733,15 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                }
                        gtk_ctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
-       }
-       else if ((global_scoring ||
+#if 0
+       else if ((global_scoring ||
                  summaryview->folder_item->prefs->scoring) &&
                 (msginfo->score >= summaryview->important_score) &&
                 (MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
                gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
                gtk_ctree_node_set_foreground(ctree, row,
                                              &summaryview->color_important);
+#endif
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }
@@ -2762,7 +2769,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        } 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);
@@ -2827,7 +2834,6 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
 
 static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
-       gboolean changed = FALSE;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
@@ -2863,10 +2869,6 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
                return;
 
-       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_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked--;
@@ -2949,14 +2951,10 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
                summaryview->deleted--;
        }
 
-       if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->unread++;
-
        if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && 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);
@@ -3097,9 +3095,6 @@ 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;
 
@@ -3141,55 +3136,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 = GTK_CTREE_ROW(node)->row.data;
-       MsgInfo *dup_msginfo;
-       
-       if (!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);
@@ -3385,7 +3331,9 @@ void summary_add_address(SummaryView *summaryview)
 
 void summary_select_all(SummaryView *summaryview)
 {
-       if (summaryview->messages >= 500) {
+       if (!summaryview->folder_item) return;
+
+       if (summaryview->folder_item->total_msgs >= 500) {
                STATUSBAR_PUSH(summaryview->mainwin,
                               _("Selecting all messages..."));
                main_window_cursor_wait(summaryview->mainwin);
@@ -3393,7 +3341,7 @@ void summary_select_all(SummaryView *summaryview)
 
        gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
 
-       if (summaryview->messages >= 500) {
+       if (summaryview->folder_item->total_msgs >= 500) {
                STATUSBAR_POP(summaryview->mainwin);
                main_window_cursor_normal(summaryview->mainwin);
        }
@@ -3625,7 +3573,7 @@ static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
                summaryview->mlist =
-                       g_slist_append(summaryview->mlist, msginfo);
+                       g_slist_prepend(summaryview->mlist, msginfo);
                gtk_ctree_node_set_row_data(ctree, node, NULL);
 
                if (msginfo->msgid && *msginfo->msgid &&
@@ -3645,6 +3593,7 @@ static void summary_execute_copy(SummaryView *summaryview)
                                summaryview);
 
        if (summaryview->mlist) {
+               summaryview->mlist = g_slist_reverse(summaryview->mlist);
                procmsg_copy_messages(summaryview->mlist);
 
                g_slist_free(summaryview->mlist);
@@ -3662,7 +3611,7 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
                summaryview->mlist =
-                       g_slist_append(summaryview->mlist, msginfo);
+                       g_slist_prepend(summaryview->mlist, msginfo);
 
                procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
                summary_set_row_marks(summaryview, node);
@@ -3687,7 +3636,7 @@ static void summary_execute_delete(SummaryView *summaryview)
                folder_item_remove_msgs(summaryview->folder_item,
                                        summaryview->mlist);
        else
-               folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+               folder_item_move_msgs(trash, summaryview->mlist);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
@@ -3967,7 +3916,7 @@ void summary_collapse_threads(SummaryView *summaryview)
 
 void summary_filter(SummaryView *summaryview)
 {
-       if (!global_processing) {
+       if (!filtering_rules) {
                alertpanel_error(_("No filter rules defined."));
                return;
        }
@@ -3982,7 +3931,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);
@@ -4015,7 +3964,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);
        }               
 }
@@ -4025,26 +3974,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 */
@@ -4411,12 +4385,12 @@ void summary_set_column_order(SummaryView *summaryview)
 
 /* callback functions */
 
-static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
+static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
                                   SummaryView *summaryview)
 {
-       if (!event) return;
-
-       summary_toggle_view(summaryview);
+       if (event)  
+               summary_toggle_view(summaryview);
+       return TRUE;
 }
 
 static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
@@ -4451,25 +4425,28 @@ 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
-
-static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(widget);
        GtkCTreeNode *node;
        MessageView *messageview;
        TextView *textview;
+       GtkAdjustment *adj;
 
-       if (summary_is_locked(summaryview)) return;
-       if (!event) return;
+       if (summary_is_locked(summaryview)) return TRUE;
+       if (!event) return TRUE;
 
        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;
+               return TRUE;
        default:
                break;
        }
@@ -4479,26 +4456,25 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                if (node)
                        gtk_sctree_select(GTK_SCTREE(ctree), node);
                else
-                       return;
+                       return TRUE;
        }
 
        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 */
-               if (summaryview->displayed != summaryview->selected) {
-                       summary_display_msg(summaryview,
-                                           summaryview->selected);
-                       break;
-               }
-               if (!textview_scroll_page(textview, FALSE))
-                       summary_select_next_unread(summaryview);
+               if (event->state & GDK_SHIFT_MASK) 
+                       textview_scroll_page(textview, TRUE);
+               else {
+                       if (summaryview->displayed != summaryview->selected) {
+                               summary_display_msg(summaryview,
+                                                   summaryview->selected);
+                               break;
+                       }
+                       if (!textview_scroll_page(textview, FALSE))
+                               summary_select_next_unread(summaryview);
+               }                               
                break;
        case GDK_BackSpace:     /* Page up */
                textview_scroll_page(textview, TRUE);
@@ -4512,27 +4488,22 @@ static void 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;
        default:
                break;
        }
+       return TRUE;
 }
 
-static void summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
+static gint summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        if (event != NULL && event->keyval == GDK_Return)
                summary_show(summaryview, summaryview->folder_item);
+       return TRUE;            
 }
 
 static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
@@ -4570,31 +4541,12 @@ static void tog_searchbar_cb(GtkWidget *w, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *)data;
        GtkWidget *hbox= summaryview->hbox_search;
-       GtkAllocation size = hbox->allocation;
-       GtkAllocation msgview_size = summaryview->messageview->vbox->allocation;
-       GtkAllocation parent_size = summaryview->vbox->allocation;
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
                prefs_common.show_searchbar = TRUE;
                gtk_widget_show(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        } else {
                prefs_common.show_searchbar = FALSE;
                gtk_widget_hide(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        }
 }
 
@@ -4644,10 +4596,15 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        switch (column < 0 ? column : summaryview->col_state[column].type) {
        case S_COL_MARK:
-               if (MSG_IS_MARKED(msginfo->flags)) {
-                       summary_unmark_row(summaryview, row);
-               } else
-                       summary_mark_row(summaryview, row);
+               if (!MSG_IS_DELETED(msginfo->flags) &&
+                   !MSG_IS_MOVE(msginfo->flags) &&
+                   !MSG_IS_COPY(msginfo->flags)) {
+                       if (MSG_IS_MARKED(msginfo->flags)) {
+                               summary_unmark_row(summaryview, row);
+                       } else {
+                               summary_mark_row(summaryview, row);
+                       }
+               }
                break;
        case S_COL_STATUS:
                if (MSG_IS_UNREAD(msginfo->flags)) {
@@ -4764,7 +4721,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,
@@ -4834,7 +4797,6 @@ static void summary_locked_clicked(GtkWidget *button,
 static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                               SummaryView *summaryview)
 {
-       GtkTargetList *list;
        GdkDragContext *context;
 
        g_return_if_fail(summaryview != NULL);
@@ -4842,9 +4804,7 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
        g_return_if_fail(summaryview->folder_item->folder != NULL);
        if (summaryview->selected == NULL) return;
 
-       list = gtk_target_list_new(summary_drag_types, 1);
-
-       context = gtk_drag_begin(widget, list,
+       context = gtk_drag_begin(widget, summaryview->target_list,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
 }
@@ -4947,25 +4907,25 @@ 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;
@@ -4983,12 +4943,12 @@ 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 PrefsFolderItem *prefs;
+       const FolderItemPrefs *prefs;
        const gchar *str1, *str2;
        const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
@@ -5014,7 +4974,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,
@@ -5038,9 +4998,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);
@@ -5066,10 +5032,6 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (MSG_IS_NEW(msginfo->flags))
-               summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags))
-               summaryview->unread--;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked--;
 
@@ -5105,10 +5067,6 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (MSG_IS_NEW(msginfo->flags))
-               summaryview->newmsgs++;
-       if (MSG_IS_UNREAD(msginfo->flags))
-               summaryview->unread++;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
 
@@ -5287,6 +5245,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);
 }
 
 /*
@@ -5352,6 +5311,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 >
@@ -5359,6 +5319,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)
@@ -5381,10 +5342,12 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
        g_return_val_if_fail(msginfo_update != NULL, TRUE);
        g_return_val_if_fail(summaryview != NULL, FALSE);
 
-       node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
-       
-       if (node) 
-               summary_set_row_marks(summaryview, node);
+       if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
+
+               if (node) 
+                       summary_set_row_marks(summaryview, node);
+       }
 
        return FALSE;
 }