2010-09-19 [pawel] 3.7.6cvs40
[claws.git] / src / summaryview.c
index 9721c6c84d0dcc54cd529e32248ae69fe9de6f6d..2ecdb2c345569a9044b25f92bbb6e3c3915fcc1f 100644 (file)
@@ -71,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"
@@ -124,6 +123,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,
@@ -205,6 +206,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);
 
@@ -396,10 +398,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) {                                         \
@@ -411,15 +414,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] = {
@@ -536,6 +539,7 @@ SummaryView *summary_create(MainWindow *mainwin)
        toggle_search = gtk_toggle_button_new();
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
                                     prefs_common.show_searchbar);
+       GTK_WIDGET_UNSET_FLAGS(toggle_search, GTK_CAN_FOCUS);
        gtk_widget_show(toggle_search);
 
        CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
@@ -756,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;
 
@@ -1129,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;
@@ -1204,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);
@@ -1244,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);
                }
@@ -1274,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)) {
@@ -1603,6 +1620,7 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 void summary_set_menu_sensitive(SummaryView *summaryview)
 {
        SensitiveCond state;
+       MsgInfo *msginfo;
        gboolean sensitive;
        gint i;
 
@@ -1678,6 +1696,15 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
                cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager, entry[i].entry, sensitive);
        }
 
+#ifndef GENERIC_UMPC
+       if ((msginfo = summary_get_selected_msg(summaryview)) && msginfo->extradata)
+               cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager,
+                       "Menus/SummaryViewPopup/ReplyTo/MailingList", TRUE);
+       else
+               cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager,
+                       "Menus/SummaryViewPopup/ReplyTo/MailingList", FALSE);
+#endif
+
        summary_lock(summaryview);
 #ifndef GENERIC_UMPC
        if (summaryview->messageview 
@@ -2040,6 +2067,30 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
        summary_select_node(summaryview, node, FALSE, TRUE);
 }
 
+void summary_select_by_msg_list(SummaryView    *summaryview, GSList *msginfos)
+{
+       GtkCMCTree *ctree;
+       GSList *msgnum_list, *walk;
+       gboolean froze = FALSE;
+
+       ctree = GTK_CMCTREE(summaryview->ctree);
+
+       msgnum_list = NULL;
+       for(walk = msginfos; walk; walk = walk->next) {
+               MsgInfo *msginfo;
+               msginfo = walk->data;
+               msgnum_list = g_slist_prepend(msgnum_list, GUINT_TO_POINTER(msginfo->msgnum));
+       }
+       START_LONG_OPERATION(summaryview, FALSE);
+       for(walk = msgnum_list; walk; walk = walk->next) {
+               GtkCMCTreeNode *node;
+               node = summary_find_msg_by_msgnum(summaryview, GPOINTER_TO_UINT(walk->data));
+               gtk_cmctree_select(ctree, node);
+       }
+       END_LONG_OPERATION(summaryview);
+       g_slist_free(msgnum_list);
+}
+
 typedef struct _PostponedSelectData
 {
        GtkCMCTree *ctree;
@@ -2431,6 +2482,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) {
@@ -2695,7 +2747,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) {
@@ -2720,6 +2772,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;
 
@@ -2729,7 +2782,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);
@@ -2738,6 +2792,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 = 
@@ -3334,9 +3389,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
@@ -3380,7 +3435,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);
@@ -3389,8 +3444,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;
@@ -3759,7 +3819,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))
@@ -3781,7 +3841,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)) {
@@ -3806,7 +3866,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);
@@ -3840,7 +3900,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;
@@ -4016,7 +4076,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);
@@ -4105,7 +4165,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;
 
@@ -4122,9 +4182,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);
 }
@@ -4173,18 +4235,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; 
@@ -4241,7 +4305,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);
@@ -4254,7 +4319,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))
@@ -4295,10 +4360,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;
 
@@ -4318,6 +4383,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",
@@ -4398,10 +4465,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--;
@@ -4643,12 +4710,6 @@ void summary_save_as(SummaryView *summaryview)
 void summary_print(SummaryView *summaryview)
 {
        GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
-#if !defined(USE_GNOMEPRINT) && !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 "
@@ -4663,30 +4724,6 @@ void summary_print(SummaryView *summaryview)
        g_free(msg);
 
        if (clist->selection == NULL) return;
-#if !defined(USE_GNOMEPRINT) && !GTK_CHECK_VERSION(2,10,0)
-       cmdline = input_dialog(_("Print"),
-                              _("Enter the print command-line:\n"
-                                "('%s' will be replaced with file name)"),
-                              prefs_common.print_cmd);
-       if (!cmdline) return;
-       if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
-           strchr(p + 2, '%')) {
-               alertpanel_error(_("Print command-line is invalid:\n'%s'"),
-                                cmdline);
-               g_free(cmdline);
-               return;
-       }
-       for (cur = clist->selection; 
-            cur != NULL && cur->data != NULL; 
-            cur = cur->next) {
-               msginfo = gtk_cmctree_node_get_row_data
-                       (ctree, GTK_CMCTREE_NODE(cur->data));
-               if (msginfo) 
-                       procmsg_print_message(msginfo, cmdline);
-       }
-
-       g_free(cmdline);
-#else
        for (cur = clist->selection; 
             cur != NULL && cur->data != NULL; 
             cur = cur->next) {
@@ -4704,7 +4741,6 @@ void summary_print(SummaryView *summaryview)
                messageview_print(msginfo, summaryview->messageview->all_headers,
                        sel_start, sel_end, partnum);
        }
-#endif
 }
 
 gboolean summary_execute(SummaryView *summaryview)
@@ -4791,9 +4827,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);
 
@@ -4808,14 +4845,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,
@@ -4825,8 +4979,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;
@@ -4845,20 +5005,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);
+                       }
+               }
        }
 }
 
@@ -4907,9 +5070,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,
@@ -4921,9 +5085,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;
 }
@@ -4957,6 +5122,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)
@@ -5000,7 +5217,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);
@@ -5161,6 +5378,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;
 
@@ -5171,8 +5390,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;
        }
 
@@ -5183,6 +5404,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;
 
@@ -5398,7 +5621,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),
@@ -5419,7 +5642,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));
@@ -5456,7 +5679,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);
@@ -5483,7 +5706,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);
        
@@ -5534,7 +5757,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),
@@ -5556,14 +5779,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);
 
@@ -5689,13 +5912,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 */
@@ -5780,7 +6003,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),
@@ -6189,7 +6412,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",
@@ -6312,6 +6535,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
@@ -6522,6 +6747,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);
 }
 
@@ -6578,7 +6804,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
@@ -6674,11 +6900,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 = 
@@ -6790,9 +7016,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;
 
@@ -6887,7 +7113,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,
@@ -6951,6 +7210,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;
 }
 
@@ -7029,7 +7290,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;
@@ -7058,7 +7319,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;
@@ -7088,7 +7349,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);
@@ -7126,8 +7387,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;
@@ -7175,7 +7436,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);
@@ -7208,7 +7469,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);
 
@@ -7270,7 +7531,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);
 
@@ -7302,7 +7563,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);
 
@@ -7373,6 +7634,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)
 {
@@ -7386,6 +7662,19 @@ 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;
@@ -7440,7 +7729,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) {
@@ -7499,8 +7788,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
@@ -7546,8 +7835,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;
@@ -7609,9 +7898,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);