Use folderview_grab_focus() outside of folderview.c.
[claws.git] / src / mainwindow.c
index 4d580e7165de7e91af372a291ea01defeb2be7ad..71e032071ed1040c0dd0567d6023c011dab56f03 100644 (file)
@@ -1,6 +1,6 @@
 /*
    Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-   Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+   Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include "main.h"
 #include "mainwindow.h"
@@ -45,6 +46,7 @@
 #include "import.h"
 #include "export.h"
 #include "edittags.h"
+#include "password.h"
 #include "prefs_common.h"
 #include "prefs_actions.h"
 #include "prefs_filtering.h"
@@ -54,7 +56,7 @@
 #include "prefs_template.h"
 #include "action.h"
 #include "account.h"
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
        #include "addressbook.h"
 #else
        #include "addressbook-dbus.h"
 #include "tags.h"
 #include "textview.h"
 #include "imap.h"
+#include "news.h"
 #include "socket.h"
 #include "printing.h"
+#include "send_message.h"
 #ifdef G_OS_WIN32
 #include "w32lib.h"
 #endif
@@ -185,6 +189,8 @@ static void filtering_debug_window_show_cb  (GtkAction      *action,
 
 static void inc_cancel_cb              (GtkAction      *action,
                                  gpointer       data);
+static void send_cancel_cb             (GtkAction      *action,
+                                 gpointer       data);
 
 static void open_msg_cb                        (GtkAction      *action,
                                  gpointer       data);
@@ -196,6 +202,8 @@ static void show_all_header_cb              (GtkAction      *action,
                                  gpointer       data);
 static void toggle_fullscreen_cb       (GtkAction      *action,
                                  gpointer       data);
+static void toggle_menubar_cb  (GtkAction      *action,
+                                 gpointer       data);
 
 static void hide_quotes_cb(GtkAction   *action,
                                  gpointer       data);
@@ -274,10 +282,6 @@ static void sort_summary_type_cb (GtkAction *action, GtkRadioAction *current, gp
 static void attract_by_subject_cb(GtkAction    *action,
                                  gpointer       data);
 
-static void zoom_in_cb          (GtkAction     *action,
-                                 gpointer       data);
-static void zoom_out_cb                 (GtkAction     *action,
-                                 gpointer       data);
 static void delete_duplicated_cb (GtkAction    *action,
                                  gpointer       data);
 static void delete_duplicated_all_cb (GtkAction        *action,
@@ -343,6 +347,8 @@ static void allsel_cb                (GtkAction     *action,
                                  gpointer       data);
 static void select_thread_cb    (GtkAction     *action,
                                  gpointer       data);
+static void trash_thread_cb     (GtkAction     *action,
+                                 gpointer       data);
 static void delete_thread_cb    (GtkAction     *action,
                                  gpointer       data);
 
@@ -423,7 +429,10 @@ static void sync_cb                 ( GtkAction    *action,
 
 static void forget_session_passwords_cb        (GtkAction      *action,
                                         gpointer        data );
-
+#ifndef PASSWORD_CRYPTO_OLD
+static void forget_master_passphrase_cb        (GtkAction      *action,
+                                        gpointer        data );
+#endif
 static gboolean mainwindow_focus_in_event      (GtkWidget      *widget, 
                                                 GdkEventFocus  *focus,
                                                 gpointer        data);
@@ -537,7 +546,6 @@ static GtkActionEntry mainwin_entries[] =
        {"Edit/Copy",                           NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(copy_cb) }, 
        {"Edit/SelectAll",                      NULL, N_("Select _all"), "<control>A", NULL, G_CALLBACK(allsel_cb) }, 
        {"Edit/SelectThread",                   NULL, N_("Select _thread"), NULL, NULL, G_CALLBACK(select_thread_cb) }, 
-       {"Edit/DeleteThread",                   NULL, N_("_Delete thread"), NULL, NULL, G_CALLBACK(delete_thread_cb) }, 
        {"Edit/---",                            NULL, "---" },
        {"Edit/Find",                           NULL, N_("_Find in current message..."), "<control>F", NULL, G_CALLBACK(search_cb) },
        {"Edit/SearchFolder",                   NULL, N_("_Search folder..."), "<shift><control>F", NULL, G_CALLBACK(search_folder_cb) },
@@ -551,9 +559,6 @@ static GtkActionEntry mainwin_entries[] =
        {"View/SetColumns/Folderlist",          NULL, N_("In _folder list..."), NULL, NULL, G_CALLBACK(set_folder_display_item_cb) },
        {"View/SetColumns/Messagelist",         NULL, N_("In _message list..."), NULL, NULL, G_CALLBACK(set_summary_display_item_cb) },
        {"View/---",                            NULL, "---" },
-       {"View/Zoom",                           NULL, N_("_Zoom") },
-       {"View/Zoom/In",                        NULL, N_("_In"), "<control>plus", NULL, G_CALLBACK(zoom_in_cb) },
-       {"View/Zoom/Out",                       NULL, N_("_Out"), "<control>minus", NULL, G_CALLBACK(zoom_out_cb) },
 
 
 #ifndef GENERIC_UMPC
@@ -647,6 +652,7 @@ static GtkActionEntry mainwin_entries[] =
        {"Message/Receive/---",                 NULL, "---" },
        {"Message/Receive/PlaceHolder",         NULL, "PlaceHolder,", NULL, NULL, G_CALLBACK(mainwindow_nothing_cb) },
        {"Message/SendQueue",                   NULL, N_("_Send queued messages"), NULL, NULL, G_CALLBACK(mw_send_queue_cb) },
+       {"Message/CancelSending",       NULL, N_("Cancel sending"), NULL, NULL, G_CALLBACK(send_cancel_cb) },
 
        {"Message/---",                         NULL, "---" },
 
@@ -684,6 +690,8 @@ static GtkActionEntry mainwin_entries[] =
        {"Message/Copy",                        NULL, N_("_Copy..."), "<shift><control>O", NULL, G_CALLBACK(copy_to_cb) },
        {"Message/Trash",                       NULL, N_("Move to _trash"), "<control>D", NULL, G_CALLBACK(delete_trash_cb) },
        {"Message/Delete",                      NULL, N_("_Delete..."), NULL, NULL, G_CALLBACK(delete_cb) },
+       {"Message/TrashThread",                 NULL, N_("Move thread to tr_ash"), NULL, NULL, G_CALLBACK(trash_thread_cb) }, 
+       {"Message/DeleteThread",                NULL, N_("Delete t_hread"), NULL, NULL, G_CALLBACK(delete_thread_cb) }, 
        {"Message/CancelNews",                  NULL, N_("Cancel a news message"), NULL, NULL, G_CALLBACK(cancel_cb) },
        /* separation */
        
@@ -772,6 +780,9 @@ static GtkActionEntry mainwin_entries[] =
        {"Tools/NetworkLog",                    NULL, N_("Network _Log"), "<shift><control>L", NULL, G_CALLBACK(log_window_show_cb) }, 
        /* {"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
+       {"Tools/ForgetMasterPassphrase",                NULL, N_("Forget _master passphrase"), NULL, NULL, G_CALLBACK(forget_master_passphrase_cb) },
+#endif
 
 /* Configuration menu */       
        {"Configuration/ChangeAccount",         NULL, N_("C_hange current account") },
@@ -804,6 +815,7 @@ static GtkActionEntry mainwin_entries[] =
 
 static GtkToggleActionEntry mainwin_toggle_entries[] = {
        {"File/OfflineMode",                    NULL, N_("Offline _mode"), "<control>W", NULL, G_CALLBACK(toggle_work_offline_cb) }, /*toggle*/
+       {"View/ShowHide/MenuBar",               NULL, N_("Men_ubar"), "<control>F12", NULL, G_CALLBACK(toggle_menubar_cb) }, /* toggle */
        {"View/ShowHide/MessageView",           NULL, N_("_Message view"), "V", NULL, G_CALLBACK(toggle_message_cb) }, /* toggle */
 #ifndef GENERIC_UMPC
        {"View/ShowHide/StatusBar",             NULL, N_("Status _bar"), NULL, NULL, G_CALLBACK(toggle_statusbar_cb) }, /* toggle */
@@ -813,9 +825,7 @@ static GtkToggleActionEntry mainwin_toggle_entries[] = {
        {"View/HideReadThreads",                NULL, N_("Hide read threads"), NULL, NULL, G_CALLBACK(hide_read_threads) }, /* toggle */
        {"View/HideReadMessages",               NULL, N_("_Hide read messages"), NULL, NULL, G_CALLBACK(hide_read_messages) }, /* toggle */
        {"View/HideDelMessages",                NULL, N_("Hide deleted messages"), NULL, NULL, G_CALLBACK(hide_del_messages) }, /* toggle */
-#ifndef MAEMO
        {"View/FullScreen",                     NULL, N_("_Fullscreen"), "F11", NULL, G_CALLBACK(toggle_fullscreen_cb) }, /* toggle */
-#endif
        {"View/AllHeaders",                     NULL, N_("Show all _headers"), "<control>H", NULL, G_CALLBACK(show_all_header_cb) }, /* toggle */
        {"View/Quotes/CollapseAll",             NULL, N_("_Collapse all"), "<control><shift>Q", NULL, G_CALLBACK(hide_quotes_cb) }, /* 1 toggle */
        {"View/Quotes/Collapse2",               NULL, N_("Collapse from level _2"), NULL, NULL, G_CALLBACK(hide_quotes_cb) }, /* 2 toggle */
@@ -882,6 +892,7 @@ static GtkRadioActionEntry mainwin_radio_enc_entries[] =
        ENC_ACTION(CS_ISO_8859_9, C_ISO_8859_9, N_("Turkish (ISO-8859-_9)")), /* RADIO set_charset_cb */
        ENC_ACTION("Cyrillic/"CS_ISO_8859_5, C_ISO_8859_5, "ISO-8859-_5"), /* RADIO set_charset_cb */
        ENC_ACTION("Cyrillic/"CS_KOI8_R, C_KOI8_R, "KOI8-_R"), /* RADIO set_charset_cb */
+       ENC_ACTION("Cyrillic/"CS_MACCYR, C_MACCYR, "_Mac-Cyrillic"), /* RADIO set_charset_cb */
        ENC_ACTION("Cyrillic/"CS_KOI8_U, C_KOI8_U, "KOI8-_U"), /* RADIO set_charset_cb */
        ENC_ACTION("Cyrillic/"CS_WINDOWS_1251, C_WINDOWS_1251, "Windows-1251"), /* RADIO set_charset_cb */
        ENC_ACTION("Japanese/"CS_ISO_2022_JP, C_ISO_2022_JP, "ISO-2022-_JP"), /* RADIO set_charset_cb */
@@ -988,7 +999,7 @@ static void mainwindow_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_i
                        }
                }
        } else
-               g_warning("invalid number of color elements (%d)\n", n);
+               g_warning("invalid number of color elements (%d)", n);
 
        g_slist_free(sel);
        /* reset "dont_toggle" state */
@@ -1137,7 +1148,7 @@ void mainwin_accel_changed_cb (GtkAccelGroup *accelgroup, guint keyval, GdkModif
                        GtkLabel *label = g_object_get_data(G_OBJECT(item), "accel_label");
                        gchar *new_accel;
                        
-                       if (keyval == GDK_KEY_BackSpace) {
+                       if (keyval == GDK_KEY_Delete) {
                                const gchar *accel_path;
                                accel_path = gtk_menu_item_get_accel_path(item);
                                keyval = 0; modifier = 0;
@@ -1148,6 +1159,7 @@ void mainwin_accel_changed_cb (GtkAccelGroup *accelgroup, guint keyval, GdkModif
                        g_free(new_accel);
                }
        }
+       g_list_free(closures);
 }
 
 static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refresh)
@@ -1185,7 +1197,6 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
        g_free(accel_path);
        gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-
        item = gtk_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
        gtk_widget_show(item);
@@ -1244,7 +1255,7 @@ static gint mainwin_tag_cmp_list(gconstpointer a, gconstpointer b)
                return tag_b == NULL ? 0:1;
        
        if (tag_b == NULL)
-               return tag_a == NULL ? 0:1;
+               return 1;
  
        return g_utf8_collate(tag_a, tag_b);
 }
@@ -1310,7 +1321,6 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
        g_free(accel_path);
        gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_KEY_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-
        g_slist_free(orig);
        gtk_widget_show(menu);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
@@ -1357,25 +1367,6 @@ void mainwindow_show_error(void)
        gtk_widget_show(mainwin->warning_btn);
 }
 
-static void main_window_zoom(ZoomType type)
-{
-       static gboolean zooming = FALSE;
-
-       if (zooming)
-               return;
-       zooming = TRUE;
-
-       prefs_common_zoom_font(&prefs_common.textfont, type);
-       prefs_common_zoom_font(&prefs_common.printfont, type);
-       prefs_common_zoom_font(&prefs_common.boldfont, type);
-       prefs_common_zoom_font(&prefs_common.normalfont, type);
-       prefs_common_zoom_font(&prefs_common.smallfont, type);
-
-       main_window_reflect_prefs_all();
-
-       zooming = FALSE;
-}
-
 void mainwindow_clear_error(MainWindow *mainwin)
 {
        gtk_widget_hide(mainwin->warning_btn);
@@ -1400,13 +1391,11 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_KEY_Q:             /* Quit */
-#ifndef MAEMO
                BREAK_ON_MODIFIER_KEY();
 
                if (gtk_window_is_active(GTK_WINDOW(mainwin->window))) {
                        app_exit_cb(NULL, mainwin);
                }
-#endif
                return FALSE;
        case GDK_KEY_space:
                BREAK_ON_MODIFIER_KEY();
@@ -1418,38 +1407,10 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                                    && mainwin->summaryview->folder_item->total_msgs == 0))) {
                                g_signal_stop_emission_by_name(G_OBJECT(widget), 
                                               "key_press_event");
-                               folderview_select_next_unread(mainwin->folderview, TRUE);
+                               folderview_select_next_with_flag(mainwin->folderview, MSG_UNREAD, TRUE);
                        }
                }
                break;
-
-#ifdef MAEMO
-       case GDK_KEY_F6:
-               if (maemo_mainwindow_is_fullscreen(widget)) {
-                       gtk_window_unfullscreen(GTK_WINDOW(widget));
-                } else {
-                       gtk_window_fullscreen(GTK_WINDOW(widget));
-                }
-               break;
-       case GDK_KEY_F7:
-               {
-                       main_window_zoom(ZOOM_IN);
-               }
-               break;
-       case GDK_KEY_F8:
-               {
-                       main_window_zoom(ZOOM_OUT);
-               }
-               break;
-       case GDK_KEY_Escape:
-               if (mainwin->summaryview && 
-                   mainwin->summaryview->ext_messageview && 
-                   mainwin->summaryview->ext_messageview->window && 
-                   widget == mainwin->summaryview->ext_messageview->window) {
-                       messageview_destroy(mainwin->summaryview->ext_messageview);
-               }
-               break;
-#endif
        default:
                break;
        }
@@ -1458,97 +1419,6 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
 
 #undef BREAK_ON_MODIFIER_KEY
 
-#ifdef MAEMO
-void mainwindow_maemo_led_set(gboolean state) {
-       static gint last_state = -1;
-       if (last_state == state)
-               return;
-       last_state = (gint)state;
-       if (prefs_common.maemo_show_led) {
-               if(state) {
-                 execute_command_line("/usr/bin/dbus-send --system --type=method_call "
-                       "--dest=com.nokia.mce "
-                       "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_activate "
-                       "string:PatternCommunicationEvent", TRUE);
-                 execute_command_line("/usr/bin/dbus-send --system --type=method_call "
-                       "--dest=com.nokia.mce "
-                       "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_activate "
-                       "string:PatternCommunicationEmail", TRUE);
-               } else {
-                 execute_command_line("/usr/bin/dbus-send --system --type=method_call "
-                       "--dest=com.nokia.mce "
-                       "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_deactivate "
-                       "string:PatternCommunicationEvent", TRUE);
-                 execute_command_line("/usr/bin/dbus-send --system --type=method_call "
-                       "--dest=com.nokia.mce "
-                       "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_deactivate "
-                       "string:PatternCommunicationEmail", TRUE);
-               }
-       } 
-}
-
-static void led_update(FolderItem *removed_item)
-{
-       guint new, unread, unreadmarked, marked, total, replied;
-       guint forwarded, locked, ignored, watched;
-
-       folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total,
-                               &replied, &forwarded, &locked, &ignored,
-                               &watched);
-       if (removed_item) {
-               total -= removed_item->total_msgs;
-               new -= removed_item->new_msgs;
-               unread -= removed_item->unread_msgs;
-       }
-
-       if (new > 0)
-               mainwindow_maemo_led_set(TRUE);
-       else
-               mainwindow_maemo_led_set(FALSE);
-}
-
-static gboolean maemo_folder_item_update_hook(gpointer source, gpointer data)
-{
-       led_update(NULL);
-
-       return FALSE;
-}
-
-static gboolean maemo_folder_update_hook(gpointer source, gpointer data)
-{
-       FolderUpdateData *hookdata;
-       hookdata = source;
-       if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM)
-               led_update(hookdata->item);
-       else
-               led_update(NULL);
-
-       return FALSE;
-}
-
-static void main_window_install_maemo_hooks(MainWindow *mainwin)
-{
-       gint maemo_item_hook_id, maemo_folder_hook_id;
-       
-       maemo_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, maemo_folder_item_update_hook, NULL);
-       if (maemo_item_hook_id == -1) {
-               goto err_out_item;
-       }
-
-       maemo_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, maemo_folder_update_hook, NULL);
-       if (maemo_folder_hook_id == -1) {
-               goto err_out_folder;
-       }
-       
-       return;
-
-err_out_folder:
-       hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, maemo_item_hook_id);
-err_out_item:
-       return;
-}
-#endif
-
 MainWindow *main_window_create()
 {
        MainWindow *mainwin;
@@ -1590,7 +1460,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);
+       gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION_FRIENDLY);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 #ifdef GENERIC_UMPC
        prefs_common.layout_mode = SMALL_LAYOUT;
@@ -1643,11 +1513,7 @@ MainWindow *main_window_create()
        gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_radio_dec_entries,
                        G_N_ELEMENTS(mainwin_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)mainwin);
 
-#ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
-#else
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
-#endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "View", "View", GTK_UI_MANAGER_MENU)
@@ -1683,7 +1549,6 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Edit", "Copy", "Edit/Copy", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Edit", "SelectAll", "Edit/SelectAll", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Edit", "SelectThread", "Edit/SelectThread", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Edit", "DeleteThread", "Edit/DeleteThread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Edit", "Separator1", "Edit/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Edit", "Find", "Edit/Find", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Edit", "SearchFolder", "Edit/SearchFolder", GTK_UI_MANAGER_MENUITEM)
@@ -1691,6 +1556,7 @@ MainWindow *main_window_create()
 
 /* View menu */
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "ShowHide", "View/ShowHide", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide", "MenuBar", "View/ShowHide/MenuBar", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide", "Toolbar", "View/ShowHide/Toolbar", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide/Toolbar", "TextBelowIcon", "View/ShowHide/Toolbar/TextBelowIcon", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide/Toolbar", "TextBesideIcon", "View/ShowHide/Toolbar/TextBesideIcon", GTK_UI_MANAGER_MENUITEM)
@@ -1707,16 +1573,9 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "SetColumns", "View/SetColumns", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/SetColumns", "Folderlist", "View/SetColumns/Folderlist", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/SetColumns", "Messagelist", "View/SetColumns/Messagelist", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator0", "View/---", GTK_UI_MANAGER_SEPARATOR)
-
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Zoom", "View/Zoom", GTK_UI_MANAGER_MENU)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Zoom", "In", "View/Zoom/In", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Zoom", "Out", "View/Zoom/Out", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator1", "View/---", GTK_UI_MANAGER_SEPARATOR)
 
-#ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "FullScreen", "View/FullScreen", GTK_UI_MANAGER_MENUITEM)
-#endif
 #ifndef GENERIC_UMPC
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Layout", "View/Layout", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Layout", "Standard", "View/Layout/Standard", GTK_UI_MANAGER_MENUITEM)
@@ -1783,11 +1642,11 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator8", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator4", "View/---", GTK_UI_MANAGER_SEPARATOR)
 
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Encoding", "View/Encoding", GTK_UI_MANAGER_MENU)
@@ -1823,6 +1682,7 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Encoding", "Cyrillic", "View/Encoding/Cyrillic", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_ISO_8859_5, "View/Encoding/Cyrillic/"CS_ISO_8859_5, GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_KOI8_R, "View/Encoding/Cyrillic/"CS_KOI8_R, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_MACCYR, "View/Encoding/Cyrillic/"CS_MACCYR, GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_KOI8_U, "View/Encoding/Cyrillic/"CS_KOI8_U, GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_WINDOWS_1251, "View/Encoding/Cyrillic/"CS_WINDOWS_1251, GTK_UI_MANAGER_MENUITEM)
 
@@ -1880,6 +1740,7 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Receive", "Separator1", "Message/Receive/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Receive", "PlaceHolder", "Message/Receive/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "SendQueue", "Message/SendQueue", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "CancelSending", "Message/CancelSending", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
 
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeEmail", "Message/ComposeEmail", GTK_UI_MANAGER_MENUITEM)
@@ -1914,6 +1775,8 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Copy", "Message/Copy", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Trash", "Message/Trash", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Delete", "Message/Delete", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "TrashThread", "Message/TrashThread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "DeleteThread", "Message/DeleteThread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "CancelNews", "Message/CancelNews", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator4", "Message/---", GTK_UI_MANAGER_SEPARATOR)
 
@@ -1994,6 +1857,9 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "NetworkLog", "Tools/NetworkLog", GTK_UI_MANAGER_MENUITEM)
        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
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "ForgetMasterPassphrase", "Tools/ForgetMasterPassphrase", GTK_UI_MANAGER_MENUITEM)
+#endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator9", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
 
 /* Configuration menu */
@@ -2028,14 +1894,13 @@ MainWindow *main_window_create()
 
 
        menubar = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu");
-       gtk_widget_show_all(menubar);
+       if (prefs_common.mainwin_menubar)
+               gtk_widget_show_all(menubar);
+       else
+               gtk_widget_hide(menubar);
        gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(mainwin->ui_manager));
 
-#ifndef MAEMO
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
-#else
-       hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
-#endif
 
        if (prefs_common.toolbar_detachable) {
                handlebox = gtk_handle_box_new();
@@ -2054,15 +1919,9 @@ MainWindow *main_window_create()
        mainwin->window       = window;
        mainwin_list = g_list_append(mainwin_list, mainwin);
        
-#ifdef MAEMO
-       mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
-                                         window, 
-                                         (gpointer)mainwin);
-#else
        mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
                                          handlebox, 
                                          (gpointer)mainwin);
-#endif
        toolbar_set_learn_button
                (mainwin->toolbar,
                 LEARN_SPAM);
@@ -2107,8 +1966,8 @@ MainWindow *main_window_create()
        gtk_widget_set_size_request(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
 
-       online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
-       offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
+       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);
        CLAWS_SET_TIP(online_switch, 
@@ -2257,7 +2116,7 @@ MainWindow *main_window_create()
        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\n", i);
+                       g_warning("MainWindow: color allocation %d failed", i);
        }
 #endif
 
@@ -2365,16 +2224,14 @@ MainWindow *main_window_create()
        mainwindow_colorlabel_menu_create(mainwin, FALSE);
        mainwindow_tags_menu_create(mainwin, FALSE);
 
-#ifdef MAEMO
-       main_window_install_maemo_hooks(mainwin);
-#endif
-#ifndef MAEMO
        if (prefs_common.mainwin_fullscreen) {
                cm_toggle_menu_set_active_full(mainwin->ui_manager, 
                        "Menu/View/FullScreen",
                        TRUE);
        }
-#endif
+       if (prefs_common.mainwin_menubar)
+               cm_toggle_menu_set_active_full(mainwin->ui_manager,"Menu/View/ShowHide/MenuBar", TRUE);
+       
        return mainwin;
 }
 
@@ -2473,17 +2330,17 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
                        folderview_reinit_fonts(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
                        foldersel_reflect_prefs_pixmap_theme();
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
                        addressbook_reflect_prefs_pixmap_theme();
 #endif
 #ifndef GENERIC_UMPC
-                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_ONLINE);
+                       pixmap = stock_pixmap_widget(STOCK_PIXMAP_ONLINE);
                        gtk_container_remove(GTK_CONTAINER(mainwin->online_switch), 
                                             mainwin->online_pixmap);
                        gtk_container_add (GTK_CONTAINER(mainwin->online_switch), pixmap);
                        gtk_widget_show(pixmap);
                        mainwin->online_pixmap = pixmap;
-                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_OFFLINE);
+                       pixmap = stock_pixmap_widget(STOCK_PIXMAP_OFFLINE);
                        gtk_container_remove(GTK_CONTAINER(mainwin->offline_switch), 
                                             mainwin->offline_pixmap);
                        gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
@@ -2551,7 +2408,6 @@ static gboolean main_window_reflect_tags_changes_real(gpointer data)
        MainWindow *mainwin = (MainWindow *)data;
 
        if (summary_is_locked(mainwin->summaryview)) {
-               tags_tag = 0;
                return TRUE;
        }
        /* re-create tags submenu */
@@ -2791,9 +2647,9 @@ static void main_window_show_cur_account(MainWindow *mainwin)
                           : _("none"));
 
        if (cur_account)
-               buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION);
+               buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION_FRIENDLY);
        else
-               buf = g_strdup(PROG_VERSION);
+               buf = g_strdup(PROG_VERSION_FRIENDLY);
        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);
 
@@ -3066,7 +2922,7 @@ gboolean main_window_empty_trash(MainWindow *mainwin, gboolean confirm, gboolean
 
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->stype == F_TRASH)
-               gtk_widget_grab_focus(mainwin->folderview->ctree);
+               folderview_grab_focus(mainwin->folderview);
        return TRUE;
 }
 
@@ -3104,9 +2960,9 @@ static void main_window_add_mailbox(MainWindow *mainwin)
        folder_set_ui_func(folder, NULL, NULL);
 }
 
-SensitiveCond main_window_get_current_state(MainWindow *mainwin)
+SensitiveCondMask main_window_get_current_state(MainWindow *mainwin)
 {
-       SensitiveCond state = 0;
+       SensitiveCondMask state = 0;
        SummarySelection selection;
        FolderItem *item = mainwin->summaryview->folder_item;
        GList *account_list = account_get_list();
@@ -3114,88 +2970,93 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        
        selection = summary_get_selection_type(mainwin->summaryview);
 
+#define UPDATE_STATE(...) \
+       do { \
+               state |= main_window_get_mask(__VA_ARGS__, -1); \
+       } while (0)
+
        if (mainwin->lock_count == 0 && !claws_is_starting())
-               state |= M_UNLOCKED;
+               UPDATE_STATE(M_UNLOCKED);
        if (selection != SUMMARY_NONE)
-               state |= M_MSG_EXIST;
+               UPDATE_STATE(M_MSG_EXIST);
        if (item && item->path && folder_item_parent(item) && !item->no_select) {
-               state |= M_EXEC;
+               UPDATE_STATE(M_EXEC);
                /*              if (item->folder->type != F_NEWS) */
-               state |= M_ALLOW_DELETE;
+               UPDATE_STATE(M_ALLOW_DELETE);
 
                if (prefs_common.immediate_exec == 0
                    && mainwin->lock_count == 0)
-                       state |= M_DELAY_EXEC;
+                       UPDATE_STATE(M_DELAY_EXEC);
 
                if ((selection == SUMMARY_NONE && item->hide_read_msgs)
                    || selection != SUMMARY_NONE)
-                       state |= M_HIDE_READ_MSG;
+                       UPDATE_STATE(M_HIDE_READ_MSG);
 
                if ((selection == SUMMARY_NONE && item->hide_read_threads)
                    || selection != SUMMARY_NONE)
-                       state |= M_HIDE_READ_THREADS;
+                       UPDATE_STATE(M_HIDE_READ_THREADS);
        }               
        if (mainwin->summaryview->threaded)
-               state |= M_THREADED;
+               UPDATE_STATE(M_THREADED);
        else
-               state |= M_UNTHREADED;  
+               UPDATE_STATE(M_UNTHREADED);
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
-               state |= M_TARGET_EXIST;
+               UPDATE_STATE(M_TARGET_EXIST);
        if (selection == SUMMARY_SELECTED_SINGLE)
-               state |= M_SINGLE_TARGET_EXIST;
+               UPDATE_STATE(M_SINGLE_TARGET_EXIST);
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->folder->klass->type == F_NEWS)
-               state |= M_NEWS;
+               UPDATE_STATE(M_NEWS);
        else
-               state |= M_NOT_NEWS;
+               UPDATE_STATE(M_NOT_NEWS);
        if (mainwin->summaryview->folder_item &&
            (mainwin->summaryview->folder_item->stype != F_TRASH ||
             !folder_has_parent_of_type(mainwin->summaryview->folder_item, F_TRASH)))
-               state |= M_NOT_TRASH;
+               UPDATE_STATE(M_NOT_TRASH);
 
        if (prefs_common.actions_list && g_slist_length(prefs_common.actions_list))
-               state |= M_ACTIONS_EXIST;
+               UPDATE_STATE(M_ACTIONS_EXIST);
 
        tmp = tags_get_list();
        if (tmp && g_slist_length(tmp))
-               state |= M_TAGS_EXIST;
+               UPDATE_STATE(M_TAGS_EXIST);
        g_slist_free(tmp);
 
        if (procmsg_have_queued_mails_fast() && !procmsg_is_sending())
-               state |= M_HAVE_QUEUED_MAILS;
+               UPDATE_STATE(M_HAVE_QUEUED_MAILS);
 
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (item &&
             (folder_has_parent_of_type(item, F_DRAFT) ||
              folder_has_parent_of_type(item, F_OUTBOX) ||
              folder_has_parent_of_type(item, F_QUEUE))))
-               state |= M_ALLOW_REEDIT;
+               UPDATE_STATE(M_ALLOW_REEDIT);
        if (cur_account)
-               state |= M_HAVE_ACCOUNT;
+               UPDATE_STATE(M_HAVE_ACCOUNT);
        
        if (cur_account && cur_account->protocol != A_NONE)
-               state |= M_HAVE_RETRIEVABLE_ACCOUNT;
+               UPDATE_STATE(M_HAVE_RETRIEVABLE_ACCOUNT);
 
        if (any_folder_want_synchronise())
-               state |= M_WANT_SYNC;
+               UPDATE_STATE(M_WANT_SYNC);
 
        if (item && item->prefs->processing && selection != SUMMARY_NONE)
-               state |= M_HAVE_PROCESSING;
+               UPDATE_STATE(M_HAVE_PROCESSING);
 
        if (g_list_length(account_list) > 1)
-               state |= M_HAVE_MULTI_ACCOUNT;
+               UPDATE_STATE(M_HAVE_MULTI_ACCOUNT);
 
-       for ( ; account_list != NULL; account_list = account_list->next) {
+       for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
                if (((PrefsAccount*)account_list->data)->protocol != A_NONE) {
-                       state |= M_HAVE_ANY_RETRIEVABLE_ACCOUNT;
+                       UPDATE_STATE(M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
                        break;
                }
        }
 
-       for ( ; account_list != NULL; account_list = account_list->next) {
+       for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
                if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
-                       state |= M_HAVE_NEWS_ACCOUNT;
+                       UPDATE_STATE(M_HAVE_NEWS_ACCOUNT);
                        break;
                }
        }
@@ -3204,48 +3065,80 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
            (mainwin->summaryview->folder_item &&
             mainwin->summaryview->folder_item->folder->klass->type != F_UNKNOWN &&
             mainwin->summaryview->folder_item->folder->klass->type != F_NEWS)) {
-               state |= M_CAN_LEARN_SPAM;
+               UPDATE_STATE(M_CAN_LEARN_SPAM);
        }
 
        if (mainwin->summaryview->folder_item) {
-               state |= M_FOLDER_SELECTED;
+               UPDATE_STATE(M_FOLDER_SELECTED);
        }
 
        if (inc_is_active())
-               state |= M_INC_ACTIVE;
+               UPDATE_STATE(M_INC_ACTIVE);
        if (imap_cancel_all_enabled())
-               state |= M_INC_ACTIVE;
+               UPDATE_STATE(M_INC_ACTIVE);
+
+       if (send_is_active() | procmsg_is_sending())
+               UPDATE_STATE(M_SEND_ACTIVE);
 
        if (mainwin->summaryview->deleted > 0)
-               state |= M_DELETED_EXISTS;
+               UPDATE_STATE(M_DELETED_EXISTS);
 
        if (mainwin->summaryview->deleted > 0 ||
            mainwin->summaryview->moved > 0 ||
            mainwin->summaryview->copied > 0)
-               state |= M_DELAY_EXEC;
+               UPDATE_STATE(M_DELAY_EXEC);
 
        if (summary_is_list(mainwin->summaryview))
-               state |= M_SUMMARY_ISLIST;
+               UPDATE_STATE(M_SUMMARY_ISLIST);
 
        if (prefs_common.layout_mode != SMALL_LAYOUT || mainwin->in_folder)
-               state |= M_IN_MSGLIST;
+               UPDATE_STATE(M_IN_MSGLIST);
 
        for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
                PrefsAccount *account = account_list->data;
                if (account->session_passwd || account->session_smtp_passwd) {
-                       state |= M_SESSION_PASSWORDS;
+                       UPDATE_STATE(M_SESSION_PASSWORDS);
                        break;
                }
        }
 
+#ifndef PASSWORD_CRYPTO_OLD
+       if (master_passphrase_is_entered()) {
+               UPDATE_STATE(M_MASTER_PASSPHRASE);
+       }
+#endif
+#undef UPDATE_STATE
+
        return state;
 }
 
+SensitiveCondMask main_window_get_mask(SensitiveCond cond, ...)
+{
+       va_list args;
+       gint i;
+       SensitiveCondMask value;
+       static SensitiveCondMask SensitiveCond_table[M_MAX_RESERVED];
+       static gboolean first_time = TRUE;
+
+       if (first_time) {
+               for (i = 0; i < M_MAX_RESERVED; i++)
+                       SensitiveCond_table[i] = (SensitiveCondMask) ((SensitiveCondMask)1 << i);
+               first_time = FALSE;
+       }
+
+       value = 0;
 
+       va_start(args, cond); 
+       for (i = (gint) cond; i >= 0; i = va_arg(args, gint))
+               value |= SensitiveCond_table[i];
+       va_end(args);
+
+       return value;
+}
 
 void main_window_set_menu_sensitive(MainWindow *mainwin)
 {
-       SensitiveCond state;
+       SensitiveCondMask state;
        gboolean sensitive;
        SummaryView *summaryview;
        gchar *menu_path;
@@ -3254,103 +3147,114 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        gint i;
        gboolean mimepart_selected = FALSE;
 
-       static const struct {
-               gchar *const entry;
-               SensitiveCond cond;
-       } entry[] = {
-               {"Menu/File/SaveAs", M_TARGET_EXIST},
-               {"Menu/File/SavePartAs", M_SINGLE_TARGET_EXIST},
-               {"Menu/File/Print"  , M_TARGET_EXIST},
-               {"Menu/File/SynchroniseFolders", M_WANT_SYNC},
-               {"Menu/File/Exit"      , M_UNLOCKED},
-
-               {"Menu/Edit/SelectThread"                  , M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Edit/DeleteThread"                  , M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Edit/Find", M_SINGLE_TARGET_EXIST},
-               {"Menu/Edit/QuickSearch",                    M_IN_MSGLIST},
-
-               {"Menu/View/SetColumns/Folderlist"      , M_UNLOCKED|M_SUMMARY_ISLIST}, 
-               {"Menu/View/Sort"                      , M_EXEC|M_SUMMARY_ISLIST},
-               {"Menu/View/ThreadView"               , M_EXEC|M_SUMMARY_ISLIST},
-               {"Menu/View/ExpandThreads"        , M_MSG_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/View/CollapseThreads"      , M_MSG_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/View/HideReadThreads"       , M_HIDE_READ_THREADS|M_SUMMARY_ISLIST},
-               {"Menu/View/HideReadMessages"      , M_HIDE_READ_MSG|M_SUMMARY_ISLIST},
-               {"Menu/View/HideDelMessages"       , M_SUMMARY_ISLIST},
-               {"Menu/View/Goto/Prev"        , M_MSG_EXIST},
-               {"Menu/View/Goto/Next"        , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevUnread" , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevNew"    , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevMarked" , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevLabeled", M_MSG_EXIST},
-               {"Menu/View/Goto/NextLabeled", M_MSG_EXIST},
-               {"Menu/View/Goto/ParentMessage"      , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Goto/NextPart"      , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Goto/PrevPart"      , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/OpenNewWindow"        , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/MessageSource"            , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Part"            , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/AllHeaders"                    , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Quotes"                    , M_SINGLE_TARGET_EXIST},
-
-               {"Menu/Message/Receive/CurrentAccount"
-                                                , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_RETRIEVABLE_ACCOUNT},
-               {"Menu/Message/Receive/AllAccounts"
-                                                , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_ANY_RETRIEVABLE_ACCOUNT},
-               {"Menu/Message/Receive/CancelReceiving"
-                                                , M_INC_ACTIVE},
-               {"Menu/Message/SendQueue"  , M_HAVE_ACCOUNT|M_HAVE_QUEUED_MAILS},
-               {"Menu/Message/ComposeEmail", M_HAVE_ACCOUNT},
-               {"Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT},
-               {"Menu/Message/Reply"                 , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/ReplyTo"              , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/FollowupReply", M_HAVE_ACCOUNT|M_TARGET_EXIST|M_NEWS|M_SUMMARY_ISLIST},
-               {"Menu/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/ForwardAtt" , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/Redirect"                  , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/Move"              , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
-               {"Menu/Message/Copy"              , M_TARGET_EXIST|M_EXEC},
-               {"Menu/Message/Trash"     , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS|M_NOT_TRASH},
-               {"Menu/Message/Delete"            , M_TARGET_EXIST|M_ALLOW_DELETE},
-               {"Menu/Message/CancelNews" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NEWS},
-               {"Menu/Message/Mark"              , M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/Mark/MarkSpam"     , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"Menu/Message/Mark/MarkHam"      , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"Menu/Message/Mark/IgnoreThread"    , M_TARGET_EXIST},
-               {"Menu/Message/Mark/UnignoreThread"  , M_TARGET_EXIST},
-               {"Menu/Message/Mark/Lock"         , M_TARGET_EXIST},
-               {"Menu/Message/Mark/Unlock"       , M_TARGET_EXIST},
-               {"Menu/Message/ColorLabel"                , M_TARGET_EXIST},
-               {"Menu/Message/Tags"              , M_TARGET_EXIST},
-               {"Menu/Message/Reedit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
-               {"Menu/Message/CheckSignature"               , M_SINGLE_TARGET_EXIST},
-
-               {"Menu/Tools/AddSenderToAB"   , M_SINGLE_TARGET_EXIST},
-               {"Menu/Tools/CollectAddresses"            , M_FOLDER_SELECTED},
-               {"Menu/Tools/CollectAddresses/FromFolder"
-                                                      , M_FOLDER_SELECTED},
-               {"Menu/Tools/CollectAddresses/FromSelected"
-                                                      , M_TARGET_EXIST},
-               {"Menu/Tools/FilterFolder", M_MSG_EXIST|M_EXEC},
-               {"Menu/Tools/FilterSelected"     , M_TARGET_EXIST|M_EXEC},
-               {"Menu/Tools/RunProcessing"  , M_HAVE_PROCESSING},
-               {"Menu/Tools/CreateFilterRule"           , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-               {"Menu/Tools/CreateProcessingRule"       , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-               {"Menu/Tools/ListUrls"                 , M_TARGET_EXIST},
-               {"Menu/Tools/Actions"                      , M_TARGET_EXIST|M_ACTIONS_EXIST},
-               {"Menu/Tools/Execute"                      , M_DELAY_EXEC},
-               {"Menu/Tools/Expunge"                      , M_DELETED_EXISTS},
-               {"Menu/Tools/ForgetSessionPasswords"       , M_SESSION_PASSWORDS},
-               {"Menu/Tools/DeleteDuplicates/SelFolder"   , M_MSG_EXIST|M_ALLOW_DELETE},
-
-               {"Menu/Configuration", M_UNLOCKED},
-               {"Menu/Configuration/ChangeAccount", M_HAVE_MULTI_ACCOUNT},
-               {"Menu/Configuration/AccountPrefs", M_UNLOCKED},
-               {"Menu/Configuration/CreateAccount", M_UNLOCKED},
-               {"Menu/Configuration/EditAccounts", M_UNLOCKED},
-
-               {NULL, 0}
-       };
+#define N_ENTRIES 85
+       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);
+       FILL_TABLE("Menu/View/HideReadMessages", M_HIDE_READ_MSG, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/HideDelMessages", M_SUMMARY_ISLIST);
+       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/PrevNew", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/PrevMarked", 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);
+#ifndef PASSWORD_CRYPTO_OLD
+       FILL_TABLE("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);
 
@@ -3372,7 +3276,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 
        for (; cur_item != NULL; cur_item = cur_item->next) {
                gtk_widget_set_sensitive(GTK_WIDGET(cur_item->data),
-                                        (M_UNLOCKED & state) != 0);
+                                        (main_window_get_mask(M_UNLOCKED, -1) & state) != 0);
        }
 
        g_list_free(children);
@@ -3433,23 +3337,29 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Sort/Descending", FALSE);
        }
 
-       if (mainwin->messageview 
+       if (mainwin->messageview
        &&  mainwin->messageview->mimeview
        &&  mainwin->messageview->mimeview->textview)
                cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/AllHeaders",
                                                prefs_common.show_all_headers);
-       cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & M_THREADED) != 0);
-       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ExpandThreads", (state & M_THREADED) != 0);
-       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/CollapseThreads", (state & M_THREADED) != 0);
-       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", (state & M_THREADED) != 0);
+       cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ExpandThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/CollapseThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1));
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2));
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3));
 
-       if (mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_msgs)
+       if (mainwin->summaryview->folder_item && !mainwin->summaryview->folder_item->threaded)
+               cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/HideReadThreads", FALSE);
+       if ((mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_msgs) ||
+           quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch))
                cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", FALSE);
-       if (mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_threads)
+       if ((mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_threads) ||
+           quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch))
                cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadMessages", FALSE);
+       if (quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch))
+               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideDelMessages", FALSE);
 
        cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Goto/PrevHistory",
                messageview_nav_has_prev(mainwin->messageview));
@@ -3612,6 +3522,11 @@ static void get_url_part (const gchar **buffer, gchar *url_decoded)
                for (i = 0;
                     *buf != '>' && *buf != 0x00 && i < BUFFSIZE;
                        tmp[i++] = *(buf++));
+               if (*buf == 0) {
+                       *buffer = NULL;
+                       *url_decoded = '\0';
+                       return;
+               }
                buf++;
        }
        else  {
@@ -4156,6 +4071,8 @@ static void search_cb(GtkAction *action, gpointer data)
 static void search_folder_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
+       FolderItem *item = mainwin->summaryview->folder_item;
+       cm_return_if_fail(item != NULL);
        summary_search(mainwin->summaryview);
 }
 
@@ -4267,6 +4184,8 @@ static void set_layout_cb(GtkAction *action, GtkRadioAction *current, gpointer d
        mainwindow_reset_paned(GTK_PANED(mainwin->vpaned));
        if (old_layout_mode == SMALL_LAYOUT && layout_mode != SMALL_LAYOUT) {
                mainwindow_reset_paned(GTK_PANED(mainwin->hpaned));
+               if (layout_mode == VERTICAL_LAYOUT)
+                       mainwindow_reset_paned(GTK_PANED(mainwin->vpaned));
        }
        if (old_layout_mode != SMALL_LAYOUT && layout_mode == SMALL_LAYOUT) {
                mainwin_paned_show_first(GTK_PANED(mainwin->hpaned));
@@ -4326,7 +4245,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, _("+_Synchronise"), NULL) != G_ALERTALTERNATE)
+                       GTK_STOCK_CANCEL, g_strconcat("+", _("_Synchronise"), NULL), NULL) != G_ALERTALTERNATE)
                return;
        
        if (offline_ask_sync)
@@ -4365,6 +4284,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
                        mainwindow_check_synchronise(mainwin, TRUE);
                prefs_common.work_offline = TRUE;
                imap_disconnect_all(have_connectivity);
+               nntp_disconnect_all(have_connectivity);
                hooks_invoke(OFFLINE_SWITCH_HOOKLIST, NULL);
        } else {
                /*go online */
@@ -4384,15 +4304,14 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
 
 static void addressbook_open_cb(GtkAction *action, gpointer data)
 {
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
        addressbook_open(NULL);
 #else
        GError* error = NULL;
        
        addressbook_dbus_open(FALSE, &error);
        if (error) {
-               g_warning("Failed to open address book");
-               g_warning("%s", error->message);
+               g_warning("Failed to open address book: %s", error->message);
                g_error_free(error);
        }
 #endif
@@ -4416,6 +4335,11 @@ static void inc_cancel_cb(GtkAction *action, gpointer data)
        imap_cancel_all();
 }
 
+static void send_cancel_cb(GtkAction *action, gpointer data)
+{
+       send_cancel();
+}
+
 static void move_to_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
@@ -4482,6 +4406,19 @@ static void toggle_fullscreen_cb(GtkAction *action, gpointer data)
        }
 }
 
+static void toggle_menubar_cb(GtkAction *action, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+       if (mainwin->menu_lock_count) return;
+       if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               gtk_widget_hide(GTK_WIDGET(mainwin->menubar));
+               prefs_common.mainwin_menubar = FALSE;
+       } else {
+               gtk_widget_show(GTK_WIDGET(mainwin->menubar));
+               prefs_common.mainwin_menubar = TRUE;
+       }
+}
+
 static void hide_quotes_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
@@ -4697,16 +4634,6 @@ static void collapse_threads_cb(GtkAction *action, gpointer data)
        summary_collapse_threads(mainwin->summaryview);
 }
 
-static void zoom_in_cb(GtkAction *action, gpointer data)
-{
-       main_window_zoom(ZOOM_IN);
-}
-
-static void zoom_out_cb(GtkAction *action, gpointer data)
-{
-       main_window_zoom(ZOOM_OUT);
-}
-
 static void set_summary_display_item_cb(GtkAction *action, gpointer data)
 {
        prefs_summary_column_open();
@@ -4925,7 +4852,7 @@ static void prev_history_cb(GtkAction *action, gpointer data)
                        folderview_select(mainwin->folderview, info->folder);
                summary_display_by_msgnum(mainwin->summaryview, info->msgnum);
                summary_display_msg_selected(mainwin->summaryview, FALSE);
-               procmsg_msginfo_free(info);
+               procmsg_msginfo_free(&info);
                main_window_set_menu_sensitive(mainwindow_get_mainwindow());
                toolbar_main_set_sensitive(mainwindow_get_mainwindow());
        }
@@ -4939,7 +4866,7 @@ static void next_history_cb(GtkAction *action, gpointer data)
                if (info->folder != mainwin->summaryview->folder_item)
                        folderview_select(mainwin->folderview, info->folder);
                summary_display_by_msgnum(mainwin->summaryview, info->msgnum);
-               procmsg_msginfo_free(info);
+               procmsg_msginfo_free(&info);
                main_window_set_menu_sensitive(mainwindow_get_mainwindow());
                toolbar_main_set_sensitive(mainwindow_get_mainwindow());
        }
@@ -4965,7 +4892,7 @@ static void goto_folder_cb(GtkAction *action, gpointer data)
 static void goto_unread_folder_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
-       folderview_select_next_unread(mainwin->folderview, FALSE);
+       folderview_select_next_with_flag(mainwin->folderview, MSG_UNREAD, FALSE);
 }
 
 static void scroll_prev_line_cb(GtkAction *action, gpointer data)
@@ -5013,13 +4940,19 @@ static void allsel_cb(GtkAction *action, gpointer data)
 static void select_thread_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
-       summary_select_thread(mainwin->summaryview, FALSE);
+       summary_select_thread(mainwin->summaryview, FALSE, FALSE);
+}
+
+static void trash_thread_cb(GtkAction *action, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+       summary_select_thread(mainwin->summaryview, FALSE, TRUE);
 }
 
 static void delete_thread_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
-       summary_select_thread(mainwin->summaryview, TRUE);
+       summary_select_thread(mainwin->summaryview, TRUE, FALSE);
 }
 
 static void create_filter_cb(GtkAction *gaction, gpointer data)
@@ -5257,12 +5190,12 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        gchar *str;
 
        if (item->path)
-               str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
+               str = g_strdup_printf(_("Scanning folder %s%c%s..."),
                                      LOCAL_FOLDER(folder)->rootpath,
                                      G_DIR_SEPARATOR,
                                      item->path);
        else
-               str = g_strdup_printf(_("Scanning folder %s ..."),
+               str = g_strdup_printf(_("Scanning folder %s..."),
                                      LOCAL_FOLDER(folder)->rootpath);
 
        STATUSBAR_PUSH(mainwin, str);
@@ -5406,6 +5339,17 @@ static void forget_session_passwords_cb(GtkAction *action, gpointer data)
                                   fgtn), fgtn, accs);  
 }
 
+#ifndef PASSWORD_CRYPTO_OLD
+static void forget_master_passphrase_cb(GtkAction *action, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       main_window_lock(mainwin);
+       master_passphrase_forget();
+       main_window_unlock(mainwin);
+}
+#endif
+
 void mainwindow_learn (MainWindow *mainwin, gboolean is_spam)
 {
        summary_mark_as_spam(mainwin->summaryview, is_spam, NULL);
@@ -5446,7 +5390,7 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                return;
        }
        
-       msg = strrchr(tmp, G_DIR_SEPARATOR);
+       msg = strrchr(tmp, '/');
        if (msg) {
                *msg++ = '\0';
                if ((item = folder_find_item_from_identifier(tmp))) {
@@ -5478,7 +5422,7 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                                if (popup)
                                        main_window_popup(mainwin);
                                g_free(tmp);
-                               procmsg_msginfo_free(msginfo);
+                               procmsg_msginfo_free(&msginfo);
                                return;
                        } else {
                                g_print("'%s' not found\n", msg);
@@ -5497,7 +5441,7 @@ void mainwindow_exit_folder(MainWindow *mainwin) {
        if (prefs_common.layout_mode == SMALL_LAYOUT) {
                folderview_close_opened(mainwin->folderview);
                mainwin_paned_show_first(GTK_PANED(mainwin->hpaned));
-               gtk_widget_grab_focus(mainwin->folderview->ctree);
+               folderview_grab_focus(mainwin->folderview);
        }
        mainwin->in_folder = FALSE;
        main_window_set_menu_sensitive(mainwin);
@@ -5573,25 +5517,3 @@ static void goto_prev_part_cb(GtkAction *action, gpointer data)
        &&  mainwin->messageview->mimeview)
                mimeview_select_prev_part(mainwin->messageview->mimeview);
 }
-
-#ifdef MAEMO
-gboolean maemo_mainwindow_is_fullscreen(GtkWidget *widget)
-{
-       gint w, h;
-       gtk_window_get_size(GTK_WINDOW(widget), &w, &h); 
-       return (w == 800);
-}
-
-void maemo_window_full_screen_if_needed (GtkWindow *window)
-{
-       if (maemo_mainwindow_is_fullscreen(mainwindow_get_mainwindow()->window)) {
-               gtk_window_fullscreen(GTK_WINDOW(window));
-       }
-}
-
-void maemo_connect_key_press_to_mainwindow (GtkWindow *window)
-{
-       g_signal_connect(G_OBJECT(window), "key_press_event",
-                        G_CALLBACK(mainwindow_key_pressed), mainwindow_get_mainwindow());
-}
-#endif