2008-10-09 [colin] 3.6.0cvs19
[claws.git] / src / summaryview.c
index 3072f4608e84a1a94630b4298f632b400b429ec7..7af42011f238634bb724cb4206d664b9757c8c0a 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "defs.h"
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -88,7 +71,6 @@
 #include "partial_download.h"
 #include "tags.h"
 #include "timing.h"
-#include "gedit-print.h"
 #include "log.h"
 #include "edittags.h"
 #include "manual.h"
@@ -98,7 +80,7 @@
 #define SUMMARY_COL_LOCKED_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         11
 
-
+static int normal_row_height = -1;
 static GtkStyle *bold_style;
 static GtkStyle *bold_marked_style;
 static GtkStyle *bold_deleted_style;
@@ -125,6 +107,8 @@ static GdkPixmap *forwardedxpm;
 static GdkBitmap *forwardedxpmmask;
 static GdkPixmap *ignorethreadxpm;
 static GdkBitmap *ignorethreadxpmmask;
+static GdkPixmap *watchthreadxpm;
+static GdkBitmap *watchthreadxpmmask;
 static GdkPixmap *lockedxpm;
 static GdkBitmap *lockedxpmmask;
 static GdkPixmap *spamxpm;
@@ -136,45 +120,47 @@ static GdkPixmap *keyxpm;
 static GdkBitmap *keyxpmmask;
 static GdkPixmap *clipkeyxpm;
 static GdkBitmap *clipkeyxpmmask;
+static GdkPixmap *keysignxpm;
+static GdkBitmap *keysignxpmmask;
 static GdkPixmap *gpgsignedxpm;
 static GdkBitmap *gpgsignedxpmmask;
 static GdkPixmap *clipgpgsignedxpm;
 static GdkBitmap *clipgpgsignedxpmmask;
 
-static void summary_free_msginfo_func  (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_free_msginfo_func  (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
-static void summary_set_marks_func     (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_set_marks_func     (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 
 void  summary_set_menu_sensitive       (SummaryView            *summaryview);
 guint summary_get_msgnum               (SummaryView            *summaryview,
-                                        GtkCTreeNode           *node);
+                                        GtkCMCTreeNode         *node);
 
 
 static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
                                             guint action);
 
-static GtkCTreeNode *summary_find_prev_msg
+static GtkCMCTreeNode *summary_find_prev_msg
                                        (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_next_msg
+                                        GtkCMCTreeNode         *current_node);
+static GtkCMCTreeNode *summary_find_next_msg
                                        (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
+                                        GtkCMCTreeNode         *current_node);
 
-static GtkCTreeNode *summary_find_prev_flagged_msg
+static GtkCMCTreeNode *summary_find_prev_flagged_msg
                                        (SummaryView    *summaryview,
-                                        GtkCTreeNode   *current_node,
+                                        GtkCMCTreeNode *current_node,
                                         MsgPermFlags    flags,
                                         gboolean        start_from_prev);
-static GtkCTreeNode *summary_find_next_flagged_msg
+static GtkCMCTreeNode *summary_find_next_flagged_msg
                                        (SummaryView    *summaryview,
-                                        GtkCTreeNode   *current_node,
+                                        GtkCMCTreeNode *current_node,
                                         MsgPermFlags    flags,
                                         gboolean        start_from_next);
 
-static GtkCTreeNode *summary_find_msg_by_msgnum
+static GtkCMCTreeNode *summary_find_msg_by_msgnum
                                        (SummaryView            *summaryview,
                                         guint                   msgnum);
 
@@ -189,59 +175,59 @@ static inline void summary_set_header     (SummaryView            *summaryview,
                                         gchar                  *text[],
                                         MsgInfo                *msginfo);
 static void summary_display_msg                (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_display_msg_full   (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row,
+                                        GtkCMCTreeNode         *row,
                                         gboolean                new_window,
                                         gboolean                all_headers);
 static void summary_set_row_marks      (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 
 static gboolean summary_set_row_tag    (SummaryView            *summaryview, 
-                                        GtkCTreeNode           *row, 
+                                        GtkCMCTreeNode                 *row, 
                                         gboolean                refresh,
                                         gboolean                set, 
                                         gint                    id);
 /* message handling */
 static void summary_mark_row           (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_lock_row           (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_unlock_row         (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_mark_row_as_read   (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_mark_row_as_unread (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_delete_row         (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_unmark_row         (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_move_row_to                (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row,
+                                        GtkCMCTreeNode         *row,
                                         FolderItem             *to_folder);
 static void summary_copy_row_to                (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row,
+                                        GtkCMCTreeNode         *row,
                                         FolderItem             *to_folder);
 
 static gint summary_execute_move       (SummaryView            *summaryview);
-static void summary_execute_move_func  (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_execute_move_func  (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 static void summary_execute_copy       (SummaryView            *summaryview);
-static void summary_execute_copy_func  (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_execute_copy_func  (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 static void summary_execute_delete     (SummaryView            *summaryview);
-static void summary_execute_delete_func        (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_execute_delete_func        (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 
 static void summary_thread_init                (SummaryView            *summaryview);
 
 static void summary_unthread_for_exec          (SummaryView    *summaryview);
-static void summary_unthread_for_exec_func     (GtkCTree       *ctree,
-                                                GtkCTreeNode   *node,
+static void summary_unthread_for_exec_func     (GtkCMCTree     *ctree,
+                                                GtkCMCTreeNode *node,
                                                 gpointer        data);
 
 void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
@@ -272,7 +258,7 @@ static GtkWidget *summary_ctree_create      (SummaryView    *summaryview);
 static gint summary_toggle_pressed     (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
 static void summary_toggle_multiple_pressed
                                        (GtkWidget              *widget,
                                         SummaryView            *summaryview);
@@ -290,27 +276,28 @@ static gboolean summary_button_released   (GtkWidget              *ctree,
 static gboolean summary_key_pressed    (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static void summary_tree_expanded      (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_tree_expanded      (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         SummaryView            *summaryview);
-static void summary_tree_collapsed     (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_tree_collapsed     (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         SummaryView            *summaryview);
-static void summary_selected           (GtkCTree               *ctree,
-                                        GtkCTreeNode           *row,
+static void summary_selected           (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *row,
                                         gint                    column,
                                         SummaryView            *summaryview);
-static void summary_unselected         (GtkCTree               *ctree,
-                                        GtkCTreeNode           *row,
+static void summary_unselected         (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *row,
                                         gint                    column,
                                         SummaryView            *summaryview);
-static void summary_col_resized                (GtkCList               *clist,
+static void summary_col_resized                (GtkCMCList             *clist,
                                         gint                    column,
                                         gint                    width,
                                         SummaryView            *summaryview);
 static void summary_reply_cb           (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+#ifndef GENERIC_UMPC
 static void summary_show_all_header_cb (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
@@ -318,13 +305,15 @@ static void summary_show_all_header_cb    (SummaryView            *summaryview,
 static void summary_add_address_cb     (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+#endif
 static void summary_create_filter_cb   (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+#ifndef GENERIC_UMPC
 static void summary_create_processing_cb(SummaryView           *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
-
+#endif
 static void summary_mark_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_status_clicked     (GtkWidget              *button,
@@ -381,47 +370,50 @@ static void summary_drag_end(GtkWidget *widget,
                                          SummaryView    *summaryview);
 /* custom compare functions for sorting */
 
-static gint summary_cmp_by_mark                (GtkCList               *clist,
+static gint summary_cmp_by_mark                (GtkCMCList             *clist,
+                                        gconstpointer           ptr1,
+                                        gconstpointer           ptr2);
+static gint summary_cmp_by_status      (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_status      (GtkCList               *clist,
+static gint summary_cmp_by_mime                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_mime                (GtkCList               *clist,
+static gint summary_cmp_by_num         (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_num         (GtkCList               *clist,
+static gint summary_cmp_by_size                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_size                (GtkCList               *clist,
+static gint summary_cmp_by_date                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_date                (GtkCList               *clist,
+static gint summary_cmp_by_thread_date (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_from                (GtkCList               *clist,
+static gint summary_cmp_by_from                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 static gint summary_cmp_by_simplified_subject
-                                       (GtkCList               *clist, 
+                                       (GtkCMCList             *clist, 
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_score       (GtkCList               *clist,
+static gint summary_cmp_by_score       (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_label       (GtkCList               *clist,
+static gint summary_cmp_by_label       (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_to          (GtkCList               *clist,
+static gint summary_cmp_by_to          (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_subject     (GtkCList               *clist,
+static gint summary_cmp_by_subject     (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_locked      (GtkCList               *clist,
+static gint summary_cmp_by_locked      (GtkCMCList             *clist,
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_tags                (GtkCList               *clist,
+static gint summary_cmp_by_tags                (GtkCMCList             *clist,
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
 
@@ -436,6 +428,10 @@ static void summary_find_answers   (SummaryView    *summaryview,
 static gboolean summary_update_msg     (gpointer source, gpointer data);
 static gboolean summary_update_folder_item_hook(gpointer source, gpointer data);
 static gboolean summary_update_folder_hook(gpointer source, gpointer data);
+static void summary_set_colorlabel_color (GtkCMCTree           *ctree,
+                                  GtkCMCTreeNode               *node,
+                                  guint                 labelcolor);
+static void summary_thread_build(SummaryView *summaryview);
 
 GtkTargetEntry summary_drag_types[2] =
 {
@@ -443,74 +439,156 @@ GtkTargetEntry summary_drag_types[2] =
        {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
 };
 
-static GtkItemFactoryEntry summary_popup_entries[] =
-{
-       {N_("/_Reply"),                 "<control>R", summary_reply_cb, COMPOSE_REPLY, NULL},
-       {N_("/Repl_y to"),              NULL, NULL,             0, "<Branch>"},
-       {N_("/Repl_y to/_all"),         "<shift><control>R", summary_reply_cb,  COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/Repl_y to/_sender"),      NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
-       {N_("/Repl_y to/mailing _list"),
-                                       "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
-       {"/---",                        NULL, NULL,             0, "<Separator>"},
-       {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
-       {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
-       {"/---",                        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_("/Move to _trash"),         "<control>D", summary_delete_trash,     0, NULL},
-       {N_("/_Delete..."),             NULL, summary_delete, 0, NULL},
-       {"/---",                        NULL, NULL,             0, "<Separator>"},
-       {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
-       {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
-       {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
-       {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
-       {N_("/_Mark/Mark as unr_ead"),  NULL, summary_mark_as_unread, 0, NULL},
-       {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
-       {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
-       {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
-       {N_("/_Mark/Unignore thread"),  NULL, summary_unignore_thread, 0, NULL},
-       {N_("/_Mark/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_Mark/Mark as _spam"),    NULL, summary_mark_as_spam, 1, NULL},
-       {N_("/_Mark/Mark as _ham"),     NULL, summary_mark_as_spam, 0, NULL},
-       {N_("/_Mark/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_Mark/Lock"),             NULL, summary_msgs_lock, 0, NULL},
-       {N_("/_Mark/Unlock"),           NULL, summary_msgs_unlock, 0, NULL},
-       {N_("/Color la_bel"),           NULL, NULL,             0, NULL},
-       {N_("/Ta_gs"),                  NULL, NULL,             0, NULL},
-
-       {"/---",                        NULL, NULL,             0, "<Separator>"},
-       {N_("/Add sender to address boo_k"),
-                                       NULL, summary_add_address_cb, 0, NULL},
-       {N_("/Create f_ilter rule"),    NULL, NULL,             0, "<Branch>"},
-       {N_("/Create f_ilter rule/_Automatically"),
-                                       NULL, summary_create_filter_cb, FILTER_BY_AUTO, NULL},
-       {N_("/Create f_ilter rule/by _From"),
-                                       NULL, summary_create_filter_cb, FILTER_BY_FROM, NULL},
-       {N_("/Create f_ilter rule/by _To"),
-                                       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},
-       {"/---",                        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/Message _source"),  "<control>U", summary_view_source, 0, NULL},
-       {N_("/_View/All _headers"),     "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
-       {"/---",                        NULL, NULL,             0, "<Separator>"},
-       {N_("/_Save as..."),            "<control>S", summary_save_as,   0, NULL},
-       {N_("/_Print..."),              "<control>P", summary_print,   0, NULL},
+#define DO_ACTION(name, act) {                                         \
+       if(!strcmp(name, a_name)) {                                     \
+               act;                                                    \
+       }                                                               \
+}
+
+static void summary_menu_cb(GtkAction *action, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *)data;
+       const gchar *a_name = gtk_action_get_name(action);
+       
+       DO_ACTION("SummaryViewPopup/Reply", summary_reply_cb(summaryview, COMPOSE_REPLY, NULL));
+#ifndef GENERIC_UMPC
+       DO_ACTION("SummaryViewPopup/ReplyTo/All", summary_reply_cb(summaryview, COMPOSE_REPLY_TO_ALL, NULL));
+       DO_ACTION("SummaryViewPopup/ReplyTo/Sender", summary_reply_cb(summaryview, COMPOSE_REPLY_TO_SENDER, NULL));
+       DO_ACTION("SummaryViewPopup/ReplyTo/MailingList", summary_reply_cb(summaryview, COMPOSE_REPLY_TO_LIST, NULL));
+#endif
+       DO_ACTION("SummaryViewPopup/Forward", summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, NULL));
+#ifndef GENERIC_UMPC
+       DO_ACTION("SummaryViewPopup/ForwardAsAtt", summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL));
+       DO_ACTION("SummaryViewPopup/Redirect", summary_reply_cb(summaryview, COMPOSE_REDIRECT, NULL));
+#endif
+       DO_ACTION("SummaryViewPopup/Move", summary_move_to(summaryview));
+       DO_ACTION("SummaryViewPopup/Copy", summary_copy_to(summaryview));
+       DO_ACTION("SummaryViewPopup/Trash", summary_delete_trash(summaryview));
+#ifndef GENERIC_UMPC
+       DO_ACTION("SummaryViewPopup/Delete", summary_delete(summaryview));
+#endif
+       DO_ACTION("SummaryViewPopup/Mark/Mark", summary_mark(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/Unmark", summary_unmark(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/MarkUnread", summary_mark_as_unread(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/MarkRead", summary_mark_as_read(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/MarkAllRead", summary_mark_all_read(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/IgnoreThread", summary_ignore_thread(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/UnignoreThread", summary_unignore_thread(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/WatchThread", summary_watch_thread(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/UnwatchThread", summary_unwatch_thread(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/MarkSpam", summary_mark_as_spam(summaryview, 1, NULL));
+       DO_ACTION("SummaryViewPopup/Mark/MarkHam", summary_mark_as_spam(summaryview, 0, NULL));
+       DO_ACTION("SummaryViewPopup/Mark/Lock", summary_msgs_lock(summaryview));
+       DO_ACTION("SummaryViewPopup/Mark/Unlock", summary_msgs_unlock(summaryview));
+#ifndef GENERIC_UMPC
+       DO_ACTION("SummaryViewPopup/AddSenderToAB", summary_add_address_cb(summaryview, 0, 0)); 
+#endif
+       DO_ACTION("SummaryViewPopup/CreateFilterRule/Automatically", summary_create_filter_cb(summaryview, FILTER_BY_AUTO, NULL)); 
+       DO_ACTION("SummaryViewPopup/CreateFilterRule/ByFrom", summary_create_filter_cb(summaryview, FILTER_BY_FROM, NULL)); 
+       DO_ACTION("SummaryViewPopup/CreateFilterRule/ByTo", summary_create_filter_cb(summaryview, FILTER_BY_TO, NULL)); 
+       DO_ACTION("SummaryViewPopup/CreateFilterRule/BySubject", summary_create_filter_cb(summaryview, FILTER_BY_SUBJECT, NULL)); 
+#ifndef GENERIC_UMPC
+       DO_ACTION("SummaryViewPopup/CreateProcessingRule/Automatically", summary_create_processing_cb(summaryview, FILTER_BY_AUTO, NULL)); 
+       DO_ACTION("SummaryViewPopup/CreateProcessingRule/ByFrom", summary_create_processing_cb(summaryview, FILTER_BY_FROM, NULL)); 
+       DO_ACTION("SummaryViewPopup/CreateProcessingRule/ByTo", summary_create_processing_cb(summaryview, FILTER_BY_TO, NULL)); 
+       DO_ACTION("SummaryViewPopup/CreateProcessingRule/BySubject", summary_create_processing_cb(summaryview, FILTER_BY_SUBJECT, NULL)); 
+#endif
+       DO_ACTION("SummaryViewPopup/View/OpenInNewWindow", summary_open_msg(summaryview)); 
+       DO_ACTION("SummaryViewPopup/View/MessageSource", summary_view_source(summaryview)); 
+       DO_ACTION("SummaryViewPopup/SaveAs", summary_save_as(summaryview)); 
+#ifndef GENERIC_UMPC
+       DO_ACTION("SummaryViewPopup/Print", summary_print(summaryview)); 
+#endif
+#ifndef GENERIC_UMPC
+       DO_ACTION("SummaryViewPopup/View/AllHeaders", summary_show_all_header_cb(summaryview, 0, 0)); 
+#endif
+}
+
+static GtkActionEntry summary_popup_entries[] =
+{
+       {"SummaryViewPopup",                            NULL, "SummaryViewPopup" },
+       {"SummaryViewPopup/Reply",                      NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(summary_menu_cb) },
+#ifndef GENERIC_UMPC
+       {"SummaryViewPopup/ReplyTo",                    NULL, "Repl_y to" },
+       {"SummaryViewPopup/ReplyTo/All",                NULL, N_("_all"), "<shift><control>R", NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/ReplyTo/Sender",             NULL, N_("_sender"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/ReplyTo/MailingList",        NULL, N_("_mailing list"), "<control>L", NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/---",                        NULL, "---", NULL, NULL, NULL },
+#endif
+
+       {"SummaryViewPopup/Forward",                    NULL, N_("_Forward"), "<control><alt>F", NULL, G_CALLBACK(summary_menu_cb) }, /* inline */
+#ifndef GENERIC_UMPC
+       {"SummaryViewPopup/ForwardAsAtt",               NULL, N_("For_ward as attachment"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, /* as attach */
+       {"SummaryViewPopup/Redirect",                   NULL, N_("Redirect"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+#endif
+       /* separation */
+       {"SummaryViewPopup/Move",                       NULL, N_("M_ove..."), "<control>O", NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/Copy",                       NULL, N_("_Copy..."), "<shift><control>O", NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/Trash",                      NULL, N_("Move to _trash"), "<control>D", NULL, G_CALLBACK(summary_menu_cb) }, 
+#ifndef GENERIC_UMPC
+       {"SummaryViewPopup/Delete",                     NULL, N_("_Delete..."), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+#endif
+       /* separation */
+       {"SummaryViewPopup/Mark",                       NULL, "_Mark" },
+       {"SummaryViewPopup/Mark/Mark",                  NULL, N_("_Mark"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/Unmark",                NULL, N_("_Unmark"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/---",                   NULL, "---", NULL, NULL, NULL },
+
+       {"SummaryViewPopup/Mark/MarkUnread",            NULL, N_("Mark as unr_ead"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/MarkRead",              NULL, N_("Mark as rea_d"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/MarkAllRead",           NULL, N_("Mark all read"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/IgnoreThread",          NULL, N_("Ignore thread"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/UnignoreThread",        NULL, N_("Unignore thread"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/WatchThread",           NULL, N_("Watch thread"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/UnwatchThread",         NULL, N_("Unwatch thread"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       /* separation */
+
+       {"SummaryViewPopup/Mark/MarkSpam",              NULL, N_("Mark as spam"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/MarkHam",               NULL, N_("Mark as ham"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       /* separation */
+
+       {"SummaryViewPopup/Mark/Lock",                  NULL, N_("Lock"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+       {"SummaryViewPopup/Mark/Unlock",                NULL, N_("Unlock"), NULL, NULL, G_CALLBACK(summary_menu_cb) },
+
+       {"SummaryViewPopup/ColorLabel",                 NULL, "Color la_bel" },
+       {"SummaryViewPopup/Tags",                       NULL, "Ta_gs" },
+
+       /* separation */
+#ifndef GENERIC_UMPC
+       {"SummaryViewPopup/AddSenderToAB",                      NULL, N_("Add sender to address boo_k"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+#endif
+       {"SummaryViewPopup/CreateFilterRule",                   NULL, N_("Create f_ilter rule") },
+       {"SummaryViewPopup/CreateFilterRule/Automatically",     NULL, N_("_Automatically"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/CreateFilterRule/ByFrom",            NULL, N_("By _From"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/CreateFilterRule/ByTo",              NULL, N_("By _To"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/CreateFilterRule/BySubject",         NULL, N_("By _Subject"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+
+#ifndef GENERIC_UMPC
+       {"SummaryViewPopup/CreateProcessingRule",                       NULL, N_("Create processing rule") },
+       {"SummaryViewPopup/CreateProcessingRule/Automatically", NULL, N_("_Automatically"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/CreateProcessingRule/ByFrom",                NULL, N_("By _From"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/CreateProcessingRule/ByTo",          NULL, N_("By _To"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/CreateProcessingRule/BySubject",             NULL, N_("By _Subject"), NULL, NULL, G_CALLBACK(summary_menu_cb) }, 
+
+#endif
+       /* separation */
+       {"SummaryViewPopup/View",                       NULL, "_View" },
+       {"SummaryViewPopup/View/OpenInNewWindow",       NULL, N_("Open in new _window"), "<control><alt>N", NULL, G_CALLBACK(summary_menu_cb) }, 
+       {"SummaryViewPopup/View/MessageSource",         NULL, N_("Message _source"), "<control>U", NULL, G_CALLBACK(summary_menu_cb) }, 
+       /* separation */
+       {"SummaryViewPopup/SaveAs",                     NULL, N_("_Save as..."), "<control>S", NULL, G_CALLBACK(summary_menu_cb) }, 
+#ifndef GENERIC_UMPC
+       {"SummaryViewPopup/Print",                      NULL, N_("Print..."), "<control>P", NULL, G_CALLBACK(summary_menu_cb) }, 
+#endif
 };  /* see also list in menu_connect_identical_items() in menu.c if this changes */
 
+#ifndef GENERIC_UMPC
+static GtkToggleActionEntry summary_popup_toggleentries[] =
+{
+       {"SummaryViewPopup/View/AllHeaders",            NULL, N_("All _headers"), "<control>H", NULL, G_CALLBACK(summary_menu_cb) }, 
+};
+#endif
+
 static const gchar *const col_label[N_SUMMARY_COLS] = {
        "",             /* S_COL_MARK    */
        N_("S"),        /* S_COL_STATUS  */
@@ -529,13 +607,13 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
 void summary_freeze(SummaryView *summaryview)
 {
        if (summaryview)
-               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_freeze(GTK_CMCLIST(summaryview->ctree));
 }
 
 void summary_thaw(SummaryView *summaryview)
 {
        if (summaryview)
-               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
 }
 
 void summary_grab_focus(SummaryView *summaryview)
@@ -555,7 +633,7 @@ GtkWidget *summary_get_main_widget(SummaryView *summaryview)
 #define START_LONG_OPERATION(summaryview,force_freeze) {       \
        summary_lock(summaryview);                              \
        main_window_cursor_wait(summaryview->mainwin);          \
-       if (force_freeze || sc_g_list_bigger(GTK_CLIST(summaryview->ctree)->selection, 1)) {\
+       if (force_freeze || sc_g_list_bigger(GTK_CMCLIST(summaryview->ctree)->selection, 1)) {\
                froze = TRUE;                                           \
                summary_freeze(summaryview);    \
        }                                                       \
@@ -592,20 +670,20 @@ SummaryView *summary_create(void)
        GtkWidget *statlabel_msgs;
        GtkWidget *hbox_spc;
        GtkWidget *toggle_eventbox;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        GtkWidget *multiple_sel_togbtn;
 #endif
        GtkWidget *toggle_arrow;
-       GtkWidget *popupmenu;
        GtkWidget *toggle_search;
-       GtkItemFactory *popupfactory;
-       gint n_entries;
        QuickSearch *quicksearch;
+       CLAWS_TIP_DECL();
 
        debug_print("Creating summary view...\n");
        summaryview = g_new0(SummaryView, 1);
 
-       summaryview->tips = gtk_tooltips_new();
+#if !(GTK_CHECK_VERSION(2,12,0))
+       summaryview->tooltips = tips;
+#endif
 #define SUMMARY_VBOX_SPACING 3
        vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
        
@@ -627,9 +705,7 @@ SummaryView *summary_create(void)
                                     prefs_common.show_searchbar);
        gtk_widget_show(toggle_search);
 
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
-                            toggle_search,
-                            _("Toggle quick search bar"), NULL);
+       CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
        
        gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);      
 
@@ -661,13 +737,12 @@ SummaryView *summary_create(void)
                         G_CALLBACK(summary_toggle_pressed),
                         summaryview);
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        multiple_sel_togbtn = gtk_toggle_button_new();
        gtk_widget_show(multiple_sel_togbtn);
        gtk_box_pack_end(GTK_BOX(hbox), multiple_sel_togbtn, FALSE, FALSE, 4);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
-                            multiple_sel_togbtn,
-                            _("Toggle multiple selection"), NULL);
+       CLAWS_SET_TIP(multiple_sel_togbtn,
+                            _("Toggle multiple selection"));
        g_signal_connect(G_OBJECT(multiple_sel_togbtn), "toggled",
                         G_CALLBACK(summary_toggle_multiple_pressed),
                         summaryview);
@@ -686,8 +761,13 @@ SummaryView *summary_create(void)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-#ifndef MAEMO
-       gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+       summaryview->mainwidget_book = gtk_notebook_new();
+        gtk_notebook_set_show_tabs(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
+        gtk_notebook_set_show_border(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
+#ifndef GENERIC_UMPC
+       gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
+               scrolledwin);
+       gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
 #endif
        gtk_widget_set_size_request(vbox,
                             prefs_common.summaryview_width,
@@ -697,9 +777,9 @@ SummaryView *summary_create(void)
        gtk_widget_show(ctree);
 
        gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->hadjustment);
+                                           GTK_CMCLIST(ctree)->hadjustment);
        gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->vadjustment);
+                                           GTK_CMCLIST(ctree)->vadjustment);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
        /* status label */
@@ -710,8 +790,10 @@ SummaryView *summary_create(void)
        quicksearch = quicksearch_new();
        gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
 
-#ifdef MAEMO
-       gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+#ifdef GENERIC_UMPC
+       gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
+               scrolledwin);
+       gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
 #endif
        quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
 
@@ -719,11 +801,100 @@ SummaryView *summary_create(void)
                          G_CALLBACK(tog_searchbar_cb), summaryview);
 
        /* create popup menu */
-       n_entries = sizeof(summary_popup_entries) /
-               sizeof(summary_popup_entries[0]);
-       popupmenu = menu_create_items(summary_popup_entries, n_entries,
-                                     "<SummaryView>", &popupfactory,
-                                     summaryview);
+       summaryview->action_group = cm_menu_create_action_group("SummaryViewPopup", summary_popup_entries,
+                       G_N_ELEMENTS(summary_popup_entries), (gpointer)summaryview);
+#ifndef GENERIC_UMPC
+       gtk_action_group_add_toggle_actions(summaryview->action_group, summary_popup_toggleentries,
+                       G_N_ELEMENTS(summary_popup_toggleentries), (gpointer)summaryview);
+#endif
+
+       MENUITEM_ADDUI("/Menus", "SummaryViewPopup", "SummaryViewPopup", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Reply", "SummaryViewPopup/Reply", GTK_UI_MANAGER_MENUITEM)
+#ifndef GENERIC_UMPC
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "ReplyTo", "SummaryViewPopup/ReplyTo", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator1", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+#endif
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Forward", "SummaryViewPopup/Forward", GTK_UI_MANAGER_MENUITEM)
+#ifndef GENERIC_UMPC
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "ForwardAsAtt", "SummaryViewPopup/ForwardAsAtt", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Redirect", "SummaryViewPopup/Redirect", GTK_UI_MANAGER_MENUITEM)
+#endif
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator2", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Move", "SummaryViewPopup/Move", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Copy", "SummaryViewPopup/Copy", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Trash", "SummaryViewPopup/Trash", GTK_UI_MANAGER_MENUITEM)
+#ifndef GENERIC_UMPC
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Delete", "SummaryViewPopup/Delete", GTK_UI_MANAGER_MENUITEM)
+#endif
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator3", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Mark", "SummaryViewPopup/Mark", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "ColorLabel", "SummaryViewPopup/ColorLabel", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Tags", "SummaryViewPopup/Tags", GTK_UI_MANAGER_MENU)
+
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator4", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+#ifndef GENERIC_UMPC
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "AddSenderToAB", "SummaryViewPopup/AddSenderToAB", GTK_UI_MANAGER_MENUITEM)
+#endif
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "CreateFilterRule", "SummaryViewPopup/CreateFilterRule", GTK_UI_MANAGER_MENU)
+#ifndef GENERIC_UMPC
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "CreateProcessingRule", "SummaryViewPopup/CreateProcessingRule", GTK_UI_MANAGER_MENU)
+#endif
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator5", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "View", "SummaryViewPopup/View", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "SaveAs", "SummaryViewPopup/SaveAs", GTK_UI_MANAGER_MENUITEM)
+#ifndef GENERIC_UMPC
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Print", "SummaryViewPopup/Print", GTK_UI_MANAGER_MENUITEM)
+#endif
+       /* last separator, for plugins */
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator6", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+
+       /* submenus - replyto */
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/ReplyTo", "All", "SummaryViewPopup/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/ReplyTo", "Sender", "SummaryViewPopup/ReplyTo/Sender", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/ReplyTo", "MailingList", "SummaryViewPopup/ReplyTo/MailingList", GTK_UI_MANAGER_MENUITEM)
+
+       /* submenus - mark */
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "Mark", "SummaryViewPopup/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "Unmark", "SummaryViewPopup/Mark/Unmark", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "Separator1", "SummaryViewPopup/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "MarkUnread", "SummaryViewPopup/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "MarkRead", "SummaryViewPopup/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "MarkAllRead", "SummaryViewPopup/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "IgnoreThread", "SummaryViewPopup/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "UnignoreThread", "SummaryViewPopup/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "WatchThread", "SummaryViewPopup/Mark/WatchThread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "UnwatchThread", "SummaryViewPopup/Mark/UnwatchThread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "Separator2", "SummaryViewPopup/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "MarkSpam", "SummaryViewPopup/Mark/MarkSpam", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "MarkHam", "SummaryViewPopup/Mark/MarkHam", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "Separator3", "SummaryViewPopup/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "Lock", "SummaryViewPopup/Mark/Lock", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/Mark", "Unlock", "SummaryViewPopup/Mark/Unlock", GTK_UI_MANAGER_MENUITEM)
+
+       /* submenus - colorlabel and tags are dynamic */
+       /* submenus - createfilterrule */
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateFilterRule", "Automatically", "SummaryViewPopup/CreateFilterRule/Automatically", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateFilterRule", "ByFrom", "SummaryViewPopup/CreateFilterRule/ByFrom", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateFilterRule", "ByTo", "SummaryViewPopup/CreateFilterRule/ByTo", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateFilterRule", "BySubject", "SummaryViewPopup/CreateFilterRule/BySubject", GTK_UI_MANAGER_MENUITEM)
+               
+#ifndef GENERIC_UMPC
+       /* submenus - createprocessingrule */
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateProcessingRule", "Automatically", "SummaryViewPopup/CreateProcessingRule/Automatically", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateProcessingRule", "ByFrom", "SummaryViewPopup/CreateProcessingRule/ByFrom", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateProcessingRule", "ByTo", "SummaryViewPopup/CreateProcessingRule/ByTo", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/CreateProcessingRule", "BySubject", "SummaryViewPopup/CreateProcessingRule/BySubject", GTK_UI_MANAGER_MENUITEM)
+#endif
+               
+       /* submenus - view */
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/View", "OpenInNewWindow", "SummaryViewPopup/View/OpenInNewWindow", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/View", "MessageSource", "SummaryViewPopup/View/MessageSource", GTK_UI_MANAGER_MENUITEM)
+#ifndef GENERIC_UMPC
+       MENUITEM_ADDUI("/Menus/SummaryViewPopup/View", "AllHeaders", "SummaryViewPopup/View/AllHeaders", GTK_UI_MANAGER_MENUITEM)
+#endif         
+       summaryview->popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+                               gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/SummaryViewPopup")) );
+
 
        summaryview->vbox = vbox;
        summaryview->scrolledwin = scrolledwin;
@@ -738,12 +909,10 @@ SummaryView *summary_create(void)
        summaryview->statlabel_msgs = statlabel_msgs;
        summaryview->toggle_eventbox = toggle_eventbox;
        summaryview->toggle_arrow = toggle_arrow;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        summaryview->multiple_sel_togbtn = multiple_sel_togbtn;
 #endif
        summaryview->toggle_search = toggle_search;
-       summaryview->popupmenu = popupmenu;
-       summaryview->popupfactory = popupfactory;
        summaryview->lock_count = 0;
        summaryview->msginfo_update_callback_id =
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
@@ -784,8 +953,8 @@ void summary_relayout(SummaryView *summaryview)
 {
        gtk_widget_realize(summaryview->stat_box);
 
-       gtk_widget_ref(summaryview->hbox_l);
-       gtk_widget_ref(summaryview->statlabel_msgs);
+       g_object_ref(summaryview->hbox_l);
+       g_object_ref(summaryview->statlabel_msgs);
        
        gtkut_container_remove(GTK_CONTAINER(summaryview->hbox_l->parent), summaryview->hbox_l);
        gtkut_container_remove(GTK_CONTAINER(summaryview->statlabel_msgs->parent), summaryview->statlabel_msgs);
@@ -810,16 +979,25 @@ void summary_relayout(SummaryView *summaryview)
                gtk_box_pack_start(GTK_BOX(summaryview->stat_box2), summaryview->statlabel_msgs, FALSE, FALSE, 4);
                gtk_widget_show_all(summaryview->stat_box);
                gtk_widget_show_all(summaryview->stat_box2);
-               if (prefs_common.layout_mode == SMALL_LAYOUT)
+               if (prefs_common.layout_mode == SMALL_LAYOUT) {
                        gtk_widget_hide(summaryview->toggle_eventbox);
-               else
+                       gtk_widget_hide(summaryview->statlabel_msgs);
+               } else {
                        gtk_widget_show(summaryview->toggle_eventbox);
+                       gtk_widget_show(summaryview->statlabel_msgs);
+               }
                        
                break;
        }
-       gtk_widget_unref(summaryview->hbox_l);
-       gtk_widget_unref(summaryview->statlabel_msgs);
+       summary_set_column_order(summaryview);
+
+       g_object_unref(summaryview->hbox_l);
+       g_object_unref(summaryview->statlabel_msgs);
        quicksearch_relayout(summaryview->quicksearch);
+       if (prefs_common.show_searchbar)
+               quicksearch_show(summaryview->quicksearch);
+       else
+               quicksearch_hide(summaryview->quicksearch);
 }
 
 static void summary_set_fonts(SummaryView *summaryview)
@@ -828,20 +1006,30 @@ static void summary_set_fonts(SummaryView *summaryview)
        gint size;
 
        font_desc = pango_font_description_from_string(NORMAL_FONT);
-       gtk_widget_modify_font(summaryview->ctree, font_desc);
-       pango_font_description_free(font_desc);
+       if (font_desc) {
+               gtk_widget_modify_font(summaryview->ctree, font_desc);
+               pango_font_description_free(font_desc);
+       }
 
        if (!bold_style) {
                bold_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
-               font_desc = pango_font_description_from_string(NORMAL_FONT);
-               if (font_desc) {
-                       pango_font_description_free(bold_style->font_desc);
-                       bold_style->font_desc = font_desc;
+
+               if (prefs_common.derive_from_normal_font || !BOLD_FONT) {
+                       font_desc = pango_font_description_from_string(NORMAL_FONT);
+                       if (font_desc) {
+                               pango_font_description_free(bold_style->font_desc);
+                               bold_style->font_desc = font_desc;
+                       }
+                       pango_font_description_set_weight
+                                       (bold_style->font_desc, PANGO_WEIGHT_BOLD);
+               } else {
+                       font_desc = pango_font_description_from_string(BOLD_FONT);
+                       if (font_desc) {
+                               pango_font_description_free(bold_style->font_desc);
+                               bold_style->font_desc = font_desc;
+                       }
                }
-               
-               pango_font_description_set_weight
-                               (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                bold_marked_style = gtk_style_copy(bold_style);
                bold_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -850,15 +1038,21 @@ static void summary_set_fonts(SummaryView *summaryview)
                        summaryview->color_dim;
        }
 
-       font_desc = pango_font_description_new();
-       size = pango_font_description_get_size
-               (summaryview->ctree->style->font_desc);
-       pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
-       gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
-       gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
-       gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
-       /* ici */
-       pango_font_description_free(font_desc);
+       if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
+               font_desc = pango_font_description_new();
+               size = pango_font_description_get_size
+                       (summaryview->ctree->style->font_desc);
+               pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+       } else {
+               font_desc = pango_font_description_from_string(SMALL_FONT);
+       }
+       if (font_desc) {
+               gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
+               gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
+               gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
+               pango_font_description_free(font_desc);
+       }
+
 }
 
 static void summary_set_folder_pixmap(SummaryView *summaryview, StockPixmap icon)
@@ -905,8 +1099,12 @@ void summary_init(SummaryView *summaryview)
                         &lockedxpm, &lockedxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
                         &ignorethreadxpm, &ignorethreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_WATCHTHREAD,
+                        &watchthreadxpm, &watchthreadxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
                         &clipkeyxpm, &clipkeyxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY_SIGN,
+                        &keysignxpm, &keysignxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
                         &keyxpm, &keyxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
@@ -929,7 +1127,7 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_show(pixmap);
        summaryview->quick_search_pixmap = pixmap;
        
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
        gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
        gtk_widget_show(pixmap);
@@ -941,8 +1139,9 @@ void summary_init(SummaryView *summaryview)
        summaryview->sort_type = SORT_ASCENDING;
 
        /* Init summaryview extra data */
+#ifndef G_OS_WIN32
        summaryview->simplify_subject_preg = NULL;
-
+#endif
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
        summary_colorlabel_menu_create(summaryview, FALSE);
@@ -957,9 +1156,9 @@ void summary_init(SummaryView *summaryview)
   && (!g_ascii_strcasecmp(m->folder->name,item->name)) )
 
 #define FOLDER_SHOWS_TO_HDR(i) \
-( folder_has_parent_of_type(i, F_OUTBOX) \
-  ||  folder_has_parent_of_type(i, F_DRAFT) \
-  ||  folder_has_parent_of_type(i, F_QUEUE) )
+( i && (folder_has_parent_of_type(i, F_OUTBOX) \
+        || folder_has_parent_of_type(i, F_DRAFT) \
+        || folder_has_parent_of_type(i, F_QUEUE)) )
   
 static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
 {
@@ -967,9 +1166,9 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        gboolean showing_from = FALSE, showing_to = FALSE;
        gint from_pos = 0, to_pos = 0;
        SummaryColumnState *col_state = summaryview->col_state;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        
-       if (!item)
+       if (!item || (prefs_common.layout_mode == VERTICAL_LAYOUT && prefs_common.two_line_vert) )
                return;
        if (FOLDER_SHOWS_TO_HDR(item))
                show_to = TRUE;
@@ -1011,10 +1210,10 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        summaryview->col_pos[S_COL_TO] = from_pos;
        summaryview->col_pos[S_COL_FROM] = to_pos;
 
-       gtk_clist_set_column_visibility
-               (GTK_CLIST(ctree), from_pos, col_state[from_pos].visible);
-       gtk_clist_set_column_visibility
-               (GTK_CLIST(ctree), to_pos, col_state[to_pos].visible);
+       gtk_cmclist_set_column_visibility
+               (GTK_CMCLIST(ctree), from_pos, col_state[from_pos].visible);
+       gtk_cmclist_set_column_visibility
+               (GTK_CMCLIST(ctree), to_pos, col_state[to_pos].visible);
 
        summary_set_column_titles(summaryview);
 }
@@ -1033,7 +1232,7 @@ static gboolean summaryview_quicksearch_recurse(gpointer data)
 
 static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
 {
-       int u = 0, n = 0, m = 0, t = 0;
+       int u = 0, n = 0, m = 0, t = 0, r = 0, f = 0, l = 0, i = 0, w = 0;
        GSList *cur;
        START_TIMING("");
        for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
@@ -1045,11 +1244,26 @@ static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
                        u++;
                if (MSG_IS_MARKED(msginfo->flags))
                        m++;            
+               if (MSG_IS_REPLIED(msginfo->flags))
+                       r++;
+               if (MSG_IS_FORWARDED(msginfo->flags))
+                       f++;
+               if (MSG_IS_LOCKED(msginfo->flags))
+                       l++;
+               if (MSG_IS_IGNORE_THREAD(msginfo->flags))
+                       i++;
+               if (MSG_IS_WATCH_THREAD(msginfo->flags))
+                       w++;
        }
        if (t != item->total_msgs
        ||  n != item->new_msgs
        ||  u != item->unread_msgs
        ||  m != item->marked_msgs
+       ||  r != item->replied_msgs
+       ||  f != item->forwarded_msgs
+       ||  l != item->locked_msgs
+       ||  i != item->ignored_msgs
+       ||  w != item->watched_msgs
        ||  (m == 0 && item->unreadmarked_msgs != 0)
        ||  item->unreadmarked_msgs < 0) {
                debug_print("Inconsistency\n");
@@ -1063,8 +1277,8 @@ static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
 
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node = NULL;
        GSList *mlist = NULL;
        gchar *buf;
        gboolean is_refresh;
@@ -1085,8 +1299,14 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        inc_lock();
        summary_lock(summaryview);
 
+       utils_free_regex();
+
        is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
 
+       if (item && item->folder->klass->item_opened) {
+               item->folder->klass->item_opened(item);
+       }
+
        if (!is_refresh) {
                main_create_mailing_list_menu (summaryview->mainwin, NULL);
                if (prefs_common.layout_mode == SMALL_LAYOUT) {
@@ -1097,7 +1317,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
        }
        if (!prefs_common.summary_quicksearch_sticky
-        && !prefs_common.summary_quicksearch_recurse
+        && (!prefs_common.summary_quicksearch_recurse
+         || !quicksearch_is_active(summaryview->quicksearch)
+         || (item && !quicksearch_is_in_subfolder(summaryview->quicksearch, item)))
         && !quicksearch_is_running(summaryview->quicksearch)
         && !is_refresh) {
                quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
@@ -1147,7 +1369,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                g_free(buf);
                debug_print("empty folder (%p %s %p %d)\n\n",
                                item, 
-                               item?item->path:"NULL",
+                               (item && item->path)?item->path:"(null)",
                                item?folder_item_parent(item):0x0,
                                item?item->no_select:FALSE);
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
@@ -1316,24 +1538,25 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                   message, but do not display it */
                                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                                     MSG_UNREAD, FALSE);
-                               if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
-                                       node = gtk_ctree_node_nth
+                               if (node == NULL && GTK_CMCLIST(ctree)->row_list != NULL)
+                                       node = gtk_cmctree_node_nth
                                                (ctree,
                                                 item->sort_type == SORT_DESCENDING
-                                                ? 0 : GTK_CLIST(ctree)->rows - 1);
+                                                ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                                summary_unlock(summaryview);
                                summary_select_node(summaryview, node, FALSE, TRUE);
                                summary_lock(summaryview);
                        }
                } else {
                        /* just select first/last */
-                       if (GTK_CLIST(ctree)->row_list != NULL)
-                               node = gtk_ctree_node_nth
+                       if (GTK_CMCLIST(ctree)->row_list != NULL)
+                               node = gtk_cmctree_node_nth
                                        (ctree,
                                         item->sort_type == SORT_DESCENDING
-                                        ? 0 : GTK_CLIST(ctree)->rows - 1);
+                                        ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                        gtk_sctree_select(GTK_SCTREE(ctree), node);
-                       gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
+                       summaryview->selected = node;
+                       gtk_cmctree_node_moveto(ctree, node, 0, 0.5, 0);
                }
        } else {
                /* backward compat */
@@ -1373,11 +1596,19 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                }
                                break;
                        case ACTION_LAST_LIST:
-                               if (GTK_CLIST(ctree)->row_list != NULL) {
-                                       node = gtk_ctree_node_nth
+                               if (GTK_CMCLIST(ctree)->row_list != NULL) {
+                                       node = gtk_cmctree_node_nth
                                                (ctree,
                                                 item->sort_type == SORT_DESCENDING
-                                                ? 0 : GTK_CLIST(ctree)->rows - 1);
+                                                ? 0 : GTK_CMCLIST(ctree)->rows - 1);
+                               }
+                               break;
+                       case ACTION_FIRST_LIST:
+                               if (GTK_CMCLIST(ctree)->row_list != NULL) {
+                                       node = gtk_cmctree_node_nth
+                                               (ctree,
+                                                item->sort_type == SORT_ASCENDING
+                                                ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                                }
                                break;
                        case ACTION_NOTHING:
@@ -1392,10 +1623,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
 
                summary_unlock(summaryview);
-               if (node)
-                       summary_select_node(summaryview, node,
-                                   prefs_common.always_show_msg,
-                                   TRUE);
+               if (node) {
+                       gboolean show = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
+                               (prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
+                                               messageview_is_visible(summaryview->messageview));
+                       summary_select_node(summaryview, node, show, TRUE);
+               }
                summary_lock(summaryview);
        }
 
@@ -1419,12 +1652,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
 void summary_clear_list(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
        gint optimal_width;
 
        summary_freeze(summaryview);
 
-       gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
+       gtk_cmctree_pre_recursive(GTK_CMCTREE(summaryview->ctree),
                                NULL, summary_free_msginfo_func, NULL);
 
        if (summaryview->folder_item) {
@@ -1449,11 +1682,11 @@ void summary_clear_list(SummaryView *summaryview)
        }
        summaryview->mlist = NULL;
 
-       gtk_clist_clear(clist);
+       gtk_cmclist_clear(clist);
        if (summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
-               optimal_width = gtk_clist_optimal_column_width
+               optimal_width = gtk_cmclist_optimal_column_width
                        (clist, summaryview->col_pos[S_COL_SUBJECT]);
-               gtk_clist_set_column_width
+               gtk_cmclist_set_column_width
                        (clist, summaryview->col_pos[S_COL_SUBJECT],
                         optimal_width);
        }
@@ -1488,7 +1721,7 @@ gboolean summary_is_locked(SummaryView *summaryview)
 
 SummarySelection summary_get_selection_type(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
        SummarySelection selection;
 
        if (!clist->row_list)
@@ -1511,7 +1744,7 @@ MsgInfo *summary_get_selected_msg(SummaryView *summaryview)
 {
        /* summaryview->selected may be valid when multiple 
         * messages were selected */
-       GList *sellist = GTK_CLIST(summaryview->ctree)->selection;
+       GList *sellist = GTK_CMCLIST(summaryview->ctree)->selection;
 
        if (sellist == NULL || sellist->next) 
                return NULL;
@@ -1525,7 +1758,7 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
        GList *cur;
        MsgInfo *msginfo;
 
-       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
+       for (cur = GTK_CMCLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
             cur = cur->next) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
                mlist = g_slist_prepend(mlist, msginfo);
@@ -1538,55 +1771,70 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 
 void summary_set_menu_sensitive(SummaryView *summaryview)
 {
-       GtkItemFactory *ifactory = summaryview->popupfactory;
        SensitiveCond state;
        gboolean sensitive;
-       GtkWidget *menuitem;
        gint i;
 
        static const struct {
                gchar *const entry;
                SensitiveCond cond;
        } entry[] = {
-               {"/Reply"                       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Reply to"                    , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Reply to/all"                , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Reply to/sender"             , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Reply to/mailing list"       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-
-               {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Forward as attachment"       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Redirect"                    , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-
-               {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
-               {"/Copy..."                     , M_TARGET_EXIST|M_EXEC},
-               {"/Move to trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
-               {"/Delete..."                   , M_TARGET_EXIST|M_ALLOW_DELETE},
-
-               {"/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/Unignore thread"        , M_TARGET_EXIST},
-               {"/Mark/Lock"                   , M_TARGET_EXIST},
-               {"/Mark/Unlock"                 , M_TARGET_EXIST},
-               {"/Mark/Mark as spam"           , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"/Mark/Mark as ham"            , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"/Color label"                 , M_TARGET_EXIST},
-               {"/Tags"                        , 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/Message source"         , M_SINGLE_TARGET_EXIST},
-               {"/View/All headers"            , M_SINGLE_TARGET_EXIST},
-               {"/Save as..."                  , M_TARGET_EXIST},
-               {"/Print..."                    , M_TARGET_EXIST},
+               {"SummaryViewPopup/Reply"                       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+#ifndef GENERIC_UMPC
+               {"SummaryViewPopup/ReplyTo"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"SummaryViewPopup/ReplyTo/All"         , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"SummaryViewPopup/ReplyTo/Sender"             , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"SummaryViewPopup/ReplyTo/MailingList"       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+#endif
+
+               {"SummaryViewPopup/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+#ifndef GENERIC_UMPC
+               {"SummaryViewPopup/ForwardAsAtt"        , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"SummaryViewPopup/Redirect"                    , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+#endif
+
+               {"SummaryViewPopup/Move"                        , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+               {"SummaryViewPopup/Copy"                        , M_TARGET_EXIST|M_EXEC},
+               {"SummaryViewPopup/Trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+#ifndef GENERIC_UMPC
+               {"SummaryViewPopup/Delete"                      , M_TARGET_EXIST|M_ALLOW_DELETE},
+#endif
+
+               {"SummaryViewPopup/Mark"                        , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/Mark"                   , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/Unmark"                 , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/MarkUnread"     , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/MarkRead"       , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/MarkAllRead"    , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/IgnoreThread"           , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/UnignoreThread"         , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/WatchThread"            , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/UnwatchThread"          , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/Unlock"                 , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/Lock"                   , M_TARGET_EXIST},
+               {"SummaryViewPopup/Mark/MarkSpam"               , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
+               {"SummaryViewPopup/Mark/MarkHam"                , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
+               {"SummaryViewPopup/ColorLabel"                  , M_TARGET_EXIST},
+               {"SummaryViewPopup/Tags"                        , M_TARGET_EXIST},
+
+#ifndef GENERIC_UMPC
+               {"SummaryViewPopup/AddSenderToAB"       , M_SINGLE_TARGET_EXIST},
+#endif
+               {"SummaryViewPopup/CreateFilterRule"            , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+#ifndef GENERIC_UMPC
+               {"SummaryViewPopup/CreateProcessingRule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+#endif
+
+               {"SummaryViewPopup/View"                        , M_SINGLE_TARGET_EXIST},
+               {"SummaryViewPopup/View/OpenInNewWindow"     , M_SINGLE_TARGET_EXIST},
+               {"SummaryViewPopup/View/MessageSource"          , M_SINGLE_TARGET_EXIST},
+#ifndef GENERIC_UMPC
+               {"SummaryViewPopup/View/AllHeaders"             , M_SINGLE_TARGET_EXIST},
+#endif
+               {"SummaryViewPopup/SaveAs"                      , M_TARGET_EXIST},
+#ifndef GENERIC_UMPC
+               {"SummaryViewPopup/Print"                       , M_TARGET_EXIST},
+#endif
                {NULL, 0}
        };
 
@@ -1596,24 +1844,23 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 
        for (i = 0; entry[i].entry != NULL; i++) {
                sensitive = ((entry[i].cond & state) == entry[i].cond);
-               menu_set_sensitive(ifactory, entry[i].entry, sensitive);
+               cm_menu_set_sensitive(entry[i].entry, sensitive);
        }
 
-
        summary_lock(summaryview);
-       menuitem = gtk_item_factory_get_widget(ifactory, "/View/All headers");
+#ifndef GENERIC_UMPC
        if (summaryview->messageview 
        &&  summaryview->messageview->mimeview
        &&  summaryview->messageview->mimeview->textview)
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem),
-                        summaryview->messageview->mimeview->textview->show_all_headers);
+               cm_toggle_menu_set_active("SummaryViewPopup/View/AllHeaders",
+                       summaryview->messageview->mimeview->textview->show_all_headers);
+#endif
        summary_unlock(summaryview);
 }
 
 void summary_select_prev_unread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
        gboolean skip_cur = FALSE;
 
        if (summaryview->displayed 
@@ -1658,7 +1905,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
 
 void summary_select_next_unread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = summaryview->selected;
+       GtkCMCTreeNode *node = summaryview->selected;
        gboolean skip_cur = FALSE;
        
        if (summaryview->displayed 
@@ -1712,7 +1959,7 @@ void summary_select_next_unread(SummaryView *summaryview)
 
 void summary_select_prev_new(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
        gboolean skip_cur = FALSE;
 
        if (summaryview->displayed 
@@ -1757,7 +2004,7 @@ void summary_select_prev_new(SummaryView *summaryview)
 
 void summary_select_next_new(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = summaryview->selected;
+       GtkCMCTreeNode *node = summaryview->selected;
        gboolean skip_cur = FALSE;
        
        if (summaryview->displayed 
@@ -1811,7 +2058,7 @@ void summary_select_next_new(SummaryView *summaryview)
 
 void summary_select_prev_marked(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_prev_flagged_msg
                (summaryview, summaryview->selected, MSG_MARKED, TRUE);
@@ -1836,7 +2083,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
 
 void summary_select_next_marked(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = summaryview->selected;
+       GtkCMCTreeNode *node = summaryview->selected;
        gboolean skip_cur = FALSE;
        
        if (summaryview->displayed 
@@ -1890,7 +2137,7 @@ void summary_select_next_marked(SummaryView *summaryview)
 
 void summary_select_prev_labeled(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_prev_flagged_msg
                (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
@@ -1915,7 +2162,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
 
 void summary_select_next_labeled(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_next_flagged_msg
                (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
@@ -1946,17 +2193,17 @@ void summary_select_last_read(SummaryView *summaryview)
 
 void summary_select_parent(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = NULL;
+       GtkCMCTreeNode *node = NULL;
 
        if (summaryview->selected)
-               node = GTK_CTREE_ROW(summaryview->selected)->parent;
+               node = GTK_CMCTREE_ROW(summaryview->selected)->parent;
        if (node)
                summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_msg_by_msgnum(summaryview, msgnum);
        summary_select_node(summaryview, node, FALSE, TRUE);
@@ -1964,9 +2211,9 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
 
 typedef struct _PostponedSelectData
 {
-       GtkCTree *ctree;
-       GtkCTreeNode *row;
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree;
+       GtkCMCTreeNode *row;
+       GtkCMCTreeNode *node;
        GtkScrollType type;
        gint column;
        SummaryView *summaryview;
@@ -2002,10 +2249,10 @@ static gboolean summary_select_retry(void *data)
  * TRUE, display the corresponding message in the message view.
  * If @do_refresh is TRUE, the widget is refreshed.
  **/
-void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
+void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
                         gboolean display_msg, gboolean do_refresh)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        
        if (summary_is_locked(summaryview)
        && !GTK_SCTREE(ctree)->selecting_range
@@ -2037,7 +2284,7 @@ void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
                        GTK_EVENTS_FLUSH();
                        summary_unlock(summaryview);
                        gtk_widget_grab_focus(GTK_WIDGET(ctree));
-                       gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
+                       gtk_cmctree_node_moveto(ctree, node, 0, 0.5, 0);
                }
                if (display_msg && summaryview->displayed == node)
                        summaryview->displayed = NULL;
@@ -2048,57 +2295,57 @@ void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
        }
 }
 
-guint summary_get_msgnum(SummaryView *summaryview, GtkCTreeNode *node)
+guint summary_get_msgnum(SummaryView *summaryview, GtkCMCTreeNode *node)
 {
-       GtkCTree *ctree =NULL;
+       GtkCMCTree *ctree =NULL;
        MsgInfo *msginfo;
 
        if (!summaryview)
                return 0;
-       ctree = GTK_CTREE(summaryview->ctree);
+       ctree = GTK_CMCTREE(summaryview->ctree);
        if (!node)
                return 0;
-       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, node);
        if (msginfo)
                return msginfo->msgnum;
        else 
                return -1;
 }
 
-static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
-                                          GtkCTreeNode *current_node)
+static GtkCMCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
+                                          GtkCMCTreeNode *current_node)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node)
                node = current_node;
        else
-               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+               node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
        }
 
        return node;
 }
 
-static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
-                                          GtkCTreeNode *current_node)
+static GtkCMCTreeNode *summary_find_next_msg(SummaryView *summaryview,
+                                          GtkCMCTreeNode *current_node)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node)
                node = current_node;
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && !MSG_IS_DELETED(msginfo->flags) 
                && !MSG_IS_MOVE(msginfo->flags)) break;
        }
@@ -2106,38 +2353,38 @@ static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
        return node;
 }
 
-static GtkCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
-                                                  GtkCTreeNode *current_node,
+static GtkCMCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
+                                                  GtkCMCTreeNode *current_node,
                                                   MsgPermFlags flags,
                                                   gboolean start_from_prev)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node) {
                if (start_from_prev)
-                       node = GTK_CTREE_NODE_PREV(current_node);
+                       node = GTK_CMCTREE_NODE_PREV(current_node);
                else
                        node = current_node;
        } else
-               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+               node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
        }
 
        return node;
 }
 
-static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
-                                                  GtkCTreeNode *current_node,
+static GtkCMCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
+                                                  GtkCMCTreeNode *current_node,
                                                   MsgPermFlags flags,
                                                   gboolean start_from_next)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node) {
@@ -2146,10 +2393,10 @@ static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
                else
                        node = current_node;
        } else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                /* Find msg with matching flags but ignore messages with
                   ignore flags, if searching for new or unread messages */
                if ((msginfo && (msginfo->flags.perm_flags & flags) != 0) &&
@@ -2161,17 +2408,17 @@ static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
        return node;
 }
 
-static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
+static GtkCMCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
                                                guint msgnum)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && msginfo->msgnum == msgnum) break;
        }
 
@@ -2205,11 +2452,11 @@ static gint attract_compare_func(gconstpointer a, gconstpointer b)
 
 void summary_attract_by_subject(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(ctree);
-       GtkCTreeNode *src_node;
-       GtkCTreeNode *dst_node, *sibling;
-       GtkCTreeNode *tmp;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(ctree);
+       GtkCMCTreeNode *src_node;
+       GtkCMCTreeNode *dst_node, *sibling;
+       GtkCMCTreeNode *tmp;
        MsgInfo *src_msginfo, *dst_msginfo;
        GHashTable *subject_table;
 
@@ -2223,10 +2470,10 @@ void summary_attract_by_subject(SummaryView *summaryview)
        subject_table = g_hash_table_new(attract_hash_func,
                                         attract_compare_func);
 
-       for (src_node = GTK_CTREE_NODE(clist->row_list);
+       for (src_node = GTK_CMCTREE_NODE(clist->row_list);
             src_node != NULL;
             src_node = tmp) {
-               tmp = GTK_CTREE_ROW(src_node)->sibling;
+               tmp = GTK_CMCTREE_ROW(src_node)->sibling;
                src_msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(src_node);
                if (!src_msginfo) continue;
                if (!src_msginfo->subject) continue;
@@ -2244,9 +2491,9 @@ void summary_attract_by_subject(SummaryView *summaryview)
                            > 60 * 60 * 24 * 20)
                                continue;
 
-                       sibling = GTK_CTREE_ROW(dst_node)->sibling;
+                       sibling = GTK_CMCTREE_ROW(dst_node)->sibling;
                        if (src_node != sibling)
-                               gtk_ctree_move(ctree, src_node, NULL, sibling);
+                               gtk_cmctree_move(ctree, src_node, NULL, sibling);
                }
 
                g_hash_table_insert(subject_table,
@@ -2255,7 +2502,7 @@ void summary_attract_by_subject(SummaryView *summaryview)
 
        g_hash_table_destroy(subject_table);
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+       gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
        summary_thaw(summaryview);
 
@@ -2265,22 +2512,22 @@ void summary_attract_by_subject(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 }
 
-static void summary_free_msginfo_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_free_msginfo_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                      gpointer data)
 {
-       MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, node);
 
        if (msginfo)
                procmsg_msginfo_free(msginfo);
 }
 
-static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                   gpointer data)
 {
        SummaryView *summaryview = data;
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, node);
 
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
@@ -2292,16 +2539,19 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 static void summary_update_status(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        summaryview->total_size =
        summaryview->deleted = summaryview->moved = summaryview->copied = 0;
 
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
             node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+               
+               if (!msginfo)
+                       continue;
 
                if (MSG_IS_DELETED(msginfo->flags))
                        summaryview->deleted++;
@@ -2322,9 +2572,13 @@ static void summary_status_show(SummaryView *summaryview)
        gchar *itstr;
        GList *rowlist, *cur;
        guint n_selected = 0, n_new = 0, n_unread = 0, n_total = 0;
-       off_t sel_size = 0, n_size = 0;
+       guint n_marked = 0, n_replied = 0, n_forwarded = 0, n_locked = 0, n_ignored = 0, n_watched = 0;
+       goffset sel_size = 0, n_size = 0;
        MsgInfo *msginfo;
        gchar *name;
+#if GTK_CHECK_VERSION(2, 12, 0)
+       gchar *tooltip;
+#endif
        
        if (!summaryview->folder_item) {
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
@@ -2334,11 +2588,11 @@ static void summary_status_show(SummaryView *summaryview)
                return;
        }
 
-       rowlist = GTK_CLIST(summaryview->ctree)->selection;
+       rowlist = GTK_CMCLIST(summaryview->ctree)->selection;
        for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
-               msginfo = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(summaryview->ctree),
-                        GTK_CTREE_NODE(cur->data));
+               msginfo = gtk_cmctree_node_get_row_data
+                       (GTK_CMCTREE(summaryview->ctree),
+                        GTK_CMCTREE_NODE(cur->data));
                if (msginfo) {
                        sel_size += msginfo->size;
                        n_selected++;
@@ -2347,11 +2601,11 @@ static void summary_status_show(SummaryView *summaryview)
        
        if (summaryview->folder_item->hide_read_msgs 
        || quicksearch_is_active(summaryview->quicksearch)) {
-               rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+               rowlist = GTK_CMCLIST(summaryview->ctree)->row_list;
                for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
-                       msginfo = gtk_ctree_node_get_row_data
-                               (GTK_CTREE(summaryview->ctree),
-                                GTK_CTREE_NODE(cur));
+                       msginfo = gtk_cmctree_node_get_row_data
+                               (GTK_CMCTREE(summaryview->ctree),
+                                GTK_CMCTREE_NODE(cur));
                        if (msginfo) {
                                n_size += msginfo->size;
                                n_total++;
@@ -2359,11 +2613,29 @@ static void summary_status_show(SummaryView *summaryview)
                                        n_new++;
                                if (MSG_IS_UNREAD(msginfo->flags))
                                        n_unread++;
+                               if (MSG_IS_MARKED(msginfo->flags))
+                                       n_marked++;
+                               if (MSG_IS_REPLIED(msginfo->flags))
+                                       n_replied++;
+                               if (MSG_IS_FORWARDED(msginfo->flags))
+                                       n_forwarded++;
+                               if (MSG_IS_LOCKED(msginfo->flags))
+                                       n_locked++;
+                               if (MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                       n_ignored++;
+                               if (MSG_IS_WATCH_THREAD(msginfo->flags))
+                                       n_watched++;
                        }
                }
        } else {
                n_new = summaryview->folder_item->new_msgs;
                n_unread = summaryview->folder_item->unread_msgs;
+               n_marked = summaryview->folder_item->marked_msgs;
+               n_replied = summaryview->folder_item->replied_msgs;
+               n_forwarded = summaryview->folder_item->forwarded_msgs;
+               n_locked = summaryview->folder_item->locked_msgs;
+               n_ignored = summaryview->folder_item->ignored_msgs;
+               n_watched = summaryview->folder_item->watched_msgs;
                n_total = summaryview->folder_item->total_msgs;
                n_size = summaryview->total_size;
        }
@@ -2396,7 +2668,7 @@ static void summary_status_show(SummaryView *summaryview)
                spc = "";
 
        if (n_selected) {
-               sel = g_strdup_printf(" (%s)", to_human_readable(sel_size));
+               sel = g_strdup_printf(" (%s)", to_human_readable((goffset)sel_size));
                if (n_selected == 1)
                        itstr = g_strdup(_(" item selected"));
                else
@@ -2406,28 +2678,75 @@ static void summary_status_show(SummaryView *summaryview)
                itstr = g_strdup("");
        }
                
-       str = g_strconcat(n_selected ? itos(n_selected) : "",
-                                       itstr, sel, spc, del, mv, cp, NULL);
-       gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
-       g_free(str);
-       g_free(sel);
-       g_free(del);
-       g_free(mv);
-       g_free(cp);
-       g_free(itstr);
-
-       str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
-
-                                     n_new, n_unread, n_total,
-                                     to_human_readable(n_size));
-       gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
-       g_free(str);
+       if (prefs_common.layout_mode != SMALL_LAYOUT) {
+               str = g_strconcat(n_selected ? itos(n_selected) : "",
+                                               itstr, sel, spc, del, mv, cp, NULL);
+               g_free(sel);
+               g_free(del);
+               g_free(mv);
+               g_free(cp);
+               g_free(itstr);
+               
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
+               g_free(str);
+
+               str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
+                                             n_new, n_unread, n_total,
+                                             to_human_readable((goffset)n_size));
+
+
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
+               g_free(str);
+#if GTK_CHECK_VERSION(2, 12, 0)
+               tooltip = g_strdup_printf(_("<b>Message summary</b>\n"
+                                           "<b>New:</b> %d\n"
+                                           "<b>Unread:</b> %d\n"
+                                           "<b>Total:</b> %d\n"
+                                           "<b>Size:</b> %s\n\n"
+                                           "<b>Marked:</b> %d\n"
+                                           "<b>Replied:</b> %d\n"
+                                           "<b>Forwarded:</b> %d\n"
+                                           "<b>Locked:</b> %d\n"
+                                           "<b>Ignored:</b> %d\n"
+                                           "<b>Watched:</b> %d"),
+                                             n_new, n_unread, n_total,
+                                             to_human_readable((goffset)n_size),
+                                             n_marked,n_replied,n_forwarded,
+                                             n_locked,n_ignored,n_watched);
+
+               gtk_widget_set_tooltip_markup(GTK_WIDGET(summaryview->statlabel_msgs),
+                                           tooltip); 
+               g_free(tooltip);
+#endif
+       } else {
+               gchar *ssize, *tsize;
+               if (n_selected) {
+                       ssize = g_strdup(to_human_readable((goffset)sel_size));
+                       tsize = g_strdup(to_human_readable((goffset)n_size));
+                       str = g_strdup_printf(_("%d/%d selected (%s/%s), %d unread"),
+                               n_selected, n_total, ssize, tsize, n_unread);
+                       g_free(ssize);
+                       g_free(tsize);
+               } else
+                       str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
+                               n_new, n_unread, n_total, to_human_readable((goffset)n_size));
+               g_free(sel);
+               g_free(del);
+               g_free(mv);
+               g_free(cp);
+               g_free(itstr);
+               
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
+               g_free(str);
+       }
+
+       summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
 }
 
 static void summary_set_column_titles(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
        FolderItem *item = summaryview->folder_item;
        GtkWidget *hbox;
        GtkWidget *label;
@@ -2481,29 +2800,32 @@ static void summary_set_column_titles(SummaryView *summaryview)
                if (type == S_COL_MIME) {
                        label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
                        gtk_widget_show(label);
-                       gtk_clist_set_column_widget(clist, pos, label);
+                       gtk_cmclist_set_column_widget(clist, pos, label);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Attachment"));
                        continue;
                } else if (type == S_COL_MARK) {
                        label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
                        gtk_widget_show(label);
-                       gtk_clist_set_column_widget(clist, pos, label);
+                       gtk_cmclist_set_column_widget(clist, pos, label);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Mark"));
                        continue;
                } else if (type == S_COL_LOCKED) {
                        label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
                        gtk_widget_show(label);
-                       gtk_clist_set_column_widget(clist, pos, label);
+                       gtk_cmclist_set_column_widget(clist, pos, label);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Locked"));
                        continue;
                } else if (type == S_COL_STATUS) {
-                       gtk_clist_set_column_title(clist, pos, title);
+                       gtk_cmclist_set_column_title(clist, pos, title);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Status"));
                        continue;
                }
 
                hbox  = gtk_hbox_new(FALSE, 4);
                label = gtk_label_new(title);
+#ifdef GENERIC_UMPC
+       gtk_widget_set_size_request(hbox, -1, 20);
+#endif
 
                if (justify == GTK_JUSTIFY_RIGHT)
                        gtk_box_pack_end(GTK_BOX(hbox), label,
@@ -2517,6 +2839,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                                (summaryview->sort_type == SORT_ASCENDING
                                 ? GTK_ARROW_DOWN : GTK_ARROW_UP,
                                 GTK_SHADOW_IN);
+                       gtk_widget_set_size_request(GTK_WIDGET(arrow), 10, 10);
                        if (justify == GTK_JUSTIFY_RIGHT)
                                gtk_box_pack_start(GTK_BOX(hbox), arrow,
                                                   FALSE, FALSE, 0);
@@ -2526,7 +2849,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                }
 
                gtk_widget_show_all(hbox);
-               gtk_clist_set_column_widget(clist, pos, hbox);
+               gtk_cmclist_set_column_widget(clist, pos, hbox);
        }
 }
 
@@ -2534,8 +2857,8 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
 {
        GtkMenuShell *menu;
        GList *cur;
-       GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        gboolean froze = FALSE;
        gboolean redisplay = FALSE;
 
@@ -2545,12 +2868,12 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
-               gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+               gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
        summary_tags_menu_create(summaryview, TRUE);
 
        START_LONG_OPERATION(summaryview, TRUE);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node)) {
                redisplay |= summary_set_row_tag(summaryview,
                                           node, TRUE, FALSE, 0);
@@ -2563,20 +2886,27 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
 
 void summary_reflect_prefs(void)
 {
-       static gchar *last_font = NULL;
-       gboolean update_font = TRUE;
+       static gchar *last_smallfont = NULL;
+       static gchar *last_normalfont = NULL;
+       static gchar *last_boldfont = NULL;
+       gboolean update_font = FALSE;
        SummaryView *summaryview = NULL;
 
        if (!mainwindow_get_mainwindow())
                return;
        summaryview = mainwindow_get_mainwindow()->summaryview;
 
-       if (last_font && !strcmp(last_font, NORMAL_FONT))
-               update_font = FALSE;
+       if (!last_smallfont || strcmp(last_smallfont, SMALL_FONT) ||
+                       !last_normalfont || strcmp(last_normalfont, NORMAL_FONT) ||
+                       !last_boldfont || strcmp(last_boldfont, BOLD_FONT))
+               update_font = TRUE;
 
-       g_free(last_font);
-       
-       last_font = g_strdup(NORMAL_FONT);
+       g_free(last_smallfont);
+       last_smallfont = g_strdup(SMALL_FONT);
+       g_free(last_normalfont);
+       last_normalfont = g_strdup(NORMAL_FONT);
+       g_free(last_boldfont);
+       last_boldfont = g_strdup(BOLD_FONT);
 
        if (update_font) {      
                bold_style = bold_marked_style = bold_deleted_style = 
@@ -2585,15 +2915,18 @@ void summary_reflect_prefs(void)
        }
 
        summary_set_column_titles(summaryview);
-       summary_show(summaryview, summaryview->folder_item);
+       summary_relayout(summaryview);
+       
+       if (summaryview->folder_item)
+               summary_show(summaryview, summaryview->folder_item);
 }
 
 void summary_sort(SummaryView *summaryview,
                  FolderSortKey sort_key, FolderSortType sort_type)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
-       GtkCListCompareFunc cmp_func = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
+       GtkCMCListCompareFunc cmp_func = NULL;
        START_TIMING("");
        g_signal_handlers_block_by_func(G_OBJECT(summaryview->ctree),
                                       G_CALLBACK(summary_tree_expanded), summaryview);
@@ -2601,46 +2934,51 @@ void summary_sort(SummaryView *summaryview,
 
        switch (sort_key) {
        case SORT_BY_MARK:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_mark;
                break;
        case SORT_BY_STATUS:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_status;
                break;
        case SORT_BY_MIME:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_mime;
                break;
        case SORT_BY_NUMBER:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_num;
                break;
        case SORT_BY_SIZE:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_size;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_size;
                break;
        case SORT_BY_DATE:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_date;
+               break;
+       case SORT_BY_THREAD_DATE:
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_thread_date;
                break;
        case SORT_BY_FROM:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_from;
                break;
        case SORT_BY_SUBJECT:
+#ifndef G_OS_WIN32
                if (summaryview->simplify_subject_preg)
-                       cmp_func = (GtkCListCompareFunc)summary_cmp_by_simplified_subject;
+                       cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_simplified_subject;
                else
-                       cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
+#endif
+                       cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_subject;
                break;
        case SORT_BY_SCORE:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_score;
                break;
        case SORT_BY_LABEL:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_label;
                break;
        case SORT_BY_TO:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_to;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_to;
                break;
        case SORT_BY_LOCKED:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_locked;
                break;
        case SORT_BY_TAGS:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_tags;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_tags;
                break;
        case SORT_BY_NONE:
                break;
@@ -2664,12 +3002,12 @@ void summary_sort(SummaryView *summaryview,
 
                main_window_cursor_wait(summaryview->mainwin);
 
-               gtk_clist_set_compare_func(clist, cmp_func);
+               gtk_cmclist_set_compare_func(clist, cmp_func);
 
-               gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
+               gtk_cmclist_set_sort_type(clist, (GtkSortType)sort_type);
                gtk_sctree_sort_recursive(ctree, NULL);
 
-               gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+               gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
                main_window_cursor_normal(summaryview->mainwin);
 
@@ -2683,8 +3021,33 @@ unlock:
        END_TIMING();
 }
 
-static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
-                                  GtkCTreeNode *cnode, gpointer data)
+static gboolean summary_update_thread_age(GNode *node, gpointer data)
+{
+       MsgInfo *msginfo = node->data;
+       time_t *most_recent = (time_t *)data;
+
+       if (msginfo->date_t > *most_recent) {
+               *most_recent = msginfo->date_t;
+       }
+       return FALSE;
+}      
+
+static void summary_find_thread_age(GNode *gnode)
+{
+       MsgInfo *msginfo = (MsgInfo *)gnode->data;
+       time_t most_recent;
+
+       if (!msginfo)
+               return;
+       most_recent = msginfo->thread_date = msginfo->date_t;
+
+       g_node_traverse(gnode, G_IN_ORDER, G_TRAVERSE_ALL, -1, summary_update_thread_age, &most_recent);
+
+       msginfo->thread_date = most_recent;
+}
+
+static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode *gnode,
+                                  GtkCMCTreeNode *cnode, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *)data;
        MsgInfo *msginfo = (MsgInfo *)gnode->data;
@@ -2692,13 +3055,14 @@ static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *g
        gint *col_pos = summaryview->col_pos;
        const gchar *msgid = msginfo->msgid;
        GHashTable *msgid_table = summaryview->msgid_table;
-       
+       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+
        summary_set_header(summaryview, text, msginfo);
 
        gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
                                NULL, NULL, NULL, NULL, FALSE, summaryview->threaded && !summaryview->thread_collapsed);
 #define SET_TEXT(col) {                                                \
-       gtk_ctree_node_set_text(ctree, cnode, col_pos[col],     \
+       gtk_cmctree_node_set_text(ctree, cnode, col_pos[col],   \
                                text[col_pos[col]]);            \
 }
 
@@ -2717,6 +3081,9 @@ static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *g
        if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible)
                SET_TEXT(S_COL_TAGS);
 
+       if (vert && prefs_common.two_line_vert)
+               g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
+
 #undef SET_TEXT
 
        GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
@@ -2731,12 +3098,14 @@ static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *g
 static void summary_set_ctree_from_list(SummaryView *summaryview,
                                        GSList *mlist)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
-       GtkCTreeNode *node = NULL;
+       GtkCMCTreeNode *node = NULL;
        GHashTable *msgid_table;
        GHashTable *subject_table = NULL;
        GSList * cur;
+       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+
        START_TIMING("");
        
        if (!mlist) return;
@@ -2767,8 +3136,10 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                START_TIMING("threaded");
                root = procmsg_get_thread_tree(mlist);
 
+               
                for (gnode = root->children; gnode != NULL;
                     gnode = gnode->next) {
+                       summary_find_thread_age(gnode);
                        node = gtk_sctree_insert_gnode
                                (ctree, NULL, node, gnode,
                                 summary_insert_gnode_func, summaryview);
@@ -2790,6 +3161,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                (ctree, NULL, node, text, 2,
                                 NULL, NULL, NULL, NULL,
                                 FALSE, FALSE);
+                       if (vert && prefs_common.two_line_vert)
+                               g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
 
                        GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
                        summary_set_marks_func(ctree, node, summaryview);
@@ -2811,9 +3184,9 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
            summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
                gint optimal_width;
 
-               optimal_width = gtk_clist_optimal_column_width
-                       (GTK_CLIST(ctree), summaryview->col_pos[S_COL_SUBJECT]);
-               gtk_clist_set_column_width(GTK_CLIST(ctree),
+               optimal_width = gtk_cmclist_optimal_column_width
+                       (GTK_CMCLIST(ctree), summaryview->col_pos[S_COL_SUBJECT]);
+               gtk_cmclist_set_column_width(GTK_CMCLIST(ctree),
                                           summaryview->col_pos[S_COL_SUBJECT],
                                           optimal_width);
        }
@@ -2833,13 +3206,13 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
        summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        if (prefs_common.bold_unread) {
                START_TIMING("bold_unread");
                while (node) {
-                       GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
-                       if (GTK_CTREE_ROW(node)->children)
+                       GtkCMCTreeNode *next = GTK_CMCTREE_NODE_NEXT(node);
+                       if (GTK_CMCTREE_ROW(node)->children)
                                summary_set_row_marks(summaryview, node);
                        node = next;
                }
@@ -2856,7 +3229,7 @@ static gchar *summary_complete_address(const gchar *addr)
        gint count;
        gchar *res, *tmp, *email_addr;
        
-       if (addr == NULL)
+       if (addr == NULL || !strchr(addr, '@'))
                return NULL;
 
        Xstrdup_a(email_addr, addr, return NULL);
@@ -2886,7 +3259,14 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        gint *col_pos = summaryview->col_pos;
        gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
        gboolean should_swap = FALSE;
-
+       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+#if GTK_CHECK_VERSION(2,12,0)
+       static const gchar *color_dim_rgb = NULL;
+       if (!color_dim_rgb)
+               color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
+#else
+       static const gchar *color_dim_rgb = "#888888";
+#endif
        text[col_pos[S_COL_FROM]]   = "";
        text[col_pos[S_COL_TO]]     = "";
        text[col_pos[S_COL_SUBJECT]]= "";
@@ -2926,8 +3306,9 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
                text[col_pos[S_COL_TAGS]] = "";
 
        /* slow! */
-       if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible) {
-               if (msginfo->date_t) {
+       if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible || 
+           (vert && prefs_common.two_line_vert)) {
+               if (msginfo->date_t && msginfo->date_t > 0) {
                        procheader_date_get_localtime(date_modified,
                                                      sizeof(date_modified),
                                                      msginfo->date_t);
@@ -2946,7 +3327,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 
                if (addr) {
                        extract_address(addr);
-                       if (account_find_from_address(addr)) {
+                       if (account_find_from_address(addr, FALSE)) {
                                should_swap = TRUE;
                        }
                        g_free(addr);
@@ -2985,17 +3366,36 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
                text[col_pos[S_COL_FROM]] = tmp2;
        }
        
+#ifndef G_OS_WIN32
        if (summaryview->simplify_subject_preg != NULL)
                text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? 
                        string_remove_match(tmp3, BUFFSIZE, msginfo->subject, 
                                        summaryview->simplify_subject_preg) : 
                        _("(No Subject)");
        else 
+#endif
                text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
                        _("(No Subject)");
+       if (vert && prefs_common.two_line_vert) {
+               if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) {
+                       gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>From: %s, on %s</span>"),
+                                       text[col_pos[S_COL_SUBJECT]],
+                                       color_dim_rgb,
+                                       text[col_pos[S_COL_FROM]],
+                                       text[col_pos[S_COL_DATE]]);
+                       text[col_pos[S_COL_SUBJECT]] = tmp;
+               } else {
+                       gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>To: %s, on %s</span>"),
+                                       text[col_pos[S_COL_SUBJECT]],
+                                       color_dim_rgb,
+                                       text[col_pos[S_COL_TO]],
+                                       text[col_pos[S_COL_DATE]]);
+                       text[col_pos[S_COL_SUBJECT]] = tmp;
+               }
+       }
 }
 
-static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_display_msg(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
        summary_display_msg_full(summaryview, row, FALSE, FALSE);
 }
@@ -3091,7 +3491,7 @@ gboolean defer_change(gpointer data)
 }
 
 static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
-                                     GtkCTreeNode *row)
+                                     GtkCMCTreeNode *row)
 {
        g_return_if_fail(summaryview != NULL);
        g_return_if_fail(msginfo != NULL);
@@ -3126,10 +3526,10 @@ static int msginfo_mark_as_read_timeout(void *data)
 }
 
 static void summary_display_msg_full(SummaryView *summaryview,
-                                    GtkCTreeNode *row,
+                                    GtkCMCTreeNode *row,
                                     gboolean new_window, gboolean all_headers)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gint val;
        START_TIMING("");
@@ -3147,7 +3547,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        STATUSBAR_POP(summaryview->mainwin);
        GTK_EVENTS_FLUSH();
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        
        g_return_if_fail(msginfo);
 
@@ -3168,10 +3568,10 @@ static void summary_display_msg_full(SummaryView *summaryview,
                        summaryview->last_displayed = summaryview->displayed;
                        summaryview->displayed = row;
                        val = messageview_show(msgview, msginfo, all_headers);
-                       if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
+                       if (GTK_CMCLIST(msgview->mimeview->ctree)->row_list == NULL)
                                gtk_widget_grab_focus(summaryview->ctree);
                        gtkut_ctree_node_move_if_on_the_edge(ctree, row,
-                               GTK_CLIST(summaryview->ctree)->focus_row);
+                               GTK_CMCLIST(summaryview->ctree)->focus_row);
                } else {
                        msgview = summaryview->messageview;
                        summaryview->last_displayed = summaryview->displayed;
@@ -3181,20 +3581,26 @@ static void summary_display_msg_full(SummaryView *summaryview,
                                GTK_EVENTS_FLUSH();
                        }
                        val = messageview_show(msgview, msginfo, all_headers);
-                       if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
+                       if (GTK_CMCLIST(msgview->mimeview->ctree)->row_list == NULL)
                                gtk_widget_grab_focus(summaryview->ctree);
                        gtkut_ctree_node_move_if_on_the_edge(ctree, row,
-                               GTK_CLIST(summaryview->ctree)->focus_row);
+                               GTK_CMCLIST(summaryview->ctree)->focus_row);
                }
        }
 
        if (val == 0 && MSG_IS_UNREAD(msginfo->flags)) {
-               if (prefs_common.mark_as_read_delay) {
+               if (!prefs_common.mark_as_read_on_new_window &&
+                   prefs_common.mark_as_read_delay) {
                        MarkAsReadData *data = g_new0(MarkAsReadData, 1);
                        data->summaryview = summaryview;
                        data->msginfo = msginfo;
+#if GLIB_CHECK_VERSION(2,14,0)
+                       g_timeout_add_seconds(prefs_common.mark_as_read_delay,
+                               msginfo_mark_as_read_timeout, data);
+#else
                        g_timeout_add(prefs_common.mark_as_read_delay * 1000,
                                msginfo_mark_as_read_timeout, data);
+#endif
                } else if (new_window || !prefs_common.mark_as_read_on_new_window) {
                        msginfo_mark_as_read(summaryview, msginfo, row);
                }
@@ -3219,7 +3625,7 @@ void summary_display_msg_selected(SummaryView *summaryview,
 
 void summary_redisplay_msg(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        if (summaryview->displayed) {
                node = summaryview->displayed;
@@ -3240,14 +3646,14 @@ void summary_open_msg(SummaryView *summaryview)
 
 void summary_view_source(SummaryView * summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        SourceWindow *srcwin;
 
        if (!summaryview->selected) return;
 
        srcwin = source_window_create();
-       msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
        source_window_show_msg(srcwin, msginfo);
        source_window_show(srcwin);
 #ifdef MAEMO
@@ -3265,7 +3671,7 @@ void summary_reedit(SummaryView *summaryview)
        if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item))
                return;
 
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+       msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
 
@@ -3274,8 +3680,8 @@ void summary_reedit(SummaryView *summaryview)
 
 gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
 
        if (summary_is_locked(summaryview)
        && !GTK_SCTREE(ctree)->selecting_range
@@ -3304,7 +3710,7 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
                        return FALSE;
        } else {
                if (summaryview->selected) {
-                       node = GTK_CTREE_NODE_PREV(summaryview->selected);
+                       node = GTK_CMCTREE_NODE_PREV(summaryview->selected);
                        if (!node) return FALSE;
                }
        }
@@ -3314,190 +3720,204 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
 
        g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical", type, 0.0);
 
-       if (GTK_CLIST(ctree)->selection)
+       if (GTK_CMCLIST(ctree)->selection)
                gtk_sctree_set_anchor_row
                        (GTK_SCTREE(ctree),
-                        GTK_CTREE_NODE(GTK_CLIST(ctree)->selection->data));
+                        GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->selection->data));
 
        return TRUE;
 }
 
+gboolean summary_is_list(SummaryView *summaryview)
+{
+       return (gtk_notebook_get_current_page(
+               GTK_NOTEBOOK(summaryview->mainwidget_book)) == 0);
+}
+
 void summary_toggle_view(SummaryView *summaryview)
 {
        if (prefs_common.layout_mode == SMALL_LAYOUT)
                return;
        if (!messageview_is_visible(summaryview->messageview) &&
-           summaryview->selected)
+           summaryview->selected && summary_is_list(summaryview))
                summary_display_msg(summaryview,
                                    summaryview->selected);
        else
                main_window_toggle_message_view(summaryview->mainwin);
 }
 
-static gboolean summary_search_unread_recursive(GtkCTree *ctree,
-                                               GtkCTreeNode *node)
+static gboolean summary_search_unread_recursive(GtkCMCTree *ctree,
+                                               GtkCMCTreeNode *node)
 {
        MsgInfo *msginfo;
 
        if (node) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                        return TRUE;
-               node = GTK_CTREE_ROW(node)->children;
+               node = GTK_CMCTREE_ROW(node)->children;
        } else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        while (node) {
                if (summary_search_unread_recursive(ctree, node) == TRUE)
                        return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
+               node = GTK_CMCTREE_ROW(node)->sibling;
        }
 
        return FALSE;
 }
 
 static gboolean summary_have_unread_children(SummaryView *summaryview,
-                                            GtkCTreeNode *node)
+                                            GtkCMCTreeNode *node)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 
        if (!node) return FALSE;
 
-       node = GTK_CTREE_ROW(node)->children;
+       node = GTK_CMCTREE_ROW(node)->children;
 
        while (node) {
                if (summary_search_unread_recursive(ctree, node) == TRUE)
                        return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
+               node = GTK_CMCTREE_ROW(node)->sibling;
        }
        return FALSE;
 }
 
-static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkStyle *style = NULL;
        MsgInfo *msginfo;
        MsgFlags flags;
        gint *col_pos = summaryview->col_pos;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        if (!msginfo) return;
 
        flags = msginfo->flags;
 
-       gtk_ctree_node_set_foreground(ctree, row, NULL);
+       gtk_cmctree_node_set_foreground(ctree, row, NULL);
 
        /* set new/unread column */
        if (MSG_IS_IGNORE_THREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          ignorethreadxpm, ignorethreadxpmmask);
+       } else if (MSG_IS_WATCH_THREAD(flags)) {
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+                                         watchthreadxpm, watchthreadxpmmask);
        } else if (MSG_IS_SPAM(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          spamxpm, spamxpmmask);
        } else if (MSG_IS_NEW(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          newxpm, newxpmmask);
        } else if (MSG_IS_UNREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          unreadxpm, unreadxpmmask);
        } else if (MSG_IS_REPLIED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          repliedxpm, repliedxpmmask);
        } else if (MSG_IS_FORWARDED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          forwardedxpm, forwardedxpmmask);
        } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
                                        "");
        }
 
        if (prefs_common.bold_unread &&
            ((MSG_IS_UNREAD(flags) && !MSG_IS_IGNORE_THREAD(flags)) ||
-            (!GTK_CTREE_ROW(row)->expanded &&
-             GTK_CTREE_ROW(row)->children &&
+            (!GTK_CMCTREE_ROW(row)->expanded &&
+             GTK_CMCTREE_ROW(row)->children &&
              summary_have_unread_children(summaryview, row))))
                style = bold_style;
 
        /* set mark column */
        if (MSG_IS_DELETED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          deletedxpm, deletedxpmmask);
                if (style)
                        style = bold_deleted_style;
                else {
                        style = small_deleted_style;
                }
-                       gtk_ctree_node_set_foreground
+                       gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_dim);
        } else if (MSG_IS_MARKED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          markxpm, markxpmmask);
        } else if (MSG_IS_MOVE(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          movedxpm, movedxpmmask);
                if (style)
                        style = bold_marked_style;
                else {
                        style = small_marked_style;
                }
-                       gtk_ctree_node_set_foreground
+                       gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
        } else if (MSG_IS_COPY(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          copiedxpm, copiedxpmmask);
                if (style)
                        style = bold_marked_style;
                else {
                        style = small_marked_style;
                }
-                       gtk_ctree_node_set_foreground
+                       gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
        } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "");
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "");
        }
 
        if (MSG_IS_LOCKED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
                                          lockedxpm, lockedxpmmask);
        }
        else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], "");
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], "");
        }
 
        if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipgpgsignedxpm, clipgpgsignedxpmmask);
        } else if (MSG_IS_SIGNED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                         gpgsignedxpm, gpgsignedxpmmask);
+               if (MSG_IS_ENCRYPTED(flags)) {
+                       gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         keysignxpm, keysignxpmmask);
+               } else {
+                       gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                                 gpgsignedxpm, gpgsignedxpmmask);
+               }
        } else if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_ENCRYPTED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_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],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          keyxpm, keyxpmmask);
        } else if (MSG_IS_WITH_ATTACHMENT(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_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], "");
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_MIME], "");
        }
        if (!style)
                style = small_style;
 
-       gtk_ctree_node_set_row_style(ctree, row, style);
+       gtk_cmctree_node_set_row_style(ctree, row, style);
 
        if (MSG_GET_COLORLABEL(flags))
                summary_set_colorlabel_color(ctree, row, MSG_GET_COLORLABEL_VALUE(flags));
 }
 
-static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_mark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
@@ -3513,13 +3933,13 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
        debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
 }
 
-static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
        gboolean changed = FALSE;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
@@ -3539,12 +3959,12 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
        debug_print("Message %d is locked\n", msginfo->msgnum);
 }
 
-static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_unlock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (!MSG_IS_LOCKED(msginfo->flags))
                return;
@@ -3556,14 +3976,16 @@ static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
 
 void summary_mark(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               summary_mark_row(summaryview, GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
 
@@ -3571,12 +3993,12 @@ void summary_mark(SummaryView *summaryview)
 }
 
 static void summary_mark_row_as_read(SummaryView *summaryview,
-                                    GtkCTreeNode *row)
+                                    GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
 
        if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
@@ -3590,15 +4012,17 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
 
 void summary_mark_as_read(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
-                                        GTK_CTREE_NODE(cur->data));
+                                        GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        
@@ -3607,14 +4031,16 @@ void summary_mark_as_read(SummaryView *summaryview)
 
 void summary_msgs_lock(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_lock_row(summaryview,
-                                        GTK_CTREE_NODE(cur->data));
+                                        GTK_CMCTREE_NODE(cur->data));
        END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
@@ -3622,14 +4048,16 @@ void summary_msgs_lock(SummaryView *summaryview)
 
 void summary_msgs_unlock(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_unlock_row(summaryview,
-                                  GTK_CTREE_NODE(cur->data));
+                                  GTK_CMCTREE_NODE(cur->data));
        END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
@@ -3637,8 +4065,8 @@ void summary_msgs_unlock(SummaryView *summaryview)
 
 void summary_mark_all_read(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        AlertValue val;
        gboolean froze = FALSE;
 
@@ -3654,15 +4082,17 @@ void summary_mark_all_read(SummaryView *summaryview)
                        prefs_common.ask_mark_all_read = FALSE;
        }
        
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, TRUE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
        folder_item_set_batch(summaryview->folder_item, FALSE);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node)) {
-               if (!GTK_CTREE_ROW(node)->expanded)
+               if (!GTK_CMCTREE_ROW(node)->expanded)
                        summary_set_row_marks(summaryview, node);
        }
        END_LONG_OPERATION(summaryview);
@@ -3672,7 +4102,7 @@ void summary_mark_all_read(SummaryView *summaryview)
 
 void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *widget)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean is_spam = action;
        GSList *msgs = NULL;
@@ -3680,21 +4110,24 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
        gboolean moved = FALSE;
        gboolean froze = FALSE;
 
-       prefs_common.immediate_exec = FALSE;
 
-       START_LONG_OPERATION(summaryview, FALSE);
+       if (summary_is_locked(summaryview))
+               return;
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
-               GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-               MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       prefs_common.immediate_exec = FALSE;
+       START_LONG_OPERATION(summaryview, FALSE);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+               GtkCMCTreeNode *row = GTK_CMCTREE_NODE(cur->data);
+               MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, row);
                if (msginfo)
                        msgs = g_slist_prepend(msgs, msginfo);
        }
        
        if (procmsg_spam_learner_learn(NULL, msgs, is_spam) == 0) {
-               for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
-                       GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-                       MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+                       GtkCMCTreeNode *row = GTK_CMCTREE_NODE(cur->data);
+                       MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, row);
                        if (!msginfo)
                                continue;
                        if (is_spam) {
@@ -3716,7 +4149,7 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
        }
 
        prefs_common.immediate_exec = immediate_exec;
-
+       folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
 
        if (prefs_common.immediate_exec && moved) {
@@ -3736,12 +4169,12 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
 
 
 static void summary_mark_row_as_unread(SummaryView *summaryview,
-                                      GtkCTreeNode *row)
+                                      GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags)) {
                procmsg_msginfo_set_to_folder(msginfo, NULL);
@@ -3758,16 +4191,18 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
 
 void summary_mark_as_unread(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
                cur = cur->next)
                summary_mark_row_as_unread(summaryview,
-                                          GTK_CTREE_NODE(cur->data));
+                                          GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        
@@ -3823,12 +4258,12 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
        }
 }
 
-static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_delete_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
 
        if (MSG_IS_LOCKED(msginfo->flags)) return;
@@ -3857,7 +4292,7 @@ void summary_cancel(SummaryView *summaryview)
 {
        MsgInfo * msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+       msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
 
@@ -3882,11 +4317,11 @@ void summary_cancel(SummaryView *summaryview)
 
 void summary_delete(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        FolderItem *item = summaryview->folder_item;
        GList *cur;
-       GtkCTreeNode *sel_last = NULL;
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *sel_last = NULL;
+       GtkCMCTreeNode *node;
        AlertValue aval;
        MsgInfo *msginfo;
        gboolean froze = FALSE;
@@ -3899,14 +4334,11 @@ void summary_delete(SummaryView *summaryview)
 
        if (!prefs_common.live_dangerously) {
                gchar *buf = NULL;
-               int num = g_list_length(GTK_CLIST(summaryview->ctree)->selection);
-               if (num == 1)
-                       buf = g_strdup_printf(_(
-                               "Do you really want to delete the selected message?"));
-               else
-                       buf = g_strdup_printf(_(
-                               "Do you really want to delete the %d selected messages?"), 
-                               num);
+               int num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
+               buf = g_strdup_printf(ngettext(
+                       "Do you really want to delete the selected message?",
+                       "Do you really want to delete the %d selected messages?", num), 
+                       num);
                aval = alertpanel(_("Delete message(s)"),
                                  buf,
                                  GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
@@ -3914,12 +4346,12 @@ void summary_delete(SummaryView *summaryview)
                if (aval != G_ALERTALTERNATE) return;
        }
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
             cur = cur->next) {
-               GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-               msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               GtkCMCTreeNode *row = GTK_CMCTREE_NODE(cur->data);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, row);
                if (msginfo && msginfo->total_size != 0 && 
-                   msginfo->size != (off_t)msginfo->total_size)
+                   msginfo->size != (goffset)msginfo->total_size)
                        partial_mark_for_delete(msginfo);
        }
 
@@ -3929,8 +4361,8 @@ void summary_delete(SummaryView *summaryview)
         * that is not deleted. */
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
-               sel_last = GTK_CTREE_NODE(cur->data);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+               sel_last = GTK_CMCTREE_NODE(cur->data);
                summary_delete_row(summaryview, sel_last);
        }
        folder_item_set_batch(summaryview->folder_item, FALSE);
@@ -3975,12 +4407,12 @@ void summary_delete_trash(SummaryView *summaryview)
 }
 
 
-static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_unmark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
@@ -4000,29 +4432,31 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 
 void summary_unmark(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               summary_unmark_row(summaryview, GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
 }
 
-static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
+static void summary_move_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
                                FolderItem *to_folder)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        g_return_if_fail(to_folder != NULL);
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_LOCKED(msginfo->flags))
                return;
@@ -4052,7 +4486,7 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
 void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 {
        GList *cur;
-       GtkCTreeNode *sel_last = NULL;
+       GtkCMCTreeNode *sel_last = NULL;
        gboolean froze = FALSE;
 
        if (!to_folder) return;
@@ -4066,33 +4500,41 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
+       if (to_folder->no_select) {
+               alertpanel_error(_("The destination folder can only be used to "
+                                  "store subfolders."));
+               return;
+       }
+
        START_LONG_OPERATION(summaryview, FALSE); 
 
-       for (cur = GTK_CLIST(summaryview->ctree)->selection;
+       for (cur = GTK_CMCLIST(summaryview->ctree)->selection;
             cur != NULL && cur->data != NULL; cur = cur->next) {
-               sel_last = GTK_CTREE_NODE(cur->data);
+               sel_last = GTK_CMCTREE_NODE(cur->data);
                summary_move_row_to
-                       (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+                       (summaryview, GTK_CMCTREE_NODE(cur->data), to_folder);
        }
        END_LONG_OPERATION(summaryview);
 
-       summaryview->display_msg = prefs_common.always_show_msg;
+       summaryview->display_msg = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
+               ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
+                               messageview_is_visible(summaryview->messageview)));
        
        if (prefs_common.immediate_exec) {
                summary_execute(summaryview);
        } else {
-               GtkCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
+               GtkCMCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
                if (!node)
                        node = summary_find_prev_msg(summaryview, sel_last);
-               summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
+               summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
                summary_status_show(summaryview);
        }
        
        if (!summaryview->selected) { /* this was the last message */
-               GtkCTreeNode *node = gtk_ctree_node_nth (GTK_CTREE(summaryview->ctree), 
-                                                        GTK_CLIST(summaryview->ctree)->rows - 1);
+               GtkCMCTreeNode *node = gtk_cmctree_node_nth (GTK_CMCTREE(summaryview->ctree), 
+                                                        GTK_CMCLIST(summaryview->ctree)->rows - 1);
                if (node)
-                       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
+                       summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
        }
 
 }
@@ -4105,19 +4547,19 @@ void summary_move_to(SummaryView *summaryview)
            FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
        to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-                                        FOLDER_SEL_MOVE, NULL);
+                                        FOLDER_SEL_MOVE, NULL, FALSE);
        summary_move_selected_to(summaryview, to_folder);
 }
 
-static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
+static void summary_copy_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
                                FolderItem *to_folder)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        g_return_if_fail(to_folder != NULL);
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        procmsg_msginfo_set_to_folder(msginfo, to_folder);
        if (MSG_IS_DELETED(msginfo->flags))
@@ -4157,12 +4599,18 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
+       if (to_folder->no_select) {
+               alertpanel_error(_("The destination folder can only be used to "
+                                  "store subfolders."));
+               return;
+       }
+
        START_LONG_OPERATION(summaryview, FALSE);
 
-       for (cur = GTK_CLIST(summaryview->ctree)->selection;
+       for (cur = GTK_CMCLIST(summaryview->ctree)->selection;
             cur != NULL && cur->data != NULL; cur = cur->next)
                summary_copy_row_to
-                       (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+                       (summaryview, GTK_CMCTREE_NODE(cur->data), to_folder);
 
        END_LONG_OPERATION(summaryview);
 
@@ -4180,23 +4628,49 @@ void summary_copy_to(SummaryView *summaryview)
        if (!summaryview->folder_item) return;
 
        to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-                                        FOLDER_SEL_COPY, NULL);
+                                        FOLDER_SEL_COPY, NULL, FALSE);
        summary_copy_selected_to(summaryview, to_folder);
 }
 
 void summary_add_address(SummaryView *summaryview)
 {
-       MsgInfo *msginfo;
+       MsgInfo *msginfo, *full_msginfo;
        gchar *from;
+       GtkWidget *image = NULL;
+       GdkPixbuf *picture = NULL;
 
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+       msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
-       if (!msginfo) return;
+       if (!msginfo || !msginfo->from) 
+               return;
 
        Xstrdup_a(from, msginfo->from, return);
        eliminate_address_comment(from);
        extract_address(from);
-       addressbook_add_contact(msginfo->fromname, from, NULL);
+       
+       full_msginfo = procmsg_msginfo_get_full_info(msginfo);
+       if (full_msginfo &&
+           full_msginfo->extradata &&
+           full_msginfo->extradata->face) {
+               image = face_get_from_header(full_msginfo->extradata->face);
+       } 
+#if HAVE_LIBCOMPFACE
+       else if (full_msginfo &&
+                full_msginfo->extradata &&
+                full_msginfo->extradata->xface) {
+               image = xface_get_from_header(full_msginfo->extradata->xface,
+                               &summaryview->ctree->style->white,
+                               summaryview->mainwin->window->window);  
+       }
+#endif
+       procmsg_msginfo_free(full_msginfo);
+       if (image)
+               picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
+
+       addressbook_add_contact(msginfo->fromname, from, NULL, picture);
+
+       if (image)
+               gtk_widget_destroy(image);
 }
 
 void summary_select_all(SummaryView *summaryview)
@@ -4204,7 +4678,7 @@ void summary_select_all(SummaryView *summaryview)
        if (!summaryview->folder_item) return;
 
        summary_lock(summaryview);
-       gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
+       gtk_cmclist_select_all(GTK_CMCLIST(summaryview->ctree));
        summary_unlock(summaryview);
        summary_status_show(summaryview);
 }
@@ -4219,26 +4693,26 @@ void summary_unselect_all(SummaryView *summaryview)
 
 void summary_select_thread(SummaryView *summaryview, gboolean delete_thread)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node = NULL;
        gboolean froze = FALSE;
        GList *cur = NULL;
        GList *copy = NULL;
-       if (!GTK_CLIST(summaryview->ctree)->selection) 
+       if (!GTK_CMCLIST(summaryview->ctree)->selection) 
                return;
 
 
        START_LONG_OPERATION(summaryview, FALSE);
-       copy = g_list_copy(GTK_CLIST(summaryview->ctree)->selection);
+       copy = g_list_copy(GTK_CMCLIST(summaryview->ctree)->selection);
        for (cur = copy; cur != NULL && cur->data != NULL;
             cur = cur->next) {
-               node = GTK_CTREE_NODE(cur->data);
+               node = GTK_CMCTREE_NODE(cur->data);
                if (!node)
                        continue;
-               while (GTK_CTREE_ROW(node)->parent != NULL)
-                       node = GTK_CTREE_ROW(node)->parent;
+               while (GTK_CMCTREE_ROW(node)->parent != NULL)
+                       node = GTK_CMCTREE_ROW(node)->parent;
 
-               gtk_ctree_select_recursive(ctree, node);
+               gtk_cmctree_select_recursive(ctree, node);
        }
        g_list_free(copy);
        END_LONG_OPERATION(summaryview);
@@ -4254,7 +4728,7 @@ void summary_select_thread(SummaryView *summaryview, gboolean delete_thread)
 
 void summary_save_as(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gchar *filename = NULL;
        gchar *src, *dest;
@@ -4263,7 +4737,7 @@ void summary_save_as(SummaryView *summaryview)
        AlertValue aval = 0;
 
        if (!summaryview->selected) return;
-       msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
        if (!msginfo) return;
 
        if (msginfo->subject) {
@@ -4310,10 +4784,10 @@ void summary_save_as(SummaryView *summaryview)
         * If two or more msgs are selected,
         * append them to the output file.
         */
-       if (GTK_CLIST(ctree)->selection->next) {
+       if (GTK_CMCLIST(ctree)->selection->next) {
                GList *item;
-               for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) {
-                       msginfo = gtk_ctree_node_get_row_data(ctree, GTK_CTREE_NODE(item->data));
+               for (item = GTK_CMCLIST(ctree)->selection->next; item != NULL; item=item->next) {
+                       msginfo = gtk_cmctree_node_get_row_data(ctree, GTK_CMCTREE_NODE(item->data));
                        if (!msginfo) break;
                        src = procmsg_get_message_file(msginfo);
                        if (append_file(src, dest, TRUE) < 0)
@@ -4327,17 +4801,28 @@ void summary_save_as(SummaryView *summaryview)
 
 void summary_print(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
-#ifndef USE_GNOMEPRINT
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
+#if !GTK_CHECK_VERSION(2,10,0)
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gchar *cmdline = NULL;
        gchar *p;
 #endif
        GList *cur;
+       gchar *msg = g_strdup_printf(_("You are about to print %d "
+                                      "messages, one by one. Do you "
+                                      "want to continue?"), 
+                                      g_list_length(clist->selection));
+       if (g_list_length(clist->selection) > 9
+       &&  alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, "+" GTK_STOCK_YES, NULL)
+           != G_ALERTALTERNATE) {
+               g_free(msg);
+               return;
+       }
+       g_free(msg);
 
        if (clist->selection == NULL) return;
-#ifndef USE_GNOMEPRINT
+#if !GTK_CHECK_VERSION(2,10,0)
        cmdline = input_dialog(_("Print"),
                               _("Enter the print command line:\n"
                                 "('%s' will be replaced with file name)"),
@@ -4353,8 +4838,8 @@ void summary_print(SummaryView *summaryview)
        for (cur = clist->selection; 
             cur != NULL && cur->data != NULL; 
             cur = cur->next) {
-               msginfo = gtk_ctree_node_get_row_data
-                       (ctree, GTK_CTREE_NODE(cur->data));
+               msginfo = gtk_cmctree_node_get_row_data
+                       (ctree, GTK_CMCTREE_NODE(cur->data));
                if (msginfo) 
                        procmsg_print_message(msginfo, cmdline);
        }
@@ -4364,9 +4849,9 @@ void summary_print(SummaryView *summaryview)
        for (cur = clist->selection; 
             cur != NULL && cur->data != NULL; 
             cur = cur->next) {
-               GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
-               MsgInfo *msginfo = gtk_ctree_node_get_row_data(
-                                       GTK_CTREE(summaryview->ctree),
+               GtkCMCTreeNode *node = GTK_CMCTREE_NODE(cur->data);
+               MsgInfo *msginfo = gtk_cmctree_node_get_row_data(
+                                       GTK_CMCTREE(summaryview->ctree),
                                        node);
                gint sel_start = -1, sel_end = -1, partnum = 0;
                
@@ -4383,10 +4868,10 @@ void summary_print(SummaryView *summaryview)
 
 gboolean summary_execute(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
-       GtkCTreeNode *node, *next;
-       GtkCTreeNode *new_selected = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
+       GtkCMCTreeNode *node, *next;
+       GtkCMCTreeNode *new_selected = NULL;
        gint move_val = -1;
 
        if (!summaryview->folder_item) return FALSE;
@@ -4406,25 +4891,25 @@ gboolean summary_execute(SummaryView *summaryview)
        summary_execute_copy(summaryview);
        summary_execute_delete(summaryview);
        
-       node = GTK_CTREE_NODE(clist->row_list);
+       node = GTK_CMCTREE_NODE(clist->row_list);
        for (; node != NULL; node = next) {
                next = gtkut_ctree_node_next(ctree, node);
-               if (gtk_ctree_node_get_row_data(ctree, node) != NULL) continue;
+               if (gtk_cmctree_node_get_row_data(ctree, node) != NULL) continue;
 
                if (node == summaryview->displayed) {
                        messageview_clear(summaryview->messageview);
                        summaryview->displayed = NULL;
                }
-               if (GTK_CTREE_ROW(node)->children != NULL) {
+               if (GTK_CMCTREE_ROW(node)->children != NULL) {
                        next = NULL;
-                       if (GTK_CTREE_ROW(node)->sibling) {
-                               next = GTK_CTREE_ROW(node)->sibling;
+                       if (GTK_CMCTREE_ROW(node)->sibling) {
+                               next = GTK_CMCTREE_ROW(node)->sibling;
                        } else {
-                               GtkCTreeNode *parent = NULL;
-                               for (parent = GTK_CTREE_ROW(node)->parent; parent != NULL;
-                                    parent = GTK_CTREE_ROW(parent)->parent) {
-                                       if (GTK_CTREE_ROW(parent)->sibling) {
-                                               next = GTK_CTREE_ROW(parent)->sibling;
+                               GtkCMCTreeNode *parent = NULL;
+                               for (parent = GTK_CMCTREE_ROW(node)->parent; parent != NULL;
+                                    parent = GTK_CMCTREE_ROW(parent)->parent) {
+                                       if (GTK_CMCTREE_ROW(parent)->sibling) {
+                                               next = GTK_CMCTREE_ROW(parent)->sibling;
                                        }
                                }
                        }
@@ -4459,9 +4944,9 @@ gboolean summary_execute(SummaryView *summaryview)
        summary_thaw(summaryview);
 
        summaryview->selected = clist->selection ?
-               GTK_CTREE_NODE(clist->selection->data) : NULL;
+               GTK_CMCTREE_NODE(clist->selection->data) : NULL;
 
-       if (!GTK_CLIST(summaryview->ctree)->row_list) {
+       if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));
                gtk_widget_grab_focus(summaryview->folderview->ctree);
@@ -4471,7 +4956,7 @@ gboolean summary_execute(SummaryView *summaryview)
        summary_update_status(summaryview);
        summary_status_show(summaryview);
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+       gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
        summary_unlock(summaryview);
 
@@ -4484,11 +4969,11 @@ gboolean summary_execute(SummaryView *summaryview)
 
 static gint summary_execute_move(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GSList *cur;
        gint val = -1;
        /* search moving messages and execute */
-       gtk_ctree_pre_recursive(ctree, NULL, summary_execute_move_func,
+       gtk_cmctree_pre_recursive(ctree, NULL, summary_execute_move_func,
                                summaryview);
 
        if (summaryview->mlist) {
@@ -4508,7 +4993,7 @@ static gint summary_execute_move(SummaryView *summaryview)
        return 0;
 }
 
-static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_execute_move_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                      gpointer data)
 {
        SummaryView *summaryview = data;
@@ -4519,7 +5004,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_prepend(summaryview->mlist, msginfo);
-               gtk_ctree_node_set_row_data(ctree, node, NULL);
+               gtk_cmctree_node_set_row_data(ctree, node, NULL);
 
                if (msginfo->msgid && *msginfo->msgid &&
                    node == g_hash_table_lookup(summaryview->msgid_table,
@@ -4538,12 +5023,12 @@ static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 static void summary_execute_copy(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 
        /* search copying messages and execute */
        hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
                summaryview->msginfo_update_callback_id);
-       gtk_ctree_pre_recursive(ctree, NULL, summary_execute_copy_func,
+       gtk_cmctree_pre_recursive(ctree, NULL, summary_execute_copy_func,
                                summaryview);
 
        if (summaryview->mlist) {
@@ -4558,7 +5043,7 @@ static void summary_execute_copy(SummaryView *summaryview)
                        summary_update_msg, (gpointer) summaryview);
 }
 
-static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_execute_copy_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                      gpointer data)
 {
        SummaryView *summaryview = data;
@@ -4577,11 +5062,11 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 static void summary_execute_delete(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GSList *cur;
 
        /* search deleting messages and execute */
-       gtk_ctree_pre_recursive
+       gtk_cmctree_pre_recursive
                (ctree, NULL, summary_execute_delete_func, summaryview);
 
        if (!summaryview->mlist) return;
@@ -4602,7 +5087,7 @@ static void summary_execute_delete(SummaryView *summaryview)
        summaryview->mlist = NULL;
 }
 
-static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_execute_delete_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                        gpointer data)
 {
        SummaryView *summaryview = data;
@@ -4613,7 +5098,7 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
        if (msginfo && MSG_IS_DELETED(msginfo->flags)) {
                summaryview->mlist =
                        g_slist_prepend(summaryview->mlist, msginfo);
-               gtk_ctree_node_set_row_data(ctree, node, NULL);
+               gtk_cmctree_node_set_row_data(ctree, node, NULL);
 
                if (msginfo->msgid && *msginfo->msgid &&
                    node == g_hash_table_lookup(summaryview->msgid_table,
@@ -4633,12 +5118,12 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 /* thread functions */
 
-void summary_thread_build(SummaryView *summaryview)
+static void summary_thread_build(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
-       GtkCTreeNode *next;
-       GtkCTreeNode *parent;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
+       GtkCMCTreeNode *next;
+       GtkCMCTreeNode *parent;
        MsgInfo *msginfo;
         GSList *reflist;
 
@@ -4652,9 +5137,9 @@ void summary_thread_build(SummaryView *summaryview)
                                       G_CALLBACK(summary_tree_expanded), summaryview);
        summary_freeze(summaryview);
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
        while (node) {
-               next = GTK_CTREE_ROW(node)->sibling;
+               next = GTK_CMCTREE_ROW(node)->sibling;
 
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
@@ -4680,8 +5165,8 @@ void summary_thread_build(SummaryView *summaryview)
                                 msginfo->subject);
                }
 
-               if (parent && parent != node && parent != GTK_CTREE_ROW(node)->parent) {
-                       gtk_ctree_move(ctree, node, parent, NULL);
+               if (parent && parent != node && parent != GTK_CMCTREE_ROW(node)->parent) {
+                       gtk_cmctree_move(ctree, node, parent, NULL);
                }
 
                node = next;
@@ -4704,17 +5189,17 @@ void summary_thread_build(SummaryView *summaryview)
 
 static void summary_thread_init(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-       GtkCTreeNode *next;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
+       GtkCMCTreeNode *next;
        START_TIMING("");
        if (!summaryview->thread_collapsed) {
                g_signal_handlers_block_by_func(G_OBJECT(ctree),
                                       G_CALLBACK(summary_tree_expanded), summaryview);
                while (node) {
-                       next = GTK_CTREE_ROW(node)->sibling;
-                       if (GTK_CTREE_ROW(node)->children)
-                               gtk_ctree_expand_recursive(ctree, node);
+                       next = GTK_CMCTREE_ROW(node)->sibling;
+                       if (GTK_CMCTREE_ROW(node)->children)
+                               gtk_cmctree_expand_recursive(ctree, node);
                        node = next;
                }
                g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
@@ -4725,15 +5210,15 @@ static void summary_thread_init(SummaryView *summaryview)
 
 static void summary_unthread_for_exec(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        gboolean froze = FALSE;
 
        debug_print("Unthreading for execution...");
 
        START_LONG_OPERATION(summaryview, TRUE);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-            node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
+            node != NULL; node = GTK_CMCTREE_NODE_NEXT(node)) {
                summary_unthread_for_exec_func(ctree, node, summaryview);
        }
 
@@ -4742,13 +5227,13 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
        debug_print("done.\n");
 }
 
-static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_unthread_for_exec_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                           gpointer data)
 {
        MsgInfo *msginfo;
-       GtkCTreeNode *top_parent;
-       GtkCTreeNode *child;
-       GtkCTreeNode *sibling;
+       GtkCMCTreeNode *top_parent;
+       GtkCMCTreeNode *child;
+       GtkCMCTreeNode *sibling;
        SummaryView * summaryview = (SummaryView *)data;
        msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
@@ -4756,7 +5241,7 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
            (!MSG_IS_MOVE(msginfo->flags) &&
             !MSG_IS_DELETED(msginfo->flags)))
                return;
-       child = GTK_CTREE_ROW(node)->children;
+       child = GTK_CMCTREE_ROW(node)->children;
        if (!child) return;
 
        if (node == summaryview->selected)
@@ -4765,20 +5250,20 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
                summaryview->displayed = NULL;
 
        for (top_parent = node;
-            GTK_CTREE_ROW(top_parent)->parent != NULL;
-            top_parent = GTK_CTREE_ROW(top_parent)->parent)
+            GTK_CMCTREE_ROW(top_parent)->parent != NULL;
+            top_parent = GTK_CMCTREE_ROW(top_parent)->parent)
                ;
-       sibling = GTK_CTREE_ROW(top_parent)->sibling;
+       sibling = GTK_CMCTREE_ROW(top_parent)->sibling;
 
        GTK_SCTREE(ctree)->sorting = TRUE;
        while (child != NULL) {
-               GtkCTreeNode *next_child;
+               GtkCMCTreeNode *next_child;
                MsgInfo *cinfo = GTKUT_CTREE_NODE_GET_ROW_DATA(child);
                
-               next_child = GTK_CTREE_ROW(child)->sibling;
+               next_child = GTK_CMCTREE_ROW(child)->sibling;
                
                if (!MSG_IS_MOVE(cinfo->flags) && !MSG_IS_DELETED(cinfo->flags)) {
-                       gtk_ctree_move(ctree, child, 
+                       gtk_cmctree_move(ctree, child, 
                                NULL, 
                                sibling); 
                } else {
@@ -4798,19 +5283,19 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 void summary_expand_threads(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        g_signal_handlers_block_by_func(G_OBJECT(ctree),
                                       G_CALLBACK(summary_tree_expanded), summaryview);
        summary_freeze(summaryview);
 
        while (node) {
-               if (GTK_CTREE_ROW(node)->children) {
-                       gtk_ctree_expand(ctree, node);
+               if (GTK_CMCTREE_ROW(node)->children) {
+                       gtk_cmctree_expand(ctree, node);
                        summary_set_row_marks(summaryview, node);
                }
-               node = GTK_CTREE_NODE_NEXT(node);
+               node = GTK_CMCTREE_NODE_NEXT(node);
        }
 
        summary_thaw(summaryview);
@@ -4819,27 +5304,27 @@ void summary_expand_threads(SummaryView *summaryview)
 
        summaryview->thread_collapsed = FALSE;
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+       gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 }
 
 void summary_collapse_threads(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        summary_freeze(summaryview);
 
        while (node) {
-               if (GTK_CTREE_ROW(node)->children)
-                       gtk_ctree_collapse(ctree, node);
-               node = GTK_CTREE_ROW(node)->sibling;
+               if (GTK_CMCTREE_ROW(node)->children)
+                       gtk_cmctree_collapse(ctree, node);
+               node = GTK_CMCTREE_ROW(node)->sibling;
        }
 
        summary_thaw(summaryview);
        
        summaryview->thread_collapsed = TRUE;
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+       gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 }
 
 static void account_rules_radio_button_toggled_cb(GtkToggleButton *btn, gpointer data)
@@ -4938,7 +5423,7 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
        if (selected_only) {
                GList *cur;
 
-               for (cur = GTK_CLIST(summaryview->ctree)->selection;
+               for (cur = GTK_CMCLIST(summaryview->ctree)->selection;
                     cur != NULL && cur->data != NULL; cur = cur->next) {
                        mlist = g_slist_prepend(mlist, 
                                 procmsg_msginfo_new_ref(
@@ -4948,10 +5433,15 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
        } else {
                mlist = folder_item_get_msg_list(summaryview->folder_item);
        }
+       
+       folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
                summary_filter_func((MsgInfo *)cur_list->data);
        }
+       folder_item_set_batch(summaryview->folder_item, FALSE);
+       
        filtering_move_and_copy_msgs(mlist);
+       
        for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
                procmsg_msginfo_free((MsgInfo *)cur_list->data);
        }
@@ -5027,7 +5517,7 @@ void summary_filter_open(SummaryView *summaryview, PrefsFilterType type,
        
        if (!summaryview->selected) return;
 
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+       msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
        
@@ -5058,7 +5548,7 @@ static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
 
 /* summary_set_colorlabel_color() - labelcolor parameter is the color *flag*
  * for the messsage; not the color index */
-void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
+void summary_set_colorlabel_color(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                  guint labelcolor)
 {
        GdkColor color;
@@ -5066,12 +5556,12 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
        MsgInfo *msginfo;
        gint color_index;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, node);
        g_return_if_fail(msginfo);
 
        color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
        ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
-       prev_style = gtk_ctree_node_get_row_style(ctree, node);
+       prev_style = gtk_cmctree_node_get_row_style(ctree, node);
 
        if (color_index < 0 || color_index >= N_COLOR_LABELS) {
                if (!prev_style) return;
@@ -5094,16 +5584,16 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
                style->fg[GTK_STATE_SELECTED].blue  = (color.blue  + 3*ctree_style->fg[GTK_STATE_SELECTED].blue ) / 4;
        }
 
-       gtk_ctree_node_set_row_style(ctree, node, style);
-       gtk_style_unref(style);
+       gtk_cmctree_node_set_row_style(ctree, node, style);
+       g_object_unref(style);
 }
 
-static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
+static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCMCTreeNode *row, guint labelcolor)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
 
        summary_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0, 
@@ -5114,31 +5604,30 @@ static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *r
 void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
                            GtkWidget *widget)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_set_row_colorlabel(summaryview,
-                                          GTK_CTREE_NODE(cur->data), labelcolor);
+                                          GTK_CMCTREE_NODE(cur->data), labelcolor);
        END_LONG_OPERATION(summaryview);
 }
 
-static gboolean summary_set_row_tag(SummaryView *summaryview, GtkCTreeNode *row, gboolean refresh, gboolean set, gint id)
+static gboolean summary_set_row_tag(SummaryView *summaryview, GtkCMCTreeNode *row, gboolean refresh, gboolean set, gint id)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gchar *tags_str = NULL;
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_val_if_fail(msginfo, FALSE);
 
        procmsg_msginfo_update_tags(msginfo, set, id);
        
-       
        if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible) {
                tags_str = procmsg_msginfo_get_tags_str(msginfo);
-               gtk_ctree_node_set_text(ctree, row, 
+               gtk_cmctree_node_set_text(ctree, row, 
                                summaryview->col_pos[S_COL_TAGS],
                                tags_str?tags_str:"-");
                g_free(tags_str);
@@ -5154,17 +5643,22 @@ static gboolean summary_set_row_tag(SummaryView *summaryview, GtkCTreeNode *row,
 void summary_set_tag(SummaryView *summaryview, gint tag_id,
                            GtkWidget *widget)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean set = tag_id > 0;
        gint real_id = set? tag_id:-tag_id;
        gboolean froze = FALSE;
        gboolean redisplay = FALSE;
+
+       if (summary_is_locked(summaryview))
+               return;
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                redisplay |= summary_set_row_tag(summaryview,
-                                          GTK_CTREE_NODE(cur->data), FALSE, set, real_id);
+                                          GTK_CMCTREE_NODE(cur->data), FALSE, set, real_id);
        }
+       folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        if (redisplay)
                summary_redisplay_msg(summaryview);
@@ -5202,7 +5696,7 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
        summaryview = (SummaryView *)data;
        g_return_if_fail(summaryview != NULL);
 
-       sel = GTK_CLIST(summaryview->ctree)->selection;
+       sel = GTK_CMCLIST(summaryview->ctree)->selection;
        if (!sel) return;
 
        menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
@@ -5233,9 +5727,9 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
                        MsgInfo *msginfo;
                        gint clabel;
 
-                       msginfo = gtk_ctree_node_get_row_data
-                               (GTK_CTREE(summaryview->ctree),
-                                GTK_CTREE_NODE(sel->data));
+                       msginfo = gtk_cmctree_node_get_row_data
+                               (GTK_CMCTREE(summaryview->ctree),
+                                GTK_CMCTREE_NODE(sel->data));
                        if (msginfo) {
                                clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
                                if (!items[clabel]->active)
@@ -5257,9 +5751,9 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
        GtkWidget *menu;
        GtkWidget *item;
        gint i;
+       gchar *accel_path = NULL;
 
-       label_menuitem = gtk_item_factory_get_item(summaryview->popupfactory,
-                                                  "/Color label");
+       label_menuitem = gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/SummaryViewPopup/ColorLabel");
        g_signal_connect(G_OBJECT(label_menuitem), "activate",
                         G_CALLBACK(summary_colorlabel_menu_item_activate_item_cb),
                           summaryview);
@@ -5267,6 +5761,9 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
 
        menu = gtk_menu_new();
 
+       gtk_menu_set_accel_group (GTK_MENU (menu), 
+               gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager));
+
        /* create sub items. for the menu item activation callback we pass the
         * index of label_colors[] as data parameter. for the None color we
         * pass an invalid (high) value. also we attach a data pointer so we
@@ -5280,10 +5777,10 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
        g_object_set_data(G_OBJECT(item), "summaryview", summaryview);
        gtk_widget_show(item);
 
-       gtk_widget_add_accelerator(item, "activate", 
-                                  summaryview->popupfactory->accel_group, 
-                                  GDK_0, GDK_CONTROL_MASK,
-                                  GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
+       accel_path = g_strdup_printf("<ClawsColorLabels>/None");
+       gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+       g_free(accel_path);
+       gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
 
        item = gtk_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -5300,6 +5797,13 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
                g_object_set_data(G_OBJECT(item), "summaryview",
                                  summaryview);
                gtk_widget_show(item);
+               accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
+               gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+               if (i < 9)
+                       gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
+               g_free(accel_path);
+               g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager), 
+                       "accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
        }
 
        gtk_widget_show(menu);
@@ -5317,10 +5821,15 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                        g_direct_hash,
                                        g_direct_equal,
                                        NULL, NULL);
+       GHashTable *menu_allsel_table = g_hash_table_new_full(
+                                       g_direct_hash,
+                                       g_direct_equal,
+                                       NULL, NULL);
+       gint sel_len;
        SummaryView *summaryview = (SummaryView *)data;
        g_return_if_fail(summaryview != NULL);
 
-       sel = GTK_CLIST(summaryview->ctree)->selection;
+       sel = GTK_CMCLIST(summaryview->ctree)->selection;
        if (!sel) return;
 
        menu = GTK_MENU_SHELL(summaryview->tags_menu);
@@ -5340,46 +5849,73 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                (GTK_CHECK_MENU_ITEM(cur->data), FALSE);
                                
                        g_hash_table_insert(menu_table, GINT_TO_POINTER(id), GTK_CHECK_MENU_ITEM(cur->data));
+                       g_hash_table_insert(menu_allsel_table, GINT_TO_POINTER(id), GINT_TO_POINTER(0));
                }
        }
 
        /* iterate all messages and set the state of the appropriate
         * items */
+       sel_len = 0;
        for (; sel != NULL; sel = sel->next) {
                MsgInfo *msginfo;
                GSList *tags = NULL;
                gint id;
                GtkCheckMenuItem *item;
-               msginfo = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(summaryview->ctree),
-                        GTK_CTREE_NODE(sel->data));
+               msginfo = gtk_cmctree_node_get_row_data
+                       (GTK_CMCTREE(summaryview->ctree),
+                        GTK_CMCTREE_NODE(sel->data));
+               sel_len++;
                if (msginfo) {
                        tags =  msginfo->tags;
                        if (!tags)
                                continue;
 
                        for (; tags; tags = tags->next) {
+                               gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, tags->data));
                                id = GPOINTER_TO_INT(tags->data);
                                item = g_hash_table_lookup(menu_table, GINT_TO_POINTER(tags->data));
-                               if (item && !item->active)
+                               if (item && !item->active) {
                                        gtk_check_menu_item_set_active
                                                (item, TRUE);
+                               }
+                               num_checked++;
+                               g_hash_table_replace(menu_allsel_table, tags->data, GINT_TO_POINTER(num_checked));
                        }
                }
        }
 
+       for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+               if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
+                       gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
+                               "tag_id"));
+                       gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, GINT_TO_POINTER(id)));
+                       if (num_checked < sel_len && num_checked > 0)
+                               gtk_check_menu_item_set_inconsistent(GTK_CHECK_MENU_ITEM(cur->data), TRUE);
+                       else
+                               gtk_check_menu_item_set_inconsistent(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
+               }
+       }
        g_hash_table_destroy(menu_table);
+       g_hash_table_destroy(menu_allsel_table);
        /* reset "dont_toggle" state */
        g_object_set_data(G_OBJECT(menu), "dont_toggle",
                          GINT_TO_POINTER(0));
-
 }
 
-static void summary_tags_menu_item_new_tag_activate_cb(GtkWidget *widget,
+void summaryview_destroy(SummaryView *summaryview)
+{
+#ifndef G_OS_WIN32
+       if(summaryview->simplify_subject_preg) {
+               regfree(summaryview->simplify_subject_preg);
+               g_free(summaryview->simplify_subject_preg);
+               summaryview->simplify_subject_preg = NULL;
+       }
+#endif
+}
+static void summary_tags_menu_item_apply_tags_activate_cb(GtkWidget *widget,
                                                     gpointer data)
 {
        SummaryView *summaryview;
-       gint id;
 
        summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
        g_return_if_fail(summaryview != NULL);
@@ -5388,25 +5924,39 @@ static void summary_tags_menu_item_new_tag_activate_cb(GtkWidget *widget,
        if (g_object_get_data(G_OBJECT(summaryview->tags_menu),
                                "dont_toggle"))
                return;
+       
+       tag_apply_open(summary_get_selection(summaryview));     
+}
 
-       id = prefs_tags_create_new(summaryview->mainwin);
-       if (id != -1) {
-               summary_set_tag(summaryview, id, NULL);
-               main_window_reflect_tags_changes(mainwindow_get_mainwindow());
-       }
+static gint summary_tag_cmp_list(gconstpointer a, gconstpointer b)
+{
+       gint id_a = GPOINTER_TO_INT(a);
+       gint id_b = GPOINTER_TO_INT(b);
+       const gchar *tag_a = tags_get_tag(id_a);
+       const gchar *tag_b = tags_get_tag(id_b);
+       
+       if (tag_a == NULL)
+               return tag_b == NULL ? 0:1;
+       
+       if (tag_b == NULL)
+               return tag_a == NULL ? 0:1;
+
+       return g_utf8_collate(tag_a, tag_b);
 }
 
 static void summary_tags_menu_create(SummaryView *summaryview, gboolean refresh)
 {
+
        GtkWidget *label_menuitem;
        GtkWidget *menu;
        GtkWidget *item;
        GSList *cur = tags_get_list();
-       GSList *orig = cur;
+       GSList *orig = NULL;
        gboolean existing_tags = FALSE;
+       gchar *accel_path = NULL;
 
-       label_menuitem = gtk_item_factory_get_item(summaryview->popupfactory,
-                                                  "/Tags");
+       cur = orig = g_slist_sort(cur, summary_tag_cmp_list);
+       label_menuitem = gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/SummaryViewPopup/Tags");
        g_signal_connect(G_OBJECT(label_menuitem), "activate",
                         G_CALLBACK(summary_tags_menu_item_activate_item_cb),
                           summaryview);
@@ -5415,11 +5965,13 @@ static void summary_tags_menu_create(SummaryView *summaryview, gboolean refresh)
 
        menu = gtk_menu_new();
 
+       gtk_menu_set_accel_group (GTK_MENU (menu), 
+               gtk_ui_manager_get_accel_group(gtkut_ui_manager()));
+
        /* create tags menu items */
        for (; cur; cur = cur->next) {
                gint id = GPOINTER_TO_INT(cur->data);
                const gchar *tag = tags_get_tag(id);
-
                item = gtk_check_menu_item_new_with_label(tag);
                gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
                g_signal_connect(G_OBJECT(item), "activate",
@@ -5430,6 +5982,9 @@ static void summary_tags_menu_create(SummaryView *summaryview, gboolean refresh)
                g_object_set_data(G_OBJECT(item), "tag_id",
                                  GINT_TO_POINTER(id));
                gtk_widget_show(item);
+               accel_path = g_strconcat("<ClawsTags>/",tag, NULL);
+               gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+               g_free(accel_path);
                existing_tags = TRUE;
        }
        if (existing_tags) {
@@ -5438,14 +5993,19 @@ static void summary_tags_menu_create(SummaryView *summaryview, gboolean refresh)
                gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
                gtk_widget_show(item);
        }
-       item = gtk_menu_item_new_with_label(_("New tag..."));
+
+       item = gtk_menu_item_new_with_label(_("Apply tags..."));
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
        g_signal_connect(G_OBJECT(item), "activate",
-                        G_CALLBACK(summary_tags_menu_item_new_tag_activate_cb),
+                        G_CALLBACK(summary_tags_menu_item_apply_tags_activate_cb),
                         NULL);
        g_object_set_data(G_OBJECT(item), "summaryview",
                          summaryview);
        gtk_widget_show(item);
+       accel_path = g_strdup_printf("<ClawsTags>/ApplyTags");
+       gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+       g_free(accel_path);
+
        g_slist_free(orig);
        gtk_widget_show(menu);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
@@ -5457,11 +6017,147 @@ static gboolean summary_popup_menu(GtkWidget *widget, gpointer data)
        SummaryView *summaryview = (SummaryView *)data;
        summaryview->display_msg = messageview_is_visible(summaryview->messageview);
 
-       gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
-                      NULL, NULL, 0, gtk_get_current_event_time());
+       gtk_menu_popup(GTK_MENU(summaryview->popupmenu), 
+                      NULL, NULL, NULL, NULL, 
+                      3, gtk_get_current_event_time());
+
        return TRUE;
 }
 
+#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *info, gint column)
+{
+       MsgFlags flags;
+       if (!info)
+               return NULL;
+
+       flags = info->flags;
+
+       switch(summaryview->col_state[column].type) {
+               case S_COL_STATUS:
+                       if (MSG_IS_IGNORE_THREAD(flags)) {
+                               return _("Ignored thread");
+                       } else if (MSG_IS_WATCH_THREAD(flags)) {
+                               return _("Watched thread");
+                       } else if (MSG_IS_SPAM(flags)) {
+                               return _("Spam");
+                       } else if (MSG_IS_NEW(flags)) {
+                               return _("New");
+                       } else if (MSG_IS_UNREAD(flags)) {
+                               return _("Unread");
+                       } else if (MSG_IS_REPLIED(flags)) {
+                               return _("Replied - click to see reply");
+                       } else if (MSG_IS_FORWARDED(flags)) {
+                               return _("Forwarded");
+                       } else {
+                               return NULL;
+                       }
+               case S_COL_MARK:
+                       if (MSG_IS_DELETED(flags)) {
+                               return _("Deleted");
+                       } else if (MSG_IS_MARKED(flags)) {
+                               return _("Marked");
+                       } else if (MSG_IS_MOVE(flags)) {
+                               return _("To be moved");
+                       } else if (MSG_IS_COPY(flags)) {
+                               return _("To be copied");
+                       } else {
+                               return NULL;
+                       }
+               case S_COL_LOCKED:
+                       if (MSG_IS_LOCKED(flags)) {
+                               return _("Locked");
+                       } else {
+                               return NULL;
+                       }
+               case S_COL_MIME:
+                       if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
+                               return _("Signed, has attachment(s)");
+                       } else if (MSG_IS_SIGNED(flags)) {
+                               return _("Signed");
+                       } else if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_ENCRYPTED(flags)) {
+                               return _("Encrypted, has attachment(s)");
+                       } else if (MSG_IS_ENCRYPTED(flags)) {
+                               return _("Encrypted");
+                       } else if (MSG_IS_WITH_ATTACHMENT(flags)) {
+                               return _("Has attachment(s)");
+                       } else {
+                               return NULL;
+                       }
+               default:
+                       return NULL;
+       }
+}
+static gboolean tooltip_cb (GtkWidget  *widget,
+                            gint        x,
+                            gint        y,
+                            gboolean    keyboard_mode,
+                            GtkTooltip *tooltip,
+                            gpointer    user_data) 
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(widget);
+       SummaryView *summaryview = (SummaryView *)user_data;
+       gint row = -1, column = -1;
+       int offset = prefs_common.show_col_headers ? 24:0;
+       GtkCMCTreeNode *node = NULL;
+       gchar *text = NULL;
+       gchar *formatted = NULL;
+       MsgInfo *info = NULL;
+       GdkRectangle rect;
+       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+
+       if (!prefs_common.show_tooltips)
+               return FALSE;
+
+       if (y - offset < 0)
+               return FALSE;
+
+       if (!gtk_cmclist_get_selection_info(GTK_CMCLIST(ctree), x, y - offset,
+                                         &row, &column))
+               return FALSE;
+
+       if ((node = gtk_cmctree_node_nth(ctree, row)) == NULL)
+               return FALSE;
+
+       if ((info = gtk_cmctree_node_get_row_data(ctree, node)) == NULL)
+               return FALSE;
+
+       switch (gtk_cmctree_node_get_cell_type(ctree, node, column)) {
+               case GTK_CMCELL_TEXT:
+                       if (gtk_cmctree_node_get_text(ctree, node, column, &text) != TRUE)
+                               return FALSE;
+                       break;
+               case GTK_CMCELL_PIXTEXT:
+                       if (gtk_cmctree_node_get_pixtext(ctree, node, column, &text, 
+                               NULL, NULL, NULL) != TRUE)
+                               return FALSE;
+                       break;
+               default: 
+                       if ((text = summaryview_get_tooltip_text(summaryview, info, column)) == NULL)
+                               return FALSE;
+       }
+       
+       if (!text || !*text)
+               return FALSE;
+
+       formatted = g_strdup(text);
+       g_strstrip(formatted);
+
+       if (!vert)      
+               gtk_tooltip_set_text (tooltip, formatted);
+       else if (prefs_common.two_line_vert)
+               gtk_tooltip_set_markup (tooltip, formatted);
+       g_free(formatted);
+       
+       rect.x = x - 2;
+       rect.y = y - 2;
+       rect.width = 12;
+       rect.height= 12;        
+       gtk_tooltip_set_tip_area(tooltip, &rect);
+       
+       return TRUE;
+}
+#endif
 static GtkWidget *summary_ctree_create(SummaryView *summaryview)
 {
        GtkWidget *ctree;
@@ -5470,6 +6166,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gchar *titles[N_SUMMARY_COLS];
        SummaryColumnType type;
        gint pos;
+       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
 
        memset(titles, 0, sizeof(titles));
 
@@ -5485,72 +6182,88 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        ctree = gtk_sctree_new_with_titles
                (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
 
-       gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
+       /* get normal row height */
+       gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
+       normal_row_height = GTK_CMCLIST(ctree)->row_height;
+
+       if (prefs_common.show_col_headers == FALSE)
+               gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_EXTENDED);
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_MARK],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_STATUS],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_LOCKED],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MIME],
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_MIME],
                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_SIZE],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_NUMBER],
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_NUMBER],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_SCORE],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MARK],
-                                  SUMMARY_COL_MARK_WIDTH);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
-                                  SUMMARY_COL_STATUS_WIDTH);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
-                                  SUMMARY_COL_LOCKED_WIDTH);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
-                                  SUMMARY_COL_MIME_WIDTH);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SUBJECT],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_MARK],
+                                  prefs_common.summary_col_size[S_COL_MARK]);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_STATUS],
+                                  prefs_common.summary_col_size[S_COL_STATUS]);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_LOCKED],
+                                  prefs_common.summary_col_size[S_COL_LOCKED]);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_MIME],
+                                  prefs_common.summary_col_size[S_COL_MIME]);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_SUBJECT],
                                   prefs_common.summary_col_size[S_COL_SUBJECT]);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_FROM],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_FROM],
                                   prefs_common.summary_col_size[S_COL_FROM]);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_TO],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_TO],
                                   prefs_common.summary_col_size[S_COL_TO]);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_DATE],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_DATE],
                                   prefs_common.summary_col_size[S_COL_DATE]);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_SIZE],
                                   prefs_common.summary_col_size[S_COL_SIZE]);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_NUMBER],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_NUMBER],
                                   prefs_common.summary_col_size[S_COL_NUMBER]);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_SCORE],
                                   prefs_common.summary_col_size[S_COL_SCORE]);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_TAGS],
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_TAGS],
                                   prefs_common.summary_col_size[S_COL_TAGS]);
 
        if (prefs_common.enable_dotted_lines) {
-               gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
-               gtk_ctree_set_expander_style(GTK_CTREE(ctree),
-                                    GTK_CTREE_EXPANDER_SQUARE);
+               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
+               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+                                    GTK_CMCTREE_EXPANDER_SQUARE);
        } else {
-               gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
-               gtk_ctree_set_expander_style(GTK_CTREE(ctree),
-                                    GTK_CTREE_EXPANDER_TRIANGLE);
+               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+                                    GTK_CMCTREE_EXPANDER_TRIANGLE);
        }
 
        gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
 
-       gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
+       gtk_cmctree_set_indent(GTK_CMCTREE(ctree), 12);
        g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[pos].button,
                                       GTK_CAN_FOCUS);
-               gtk_clist_set_column_visibility
-                       (GTK_CLIST(ctree), pos, col_state[pos].visible);
+               if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
+                    (pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
+                    pos == summaryview->col_pos[S_COL_DATE]) && vert &&
+                           prefs_common.two_line_vert)
+                       gtk_cmclist_set_column_visibility
+                               (GTK_CMCLIST(ctree), pos, FALSE);
+               else
+                       gtk_cmclist_set_column_visibility
+                               (GTK_CMCLIST(ctree), pos, col_state[pos].visible);
        }
+       if (prefs_common.two_line_vert)
+               gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert);
 
        /* connect signal to the buttons for sorting */
 #define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
        g_signal_connect \
-               (G_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
+               (G_OBJECT(GTK_CMCLIST(ctree)->column[col_pos[col]].button), \
                 "clicked", \
                 G_CALLBACK(func), \
                 summaryview)
@@ -5567,7 +6280,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE,   summary_score_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_LOCKED,  summary_locked_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_TAGS,    summary_tags_clicked);
-
+       
 #undef CLIST_BUTTON_SIGNAL_CONNECT
 
        g_signal_connect(G_OBJECT(ctree), "tree_select_row",
@@ -5625,6 +6338,12 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                         G_CALLBACK(summary_drag_motion_cb),
                         summaryview);
 
+#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+       g_object_set (G_OBJECT(ctree), "has-tooltip", TRUE, NULL);
+       g_signal_connect(G_OBJECT(ctree), "query-tooltip", 
+                        G_CALLBACK(tooltip_cb),
+                       summaryview);
+#endif
        return ctree;
 }
 
@@ -5645,9 +6364,9 @@ void summary_set_column_order(SummaryView *summaryview)
        summary_set_fonts(summaryview);
        summary_set_column_titles(summaryview);
        gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->hadjustment);
+                                           GTK_CMCLIST(ctree)->hadjustment);
        gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->vadjustment);
+                                           GTK_CMCLIST(ctree)->vadjustment);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_widget_show(ctree);
 
@@ -5655,12 +6374,20 @@ void summary_set_column_order(SummaryView *summaryview)
 
        summary_select_by_msgnum(summaryview, selected_msgnum);
 
+       summaryview->selected = summary_find_msg_by_msgnum(summaryview, selected_msgnum);
        summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
        summaryview->last_displayed = summaryview->displayed;
        if (!summaryview->displayed)
                messageview_clear(summaryview->messageview);
        else
                summary_redisplay_msg(summaryview);
+
+       if (prefs_common.layout_mode == VERTICAL_LAYOUT &&
+           prefs_common.two_line_vert) {
+               gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 2*normal_row_height + 2);           
+       } else {
+               gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 0);         
+       }
 }
 
 
@@ -5683,7 +6410,7 @@ static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
                summary_toggle_view(summaryview);
        return TRUE;
 }
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
 static void summary_toggle_multiple_pressed(GtkWidget *widget,
                                   SummaryView *summaryview)
 {
@@ -5699,6 +6426,7 @@ static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        if (event->button == 3) {
                summaryview->display_msg = messageview_is_visible(summaryview->messageview);
                /* right clicked */
+               cm_menu_set_sensitive("SummaryViewPopup/Trash", !folder_has_parent_of_type(summaryview->folder_item, F_TRASH));
                gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
                               NULL, NULL, event->button, event->time);
        } else if (event->button == 2) {
@@ -5720,7 +6448,10 @@ static gboolean summary_button_released(GtkWidget *ctree, GdkEventButton *event,
 
 gboolean summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 {
-       return summary_key_pressed(summaryview->ctree, event, summaryview);
+       if (summary_is_list(summaryview))
+               return summary_key_pressed(summaryview->ctree, event, summaryview);
+       else
+               return FALSE;
 }
 
 #define BREAK_ON_MODIFIER_KEY() \
@@ -5729,8 +6460,8 @@ gboolean summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *eve
 static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                    SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(widget);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(widget);
+       GtkCMCTreeNode *node;
        MessageView *messageview;
        TextView *textview;
        GtkAdjustment *adj;
@@ -5753,8 +6484,10 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                switch (event->keyval) {
                case GDK_space:         /* Page down or go to the next */
                        handled = TRUE;
-                       if (event->state & GDK_CONTROL_MASK) 
-                               event->state &= ~GDK_CONTROL_MASK;
+                       if (event->state & GDK_CONTROL_MASK) {
+                               handled = FALSE;
+                               break;
+                       }
                        if (event->state & GDK_SHIFT_MASK) 
                                mimeview_scroll_page(messageview->mimeview, TRUE);
                        else {
@@ -5780,8 +6513,12 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                case GDK_KP_Enter:
                        handled = TRUE;
                        if (summaryview->displayed != summaryview->selected) {
+#ifndef GENERIC_UMPC
                                summary_display_msg(summaryview,
                                                    summaryview->selected);
+#else
+                               summary_open_row(NULL, summaryview);
+#endif
                                break;
                        }
                        mimeview_scroll_one_line(messageview->mimeview, mod_pressed);
@@ -5808,18 +6545,18 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_Home:
        case GDK_End:
                if ((node = summaryview->selected) != NULL) {
-                       GtkCTreeNode *next = NULL;
+                       GtkCMCTreeNode *next = NULL;
                        next = (event->keyval == GDK_Home)
-                                       ? gtk_ctree_node_nth(ctree, 0)
-                                       : gtk_ctree_node_nth(ctree, 
-                                               g_list_length(GTK_CLIST(ctree)->row_list)-1);
+                                       ? gtk_cmctree_node_nth(ctree, 0)
+                                       : gtk_cmctree_node_nth(ctree, 
+                                               g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
                        if (next) {
                                gtk_sctree_select_with_state
                                        (GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );
 
                                /* 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);
+                               if (gtk_cmctree_node_is_visible(GTK_CMCTREE(ctree), next) != GTK_VISIBILITY_FULL)
+                                       gtk_cmctree_node_moveto(GTK_CMCTREE(ctree), next, 0, 0, 0);
                                summaryview->selected = next;
                        }
                }
@@ -5829,7 +6566,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 
        if (!summaryview->selected) {
-               node = gtk_ctree_node_nth(ctree, 0);
+               node = gtk_cmctree_node_nth(ctree, 0);
                if (node)
                        gtk_sctree_select(GTK_SCTREE(ctree), node);
                else
@@ -5844,6 +6581,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_y:
        case GDK_t:
        case GDK_l:
+       case GDK_o:
        case GDK_c:
        case GDK_a:
                if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
@@ -5903,27 +6641,27 @@ void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
        summaryview->display_msg = FALSE;
 }
 
-static void summary_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_tree_expanded(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                  SummaryView *summaryview)
 {
        summary_set_row_marks(summaryview, node);
        if (prefs_common.bold_unread) {
                while (node) {
-                       GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
-                       if (GTK_CTREE_ROW(node)->children)
+                       GtkCMCTreeNode *next = GTK_CMCTREE_NODE_NEXT(node);
+                       if (GTK_CMCTREE_ROW(node)->children)
                                summary_set_row_marks(summaryview, node);
                        node = next;
                }
        }
 }
 
-static void summary_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_tree_collapsed(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                   SummaryView *summaryview)
 {
        summary_set_row_marks(summaryview, node);
 }
 
-static void summary_unselected(GtkCTree *ctree, GtkCTreeNode *row,
+static void summary_unselected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
                               gint column, SummaryView *summaryview)
 {
        if (summary_is_locked(summaryview)
@@ -5934,7 +6672,7 @@ static void summary_unselected(GtkCTree *ctree, GtkCTreeNode *row,
        summary_status_show(summaryview);
 }
 
-static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
+static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
                             gint column, SummaryView *summaryview)
 {
        MsgInfo *msginfo;
@@ -5965,8 +6703,8 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        summary_status_show(summaryview);
 
-       if (GTK_CLIST(ctree)->selection &&
-           GTK_CLIST(ctree)->selection->next) {
+       if (GTK_CMCLIST(ctree)->selection &&
+           GTK_CMCLIST(ctree)->selection->next) {
                summaryview->display_msg = FALSE;
                summary_set_menu_sensitive(summaryview);
                toolbar_main_set_sensitive(summaryview->mainwin);
@@ -5975,7 +6713,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        summaryview->selected = row;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo != NULL);
 
        main_create_mailing_list_menu (summaryview->mainwin, msginfo);
@@ -5990,8 +6728,10 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                    !MSG_IS_COPY(msginfo->flags)) {
                        if (MSG_IS_MARKED(msginfo->flags)) {
                                summary_unmark_row(summaryview, row);
+                               summary_status_show(summaryview);
                        } else {
                                summary_mark_row(summaryview, row);
+                               summary_status_show(summaryview);
                        }
                }
                break;
@@ -6014,11 +6754,13 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                break;
        case S_COL_LOCKED:
                if (MSG_IS_LOCKED(msginfo->flags)) {
-                       summary_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
-                       summary_set_row_marks(summaryview, row);
+                       summary_unlock_row(summaryview, row);
+                       summary_status_show(summaryview);
                }
-               else
+               else {
                        summary_lock_row(summaryview, row);
+                       summary_status_show(summaryview);
+               }
                break;
        default:
                break;
@@ -6047,7 +6789,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        toolbar_main_set_sensitive(summaryview->mainwin);
 }
 
-static void summary_col_resized(GtkCList *clist, gint column, gint width,
+static void summary_col_resized(GtkCMCList *clist, gint column, gint width,
                                SummaryView *summaryview)
 {
        SummaryColumnType type = summaryview->col_state[column].type;
@@ -6070,15 +6812,15 @@ GSList *summary_get_selection(SummaryView *summaryview)
        
        g_return_val_if_fail(summaryview != NULL, NULL);
 
-       sel = GTK_CLIST(summaryview->ctree)->selection;
+       sel = GTK_CMCLIST(summaryview->ctree)->selection;
 
        g_return_val_if_fail(sel != NULL, NULL);
 
        for ( ; sel != NULL; sel = sel->next)
                msginfo_list = 
                        g_slist_prepend(msginfo_list, 
-                                      gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                                                  GTK_CTREE_NODE(sel->data)));
+                                      gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
+                                                                  GTK_CMCTREE_NODE(sel->data)));
        return g_slist_reverse(msginfo_list);
 }
 
@@ -6095,14 +6837,17 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
        compose_reply_from_messageview(msgview, msginfo_list, action);
        g_slist_free(msginfo_list);
 }
-
+#ifndef GENERIC_UMPC
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
+       GtkWidget *menuitem = gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/SummaryViewPopup/View/AllHeaders");
+       if (!menuitem)
+               return;
        summaryview->messageview->all_headers =
-                       GTK_CHECK_MENU_ITEM(widget)->active;
+                       GTK_CHECK_MENU_ITEM(menuitem)->active;
        summary_display_msg_selected(summaryview,
-                                    GTK_CHECK_MENU_ITEM(widget)->active);
+                                    GTK_CHECK_MENU_ITEM(menuitem)->active);
 }
 
 static void summary_add_address_cb(SummaryView *summaryview,
@@ -6110,23 +6855,23 @@ static void summary_add_address_cb(SummaryView *summaryview,
 {
        summary_add_address(summaryview);
 }
-
+#endif
 static void summary_create_filter_cb(SummaryView *summaryview,
                                     guint action, GtkWidget *widget)
 {
        summary_filter_open(summaryview, (PrefsFilterType)action, 0);
 }
-
+#ifndef GENERIC_UMPC
 static void summary_create_processing_cb(SummaryView *summaryview,
                                         guint action, GtkWidget *widget)
 {
        summary_filter_open(summaryview, (PrefsFilterType)action, 1);
 }
-
+#endif
 static void summary_sort_by_column_click(SummaryView *summaryview,
                                         FolderSortKey sort_key)
 {
-       GtkCTreeNode *node = NULL;
+       GtkCMCTreeNode *node = NULL;
        START_TIMING("");
        if (summaryview->sort_key == sort_key)
                summary_sort(summaryview, sort_key,
@@ -6135,13 +6880,13 @@ static void summary_sort_by_column_click(SummaryView *summaryview,
        else
                summary_sort(summaryview, sort_key, SORT_ASCENDING);
 
-       node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(summaryview->ctree)->row_list);
 
        summary_freeze(summaryview);
        if (prefs_common.bold_unread) {
                while (node) {
-                       GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
-                       if (GTK_CTREE_ROW(node)->children)
+                       GtkCMCTreeNode *next = GTK_CMCTREE_NODE_NEXT(node);
+                       if (GTK_CMCTREE_ROW(node)->children)
                                summary_set_row_marks(summaryview, node);
                        node = next;
                }
@@ -6228,6 +6973,7 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
        g_return_if_fail(summaryview != NULL);
        g_return_if_fail(summaryview->folder_item != NULL);
        g_return_if_fail(summaryview->folder_item->folder != NULL);
+
        if (summaryview->selected == NULL) return;
 
        context = gtk_drag_begin(widget, summaryview->target_list,
@@ -6265,15 +7011,15 @@ static void summary_drag_data_get(GtkWidget        *widget,
                                  SummaryView      *summaryview)
 {
        if (info == TARGET_MAIL_URI_LIST) {
-               GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+               GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
                GList *cur;
                MsgInfo *msginfo;
                gchar *mail_list = NULL, *tmp1, *tmp2;
 
-               for (cur = GTK_CLIST(ctree)->selection;
+               for (cur = GTK_CMCLIST(ctree)->selection;
                     cur != NULL && cur->data != NULL; cur = cur->next) {
-                       msginfo = gtk_ctree_node_get_row_data
-                               (ctree, GTK_CTREE_NODE(cur->data));
+                       msginfo = gtk_cmctree_node_get_row_data
+                               (ctree, GTK_CMCTREE_NODE(cur->data));
                        tmp2 = procmsg_get_message_file(msginfo);
                        if (!tmp2) continue;
                        if (msginfo->subject) {
@@ -6293,8 +7039,11 @@ static void summary_drag_data_get(GtkWidget        *widget,
                                        tmp2 = dest;
                                }
                        } 
-                       tmp1 = g_strconcat("file://", tmp2, "\r\n", NULL);
+                       tmp1 = g_filename_to_uri(tmp2, NULL, NULL);
                        g_free(tmp2);
+                       tmp2 = g_strconcat(tmp1, "\r\n", NULL);
+                       g_free(tmp1);
+                       tmp1 = tmp2;
 
                        if (!mail_list) {
                                mail_list = tmp1;
@@ -6313,7 +7062,7 @@ static void summary_drag_data_get(GtkWidget        *widget,
                        g_free(mail_list);
                } 
        } else if (info == TARGET_DUMMY) {
-               if (GTK_CLIST(summaryview->ctree)->selection)
+               if (GTK_CMCLIST(summaryview->ctree)->selection)
                        gtk_selection_data_set(selection_data,
                                               selection_data->target, 8,
                                               "Dummy-Summaryview", 
@@ -6372,16 +7121,31 @@ static void summary_drag_data_received(GtkWidget        *widget,
 
 /* custom compare functions for sorting */
 
+static gint summary_cmp_by_date(GtkCMCList *clist,
+                     gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
+       gint res;
+       if (!msginfo1 || !msginfo2)
+               return -1;
+
+       res = (msginfo1->date_t - msginfo2->date_t);
+       return res;
+}
+
 #define CMP_FUNC_DEF(func_name, val)                                    \
-static gint func_name(GtkCList *clist,                                  \
+static gint func_name(GtkCMCList *clist,                                \
                      gconstpointer ptr1, gconstpointer ptr2)            \
 {                                                                       \
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;                 \
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;                 \
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;               \
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;               \
+       gint res;                                                        \
        if (!msginfo1 || !msginfo2)                                      \
                return -1;                                               \
                                                                         \
-       return (val);                                                    \
+       res = (val);                                                     \
+       return (res != 0) ? res:summary_cmp_by_date(clist, ptr1, ptr2);  \
 }
 
 CMP_FUNC_DEF(summary_cmp_by_mark,
@@ -6399,38 +7163,60 @@ CMP_FUNC_DEF(summary_cmp_by_locked,
 
 CMP_FUNC_DEF(summary_cmp_by_num, msginfo1->msgnum - msginfo2->msgnum)
 CMP_FUNC_DEF(summary_cmp_by_size, msginfo1->size - msginfo2->size)
-CMP_FUNC_DEF(summary_cmp_by_date, msginfo1->date_t - msginfo2->date_t)
 
 #undef CMP_FUNC_DEF
 
-static gint summary_cmp_by_subject(GtkCList *clist,
+static gint summary_cmp_by_subject(GtkCMCList *clist,
                                   gconstpointer ptr1,
                                   gconstpointer ptr2)
 {
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
+       gint res;
 
        if (!msginfo1->subject)
                return (msginfo2->subject != NULL);
        if (!msginfo2->subject)
                return -1;
 
-       return subject_compare_for_sort
+       res = subject_compare_for_sort
                (msginfo1->subject, msginfo2->subject);
+       return (res != 0)? res: summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
-static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
+static gint summary_cmp_by_thread_date(GtkCMCList *clist,
+                                  gconstpointer ptr1,
+                                  gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
+       gint thread_diff = msginfo1->thread_date - msginfo2->thread_date;
+       
+       if (msginfo1->thread_date > 0 && msginfo2->thread_date > 0)
+               return thread_diff;
+       else 
+               return msginfo1->date_t - msginfo2->date_t;
+}
+
+static gint summary_cmp_by_from(GtkCMCList *clist, gconstpointer ptr1,
                                gconstpointer ptr2)
 {
        const gchar *str1, *str2;
-       const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
-       const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+       const GtkCMCListRow *r1 = (const GtkCMCListRow *) ptr1;
+       const GtkCMCListRow *r2 = (const GtkCMCListRow *) ptr2;
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
        const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
-       
+       gint res;
+
        g_return_val_if_fail(sv, -1);
-       
-       str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_FROM]])->text;
-       str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_FROM]])->text;
+       if (sv->col_state[sv->col_pos[S_COL_FROM]].visible) {
+               str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_FROM]])->text;
+               str2 = GTK_CMCELL_TEXT(r2->cell[sv->col_pos[S_COL_FROM]])->text;
+       } else {
+               str1 = msginfo1->from;
+               str2 = msginfo2->from;
+       }
 
        if (!str1)
                return str2 != NULL;
@@ -6438,21 +7224,29 @@ static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
        if (!str2)
                return -1;
  
-       return g_utf8_collate(str1, str2);
+       res = g_utf8_collate(str1, str2);
+       return (res != 0)? res: summary_cmp_by_date(clist, ptr1, ptr2);
 }
  
-static gint summary_cmp_by_to(GtkCList *clist, gconstpointer ptr1,
+static gint summary_cmp_by_to(GtkCMCList *clist, gconstpointer ptr1,
                                gconstpointer ptr2)
 {
        const gchar *str1, *str2;
-       const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
-       const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+       const GtkCMCListRow *r1 = (const GtkCMCListRow *) ptr1;
+       const GtkCMCListRow *r2 = (const GtkCMCListRow *) ptr2;
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
        const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
-       
+       gint res;
        g_return_val_if_fail(sv, -1);
        
-       str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_TO]])->text;
-       str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_TO]])->text;
+       if (sv->col_state[sv->col_pos[S_COL_TO]].visible) {
+               str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_TO]])->text;
+               str2 = GTK_CMCELL_TEXT(r2->cell[sv->col_pos[S_COL_TO]])->text;
+       } else {
+               str1 = msginfo1->to;
+               str2 = msginfo2->to;
+       }
 
        if (!str1)
                return str2 != NULL;
@@ -6460,47 +7254,68 @@ static gint summary_cmp_by_to(GtkCList *clist, gconstpointer ptr1,
        if (!str2)
                return -1;
  
-       return g_utf8_collate(str1, str2);
+       res = g_utf8_collate(str1, str2);
+       return (res != 0)? res: summary_cmp_by_date(clist, ptr1, ptr2);
 }
  
-static gint summary_cmp_by_tags(GtkCList *clist, gconstpointer ptr1,
+static gint summary_cmp_by_tags(GtkCMCList *clist, gconstpointer ptr1,
                                gconstpointer ptr2)
 {
-       const gchar *str1, *str2;
-       const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
-       const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+       gchar *str1, *str2;
+       const GtkCMCListRow *r1 = (const GtkCMCListRow *) ptr1;
+       const GtkCMCListRow *r2 = (const GtkCMCListRow *) ptr2;
        const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
-       
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
+       gint res;
        g_return_val_if_fail(sv, -1);
        
-       str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_TAGS]])->text;
-       str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_TAGS]])->text;
+       if (sv->col_state[sv->col_pos[S_COL_TAGS]].visible) {
+               str1 = g_strdup(GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_TAGS]])->text);
+               str2 = g_strdup(GTK_CMCELL_TEXT(r2->cell[sv->col_pos[S_COL_TAGS]])->text);
+       } else {
+               str1 = procmsg_msginfo_get_tags_str(msginfo1);
+               str2 = procmsg_msginfo_get_tags_str(msginfo2);
+       }
 
-       if (!str1)
-               return str2 != NULL;
-       if (!str2)
+       if (!str1) {
+               res = (str2 != NULL);
+               g_free(str2);
+               return res;
+       }
+       if (!str2) {
+               g_free(str1);
                return -1;
+       }
  
-       return g_utf8_collate(str1, str2);
+       res = g_utf8_collate(str1, str2);
+       g_free(str1);
+       g_free(str2);
+       return (res != 0)? res: summary_cmp_by_date(clist, ptr1, ptr2);
 }
  
 static gint summary_cmp_by_simplified_subject
-       (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
+       (GtkCMCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
        const FolderItemPrefs *prefs;
        const gchar *str1, *str2;
-       const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
-       const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+       const GtkCMCListRow *r1 = (const GtkCMCListRow *) ptr1;
+       const GtkCMCListRow *r2 = (const GtkCMCListRow *) ptr2;
        const MsgInfo *msginfo1 = r1->data;
        const MsgInfo *msginfo2 = r2->data;
        const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
-       
+       gint res;
+
        g_return_val_if_fail(sv, -1);
        g_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
        
-       str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_SUBJECT]])->text;
-       str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_SUBJECT]])->text;
+       if (sv->col_state[sv->col_pos[S_COL_SUBJECT]].visible) {
+               str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_SUBJECT]])->text;
+               str2 = GTK_CMCELL_TEXT(r2->cell[sv->col_pos[S_COL_SUBJECT]])->text;
+       } else {
+               str1 = msginfo1->subject;
+               str2 = msginfo2->subject;
+       }
 
        if (!str1)
                return str2 != NULL;
@@ -6514,14 +7329,15 @@ static gint summary_cmp_by_simplified_subject
        if (!prefs)
                return -1;
        
-       return subject_compare_for_sort(str1, str2);
+       res = subject_compare_for_sort(str1, str2);
+       return (res != 0)? res: summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
-static gint summary_cmp_by_score(GtkCList *clist,
+static gint summary_cmp_by_score(GtkCMCList *clist,
                                 gconstpointer ptr1, gconstpointer ptr2)
 {
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+       MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
        int diff;
 
        /* if score are equal, sort by date */
@@ -6533,14 +7349,15 @@ static gint summary_cmp_by_score(GtkCList *clist,
                return summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
-static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+static void summary_ignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
 
+       summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
        summary_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
 
        summary_set_row_marks(summaryview, row);
@@ -6550,14 +7367,14 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
 
 void summary_ignore_thread(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
-                                       GTK_CTREE_FUNC(summary_ignore_thread_func), 
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data), 
+                                       GTK_CMCTREE_FUNC(summary_ignore_thread_func), 
                                        summaryview);
 
        END_LONG_OPERATION(summaryview);
@@ -6565,12 +7382,12 @@ void summary_ignore_thread(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
-static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+static void summary_unignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
 
        summary_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
@@ -6582,14 +7399,14 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
 
 void summary_unignore_thread(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
-                                       GTK_CTREE_FUNC(summary_unignore_thread_func), 
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data), 
+                                       GTK_CMCTREE_FUNC(summary_unignore_thread_func), 
                                        summaryview);
 
        END_LONG_OPERATION(summaryview);
@@ -6598,27 +7415,27 @@ void summary_unignore_thread(SummaryView *summaryview)
 }
 
 static void summary_check_ignore_thread_func
-               (GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+               (GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
 {
        MsgInfo *msginfo;
        gint *found_ignore = (gint *) data;
 
        if (*found_ignore) return;
        else {
-               msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, row);
                *found_ignore = msginfo && MSG_IS_IGNORE_THREAD(msginfo->flags);
        }               
 }
 
 void summary_toggle_ignore_thread(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gint found_ignore = 0;
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
-                                       GTK_CTREE_FUNC(summary_check_ignore_thread_func),
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data),
+                                       GTK_CMCTREE_FUNC(summary_check_ignore_thread_func),
                                        &found_ignore);
 
        if (found_ignore) 
@@ -6627,6 +7444,100 @@ void summary_toggle_ignore_thread(SummaryView *summaryview)
                summary_ignore_thread(summaryview);
 }
 
+static void summary_watch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *) data;
+       MsgInfo *msginfo;
+
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
+       g_return_if_fail(msginfo);
+
+       summary_msginfo_change_flags(msginfo, MSG_WATCH_THREAD, 0, MSG_IGNORE_THREAD, 0);
+
+       summary_set_row_marks(summaryview, row);
+       debug_print("Message %d is marked as watch thread\n",
+           msginfo->msgnum);
+}
+
+void summary_watch_thread(SummaryView *summaryview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GList *cur;
+       gboolean froze = FALSE;
+
+       START_LONG_OPERATION(summaryview, FALSE);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data), 
+                                       GTK_CMCTREE_FUNC(summary_watch_thread_func), 
+                                       summaryview);
+
+       END_LONG_OPERATION(summaryview);
+
+       summary_status_show(summaryview);
+}
+
+static void summary_unwatch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *) data;
+       MsgInfo *msginfo;
+
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
+       g_return_if_fail(msginfo);
+
+       summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
+
+       summary_set_row_marks(summaryview, row);
+       debug_print("Message %d is marked as unwatch thread\n",
+           msginfo->msgnum);
+}
+
+void summary_unwatch_thread(SummaryView *summaryview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GList *cur;
+       gboolean froze = FALSE;
+
+       START_LONG_OPERATION(summaryview, FALSE);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data), 
+                                       GTK_CMCTREE_FUNC(summary_unwatch_thread_func), 
+                                       summaryview);
+
+       END_LONG_OPERATION(summaryview);
+
+       summary_status_show(summaryview);
+}
+
+static void summary_check_watch_thread_func
+               (GtkCMCTree *ctree, GtkCMCTreeNode *row, gpointer data)
+{
+       MsgInfo *msginfo;
+       gint *found_watch = (gint *) data;
+
+       if (*found_watch) return;
+       else {
+               msginfo = gtk_cmctree_node_get_row_data(ctree, row);
+               *found_watch = msginfo && MSG_IS_WATCH_THREAD(msginfo->flags);
+       }               
+}
+
+void summary_toggle_watch_thread(SummaryView *summaryview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GList *cur;
+       gint found_watch = 0;
+
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               gtk_cmctree_pre_recursive(ctree, GTK_CMCTREE_NODE(cur->data),
+                                       GTK_CMCTREE_FUNC(summary_check_watch_thread_func),
+                                       &found_watch);
+
+       if (found_watch) 
+               summary_unwatch_thread(summaryview);
+       else 
+               summary_watch_thread(summaryview);
+}
+
 void summary_toggle_show_read_messages(SummaryView *summaryview)
 {
        FolderItemUpdateData source;
@@ -6646,9 +7557,8 @@ static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
                                             guint action)
 {
        GtkWidget *widget;
-       widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
-                                          "/View/Hide read messages");
+
+       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadMessages");
        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);
@@ -6670,8 +7580,10 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm, &clipxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm, &lockedxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm, &watchthreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY_SIGN, &keysignxpm, &keysignxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm, &clipgpgsignedxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm, &spamxpmmask);
@@ -6687,7 +7599,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        gtk_widget_show(pixmap);
        summaryview->quick_search_pixmap = pixmap;
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
        gtk_container_remove (GTK_CONTAINER(summaryview->multiple_sel_togbtn), 
                              summaryview->multiple_sel_image);
@@ -6712,7 +7624,7 @@ void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
-               gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+               gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
        summary_colorlabel_menu_create(summaryview, TRUE);
 }
@@ -6722,14 +7634,14 @@ void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
  */
 void summary_harvest_address(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE( summaryview->ctree );
+       GtkCMCTree *ctree = GTK_CMCTREE( summaryview->ctree );
        GList *cur;
        GList *msgList;
        MsgInfo *msginfo;
 
        msgList = NULL;
-       for( cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next ) {
-               msginfo = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(cur->data) );
+       for( cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next ) {
+               msginfo = gtk_cmctree_node_get_row_data( ctree, GTK_CMCTREE_NODE(cur->data) );
                if (!msginfo)
                        continue;
                msgList = g_list_append( msgList, GUINT_TO_POINTER( msginfo->msgnum ) );
@@ -6738,6 +7650,7 @@ void summary_harvest_address(SummaryView *summaryview)
        g_list_free( msgList );
 }
 
+#ifndef G_OS_WIN32
 static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
 {
        int err;
@@ -6757,7 +7670,7 @@ static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
        
        return preg;
 }
-
+#endif
 void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *item)
 {
        FolderSortKey sort_key;
@@ -6766,6 +7679,7 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
        g_return_if_fail(item != NULL);
 
        /* Subject simplification */
+#ifndef G_OS_WIN32
        if(summaryview->simplify_subject_preg) {
                regfree(summaryview->simplify_subject_preg);
                g_free(summaryview->simplify_subject_preg);
@@ -6774,7 +7688,7 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
        if(item->prefs && item->prefs->simplify_subject_regexp && 
           item->prefs->simplify_subject_regexp[0] && item->prefs->enable_simplify_subject)
                summaryview->simplify_subject_preg = summary_compile_simplify_regexp(item->prefs->simplify_subject_regexp);
-
+#endif
        /* Sorting */
        sort_key = item->sort_key;
        sort_type = item->sort_type;
@@ -6806,7 +7720,7 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
 {
        MsgInfoUpdate *msginfo_update = (MsgInfoUpdate *) source;
        SummaryView *summaryview = (SummaryView *)data;
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        g_return_val_if_fail(msginfo_update != NULL, TRUE);
        g_return_val_if_fail(summaryview != NULL, FALSE);
@@ -6815,8 +7729,8 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
                return FALSE;
 
        if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
-               node = gtk_ctree_find_by_row_data(
-                               GTK_CTREE(summaryview->ctree), NULL, 
+               node = gtk_cmctree_find_by_row_data(
+                               GTK_CMCTREE(summaryview->ctree), NULL, 
                                msginfo_update->msginfo);
 
                if (node) 
@@ -6829,19 +7743,24 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
 void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
 {
        guint new, unread, unreadmarked, marked, total;
+       guint replied, forwarded, locked, ignored, watched;
        static gboolean tips_initialized = FALSE;
+#if !(GTK_CHECK_VERSION(2,12,0))
+       GtkTooltips *tips = summaryview->tooltips;
+#endif
 
        if (prefs_common.layout_mode != SMALL_LAYOUT) {
                if (tips_initialized) {
                        summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
-                            summaryview->folder_pixmap_eventbox,
-                            NULL, NULL);
+                       CLAWS_SET_TIP(summaryview->folder_pixmap_eventbox,
+                            NULL);
                        tips_initialized = FALSE;
                } 
                return;
        }
-       folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total);
+       folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total,
+                               &replied, &forwarded, &locked, &ignored,
+                               &watched);
        if (removed_item) {
                total -= removed_item->total_msgs;
                new -= removed_item->new_msgs;
@@ -6851,15 +7770,13 @@ void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
        if (new > 0 || unread > 0) {
                tips_initialized = TRUE;
                summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN_HRM);
-               gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
-                            summaryview->folder_pixmap_eventbox,
-                            _("Go back to the folder list (You have unread messages)"), NULL);
+               CLAWS_SET_TIP(summaryview->folder_pixmap_eventbox,
+                            _("Go back to the folder list (You have unread messages)"));
        } else {
                tips_initialized = TRUE;
                summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
-               gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
-                            summaryview->folder_pixmap_eventbox,
-                            _("Go back to the folder list"), NULL);
+               CLAWS_SET_TIP(summaryview->folder_pixmap_eventbox,
+                            _("Go back to the folder list"));
        }
 }
 
@@ -6906,7 +7823,7 @@ static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
 {
        FolderItem *sent_folder = NULL;
        PrefsAccount *account = NULL;
-       GtkCTreeNode *node = NULL;
+       GtkCMCTreeNode *node = NULL;
        char *buf = NULL;
        if (msg == NULL || msg->msgid == NULL)
                return;
@@ -6928,7 +7845,7 @@ static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
        quicksearch_set(summaryview->quicksearch, QUICK_SEARCH_EXTENDED, buf);
        g_free(buf);
 
-       node = gtk_ctree_node_nth(GTK_CTREE(summaryview->ctree), 0);
+       node = gtk_cmctree_node_nth(GTK_CMCTREE(summaryview->ctree), 0);
        if (node)
                summary_select_node(summaryview, node, TRUE, TRUE);
 }
@@ -6940,7 +7857,9 @@ gint summaryview_export_mbox_list(SummaryView *summaryview)
        gchar *mbox = filesel_select_file_save(_("Export to mbox file"), NULL);
        gint ret;
        
-       if (mbox == NULL || list == NULL)
+       if (mbox == NULL)
+               return -2;
+       if (list == NULL)
                return -1;
                
        ret = export_list_to_mbox(list, mbox);