2009-12-01 [holger] 3.7.3cvs25
[claws.git] / src / summaryview.c
index 89a67d9ddac51ecf4201f61bf3dd23aa38820e2e..96e7e2bf963546e631283938cf97594f238e0998 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2008 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 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
@@ -89,44 +89,26 @@ static GtkStyle *small_style;
 static GtkStyle *small_marked_style;
 static GtkStyle *small_deleted_style;
 
-static GdkPixmap *markxpm;
-static GdkBitmap *markxpmmask;
-static GdkPixmap *deletedxpm;
-static GdkBitmap *deletedxpmmask;
-static GdkPixmap *movedxpm;
-static GdkBitmap *movedxpmmask;
-static GdkPixmap *copiedxpm;
-static GdkBitmap *copiedxpmmask;
-
-static GdkPixmap *newxpm;
-static GdkBitmap *newxpmmask;
-static GdkPixmap *unreadxpm;
-static GdkBitmap *unreadxpmmask;
-static GdkPixmap *repliedxpm;
-static GdkBitmap *repliedxpmmask;
-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;
-static GdkBitmap *spamxpmmask;
-
-static GdkPixmap *clipxpm;
-static GdkBitmap *clipxpmmask;
-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 GdkPixbuf *markxpm;
+static GdkPixbuf *deletedxpm;
+static GdkPixbuf *movedxpm;
+static GdkPixbuf *copiedxpm;
+
+static GdkPixbuf *newxpm;
+static GdkPixbuf *unreadxpm;
+static GdkPixbuf *repliedxpm;
+static GdkPixbuf *forwardedxpm;
+static GdkPixbuf *ignorethreadxpm;
+static GdkPixbuf *watchthreadxpm;
+static GdkPixbuf *lockedxpm;
+static GdkPixbuf *spamxpm;
+
+static GdkPixbuf *clipxpm;
+static GdkPixbuf *keyxpm;
+static GdkPixbuf *clipkeyxpm;
+static GdkPixbuf *keysignxpm;
+static GdkPixbuf *gpgsignedxpm;
+static GdkPixbuf *clipgpgsignedxpm;
 
 static void summary_free_msginfo_func  (GtkCMCTree             *ctree,
                                         GtkCMCTreeNode         *node,
@@ -142,6 +124,8 @@ guint summary_get_msgnum            (SummaryView            *summaryview,
 
 static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
                                             guint action);
+static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
+                                            guint action);
 
 static GtkCMCTreeNode *summary_find_prev_msg
                                        (SummaryView            *summaryview,
@@ -223,6 +207,7 @@ static void summary_execute_delete  (SummaryView            *summaryview);
 static void summary_execute_delete_func        (GtkCMCTree             *ctree,
                                         GtkCMCTreeNode         *node,
                                         gpointer                data);
+static void summary_execute_expunge    (SummaryView            *summaryview);
 
 static void summary_thread_init                (SummaryView            *summaryview);
 
@@ -414,10 +399,11 @@ static void summary_set_colorlabel_color (GtkCMCTree              *ctree,
                                   guint                 labelcolor);
 static void summary_thread_build(SummaryView *summaryview);
 
-GtkTargetEntry summary_drag_types[2] =
+GtkTargetEntry summary_drag_types[3] =
 {
        {"text/uri-list", 0, TARGET_MAIL_URI_LIST},
-       {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+       {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
+       {"claws-mail/msg-path-list", 0, TARGET_MAIL_CM_PATH_LIST},
 };
 
 #define DO_ACTION(name, act) {                                         \
@@ -429,15 +415,15 @@ GtkTargetEntry summary_drag_types[2] =
 static GtkActionEntry summary_popup_entries[] =
 {
        {"SummaryViewPopup",                            NULL, "SummaryViewPopup" },
-       {"SummaryViewPopup/ReplyTo",                    NULL, "Repl_y to" },
-       {"SummaryViewPopup/Mark",                       NULL, "_Mark" },
-       {"SummaryViewPopup/ColorLabel",                 NULL, "Color la_bel" },
-       {"SummaryViewPopup/Tags",                       NULL, "Ta_gs" },
-       {"SummaryViewPopup/CreateFilterRule",           NULL, "Create _filter rule" },
+       {"SummaryViewPopup/ReplyTo",                    NULL, N_("Repl_y to") },
+       {"SummaryViewPopup/Mark",                       NULL, N_("_Mark") },
+       {"SummaryViewPopup/ColorLabel",                 NULL, N_("Color la_bel") },
+       {"SummaryViewPopup/Tags",                       NULL, N_("Ta_gs") },
+       {"SummaryViewPopup/CreateFilterRule",           NULL, N_("Create _filter rule") },
 #ifndef GENERIC_UMPC
-       {"SummaryViewPopup/CreateProcessingRule",       NULL, "Create processing rule" },
+       {"SummaryViewPopup/CreateProcessingRule",       NULL, N_("Create processing rule") },
 #endif
-       {"SummaryViewPopup/View",                       NULL, "_View" },
+       {"SummaryViewPopup/View",                       NULL, N_("_View") },
 };
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
@@ -774,7 +760,7 @@ SummaryView *summary_create(MainWindow *mainwin)
                                summary_update_folder_hook,
                                (gpointer) summaryview);
 
-       summaryview->target_list = gtk_target_list_new(summary_drag_types, 2);
+       summaryview->target_list = gtk_target_list_new(summary_drag_types, 3);
 
        summaryview->quicksearch = quicksearch;
 
@@ -930,42 +916,42 @@ void summary_init(SummaryView *summaryview)
        GtkWidget *pixmap;
 
        gtk_widget_realize(summaryview->ctree);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
-                        &markxpm, &markxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
-                        &deletedxpm, &deletedxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_NEW,
-                        &newxpm, &newxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD,
-                        &unreadxpm, &unreadxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED,
-                        &repliedxpm, &repliedxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
-                        &forwardedxpm, &forwardedxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
-                        &clipxpm, &clipxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
-                        &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,
-                        &gpgsignedxpm, &gpgsignedxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
-                        &clipgpgsignedxpm, &clipgpgsignedxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM,
-                        &spamxpm, &spamxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MOVED,
-                        &movedxpm, &movedxpmmask);
-       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_COPIED,
-                        &copiedxpm, &copiedxpmmask);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
+                        &markxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
+                        &deletedxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_NEW,
+                        &newxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD,
+                        &unreadxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED,
+                        &repliedxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
+                        &forwardedxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
+                        &clipxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
+                        &lockedxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
+                        &ignorethreadxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_WATCHTHREAD,
+                        &watchthreadxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
+                        &clipkeyxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_KEY_SIGN,
+                        &keysignxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
+                        &keyxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+                        &gpgsignedxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
+                        &clipgpgsignedxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM,
+                        &spamxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_MOVED,
+                        &movedxpm);
+       stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_COPIED,
+                        &copiedxpm);
 
        summary_set_fonts(summaryview);
 
@@ -1147,7 +1133,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        inc_lock();
        summary_lock(summaryview);
-
+       
+       menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
+       
        utils_free_regex();
 
        is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
@@ -1222,6 +1210,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                item?folder_item_parent(item):0x0,
                                item?item->no_select:FALSE);
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
+               summary_set_hide_del_msgs_menu(summaryview, FALSE);
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                summary_thaw(summaryview);
@@ -1262,28 +1251,37 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                mlist = folder_item_get_msg_list(item);
        }
 
-       if (summaryview->folder_item->hide_read_msgs &&
+       if ((summaryview->folder_item->hide_read_msgs || summaryview->folder_item->hide_del_msgs) &&
            quicksearch_is_active(summaryview->quicksearch) == FALSE) {
                GSList *not_killed;
                
-               summary_set_hide_read_msgs_menu(summaryview, TRUE);
+               summary_set_hide_read_msgs_menu(summaryview, summaryview->folder_item->hide_read_msgs);
+               summary_set_hide_del_msgs_menu(summaryview, summaryview->folder_item->hide_del_msgs);
                not_killed = NULL;
                for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
                        
                        if (!msginfo->hidden) {
-                               if (MSG_IS_UNREAD(msginfo->flags) &&
-                                   !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                                       not_killed = g_slist_prepend(not_killed, msginfo);
-                               else if (MSG_IS_MARKED(msginfo->flags) ||
-                                        MSG_IS_LOCKED(msginfo->flags))
-                                       not_killed = g_slist_prepend(not_killed, msginfo);
-                               else if (is_refresh &&
-                                       (msginfo->msgnum == selected_msgnum ||
-                                        msginfo->msgnum == displayed_msgnum))
-                                       not_killed = g_slist_prepend(not_killed, msginfo);
-                               else
+                               if (MSG_IS_DELETED(msginfo->flags) && summaryview->folder_item->hide_del_msgs) {
                                        procmsg_msginfo_free(msginfo);
+                                       continue;
+                               }
+                               if (summaryview->folder_item->hide_read_msgs) {
+                                       if (MSG_IS_UNREAD(msginfo->flags) &&
+                                           !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                               not_killed = g_slist_prepend(not_killed, msginfo);
+                                       else if (MSG_IS_MARKED(msginfo->flags) ||
+                                                MSG_IS_LOCKED(msginfo->flags))
+                                               not_killed = g_slist_prepend(not_killed, msginfo);
+                                       else if (is_refresh &&
+                                               (msginfo->msgnum == selected_msgnum ||
+                                                msginfo->msgnum == displayed_msgnum))
+                                               not_killed = g_slist_prepend(not_killed, msginfo);
+                                       else
+                                               procmsg_msginfo_free(msginfo);
+                               } else {
+                                       not_killed = g_slist_prepend(not_killed, msginfo);
+                               }
                         } else
                                procmsg_msginfo_free(msginfo);
                }
@@ -1292,6 +1290,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                mlist = not_killed;
        } else {
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
+               summary_set_hide_del_msgs_menu(summaryview, FALSE);
        }
 
        if (quicksearch_is_active(summaryview->quicksearch)) {
@@ -2449,6 +2448,7 @@ static void summary_status_show(SummaryView *summaryview)
        }
        
        if (summaryview->folder_item->hide_read_msgs 
+       || summaryview->folder_item->hide_del_msgs
        || quicksearch_is_active(summaryview->quicksearch)) {
                rowlist = GTK_CMCLIST(summaryview->ctree)->row_list;
                for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -2647,19 +2647,19 @@ static void summary_set_column_titles(SummaryView *summaryview)
                }
 
                if (type == S_COL_MIME) {
-                       label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
+                       label = gtk_image_new_from_pixbuf(clipxpm);
                        gtk_widget_show(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);
+                       label = gtk_image_new_from_pixbuf(markxpm);
                        gtk_widget_show(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);
+                       label = gtk_image_new_from_pixbuf(lockedxpm);
                        gtk_widget_show(label);
                        gtk_cmclist_set_column_widget(clist, pos, label);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Locked"));
@@ -2713,7 +2713,7 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
 
        /* re-create colorlabel submenu */
        menu = GTK_MENU_SHELL(summaryview->tags_menu);
-       g_return_if_fail(menu != NULL);
+       cm_return_if_fail(menu != NULL);
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -2738,6 +2738,7 @@ void summary_reflect_prefs(void)
        static gchar *last_smallfont = NULL;
        static gchar *last_normalfont = NULL;
        static gchar *last_boldfont = NULL;
+       static gboolean last_derive = 0;
        gboolean update_font = FALSE;
        SummaryView *summaryview = NULL;
 
@@ -2747,7 +2748,8 @@ void summary_reflect_prefs(void)
 
        if (!last_smallfont || strcmp(last_smallfont, SMALL_FONT) ||
                        !last_normalfont || strcmp(last_normalfont, NORMAL_FONT) ||
-                       !last_boldfont || strcmp(last_boldfont, BOLD_FONT))
+                       !last_boldfont || strcmp(last_boldfont, BOLD_FONT) ||
+                       last_derive != prefs_common.derive_from_normal_font)
                update_font = TRUE;
 
        g_free(last_smallfont);
@@ -2756,6 +2758,7 @@ void summary_reflect_prefs(void)
        last_normalfont = g_strdup(NORMAL_FONT);
        g_free(last_boldfont);
        last_boldfont = g_strdup(BOLD_FONT);
+       last_derive = prefs_common.derive_from_normal_font;
 
        if (update_font) {      
                bold_style = bold_marked_style = bold_deleted_style = 
@@ -2909,7 +2912,7 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
        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);
+                               NULL, NULL, FALSE, summaryview->threaded && !summaryview->thread_collapsed);
 #define SET_TEXT(col) {                                                \
        gtk_cmctree_node_set_text(ctree, cnode, col_pos[col],   \
                                text[col_pos[col]]);            \
@@ -3008,7 +3011,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
                        node = gtk_sctree_insert_node
                                (ctree, NULL, node, text, 2,
-                                NULL, NULL, NULL, NULL,
+                                NULL, NULL,
                                 FALSE, FALSE);
                        if (vert && prefs_common.two_line_vert)
                                g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
@@ -3352,9 +3355,9 @@ gboolean defer_change(gpointer data)
 static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
                                      GtkCMCTreeNode *row)
 {
-       g_return_if_fail(summaryview != NULL);
-       g_return_if_fail(msginfo != NULL);
-       g_return_if_fail(row != NULL);
+       cm_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(row != NULL);
 
        if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
                summary_msginfo_unset_flags
@@ -3398,7 +3401,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
                else if (summaryview->messageview)
                        summaryview->messageview->filtered = FALSE;
        }                       
-       g_return_if_fail(row != NULL);
+       cm_return_if_fail(row != NULL);
 
        if (summary_is_locked(summaryview)) return;
        summary_lock(summaryview);
@@ -3407,8 +3410,13 @@ static void summary_display_msg_full(SummaryView *summaryview,
        GTK_EVENTS_FLUSH();
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       
-       g_return_if_fail(msginfo);
+
+       if (!msginfo) {
+               debug_print("NULL msginfo\n");
+               summary_unlock(summaryview);
+               END_TIMING();
+               return;
+       }       
 
        if (new_window && prefs_common.layout_mode != SMALL_LAYOUT) {
                MessageView *msgview;
@@ -3661,26 +3669,26 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
 
        /* set new/unread column */
        if (MSG_IS_IGNORE_THREAD(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
-                                         ignorethreadxpm, ignorethreadxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+                                         ignorethreadxpm);
        } else if (MSG_IS_WATCH_THREAD(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
-                                         watchthreadxpm, watchthreadxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+                                         watchthreadxpm);
        } else if (MSG_IS_SPAM(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
-                                         spamxpm, spamxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+                                         spamxpm);
        } else if (MSG_IS_NEW(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
-                                         newxpm, newxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+                                         newxpm);
        } else if (MSG_IS_UNREAD(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
-                                         unreadxpm, unreadxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+                                         unreadxpm);
        } else if (MSG_IS_REPLIED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
-                                         repliedxpm, repliedxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+                                         repliedxpm);
        } else if (MSG_IS_FORWARDED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
-                                         forwardedxpm, forwardedxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+                                         forwardedxpm);
        } else {
                gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
                                        "");
@@ -3695,8 +3703,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
 
        /* set mark column */
        if (MSG_IS_DELETED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
-                                         deletedxpm, deletedxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
+                                         deletedxpm);
                if (style)
                        style = bold_deleted_style;
                else {
@@ -3705,11 +3713,11 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
                        gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_dim);
        } else if (MSG_IS_MARKED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
-                                         markxpm, markxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
+                                         markxpm);
        } else if (MSG_IS_MOVE(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
-                                         movedxpm, movedxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
+                                         movedxpm);
                if (style)
                        style = bold_marked_style;
                else {
@@ -3718,8 +3726,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
                        gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
        } else if (MSG_IS_COPY(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
-                                         copiedxpm, copiedxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
+                                         copiedxpm);
                if (style)
                        style = bold_marked_style;
                else {
@@ -3732,33 +3740,33 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
        }
 
        if (MSG_IS_LOCKED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
-                                         lockedxpm, lockedxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_LOCKED],
+                                         lockedxpm);
        }
        else {
                gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], "");
        }
 
        if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                         clipgpgsignedxpm, clipgpgsignedxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MIME],
+                                         clipgpgsignedxpm);
        } else if (MSG_IS_SIGNED(flags)) {
                if (MSG_IS_ENCRYPTED(flags)) {
-                       gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                         keysignxpm, keysignxpmmask);
+                       gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MIME],
+                                         keysignxpm);
                } else {
-                       gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                                 gpgsignedxpm, gpgsignedxpmmask);
+                       gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MIME],
+                                                 gpgsignedxpm);
                }
        } else if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_ENCRYPTED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                         clipkeyxpm, clipkeyxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MIME],
+                                         clipkeyxpm);
        } else if (MSG_IS_ENCRYPTED(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                         keyxpm, keyxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MIME],
+                                         keyxpm);
        } else if (MSG_IS_WITH_ATTACHMENT(flags)) {
-               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
-                                         clipxpm, clipxpmmask);
+               gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MIME],
+                                         clipxpm);
        } else {
                gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_MIME], "");
        }
@@ -3777,7 +3785,7 @@ static void summary_mark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
        if (MSG_IS_MOVE(msginfo->flags))
@@ -3799,7 +3807,7 @@ static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
        if (MSG_IS_MOVE(msginfo->flags)) {
@@ -3824,7 +3832,7 @@ static void summary_unlock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
        if (!MSG_IS_LOCKED(msginfo->flags))
                return;
        procmsg_msginfo_set_to_folder(msginfo, NULL);
@@ -3858,7 +3866,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
                return;
@@ -4034,7 +4042,7 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags)) {
                procmsg_msginfo_set_to_folder(msginfo, NULL);
                summary_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
@@ -4123,7 +4131,7 @@ static void summary_delete_row(SummaryView *summaryview, GtkCMCTreeNode *row)
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        if (MSG_IS_LOCKED(msginfo->flags)) return;
 
@@ -4140,9 +4148,11 @@ static void summary_delete_row(SummaryView *summaryview, GtkCMCTreeNode *row)
        summaryview->deleted++;
 
        if (!prefs_common.immediate_exec && 
-           !folder_has_parent_of_type(summaryview->folder_item, F_TRASH))
+           !folder_has_parent_of_type(summaryview->folder_item, F_TRASH)) {
                summary_set_row_marks(summaryview, row);
-
+       } else if (summaryview->folder_item->folder->account && !summaryview->folder_item->folder->account->imap_use_trash) {
+               summary_set_row_marks(summaryview, row);
+       }
        debug_print("Message %s/%d is set to delete\n",
                    msginfo->folder->path, msginfo->msgnum);
 }
@@ -4191,18 +4201,20 @@ void summary_delete(SummaryView *summaryview)
 
        if (!summaryview->folder_item) return;
 
-       if (!prefs_common.live_dangerously) {
-               gchar *buf = NULL;
-               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);
-               g_free(buf);
-               if (aval != G_ALERTALTERNATE) return;
+       if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
+               if (!prefs_common.live_dangerously) {
+                       gchar *buf = NULL;
+                       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);
+                       g_free(buf);
+                       if (aval != G_ALERTALTERNATE) return;
+               }
        }
 
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
@@ -4259,7 +4271,8 @@ void summary_delete_trash(SummaryView *summaryview)
                to_folder = summaryview->folder_item->folder->trash;
        
        if (to_folder == NULL || to_folder == summaryview->folder_item
-           || folder_has_parent_of_type(summaryview->folder_item, F_TRASH))
+           || folder_has_parent_of_type(summaryview->folder_item, F_TRASH)
+           || (summaryview->folder_item->folder->account && !summaryview->folder_item->folder->account->imap_use_trash))
                summary_delete(summaryview);
        else
                summary_move_selected_to(summaryview, to_folder);
@@ -4272,7 +4285,7 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
        if (MSG_IS_MOVE(msginfo->flags))
@@ -4313,10 +4326,10 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       g_return_if_fail(to_folder != NULL);
+       cm_return_if_fail(to_folder != NULL);
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
        if (MSG_IS_LOCKED(msginfo->flags))
                return;
 
@@ -4336,6 +4349,8 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
        
        if (!prefs_common.immediate_exec) {
                summary_set_row_marks(summaryview, row);
+       } else if (msginfo->folder->folder->account && !msginfo->folder->folder->account->imap_use_trash) {
+               summary_set_row_marks(summaryview, row);
        }
 
        debug_print("Message %d is set to move to %s\n",
@@ -4416,10 +4431,10 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       g_return_if_fail(to_folder != NULL);
+       cm_return_if_fail(to_folder != NULL);
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
        procmsg_msginfo_set_to_folder(msginfo, to_folder);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
@@ -4809,9 +4824,10 @@ gboolean summary_execute(SummaryView *summaryview)
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));
                gtk_widget_grab_focus(summaryview->folderview->ctree);
-       } else
+       } else {
+               menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
                gtk_widget_grab_focus(summaryview->ctree);
-
+       }
        summary_update_status(summaryview);
        summary_status_show(summaryview);
 
@@ -4826,14 +4842,131 @@ gboolean summary_execute(SummaryView *summaryview)
        return TRUE;
 }
 
+gboolean summary_expunge(SummaryView *summaryview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
+       GtkCMCTreeNode *node, *next;
+       GtkCMCTreeNode *new_selected = NULL;
+
+       if (!summaryview->folder_item) return FALSE;
+
+       if (summary_is_locked(summaryview)) return FALSE;
+
+       summary_lock(summaryview);
+
+       summary_freeze(summaryview);
+
+       main_window_cursor_wait(summaryview->mainwin);
+
+       if (summaryview->threaded)
+               summary_unthread_for_exec(summaryview);
+
+       folder_item_update_freeze();
+       summary_execute_expunge(summaryview);
+       
+       node = GTK_CMCTREE_NODE(clist->row_list);
+       for (; node != NULL; node = next) {
+               next = gtkut_ctree_node_next(ctree, node);
+               if (gtk_cmctree_node_get_row_data(ctree, node) != NULL) continue;
+
+               if (node == summaryview->displayed) {
+                       messageview_clear(summaryview->messageview);
+                       summaryview->displayed = NULL;
+               }
+               if (GTK_CMCTREE_ROW(node)->children != NULL) {
+                       next = NULL;
+                       if (GTK_CMCTREE_ROW(node)->sibling) {
+                               next = GTK_CMCTREE_ROW(node)->sibling;
+                       } else {
+                               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;
+                                       }
+                               }
+                       }
+               }
+
+               if (!new_selected &&
+                   gtkut_ctree_node_is_selected(ctree, node)) {
+                       summary_unselect_all(summaryview);
+                       new_selected = summary_find_next_msg(summaryview, node);
+                       if (!new_selected)
+                               new_selected = summary_find_prev_msg
+                                       (summaryview, node);
+               }
+
+               gtk_sctree_remove_node((GtkSCTree *)ctree, node);
+       }
+
+       folder_item_update_thaw();
+
+       if (new_selected) {
+               summary_unlock(summaryview);
+               gtk_sctree_select
+                       (GTK_SCTREE(ctree), new_selected);
+               summary_lock(summaryview);
+       }
+
+       if (summaryview->threaded) {
+               summary_thread_build(summaryview);
+               summary_thread_init(summaryview);
+       }
+
+       summary_thaw(summaryview);
+
+       summaryview->selected = clist->selection ?
+               GTK_CMCTREE_NODE(clist->selection->data) : NULL;
+
+       if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
+               menu_set_insensitive_all
+                       (GTK_MENU_SHELL(summaryview->popupmenu));
+               gtk_widget_grab_focus(summaryview->folderview->ctree);
+       } else {
+               menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
+               gtk_widget_grab_focus(summaryview->ctree);
+       }
+
+       summary_update_status(summaryview);
+       summary_status_show(summaryview);
+
+       gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+
+       summary_unlock(summaryview);
+
+       main_window_cursor_normal(summaryview->mainwin);
+
+       return TRUE;
+}
+
+static void summary_set_deleted_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
+                                     gpointer data)
+{
+       SummaryView *summaryview = data;
+       MsgInfo *msginfo;
+
+       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+
+       if (msginfo && MSG_IS_MOVE(msginfo->flags)) {
+               msginfo->flags.tmp_flags &= ~ MSG_MOVE;
+               msginfo->flags.perm_flags |= MSG_DELETED;
+               summary_set_row_marks(summaryview, node);
+               summaryview->moved--;
+               summaryview->deleted++;
+       }
+}
+
 static gint summary_execute_move(SummaryView *summaryview)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GSList *cur;
        gint val = -1;
        /* search moving messages and execute */
+       
        gtk_cmctree_pre_recursive(ctree, NULL, summary_execute_move_func,
-                               summaryview);
+                       summaryview);
 
        if (summaryview->mlist) {
                hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
@@ -4843,8 +4976,14 @@ static gint summary_execute_move(SummaryView *summaryview)
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, 
                        summary_update_msg, (gpointer) summaryview);
 
-               for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
-                       procmsg_msginfo_free((MsgInfo *)cur->data);
+               if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
+                       for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
+                               procmsg_msginfo_free((MsgInfo *)cur->data);
+               } 
+               if (summaryview->folder_item->folder->account && !summaryview->folder_item->folder->account->imap_use_trash) {
+                       gtk_cmctree_pre_recursive(ctree, NULL, summary_set_deleted_func,
+                                       summaryview);
+               }
                g_slist_free(summaryview->mlist);
                summaryview->mlist = NULL;
                return val;
@@ -4863,20 +5002,23 @@ static void summary_execute_move_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
        if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
                summaryview->mlist =
                        g_slist_prepend(summaryview->mlist, msginfo);
-               gtk_cmctree_node_set_row_data(ctree, node, NULL);
-
-               if (msginfo->msgid && *msginfo->msgid &&
-                   node == g_hash_table_lookup(summaryview->msgid_table,
-                                               msginfo->msgid))
-                       g_hash_table_remove(summaryview->msgid_table,
-                                           msginfo->msgid);
-               if (prefs_common.thread_by_subject &&
-                   msginfo->subject && *msginfo->subject && 
-                   node == subject_table_lookup(summaryview->subject_table,
-                                                msginfo->subject)) {
-                       subject_table_remove(summaryview->subject_table,
-                                            msginfo->subject);
-               }                                           
+               if (!summaryview->folder_item->folder->account || 
+                    summaryview->folder_item->folder->account->imap_use_trash) {
+                       gtk_cmctree_node_set_row_data(ctree, node, NULL);
+
+                       if (msginfo->msgid && *msginfo->msgid &&
+                           node == g_hash_table_lookup(summaryview->msgid_table,
+                                                       msginfo->msgid))
+                               g_hash_table_remove(summaryview->msgid_table,
+                                                   msginfo->msgid);
+                       if (prefs_common.thread_by_subject &&
+                           msginfo->subject && *msginfo->subject && 
+                           node == subject_table_lookup(summaryview->subject_table,
+                                                        msginfo->subject)) {
+                               subject_table_remove(summaryview->subject_table,
+                                                    msginfo->subject);
+                       }
+               }
        }
 }
 
@@ -4925,9 +5067,10 @@ static void summary_execute_delete(SummaryView *summaryview)
        GSList *cur;
 
        /* search deleting messages and execute */
-       gtk_cmctree_pre_recursive
-               (ctree, NULL, summary_execute_delete_func, summaryview);
-
+       if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
+               gtk_cmctree_pre_recursive
+                       (ctree, NULL, summary_execute_delete_func, summaryview);
+       }
        if (!summaryview->mlist) return;
 
        hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
@@ -4939,9 +5082,10 @@ static void summary_execute_delete(SummaryView *summaryview)
        summaryview->msginfo_update_callback_id =
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, 
                        summary_update_msg, (gpointer) summaryview);
-       for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
-               procmsg_msginfo_free((MsgInfo *)cur->data);
-
+       if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
+               for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
+                       procmsg_msginfo_free((MsgInfo *)cur->data);
+       }
        g_slist_free(summaryview->mlist);
        summaryview->mlist = NULL;
 }
@@ -4975,6 +5119,58 @@ static void summary_execute_delete_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
        }
 }
 
+static void summary_execute_expunge_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
+                                       gpointer data)
+{
+       SummaryView *summaryview = data;
+       MsgInfo *msginfo;
+
+       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+
+       if (msginfo && MSG_IS_DELETED(msginfo->flags)) {
+               summaryview->mlist =
+                       g_slist_prepend(summaryview->mlist, msginfo);
+               gtk_cmctree_node_set_row_data(ctree, node, NULL);
+
+               if (msginfo->msgid && *msginfo->msgid &&
+                   node == g_hash_table_lookup(summaryview->msgid_table,
+                                               msginfo->msgid)) {
+                       g_hash_table_remove(summaryview->msgid_table,
+                                           msginfo->msgid);
+               }       
+               if (prefs_common.thread_by_subject &&
+                   msginfo->subject && *msginfo->subject && 
+                   node == subject_table_lookup(summaryview->subject_table,
+                                                msginfo->subject)) {
+                       subject_table_remove(summaryview->subject_table,
+                                            msginfo->subject);
+               }                                           
+       }
+}
+
+static void summary_execute_expunge(SummaryView *summaryview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GSList *cur;
+
+       gtk_cmctree_pre_recursive
+               (ctree, NULL, summary_execute_expunge_func, summaryview);
+
+       hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
+               summaryview->msginfo_update_callback_id);
+
+       folder_item_expunge(summaryview->folder_item);
+
+       summaryview->msginfo_update_callback_id =
+               hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, 
+                       summary_update_msg, (gpointer) summaryview);
+       for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
+               procmsg_msginfo_free((MsgInfo *)cur->data);
+
+       g_slist_free(summaryview->mlist);
+       summaryview->mlist = NULL;
+}
+
 /* thread functions */
 
 static void summary_thread_build(SummaryView *summaryview)
@@ -5018,7 +5214,7 @@ static void summary_thread_build(SummaryView *summaryview)
                        }
                }
 
-               if (prefs_common.thread_by_subject && parent == NULL) {
+               if (msginfo && prefs_common.thread_by_subject && parent == NULL) {
                        parent = subject_table_lookup
                                (summaryview->subject_table,
                                 msginfo->subject);
@@ -5179,6 +5375,8 @@ void summary_collapse_threads(SummaryView *summaryview)
        GtkCMCTreeNode *node = NULL;
        GtkCMCTreeNode *focus_node = GTK_CMCTREE_NODE (g_list_nth (GTK_CMCLIST(ctree)->row_list, GTK_CMCLIST(ctree)->focus_row));
 
+       g_signal_handlers_block_by_func(G_OBJECT(ctree),
+                                      G_CALLBACK(summary_tree_collapsed), summaryview);
        summary_freeze(summaryview);
        GTK_SCTREE(ctree)->sorting = TRUE;
 
@@ -5189,8 +5387,10 @@ void summary_collapse_threads(SummaryView *summaryview)
        gtk_sctree_select(GTK_SCTREE(ctree), focus_node);
        node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
        while (node) {
-               if (GTK_CMCTREE_ROW(node)->children)
+               if (GTK_CMCTREE_ROW(node)->children) {
                        gtk_cmctree_collapse(ctree, node);
+                       summary_set_row_marks(summaryview, node);
+               }
                node = GTK_CMCTREE_ROW(node)->sibling;
        }
 
@@ -5201,6 +5401,8 @@ void summary_collapse_threads(SummaryView *summaryview)
        GTK_SCTREE(ctree)->anchor_row =
                        gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->focus_row);
        summary_thaw(summaryview);
+       g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+                                        G_CALLBACK(summary_tree_collapsed), summaryview);
        
        summaryview->thread_collapsed = TRUE;
 
@@ -5416,7 +5618,7 @@ static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
        SummaryView *summaryview;
 
        summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
-       g_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(summaryview != NULL);
 
        /* "dont_toggle" state set? */
        if (g_object_get_data(G_OBJECT(summaryview->colorlabel_menu),
@@ -5437,7 +5639,7 @@ void summary_set_colorlabel_color(GtkCMCTree *ctree, GtkCMCTreeNode *node,
        gint color_index;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, node);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
        ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
@@ -5474,7 +5676,7 @@ static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCMCTreeNode
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        summary_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0, 
                                        MSG_CLABEL_FLAG_MASK, 0);
@@ -5501,7 +5703,7 @@ static gboolean summary_set_row_tag(SummaryView *summaryview, GtkCMCTreeNode *ro
        MsgInfo *msginfo;
        gchar *tags_str = NULL;
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_val_if_fail(msginfo, FALSE);
+       cm_return_val_if_fail(msginfo, FALSE);
 
        procmsg_msginfo_update_tags(msginfo, set, id);
        
@@ -5552,7 +5754,7 @@ static void summary_tags_menu_item_activate_cb(GtkWidget *widget,
        SummaryView *summaryview;
 
        summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
-       g_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(summaryview != NULL);
 
        /* "dont_toggle" state set? */
        if (g_object_get_data(G_OBJECT(summaryview->tags_menu),
@@ -5574,14 +5776,14 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
        GList *cur, *sel;
 
        summaryview = (SummaryView *)data;
-       g_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(summaryview != NULL);
 
        sel = GTK_CMCLIST(summaryview->ctree)->selection;
        if (!sel) return;
 
        menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
        
-       g_return_if_fail(menu != NULL);
+       cm_return_if_fail(menu != NULL);
 
        Xalloca(items, (N_COLOR_LABELS + 1) * sizeof(GtkWidget *), return);
 
@@ -5707,13 +5909,13 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                        NULL, NULL);
        gint sel_len;
        SummaryView *summaryview = (SummaryView *)data;
-       g_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(summaryview != NULL);
 
        sel = GTK_CMCLIST(summaryview->ctree)->selection;
        if (!sel) return;
 
        menu = GTK_MENU_SHELL(summaryview->tags_menu);
-       g_return_if_fail(menu != NULL);
+       cm_return_if_fail(menu != NULL);
 
        /* NOTE: don't return prematurely because we set the "dont_toggle"
         * state for check menu items */
@@ -5798,7 +6000,7 @@ static void summary_tags_menu_item_apply_tags_activate_cb(GtkWidget *widget,
        SummaryView *summaryview;
 
        summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
-       g_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(summaryview != NULL);
 
        /* "dont_toggle" state set? */
        if (g_object_get_data(G_OBJECT(summaryview->tags_menu),
@@ -6009,7 +6211,7 @@ static gboolean tooltip_cb (GtkWidget  *widget,
                        break;
                case GTK_CMCELL_PIXTEXT:
                        if (gtk_cmctree_node_get_pixtext(ctree, node, column, &text, 
-                               NULL, NULL, NULL) != TRUE)
+                               NULL, NULL) != TRUE)
                                return FALSE;
                        break;
                default: 
@@ -6207,7 +6409,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                         summaryview);
 
        gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
-                         summary_drag_types, 2,
+                         summary_drag_types, 3,
                          GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
 
        g_signal_connect(G_OBJECT(ctree), "drag_data_received",
@@ -6306,6 +6508,7 @@ static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        if (event->button == 3) {
                summaryview->display_msg = messageview_is_visible(summaryview->messageview);
                /* right clicked */
+               summary_set_menu_sensitive(summaryview);
                cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager, "Menus/SummaryViewPopup/Trash", 
                        !folder_has_parent_of_type(summaryview->folder_item, F_TRASH) && summaryview->selected);
                gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
@@ -6329,6 +6532,8 @@ static gboolean summary_button_released(GtkWidget *ctree, GdkEventButton *event,
 
 gboolean summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 {
+       if (!summaryview)
+               return FALSE;
        if (summary_is_list(summaryview))
                return summary_key_pressed(summaryview->ctree, event, summaryview);
        else
@@ -6539,6 +6744,7 @@ static void summary_tree_expanded(GtkCMCTree *ctree, GtkCMCTreeNode *node,
 static void summary_tree_collapsed(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                   SummaryView *summaryview)
 {
+       gtk_sctree_select(GTK_SCTREE(ctree), node);
        summary_set_row_marks(summaryview, node);
 }
 
@@ -6595,7 +6801,7 @@ static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
        summaryview->selected = row;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(msginfo != NULL);
 
        main_create_mailing_list_menu (summaryview->mainwin, msginfo);
        toolbar_set_learn_button
@@ -6691,11 +6897,11 @@ GSList *summary_get_selection(SummaryView *summaryview)
        GList *sel = NULL;
        GSList *msginfo_list = NULL;
        
-       g_return_val_if_fail(summaryview != NULL, NULL);
+       cm_return_val_if_fail(summaryview != NULL, NULL);
 
        sel = GTK_CMCLIST(summaryview->ctree)->selection;
 
-       g_return_val_if_fail(sel != NULL, NULL);
+       cm_return_val_if_fail(sel != NULL, NULL);
 
        for ( ; sel != NULL; sel = sel->next)
                msginfo_list = 
@@ -6807,9 +7013,9 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
 {
        GdkDragContext *context;
 
-       g_return_if_fail(summaryview != NULL);
-       g_return_if_fail(summaryview->folder_item != NULL);
-       g_return_if_fail(summaryview->folder_item->folder != NULL);
+       cm_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(summaryview->folder_item != NULL);
+       cm_return_if_fail(summaryview->folder_item->folder != NULL);
 
        if (summaryview->selected == NULL) return;
 
@@ -6904,7 +7110,40 @@ static void summary_drag_data_get(GtkWidget        *widget,
                                               selection_data->target, 8,
                                               "Dummy-Summaryview", 
                                               strlen("Dummy-Summaryview")+1);
-       }
+       } else if (info == TARGET_MAIL_CM_PATH_LIST) {
+               /* content: folder_item_identifier\nmsgid1\nmsgid2\nmsgid3 */
+
+               GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+               GList *cur;
+               MsgInfo *msginfo;
+               gchar *path_list = NULL;
+
+               /* identifier */
+               if(GTK_CMCLIST(ctree)->selection != NULL) {
+                       msginfo = gtk_cmctree_node_get_row_data(ctree, GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->selection->data));
+            if(msginfo && msginfo->folder)
+              path_list = folder_item_get_identifier(msginfo->folder);
+               }
+
+               for (cur = GTK_CMCLIST(ctree)->selection;
+                    cur != NULL && cur->data != NULL; cur = cur->next) {
+                       gchar *tmp;
+
+                       msginfo = gtk_cmctree_node_get_row_data(ctree, GTK_CMCTREE_NODE(cur->data));
+            if(!msginfo)
+              continue;
+                       tmp = path_list;
+                       path_list = g_strconcat(path_list, "\n", (msginfo->msgid ? msginfo->msgid : "unknown"), NULL);
+                       g_free(tmp);
+               }
+
+               if (path_list != NULL) {
+                       gtk_selection_data_set(selection_data,
+                                              selection_data->target, 8,
+                                              path_list, strlen(path_list));
+                       g_free(path_list);
+               }
+    }
 }
 
 static gboolean summary_drag_motion_cb(GtkWidget      *widget,
@@ -6968,6 +7207,8 @@ static gint summary_cmp_by_date(GtkCMCList *clist,
                return -1;
 
        res = (msginfo1->date_t - msginfo2->date_t);
+       if (res == 0)
+               res = msginfo1->msgnum - msginfo2->msgnum;
        return res;
 }
 
@@ -7046,7 +7287,7 @@ static gint summary_cmp_by_from(GtkCMCList *clist, gconstpointer ptr1,
        const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
        gint res;
 
-       g_return_val_if_fail(sv, -1);
+       cm_return_val_if_fail(sv, -1);
        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;
@@ -7075,7 +7316,7 @@ static gint summary_cmp_by_to(GtkCMCList *clist, gconstpointer ptr1,
        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);
+       cm_return_val_if_fail(sv, -1);
        
        if (sv->col_state[sv->col_pos[S_COL_TO]].visible) {
                str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_TO]])->text;
@@ -7105,7 +7346,7 @@ static gint summary_cmp_by_tags(GtkCMCList *clist, gconstpointer ptr1,
        MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
        MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
        gint res;
-       g_return_val_if_fail(sv, -1);
+       cm_return_val_if_fail(sv, -1);
        
        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);
@@ -7143,8 +7384,8 @@ static gint summary_cmp_by_simplified_subject
        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);
+       cm_return_val_if_fail(sv, -1);
+       cm_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
        
        if (sv->col_state[sv->col_pos[S_COL_SUBJECT]].visible) {
                str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_SUBJECT]])->text;
@@ -7192,7 +7433,7 @@ static void summary_ignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, g
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_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);
@@ -7225,7 +7466,7 @@ static void summary_unignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        summary_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
@@ -7287,7 +7528,7 @@ static void summary_watch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gp
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        summary_msginfo_change_flags(msginfo, MSG_WATCH_THREAD, 0, MSG_IGNORE_THREAD, 0);
 
@@ -7319,7 +7560,7 @@ static void summary_unwatch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
        MsgInfo *msginfo;
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       g_return_if_fail(msginfo);
+       cm_return_if_fail(msginfo);
 
        summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
 
@@ -7390,6 +7631,21 @@ void summary_toggle_show_read_messages(SummaryView *summaryview)
        summary_show(summaryview, summaryview->folder_item);
 }
  
+void summary_toggle_show_del_messages(SummaryView *summaryview)
+{
+       FolderItemUpdateData source;
+       if (summaryview->folder_item->hide_del_msgs)
+               summaryview->folder_item->hide_del_msgs = 0;
+       else
+               summaryview->folder_item->hide_del_msgs = 1;
+
+       source.item = summaryview->folder_item;
+       source.update_flags = F_ITEM_UPDATE_NAME;
+       source.msg = NULL;
+       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+       summary_show(summaryview, summaryview->folder_item);
+}
 static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
                                             guint action)
 {
@@ -7403,29 +7659,42 @@ static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
                          GINT_TO_POINTER(0));
 }
 
+static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
+                                            guint action)
+{
+       GtkWidget *widget;
+
+       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideDelMessages");
+       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);
+       g_object_set_data(G_OBJECT(widget), "dont_toggle",
+                         GINT_TO_POINTER(0));
+}
+
 void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
 {
        GtkWidget *ctree = summaryview->ctree;
        GtkWidget *pixmap; 
 
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DELETED, &deletedxpm, &deletedxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW, &newxpm, &newxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm, &unreadxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm, &repliedxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm, &forwardedxpmmask);
-       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);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_MOVED, &movedxpm, &movedxpmmask);
-       stock_pixmap_gdk(ctree, STOCK_PIXMAP_COPIED, &copiedxpm, &copiedxpmmask);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_MARK, &markxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DELETED, &deletedxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_NEW, &newxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_KEY_SIGN, &keysignxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_MOVED, &movedxpm);
+       stock_pixbuf_gdk(ctree, STOCK_PIXMAP_COPIED, &copiedxpm);
 
        summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
 
@@ -7457,7 +7726,7 @@ void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
 
        /* re-create colorlabel submenu */
        menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
-       g_return_if_fail(menu != NULL);
+       cm_return_if_fail(menu != NULL);
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -7516,8 +7785,8 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
 {
        FolderSortKey sort_key;
        FolderSortType sort_type;
-       g_return_if_fail(summaryview != NULL);
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(summaryview != NULL);
+       cm_return_if_fail(item != NULL);
 
        /* Subject simplification */
 #ifndef G_OS_WIN32
@@ -7563,8 +7832,8 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
        SummaryView *summaryview = (SummaryView *)data;
        GtkCMCTreeNode *node;
 
-       g_return_val_if_fail(msginfo_update != NULL, TRUE);
-       g_return_val_if_fail(summaryview != NULL, FALSE);
+       cm_return_val_if_fail(msginfo_update != NULL, TRUE);
+       cm_return_val_if_fail(summaryview != NULL, FALSE);
 
        if (msginfo_update->msginfo->folder != summaryview->folder_item)
                return FALSE;
@@ -7626,9 +7895,9 @@ static gboolean summary_update_folder_item_hook(gpointer source, gpointer data)
        FolderItemUpdateData *hookdata = (FolderItemUpdateData *)source;
        SummaryView *summaryview = (SummaryView *)data;
 
-       g_return_val_if_fail(hookdata != NULL, FALSE);
-       g_return_val_if_fail(hookdata->item != NULL, FALSE);
-       g_return_val_if_fail(summaryview != NULL, FALSE);
+       cm_return_val_if_fail(hookdata != NULL, FALSE);
+       cm_return_val_if_fail(hookdata->item != NULL, FALSE);
+       cm_return_val_if_fail(summaryview != NULL, FALSE);
 
        if (hookdata->update_flags & F_ITEM_UPDATE_NAME) {
                gchar *name = folder_item_get_name(hookdata->item);