Remove mark all read/unread (in current folder) entries in message
[claws.git] / src / mainwindow.c
index e01564220889e92bba957863985e2cb2ceb51e02..37b8e88aeae8bbe4a234df15e6dfd808aba32867 100644 (file)
@@ -1,6 +1,6 @@
 /*
    Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-   Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+   Copyright (C) 1999-2018 the Claws Mail team and Hiroyuki Yamamoto
 
    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
 
 #include "defs.h"
 
+#ifdef G_OS_WIN32
+#define UNICODE
+#define _UNICODE
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
@@ -30,6 +35,7 @@
 #include "folderview.h"
 #include "folder_item_prefs.h"
 #include "foldersel.h"
+#include "quicksearch.h"
 #include "summaryview.h"
 #include "summary_search.h"
 #include "messageview.h"
@@ -186,6 +192,9 @@ static void log_window_show_cb      (GtkAction      *action,
                                  gpointer       data);
 static void filtering_debug_window_show_cb     (GtkAction      *action,
                                  gpointer       data);
+#ifdef G_OS_WIN32
+static void debug_log_show_cb(GtkAction *action, gpointer data);
+#endif
 
 static void inc_cancel_cb              (GtkAction      *action,
                                  gpointer       data);
@@ -704,8 +713,8 @@ static GtkActionEntry mainwin_entries[] =
        {"Message/Mark/MarkRead",                    NULL, N_("Mark as rea_d"), NULL, NULL, G_CALLBACK(mark_as_read_cb) },
        {"Message/Mark/MarkUnread",                  NULL, N_("Mark as unr_ead"), "<shift>exclam", NULL, G_CALLBACK(mark_as_unread_cb) },
        /* separation */
-       {"Message/Mark/MarkAllRead",                 NULL, N_("Mark all read"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
-       {"Message/Mark/MarkAllUnread",               NULL, N_("Mark all unread"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
+       {"Message/Mark/MarkAllRead",                 NULL, N_("Mark all read in folder"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
+       {"Message/Mark/MarkAllUnread",               NULL, N_("Mark all unread in folder"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
        /* separation */
        {"Message/Mark/IgnoreThread",                NULL, N_("Ignore thread"), NULL, NULL, G_CALLBACK(ignore_thread_cb) },
        {"Message/Mark/UnignoreThread",              NULL, N_("Unignore thread"), NULL, NULL, G_CALLBACK(unignore_thread_cb) },
@@ -776,10 +785,11 @@ static GtkActionEntry mainwin_entries[] =
        {"Tools/SSLCertificates",                    NULL, N_("SSL/TLS cer_tificates"), NULL, NULL, G_CALLBACK(ssl_manager_open_cb) }, 
 #endif
        /* {"Tools/---",                             NULL, "---", NULL, NULL, NULL }, */
-#ifndef G_OS_WIN32
        {"Tools/FilteringLog",                       NULL, N_("Filtering Lo_g"), NULL, NULL, G_CALLBACK(filtering_debug_window_show_cb) }, 
-#endif
        {"Tools/NetworkLog",                         NULL, N_("Network _Log"), "<shift><control>L", NULL, G_CALLBACK(log_window_show_cb) }, 
+#ifdef G_OS_WIN32
+       {"Tools/DebugLog",                           NULL, N_("Debug _Log"), NULL, NULL, G_CALLBACK(debug_log_show_cb) },
+#endif
        /* {"Tools/---",                             NULL, "---", NULL, NULL, NULL }, */
        {"Tools/ForgetSessionPasswords",             NULL, N_("_Forget all session passwords"), NULL, NULL, G_CALLBACK(forget_session_passwords_cb) }, 
 #ifndef PASSWORD_CRYPTO_OLD
@@ -923,27 +933,8 @@ static GtkRadioActionEntry mainwin_radio_dec_entries[] =
 };
 
 static gboolean offline_ask_sync = TRUE;
-static guint lastkey;
 static gboolean is_obscured = FALSE;
 
-static gboolean main_window_accel_activate (GtkAccelGroup *accelgroup,
-                                            GObject *arg1,
-                                            guint value,
-                                            GdkModifierType mod,
-                                            gpointer user_data) 
-{
-       MainWindow *mainwin = (MainWindow *)user_data;
-
-       if (mainwin->summaryview &&
-           mainwin->summaryview->quicksearch &&
-           quicksearch_has_focus(mainwin->summaryview->quicksearch) &&
-           (mod == 0 || mod == GDK_SHIFT_MASK)) {
-               quicksearch_pass_key(mainwin->summaryview->quicksearch, lastkey, mod);
-               return TRUE;
-       }
-       return FALSE;
-}
-
 #define N_COLOR_LABELS colorlabel_get_color_count()
 
 static void mainwindow_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
@@ -1381,14 +1372,19 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                                    gpointer data)
 {
        MainWindow *mainwin = (MainWindow*) data;
-       
+
        if (!mainwin || !event) 
                return FALSE;
 
        if (quicksearch_has_focus(mainwin->summaryview->quicksearch))
        {
-               lastkey = event->keyval;
-               return FALSE;
+               GtkWidget *entry =
+                       quicksearch_get_entry(mainwin->summaryview->quicksearch);
+               gboolean handled;
+               g_signal_emit_by_name(entry, "key-press-event", event, &handled);
+               if (handled) {
+                       return TRUE;
+               }
        }
 
        switch (event->keyval) {
@@ -1447,10 +1443,8 @@ MainWindow *main_window_create()
        FolderView *folderview;
        SummaryView *summaryview;
        MessageView *messageview;
-#if !GTK_CHECK_VERSION(3, 0, 0)
        GdkColormap *colormap;
        gboolean success[4];
-#endif
        GdkColor color[4];
        GtkWidget *ac_menu;
        gint i;
@@ -1462,7 +1456,7 @@ MainWindow *main_window_create()
 
        /* main window */
        window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
-       gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION_FRIENDLY);
+       gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 #ifdef GENERIC_UMPC
        prefs_common.layout_mode = SMALL_LAYOUT;
@@ -1854,10 +1848,11 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "SSLCertificates", "Tools/SSLCertificates", GTK_UI_MANAGER_MENUITEM)
 #endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator7", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
-#ifndef G_OS_WIN32
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "FilteringLog", "Tools/FilteringLog", GTK_UI_MANAGER_MENUITEM)
-#endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "NetworkLog", "Tools/NetworkLog", GTK_UI_MANAGER_MENUITEM)
+#ifdef G_OS_WIN32
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "DebugLog", "Tools/DebugLog", GTK_UI_MANAGER_MENUITEM)
+#endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator8", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "ForgetSessionPasswords", "Tools/ForgetSessionPasswords", GTK_UI_MANAGER_MENUITEM)
 #ifndef PASSWORD_CRYPTO_OLD
@@ -1903,6 +1898,10 @@ MainWindow *main_window_create()
                gtk_widget_hide(menubar);
        gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(mainwin->ui_manager));
 
+       /* Create a menu container for the different popup menus we
+        * will be adding from other UI elements. */
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
+
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
 
        if (prefs_common.toolbar_detachable) {
@@ -1972,7 +1971,7 @@ MainWindow *main_window_create()
        online_pixmap = stock_pixmap_widget(STOCK_PIXMAP_ONLINE);
        offline_pixmap = stock_pixmap_widget(STOCK_PIXMAP_OFFLINE);
        online_switch = gtk_button_new ();
-       gtkut_widget_set_can_focus(online_switch, FALSE);
+       gtk_widget_set_can_focus(online_switch, FALSE);
        CLAWS_SET_TIP(online_switch, 
                             _("You are online. Click the icon to go offline"));
        offline_switch = gtk_button_new ();
@@ -1992,7 +1991,7 @@ MainWindow *main_window_create()
 
        ac_button = gtk_button_new();
        CLAWS_SET_TIP(ac_button, _("Select account"));
-       gtkut_widget_set_can_focus(ac_button, FALSE);
+       gtk_widget_set_can_focus(ac_button, FALSE);
        gtk_widget_set_size_request(ac_button, -1, 0);
        gtk_box_pack_end(GTK_BOX(hbox_stat), ac_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(ac_button), "button_press_event",
@@ -2013,7 +2012,7 @@ MainWindow *main_window_create()
        g_signal_connect (G_OBJECT(offline_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
 #endif
        /* create views */
-       mainwin->folderview  = folderview  = folderview_create();
+       mainwin->folderview  = folderview  = folderview_create(mainwin);
        mainwin->summaryview = summaryview = summary_create(mainwin);
        mainwin->messageview = messageview = messageview_create(mainwin);
 
@@ -2099,29 +2098,23 @@ MainWindow *main_window_create()
        summaryview->color_dim.red = summaryview->color_dim.green =
                summaryview->color_dim.blue = COLOR_DIM;
 
-       gtkut_convert_int_to_gdk_color(prefs_common.color_new,
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_NEW],
                                       &folderview->color_new);
 
-       gtkut_convert_int_to_gdk_color(prefs_common.tgt_folder_col,
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_TGT_FOLDER],
                                       &folderview->color_op);
 
-       summaryview->color_important.red = 0;
-       summaryview->color_important.green = 0;
-       summaryview->color_important.blue = (guint16)65535;
-
        color[0] = summaryview->color_marked;
        color[1] = summaryview->color_dim;
        color[2] = folderview->color_new;
        color[3] = folderview->color_op;
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
        colormap = gdk_drawable_get_colormap(gtk_widget_get_window(window));
        gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
        for (i = 0; i < 4; i++) {
                if (success[i] == FALSE)
                        g_warning("MainWindow: color allocation %d failed", i);
        }
-#endif
 
        debug_print("done.\n");
 
@@ -2182,10 +2175,7 @@ MainWindow *main_window_create()
 #define        ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win)                        \
        gtk_window_add_accel_group                                      \
                (GTK_WINDOW(win),                                       \
-                gtk_ui_manager_get_accel_group(gtkut_ui_manager()));   \
-       g_signal_connect(G_OBJECT(gtk_ui_manager_get_accel_group(gtkut_ui_manager())), \
-                       "accel_activate",                               \
-                       G_CALLBACK(main_window_accel_activate), mainwin);
+                gtk_ui_manager_get_accel_group(gtkut_ui_manager()));
 
        ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu, mainwin->window);
        
@@ -2650,9 +2640,9 @@ static void main_window_show_cur_account(MainWindow *mainwin)
                           : _("none"));
 
        if (cur_account)
-               buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION_FRIENDLY);
+               buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION);
        else
-               buf = g_strdup(PROG_VERSION_FRIENDLY);
+               buf = g_strdup(PROG_VERSION);
        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);
 
@@ -2807,7 +2797,7 @@ void main_window_toggle_message_view(MainWindow *mainwin)
        }
        summary_grab_focus(summaryview);
        if (!summary_is_list(summaryview)) {
-               summary_show(summaryview, summaryview->folder_item);
+               summary_show(summaryview, summaryview->folder_item, FALSE);
        }
 }
 
@@ -2905,11 +2895,13 @@ gboolean main_window_empty_trash(MainWindow *mainwin, gboolean confirm, gboolean
                if (for_quit)
                        val = alertpanel(_("Empty trash"),
                               _("Delete all messages in trash folders?"),
-                              GTK_STOCK_NO, "+" GTK_STOCK_YES, _("Don't quit"));
+                              GTK_STOCK_NO, GTK_STOCK_YES, _("Don't quit"),
+                                                ALERTFOCUS_SECOND);
                else
                        val = alertpanel(_("Empty trash"),
                               _("Delete all messages in trash folders?"),
-                              GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
+                              GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+                                                ALERTFOCUS_SECOND);
                if (val == G_ALERTALTERNATE) {
                        debug_print("will empty trash\n");
                } else if (val == G_ALERTDEFAULT) {
@@ -2935,8 +2927,10 @@ static void main_window_add_mailbox(MainWindow *mainwin)
        Folder *folder;
 
        path = input_dialog(_("Add mailbox"),
-                           _("Input the location of mailbox.\n"
-                             "If an existing mailbox is specified, it will be\n"
+                           _("Input the location of the mailbox.\n"
+                             "The location can be either the full path or relative to the \n"
+                             "home directory.\n"
+                             "If the location of an existing mailbox is specified, it will be\n"
                              "scanned automatically."),
                            "Mail");
        if (!path) return;
@@ -3114,6 +3108,7 @@ SensitiveCondMask main_window_get_current_state(MainWindow *mainwin)
                UPDATE_STATE(M_MASTER_PASSPHRASE);
        }
 #endif
+
 #undef UPDATE_STATE
 
        return state;
@@ -3151,127 +3146,112 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        gchar *menu_path;
        GtkWidget *menu;
        GList *children, *cur_item;
-       gint i;
        gboolean mimepart_selected = FALSE;
 
-#define N_ENTRIES 88
-       static struct {
-               const gchar *entry;
-               SensitiveCondMask cond;
-       } entry[N_ENTRIES];
-
-       i = 0;
-#define FILL_TABLE(entry_str, ...) \
-do { \
-       entry[i].entry = (const gchar *) entry_str; entry[i++].cond = main_window_get_mask(__VA_ARGS__, -1); \
-} while (0)
-
-       FILL_TABLE("Menu/File/SaveAs", M_TARGET_EXIST);
-       FILL_TABLE("Menu/File/SavePartAs", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/File/Print", M_TARGET_EXIST);
-       FILL_TABLE("Menu/File/SynchroniseFolders", M_WANT_SYNC);
-       FILL_TABLE("Menu/File/Exit", M_UNLOCKED);
-
-       FILL_TABLE("Menu/Edit/SelectThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Edit/Find", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/Edit/QuickSearch", M_IN_MSGLIST);
-       FILL_TABLE("Menu/Edit/SearchFolder", M_TARGET_EXIST, M_SUMMARY_ISLIST);
-
-       FILL_TABLE("Menu/View/SetColumns/Folderlist", M_UNLOCKED, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/View/Sort", M_EXEC, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/View/ThreadView", M_EXEC, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/View/ExpandThreads", M_MSG_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/View/CollapseThreads", M_MSG_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/View/HideReadThreads", M_HIDE_READ_THREADS, M_SUMMARY_ISLIST, M_NOT_DRAFT);
-       FILL_TABLE("Menu/View/HideReadMessages", M_HIDE_READ_MSG, M_SUMMARY_ISLIST, M_NOT_DRAFT);
-       FILL_TABLE("Menu/View/HideDelMessages", M_SUMMARY_ISLIST, M_NOT_DRAFT);
-       FILL_TABLE("Menu/View/Goto/Prev", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/Next", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/PrevUnread", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/NextUnread", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/PrevNew", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/NextNew", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/PrevMarked", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/NextMarked", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/PrevLabeled", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/NextLabeled", M_MSG_EXIST);
-       FILL_TABLE("Menu/View/Goto/ParentMessage", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/View/Goto/NextPart", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/View/Goto/PrevPart", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/View/OpenNewWindow", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/View/MessageSource", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/View/Part", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/View/AllHeaders", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/View/Quotes", M_SINGLE_TARGET_EXIST);
-
-       FILL_TABLE("Menu/Message/Receive/CurrentAccount", M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_RETRIEVABLE_ACCOUNT);
-       FILL_TABLE("Menu/Message/Receive/AllAccounts", M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
-       FILL_TABLE("Menu/Message/Receive/CancelReceiving", M_INC_ACTIVE);
-       FILL_TABLE("Menu/Message/SendQueue", M_HAVE_ACCOUNT, M_HAVE_QUEUED_MAILS);
-       FILL_TABLE("Menu/Message/CancelSending", M_SEND_ACTIVE);
-       FILL_TABLE("Menu/Message/ComposeEmail", M_HAVE_ACCOUNT);
-       FILL_TABLE("Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT);
-       FILL_TABLE("Menu/Message/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/FollowupReply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_NEWS, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/Forward", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/ForwardAtt", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/Redirect", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/Move", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS);
-       FILL_TABLE("Menu/Message/Copy", M_TARGET_EXIST, M_EXEC);
-       FILL_TABLE("Menu/Message/Trash", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS, M_NOT_TRASH);
-       FILL_TABLE("Menu/Message/Delete", M_TARGET_EXIST, M_ALLOW_DELETE);
-       FILL_TABLE("Menu/Message/TrashThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/DeleteThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/CancelNews", M_TARGET_EXIST, M_ALLOW_DELETE, M_NEWS);
-       FILL_TABLE("Menu/Message/Mark", M_TARGET_EXIST, M_SUMMARY_ISLIST);
-       FILL_TABLE("Menu/Message/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
-       FILL_TABLE("Menu/Message/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
-       FILL_TABLE("Menu/Message/Mark/IgnoreThread", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Message/Mark/UnignoreThread", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Message/Mark/Lock", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Message/Mark/Unlock", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Message/ColorLabel", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Message/Tags", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Message/Reedit", M_HAVE_ACCOUNT, M_ALLOW_REEDIT);
-       FILL_TABLE("Menu/Message/CheckSignature", M_SINGLE_TARGET_EXIST);
-
-       FILL_TABLE("Menu/Tools/AddSenderToAB", M_SINGLE_TARGET_EXIST);
-       FILL_TABLE("Menu/Tools/CollectAddresses", M_FOLDER_SELECTED);
-       FILL_TABLE("Menu/Tools/CollectAddresses/FromFolder", M_FOLDER_SELECTED);
-       FILL_TABLE("Menu/Tools/CollectAddresses/FromSelected", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Tools/FilterFolder", M_MSG_EXIST, M_EXEC);
-       FILL_TABLE("Menu/Tools/FilterSelected", M_TARGET_EXIST, M_EXEC);
-       FILL_TABLE("Menu/Tools/RunProcessing", M_HAVE_PROCESSING);
-       FILL_TABLE("Menu/Tools/CreateFilterRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
-       FILL_TABLE("Menu/Tools/CreateProcessingRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
-       FILL_TABLE("Menu/Tools/ListUrls", M_TARGET_EXIST);
-       FILL_TABLE("Menu/Tools/Actions", M_TARGET_EXIST, M_ACTIONS_EXIST);
-       FILL_TABLE("Menu/Tools/Execute", M_DELAY_EXEC);
-       FILL_TABLE("Menu/Tools/Expunge", M_DELETED_EXISTS);
-       FILL_TABLE("Menu/Tools/ForgetSessionPasswords", M_SESSION_PASSWORDS);
+       state = main_window_get_current_state(mainwin);
+
+#define SET_SENSITIVE(entry_str, ...) \
+{ \
+       SensitiveCondMask cond = main_window_get_mask(__VA_ARGS__, -1); \
+       cm_menu_set_sensitive_full(mainwin->ui_manager, \
+                       (const gchar *) entry_str, \
+                       ((cond & state) == cond)); \
+}
+       SET_SENSITIVE("Menu/File/SaveAs", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/File/SavePartAs", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/File/Print", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/File/SynchroniseFolders", M_WANT_SYNC);
+       SET_SENSITIVE("Menu/File/Exit", M_UNLOCKED);
+
+       SET_SENSITIVE("Menu/Edit/SelectThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Edit/Find", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Edit/QuickSearch", M_IN_MSGLIST);
+       SET_SENSITIVE("Menu/Edit/SearchFolder", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+
+       SET_SENSITIVE("Menu/View/SetColumns/Folderlist", M_UNLOCKED, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/View/Sort", M_EXEC, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/View/ThreadView", M_EXEC, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/View/ExpandThreads", M_MSG_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/View/CollapseThreads", M_MSG_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/View/HideReadThreads", M_HIDE_READ_THREADS, M_SUMMARY_ISLIST, M_NOT_DRAFT);
+       SET_SENSITIVE("Menu/View/HideReadMessages", M_HIDE_READ_MSG, M_SUMMARY_ISLIST, M_NOT_DRAFT);
+       SET_SENSITIVE("Menu/View/HideDelMessages", M_SUMMARY_ISLIST, M_NOT_DRAFT);
+       SET_SENSITIVE("Menu/View/Goto/Prev", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/Next", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/PrevUnread", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/NextUnread", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/PrevNew", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/NextNew", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/PrevMarked", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/NextMarked", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/PrevLabeled", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/NextLabeled", M_MSG_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/ParentMessage", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/NextPart", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/View/Goto/PrevPart", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/View/OpenNewWindow", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/View/MessageSource", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/View/Part", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/View/AllHeaders", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/View/Quotes", M_SINGLE_TARGET_EXIST);
+
+       SET_SENSITIVE("Menu/Message/Receive/CurrentAccount", M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_RETRIEVABLE_ACCOUNT);
+       SET_SENSITIVE("Menu/Message/Receive/AllAccounts", M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
+       SET_SENSITIVE("Menu/Message/Receive/CancelReceiving", M_INC_ACTIVE);
+       SET_SENSITIVE("Menu/Message/SendQueue", M_HAVE_ACCOUNT, M_HAVE_QUEUED_MAILS);
+       SET_SENSITIVE("Menu/Message/CancelSending", M_SEND_ACTIVE);
+       SET_SENSITIVE("Menu/Message/ComposeEmail", M_HAVE_ACCOUNT);
+       SET_SENSITIVE("Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT);
+       SET_SENSITIVE("Menu/Message/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/FollowupReply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_NEWS, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/Forward", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/ForwardAtt", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/Redirect", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/Move", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS);
+       SET_SENSITIVE("Menu/Message/Copy", M_TARGET_EXIST, M_EXEC);
+       SET_SENSITIVE("Menu/Message/Trash", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS, M_NOT_TRASH);
+       SET_SENSITIVE("Menu/Message/Delete", M_TARGET_EXIST, M_ALLOW_DELETE);
+       SET_SENSITIVE("Menu/Message/TrashThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/DeleteThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/CancelNews", M_TARGET_EXIST, M_ALLOW_DELETE, M_NEWS);
+       SET_SENSITIVE("Menu/Message/Mark", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       SET_SENSITIVE("Menu/Message/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+       SET_SENSITIVE("Menu/Message/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+       SET_SENSITIVE("Menu/Message/Mark/IgnoreThread", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Message/Mark/UnignoreThread", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Message/Mark/Lock", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Message/Mark/Unlock", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Message/ColorLabel", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Message/Tags", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Message/Reedit", M_HAVE_ACCOUNT, M_ALLOW_REEDIT);
+       SET_SENSITIVE("Menu/Message/CheckSignature", M_SINGLE_TARGET_EXIST);
+
+       SET_SENSITIVE("Menu/Tools/AddSenderToAB", M_SINGLE_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Tools/CollectAddresses", M_FOLDER_SELECTED);
+       SET_SENSITIVE("Menu/Tools/CollectAddresses/FromFolder", M_FOLDER_SELECTED);
+       SET_SENSITIVE("Menu/Tools/CollectAddresses/FromSelected", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Tools/FilterFolder", M_MSG_EXIST, M_EXEC);
+       SET_SENSITIVE("Menu/Tools/FilterSelected", M_TARGET_EXIST, M_EXEC);
+       SET_SENSITIVE("Menu/Tools/RunProcessing", M_HAVE_PROCESSING);
+       SET_SENSITIVE("Menu/Tools/CreateFilterRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
+       SET_SENSITIVE("Menu/Tools/CreateProcessingRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
+       SET_SENSITIVE("Menu/Tools/ListUrls", M_TARGET_EXIST);
+       SET_SENSITIVE("Menu/Tools/Actions", M_TARGET_EXIST, M_ACTIONS_EXIST);
+       SET_SENSITIVE("Menu/Tools/Execute", M_DELAY_EXEC);
+       SET_SENSITIVE("Menu/Tools/Expunge", M_DELETED_EXISTS);
+       SET_SENSITIVE("Menu/Tools/ForgetSessionPasswords", M_SESSION_PASSWORDS);
 #ifndef PASSWORD_CRYPTO_OLD
-       FILL_TABLE("Menu/Tools/ForgetMasterPassphrase", M_MASTER_PASSPHRASE);
+       SET_SENSITIVE("Menu/Tools/ForgetMasterPassphrase", M_MASTER_PASSPHRASE);
 #endif
-       FILL_TABLE("Menu/Tools/DeleteDuplicates/SelFolder", M_MSG_EXIST, M_ALLOW_DELETE);
-
-       FILL_TABLE("Menu/Configuration", M_UNLOCKED);
-       FILL_TABLE("Menu/Configuration/ChangeAccount", M_HAVE_MULTI_ACCOUNT);
-       FILL_TABLE("Menu/Configuration/AccountPrefs", M_UNLOCKED);
-       FILL_TABLE("Menu/Configuration/CreateAccount", M_UNLOCKED);
-       FILL_TABLE("Menu/Configuration/EditAccounts", M_UNLOCKED);
-       FILL_TABLE(NULL, -1);
-#undef FILL_TABLE
-       if (i > N_ENTRIES)
-               g_error("main window menu entry table overrun (%d/%d)", i, N_ENTRIES);
-#undef ENTRIES
-
-       state = main_window_get_current_state(mainwin);
+       SET_SENSITIVE("Menu/Tools/DeleteDuplicates/SelFolder", M_MSG_EXIST, M_ALLOW_DELETE);
 
-       for (i = 0; entry[i].entry != NULL; i++) {
-               sensitive = ((entry[i].cond & state) == entry[i].cond);
-               cm_menu_set_sensitive_full(mainwin->ui_manager, entry[i].entry, sensitive);
-       }
+       SET_SENSITIVE("Menu/Configuration", M_UNLOCKED);
+       SET_SENSITIVE("Menu/Configuration/ChangeAccount", M_HAVE_MULTI_ACCOUNT);
+       SET_SENSITIVE("Menu/Configuration/AccountPrefs", M_UNLOCKED);
+       SET_SENSITIVE("Menu/Configuration/CreateAccount", M_UNLOCKED);
+       SET_SENSITIVE("Menu/Configuration/EditAccounts", M_UNLOCKED);
+#undef SET_SENSITIVE
 
        menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
                gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/Receive")));
@@ -3387,6 +3367,18 @@ do { \
        cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/CheckSignature", 
                                   mimepart_selected && mainwin->messageview->mimeview->signed_part);
 
+       sensitive = TRUE;
+       if (mimepart_selected) {
+               MimeInfo *partinfo = messageview_get_selected_mime_part(mainwin->messageview);
+
+               if (partinfo && (partinfo->type == MIMETYPE_MESSAGE ||
+                                partinfo->type == MIMETYPE_IMAGE ||
+                                partinfo->type == MIMETYPE_MULTIPART)) {
+                       sensitive = FALSE;
+               }
+       }
+       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Part/AsText", sensitive);
+
        main_window_menu_callback_unblock(mainwin);
 }
 
@@ -3418,7 +3410,7 @@ static gint mailing_list_create_submenu (MainWindow *mainwin, MsgInfo *msginfo)
        }
                
        /* Mailing list post */
-       if (!strcmp2 (msginfo->extradata->list_post, "NO")) {
+       if (!g_strcmp0 (msginfo->extradata->list_post, "NO")) {
                g_free(msginfo->extradata->list_post);
                msginfo->extradata->list_post = g_strdup (_("No posting allowed"));
        }
@@ -3892,8 +3884,7 @@ void main_window_destroy_all(void)
 
                /* free toolbar stuff */
                toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
+               toolbar_destroy(mainwin->toolbar);
 
                summaryview_destroy(mainwin->summaryview);
                mainwin->folderview->mainwin = NULL;
@@ -3989,7 +3980,7 @@ static void add_mailbox_cb(GtkAction *action, gpointer data)
 static void update_folderview_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
-       summary_show(mainwin->summaryview, NULL);
+       summary_show(mainwin->summaryview, NULL, FALSE);
        folderview_check_new_all();
 }
 
@@ -4063,7 +4054,7 @@ static void app_exit_cb(GtkAction *action, gpointer data)
 
        if (prefs_common.confirm_on_exit) {
                if (alertpanel(_("Exit"), _("Exit Claws Mail?"),
-                              GTK_STOCK_CANCEL, GTK_STOCK_QUIT,  NULL)
+                              GTK_STOCK_CANCEL, GTK_STOCK_QUIT,  NULL, ALERTFOCUS_FIRST)
                    != G_ALERTALTERNATE)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
@@ -4131,7 +4122,15 @@ static void main_window_reply_cb(GtkAction *gaction, gpointer data)
 
        msginfo_list = summary_get_selection(mainwin->summaryview);
        cm_return_if_fail(msginfo_list != NULL);
-       compose_reply_from_messageview(msgview, msginfo_list, action);
+
+       if (!summary_has_opened_message(mainwin->summaryview)) {
+               compose_reply_from_messageview(NULL, msginfo_list, action);
+       } else if (summary_is_opened_message_selected(mainwin->summaryview)) {
+               compose_reply_from_messageview(msgview, msginfo_list, action);
+       } else {
+               compose_reply_from_messageview(msgview, NULL, action);
+       }
+
        g_slist_free(msginfo_list);
 }
 
@@ -4223,6 +4222,8 @@ void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline,
                online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);
        offline_ask_sync = TRUE;
 
+       inc_reset_offline_override_timers();
+
        switching = FALSE;
 }
 
@@ -4255,7 +4256,7 @@ static void mainwindow_check_synchronise(MainWindow *mainwin, gboolean ask)
 
        if (offline_ask_sync && ask && alertpanel(_("Folder synchronisation"),
                        _("Do you want to synchronise your folders now?"),
-                       GTK_STOCK_CANCEL, g_strconcat("+", _("_Synchronise"), NULL), NULL) != G_ALERTALTERNATE)
+                       GTK_STOCK_CANCEL, _("_Synchronise"), NULL, ALERTFOCUS_SECOND) != G_ALERTALTERNATE)
                return;
        
        if (offline_ask_sync)
@@ -4339,6 +4340,34 @@ static void filtering_debug_window_show_cb(GtkAction *action, gpointer data)
        log_window_show(mainwin->filtering_debugwin);
 }
 
+#ifdef G_OS_WIN32
+static void debug_log_show_cb(GtkAction *action, gpointer data)
+{
+       GError *error = NULL;
+       gchar *logpath8 = win32_debug_log_path();
+       gunichar2 *logpath16;
+
+       debug_print("opening '%s'\n", logpath8);
+
+       logpath16 = g_utf8_to_utf16(logpath8, -1, NULL, NULL, &error);
+
+       if (error != NULL) {
+               g_warning("couldn't convert debug log path '%s' to UTF-16: %s",
+                               logpath8, error->message);
+               g_error_free(error);
+               g_free(logpath16);
+               return;
+       }
+
+       HINSTANCE ret = ShellExecute(NULL, NULL, (LPCWSTR)logpath16,
+                       NULL, NULL, SW_SHOW);
+
+       g_free(logpath8);
+       g_free(logpath16);
+       debug_print("ShellExecute result: %"G_GSIZE_FORMAT"\n", (gsize)ret);
+}
+#endif
+
 static void inc_cancel_cb(GtkAction *action, gpointer data)
 {
        inc_cancel_all();
@@ -4625,9 +4654,13 @@ static void thread_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
        gboolean threaded = FALSE;
+       guint selected_msgnum = 0;
+
        if (mainwin->menu_lock_count) return;
        if (!mainwin->summaryview->folder_item) return;
 
+       selected_msgnum = summary_get_msgnum(mainwin->summaryview, mainwin->summaryview->selected);
+
        threaded = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 
        mainwin->summaryview->folder_item->threaded = threaded; 
@@ -4635,7 +4668,8 @@ static void thread_cb(GtkAction *action, gpointer data)
        mainwin->summaryview->threaded = threaded;
 
        summary_show(mainwin->summaryview, 
-                       mainwin->summaryview->folder_item);
+                       mainwin->summaryview->folder_item, FALSE);
+       summary_select_by_msgnum(mainwin->summaryview, selected_msgnum, FALSE);
 }
 
 static void expand_threads_cb(GtkAction *action, gpointer data)
@@ -4663,29 +4697,26 @@ static void set_folder_display_item_cb(GtkAction *action, gpointer data)
 static void sort_summary_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
-       FolderItem *item = mainwin->summaryview->folder_item;
        gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
 
        if (mainwin->menu_lock_count) return;
 
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current)) && item) {
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current))) {
                summary_sort(mainwin->summaryview, (FolderSortKey)value,
-                            item->sort_type);
-               item->sort_key = value;
+                            mainwin->summaryview->sort_type);
        }
 }
 
 static void sort_summary_type_cb(GtkAction *gaction, GtkRadioAction *current, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
-       FolderItem *item = mainwin->summaryview->folder_item;
        gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
 
        if (mainwin->menu_lock_count) return;
 
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current)) && item)
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current)))
                summary_sort(mainwin->summaryview,
-                            item->sort_key, (FolderSortType)value);
+                            mainwin->summaryview->sort_key, (FolderSortType)value);
 }
 
 static void attract_by_subject_cb(GtkAction *action, gpointer data)
@@ -4829,7 +4860,7 @@ static void update_summary_cb(GtkAction *action, gpointer data)
 
        folder_update_op_count();
        folder_item_scan(fitem);
-       summary_show(mainwin->summaryview, fitem);
+       summary_show(mainwin->summaryview, fitem, FALSE);
 }
 
 static void prev_cb(GtkAction *action, gpointer data)
@@ -4899,8 +4930,8 @@ static void prev_history_cb(GtkAction *action, gpointer data)
        if (info) {
                if (info->folder != mainwin->summaryview->folder_item)
                        folderview_select(mainwin->folderview, info->folder);
-               summary_display_by_msgnum(mainwin->summaryview, info->msgnum);
-               summary_display_msg_selected(mainwin->summaryview, FALSE);
+               summary_select_by_msgnum(mainwin->summaryview, info->msgnum,
+                               OPEN_SELECTED_ON_PREVNEXT);
                procmsg_msginfo_free(&info);
                main_window_set_menu_sensitive(mainwindow_get_mainwindow());
                toolbar_main_set_sensitive(mainwindow_get_mainwindow());
@@ -4914,7 +4945,8 @@ static void next_history_cb(GtkAction *action, gpointer data)
        if (info) {
                if (info->folder != mainwin->summaryview->folder_item)
                        folderview_select(mainwin->folderview, info->folder);
-               summary_display_by_msgnum(mainwin->summaryview, info->msgnum);
+               summary_select_by_msgnum(mainwin->summaryview, info->msgnum,
+                               OPEN_SELECTED_ON_PREVNEXT);
                procmsg_msginfo_free(&info);
                main_window_set_menu_sensitive(mainwindow_get_mainwindow());
                toolbar_main_set_sensitive(mainwindow_get_mainwindow());
@@ -5085,7 +5117,7 @@ static void prefs_account_open_cb(GtkAction *action, gpointer data)
        if (!cur_account) {
                new_account_cb(NULL, mainwin);
        } else {
-               account_open(cur_account);
+               account_open(cur_account, FALSE);
        }
 }
 
@@ -5454,8 +5486,7 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                }
                if (item && msg && atoi(msg)) {
                        g_print("selecting message %d\n", atoi(msg));
-                       summary_select_by_msgnum(mainwin->summaryview, atoi(msg));
-                       summary_display_msg_selected(mainwin->summaryview, FALSE);
+                       summary_select_by_msgnum(mainwin->summaryview, atoi(msg), TRUE);
                        if (popup)
                                main_window_popup(mainwin);
                        g_free(tmp);
@@ -5467,8 +5498,7 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                        msginfo = folder_item_get_msginfo_by_msgid(item, msg);
                        if (msginfo) {
                                g_print("selecting message %s\n", msg);
-                               summary_select_by_msgnum(mainwin->summaryview, msginfo->msgnum);
-                               summary_display_msg_selected(mainwin->summaryview, FALSE);
+                               summary_select_by_msgnum(mainwin->summaryview, msginfo->msgnum, TRUE);
                                if (popup)
                                        main_window_popup(mainwin);
                                g_free(tmp);