sync with 0.8.6cvs23
[claws.git] / src / mainwindow.c
index 90a54fecb14a88f66d9e6e436966bd788b9e7476..c818ca697e1ca3f669fc9adac5266dc021bf5382 100644 (file)
@@ -60,7 +60,6 @@
 #include "import.h"
 #include "export.h"
 #include "prefs_common.h"
-#include "prefs_filter.h"
 #include "prefs_actions.h"
 #include "prefs_filtering.h"
 #include "prefs_scoring.h"
@@ -83,7 +82,8 @@
 #include "manual.h"
 #include "version.h"
 #include "selective_download.h"
-
+#include "ssl_manager.h"
+#include "sslcertwindow.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -238,15 +238,15 @@ static void toolbar_reply_cb              (GtkWidget      *widget,
 static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
                                         gpointer        data);
 
+static void toolbar_reply_to_list_cb   (GtkWidget      *widget,
+                                        gpointer        data);
+
 static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
                                         gpointer        data);
 
 static void toolbar_forward_cb         (GtkWidget      *widget,
                                         gpointer        data);
 
-static void toolbar_delete_cb          (GtkWidget      *widget,
-                                        gpointer        data);
-
 static void toolbar_exec_cb            (GtkWidget      *widget,
                                         gpointer        data);
 
@@ -268,6 +268,14 @@ static void toolbar_reply_to_all_popup_closed_cb
                                        (GtkMenuShell   *menu_shell,
                                         gpointer        data);
 
+static void toolbar_reply_to_list_popup_cb       (GtkWidget    *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+
+static void toolbar_reply_to_list_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
 static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
                                         GdkEventButton *event,
                                         gpointer        data);
@@ -283,13 +291,11 @@ static void toolbar_forward_popup_closed_cb
                                        (GtkMenuShell   *menu_shell,
                                         gpointer        data);
 
-static void activate_compose_button     (MainToolbar       *toolbar,
+static void activate_compose_button     (Toolbar       *toolbar,
                                         ToolbarStyle      style,
                                         ComposeButtonType type);
-static void toolbar_actions_execute_cb  (GtkWidget         *widget,
-                                        gpointer           data);
 static void toolbar_buttons_cb          (GtkWidget         *widget, 
-                                        ToolbarItem       *toolbar_item);
+                                        ToolbarItem       *item);
 static void toolbar_create              (MainWindow        *mainwin,
                                         GtkWidget         *container);
 
@@ -444,9 +450,6 @@ static void create_filter_cb         (MainWindow    *mainwin,
 static void prefs_common_open_cb       (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-static void prefs_filter_open_cb       (MainWindow     *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
 static void prefs_template_open_cb     (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -459,10 +462,14 @@ static void prefs_account_open_cb (MainWindow     *mainwin,
 static void prefs_scoring_open_cb      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-static void prefs_filtering_open_cb (MainWindow        *mainwin,
+static void prefs_filtering_open_cb    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-
+#ifdef USE_OPENSSL
+static void ssl_manager_open_cb        (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+#endif
 static void new_account_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -476,20 +483,11 @@ static void online_switch_clicked(GtkButton     *btn,
 static void manual_open_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void faq_open_cb                 (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
 
 static void scan_tree_func      (Folder        *folder,
                                  FolderItem    *item,
                                  gpointer       data);
                                  
-static void key_pressed (GtkWidget *widget, 
-                               GdkEventKey *event,
-                               gpointer data);
-
-static void set_toolbar_style(MainWindow *mainwin);
-
 static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
 
 static void addr_harvest_cb     ( MainWindow  *mainwin,
@@ -580,7 +578,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/E_xpand all threads"),      NULL, expand_threads_cb, 0, NULL},
        {N_("/_View/Co_llapse all threads"),    NULL, collapse_threads_cb, 0, NULL},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
-       {N_("/_View/Set display _item..."),     NULL, set_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed _items..."),  NULL, set_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
@@ -691,7 +689,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_View/Show all _header"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show all _headers"),        "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
@@ -706,9 +704,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Compose a_n email message"),     "<control>M", compose_mail_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
        {N_("/_Message/_Reply"),                "<control>R",   reply_cb, COMPOSE_REPLY, NULL},
-       {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
-       {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
-       {N_("/_Message/Reply to a_ll"),         "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to"),             NULL, NULL, 0, "<Branch>"},
+       {N_("/_Message/Repl_y to/_all"),        "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to/_sender"),     NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Repl_y to/mailing _list"),
+                                               "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+       {N_("/_Message/Follow-up and reply to"),NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/_Message/Redirect"),              NULL, reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
@@ -757,27 +759,30 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, delete_duplicated_cb,   0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/E_xecute"),                "X", execute_summary_cb, 0, NULL},
+#ifdef USE_OPENSSL
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/SSL certi_ficates..."),    
+                                               NULL, ssl_manager_open_cb, 0, NULL},
+#endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/_Log window"),             "<control>L", log_window_show_cb, 0, NULL},
+       {N_("/_Tools/_Log window"),             "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/C_ustom toolbar"),
+       {N_("/_Configuration/C_ustomize toolbars"),
                                                NULL, NULL, 0, "<Branch>"},
-       {N_("/_Configuration/C_ustom toolbar/Main toolbar"),
+       {N_("/_Configuration/C_ustomize toolbars/_Main window..."),
                                                NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
-       {N_("/_Configuration/C_ustom toolbar/Compose toolbar"),
+       {N_("/_Configuration/C_ustomize toolbars/_Compose window..."),
                                                NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
-#if 0
-       {N_("/_Configuration/_Filter setting..."),
-                                               NULL, prefs_filter_open_cb, 0, NULL},
-#endif
+       {N_("/_Configuration/C_ustomize toolbars/M_essage view..."),
+                                               NULL, prefs_toolbar_cb, TOOLBAR_MSGVIEW, NULL},
        {N_("/_Configuration/_Scoring..."),
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
-       {N_("/_Configuration/_Template..."),    NULL, prefs_template_open_cb, 0, NULL},
+       {N_("/_Configuration/_Templates..."),   NULL, prefs_template_open_cb, 0, NULL},
        {N_("/_Configuration/_Actions..."),     NULL, prefs_actions_open_cb, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/_Preferences for current account..."),
@@ -790,18 +795,12 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, NULL, 0, "<Branch>"},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual/_English"),         NULL, manual_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_Manual/_German"),          NULL, manual_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_Manual/_Spanish"),         NULL, manual_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_Manual/_French"),          NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
-       {N_("/_Help/_FAQ"),                     NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_FAQ/_German"),             NULL, faq_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_FAQ/_Italian"),            NULL, faq_open_cb, MANUAL_LANG_IT, NULL},
+       {N_("/_Help/_Manual (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
+       {N_("/_Help/_Manual (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_MANUAL_SYLDOC, NULL},
+       {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
+       {N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
@@ -818,6 +817,11 @@ static GtkItemFactoryEntry replyall_popup_entries[] =
        {N_("/Reply to all with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
        {N_("/_Reply to all without quote"), "a", reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
 };
+static GtkItemFactoryEntry replylist_popup_entries[] =
+{
+       {N_("/Reply to list with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
+       {N_("/_Reply to list without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
+};
 static GtkItemFactoryEntry replysender_popup_entries[] =
 {
        {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
@@ -843,8 +847,8 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;
-       GtkWidget *online_status;
-       GtkWidget *offline_status;
+       GtkWidget *online_pixmap;
+       GtkWidget *offline_pixmap;
        GtkWidget *online_switch;
        GtkWidget *offline_switch;
 
@@ -882,7 +886,7 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                               GTK_SIGNAL_FUNC(key_pressed), mainwin);
+                               GTK_SIGNAL_FUNC(mainwindow_key_pressed), mainwin);
 
        gtk_widget_realize(window);
        gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
@@ -902,6 +906,9 @@ MainWindow *main_window_create(SeparateType type)
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
        ifactory = gtk_item_factory_from_widget(menubar);
 
+       menu_set_sensitive(ifactory, "/Help/Manual (Local)", manual_available(MANUAL_MANUAL_LOCAL));
+       menu_set_sensitive(ifactory, "/Help/FAQ (Local)", manual_available(MANUAL_FAQ_LOCAL));
+
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
@@ -928,15 +935,15 @@ MainWindow *main_window_create(SeparateType type)
        gtk_widget_set_usize(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
 
-       online_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
-       offline_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+       online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+       offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
        online_switch = gtk_button_new ();
        offline_switch = gtk_button_new ();
-       gtk_container_add (GTK_CONTAINER(online_switch), online_status);
+       gtk_container_add (GTK_CONTAINER(online_switch), online_pixmap);
        gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);
-       gtk_container_add (GTK_CONTAINER(offline_switch), offline_status);
+       gtk_container_add (GTK_CONTAINER(offline_switch), offline_pixmap);
        gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
@@ -972,8 +979,6 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->messageview = messageview;
        summaryview->window      = window;
 
-       messageview->mainwin     = mainwin;
-
        mainwin->vbox         = vbox;
        mainwin->menubar      = menubar;
        mainwin->menu_factory = ifactory;
@@ -988,6 +993,8 @@ MainWindow *main_window_create(SeparateType type)
        
        mainwin->online_switch     = online_switch;
        mainwin->offline_switch    = offline_switch;
+       mainwin->online_pixmap     = online_pixmap;
+       mainwin->offline_pixmap    = offline_pixmap;
        
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
@@ -1023,7 +1030,7 @@ MainWindow *main_window_create(SeparateType type)
        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\n", i);
        }
 
        debug_print("done.\n");
@@ -1093,7 +1100,9 @@ MainWindow *main_window_create(SeparateType type)
        summary_init(summaryview);
        messageview_init(messageview);
        log_window_init(mainwin->logwin);
-
+#ifdef USE_OPENSSL
+       sslcertwindow_register_hook();
+#endif
        mainwin->lock_count = 0;
        mainwin->menu_lock_count = 0;
        mainwin->cursor_count = 0;
@@ -1176,6 +1185,7 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 {
        GList *cur;
        MainWindow *mainwin;
+       GtkWidget *pixmap;
 
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;
@@ -1187,9 +1197,22 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
                /* pixmap themes */
                if (pixmap_theme_changed) {
                        toolbar_update(mainwin);
-                       set_toolbar_style(mainwin);
+                       common_toolbar_set_style(mainwin, TOOLBAR_MAIN);
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
+
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_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_WORK_OFFLINE);
+                       gtk_container_remove(GTK_CONTAINER(mainwin->offline_switch), 
+                                            mainwin->offline_pixmap);
+                       gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
+                       gtk_widget_show(pixmap);
+                       mainwin->offline_pixmap = pixmap;
                }
                
                summary_redisplay_msg(mainwin->summaryview);
@@ -1270,7 +1293,8 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
        GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
-       GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       //GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       GtkWidget *message_wid = mainwin->messageview->vbox;
 
        debug_print("Changing window separation type from %d to %d\n",
                    mainwin->type, type);
@@ -1440,7 +1464,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
        for (list = folder_get_list(); list != NULL; list = list->next) {
                folder = list->data;
                if (folder && folder->trash) {
-                       folderview_update_item(folder->trash, TRUE);
+                       folder_update_item(folder->trash, TRUE);
                }
        }
 
@@ -1525,11 +1549,11 @@ void main_window_add_mbox(MainWindow *mainwin)
        item->folder = folder;
        folder->node = g_node_new(item);
 
-       folder->create_folder(folder, item, "inbox");
-       folder->create_folder(folder, item, "outbox");
-       folder->create_folder(folder, item, "queue");
-       folder->create_folder(folder, item, "draft");
-       folder->create_folder(folder, item, "trash");
+       folder_create_folder(item, "inbox");
+       folder_create_folder(item, "outbox");
+       folder_create_folder(item, "queue");
+       folder_create_folder(item, "draft");
+       folder_create_folder(item, "trash");
 
        folderview_set(mainwin->folderview);
 }
@@ -1643,7 +1667,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Go to/Prev labeled message", M_MSG_EXIST},
                {"/View/Go to/Next labeled message", M_MSG_EXIST},
                {"/View/Open in new window"        , M_SINGLE_TARGET_EXIST},
-               {"/View/Show all header          , M_SINGLE_TARGET_EXIST},
+               {"/View/Show all headers"          , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
                {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
@@ -1651,8 +1675,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Cancel receiving"      , M_INC_ACTIVE},
                {"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
                {"/Message/Reply"                 , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to sender"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to all"          , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
@@ -1741,7 +1764,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
        }
 
-       SET_CHECK_MENU_ACTIVE("/View/Show all header",
+       SET_CHECK_MENU_ACTIVE("/View/Show all headers",
                              mainwin->messageview->textview->show_all_headers);
        SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
 
@@ -1752,51 +1775,18 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 
 void main_window_popup(MainWindow *mainwin)
 {
-       gint x, y;
-       gint sx, sy;
-       GtkWidget *widget;
-
-       gdk_window_get_origin(mainwin->window->window, &x, &y);
-       sx = gdk_screen_width();
-       sy = gdk_screen_height();
-       x %= sx; if (x < 0) x = 0;
-       y %= sy; if (y < 0) y = 0;
-       gdk_window_move(mainwin->window->window, x, y);
-       gdk_window_raise(mainwin->window->window);
-       gdk_window_show(mainwin->window->window);
-
-       debug_print("window position: x = %d, y = %d\n", x, y);
+       gtkut_window_popup(mainwin->window);
 
        switch (mainwin->type) {
        case SEPARATE_FOLDER:
-               widget = mainwin->win.sep_folder.folderwin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_folder.folderwin);
                break;
        case SEPARATE_MESSAGE:
-               widget = mainwin->win.sep_message.messagewin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_message.messagewin);
                break;
        case SEPARATE_BOTH:
-               widget = mainwin->win.sep_both.folderwin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
-               widget = mainwin->win.sep_both.messagewin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_both.folderwin);
+               gtkut_window_popup(mainwin->win.sep_both.messagewin);
                break;
        default:
                break;
@@ -2030,8 +2020,8 @@ void main_window_destroy_all(void)
                
                /* free toolbar stuff */
                toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
 
                g_free(mainwin->toolbar);
                g_free(mainwin);
@@ -2296,10 +2286,16 @@ static void toolbar_reply_cb(GtkWidget   *widget,
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
-                : COMPOSE_REPLY_WITHOUT_QUOTE,
-                NULL);
+       if (prefs_common.default_reply_list)
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                        : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
+                        NULL);
+       else
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
+                        : COMPOSE_REPLY_WITHOUT_QUOTE,
+                        NULL);
 }
 
 static void toolbar_reply_to_all_cb(GtkWidget   *widget, 
@@ -2313,6 +2309,16 @@ static void toolbar_reply_to_all_cb(GtkWidget   *widget,
                 NULL);
 }
 
+static void toolbar_reply_to_list_cb(GtkWidget   *widget, 
+                                   gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
+                NULL);
+}
 
 static void toolbar_reply_to_sender_cb(GtkWidget   *widget, 
                                       gpointer     data)
@@ -2336,14 +2342,6 @@ static void toolbar_forward_cb(GtkWidget *widget,
                reply_cb(mainwin, COMPOSE_FORWARD, NULL);
 }
 
-static void toolbar_delete_cb(GtkWidget          *widget,
-                             gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       summary_delete(mainwin->summaryview);
-}
-
 static void toolbar_exec_cb(GtkWidget  *widget,
                            gpointer     data)
 {
@@ -2407,6 +2405,28 @@ static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpoin
        manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
+static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replylist_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replylist_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
 static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        MainWindow *mainwindow = (MainWindow *) data;
@@ -2452,7 +2472,7 @@ static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell,
        manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
-static void activate_compose_button (MainToolbar       *toolbar,
+static void activate_compose_button (Toolbar           *toolbar,
                                     ToolbarStyle      style,
                                     ComposeButtonType type)
 {
@@ -2466,7 +2486,7 @@ static void activate_compose_button (MainToolbar       *toolbar,
        toolbar->compose_btn_type = type;       
 }
 
-void toolbar_set_compose_button(MainToolbar       *toolbar, 
+void toolbar_set_compose_button(Toolbar            *toolbar, 
                                ComposeButtonType  compose_btn_type)
 {
        if (toolbar->compose_btn_type != compose_btn_type)
@@ -2476,54 +2496,51 @@ void toolbar_set_compose_button(MainToolbar       *toolbar,
 }
 
 static void toolbar_buttons_cb(GtkWidget         *widget, 
-                              ToolbarItem       *t_item)
+                              ToolbarItem       *item)
 {
        struct {
                gint   index;
                void (*func)(GtkWidget *widget, gpointer data);
        } toolbar_action[] = {
-               { A_RECEIVE_ALL,    toolbar_inc_all_cb         },
-               { A_RECEIVE_CUR,    toolbar_inc_cb             },
-               { A_SEND_QUEUED,    toolbar_send_cb            },
-               { A_COMPOSE_EMAIL,  toolbar_compose_cb         },
-               { A_REPLY_MESSAGE,  toolbar_reply_cb           },
-               { A_REPLY_SENDER,   toolbar_reply_to_sender_cb },
-               { A_REPLY_ALL,      toolbar_reply_to_all_cb    },
-               { A_FORWARD,        toolbar_forward_cb         },
-               { A_DELETE,         toolbar_delete_cb          },
-               { A_EXECUTE,        toolbar_exec_cb            },
-               { A_GOTO_NEXT,      toolbar_next_unread_cb     },
-               { A_SYL_ACTIONS,    toolbar_actions_execute_cb },
+               { A_RECEIVE_ALL,    toolbar_inc_all_cb                  },
+               { A_RECEIVE_CUR,    toolbar_inc_cb                      },
+               { A_SEND_QUEUED,    toolbar_send_cb                     },
+               { A_COMPOSE_EMAIL,  toolbar_compose_cb                  },
+               { A_REPLY_MESSAGE,  toolbar_reply_cb                    },
+               { A_REPLY_SENDER,   toolbar_reply_to_sender_cb          },
+               { A_REPLY_ALL,      toolbar_reply_to_all_cb             },
+               { A_REPLY_ML,       toolbar_reply_to_list_cb            },
+               { A_FORWARD,        toolbar_forward_cb                  },
+               { A_DELETE,         common_toolbar_delete_cb            },
+               { A_EXECUTE,        toolbar_exec_cb                     },
+               { A_GOTO_NEXT,      toolbar_next_unread_cb              },
+               { A_SYL_ACTIONS,    common_toolbar_actions_execute_cb   },
                
-               { A_COMPOSE_NEWS,   toolbar_compose_cb         },    
-               { A_SEPARATOR,      NULL                       }};
+               { A_COMPOSE_NEWS,   toolbar_compose_cb                  },    
+               { A_SEPARATOR,      NULL                                }};
 
        gint num_items = sizeof(toolbar_action)/sizeof(toolbar_action[0]);
        gint i;
 
        for (i = A_RECEIVE_ALL; i < num_items; i++) {
 
-               if (toolbar_action[i].index == t_item->index) {
-                       MainWindow *mainwin = (MainWindow*)t_item->parent;
-                       toolbar_action[i].func(widget, mainwin);
+               if (toolbar_action[i].index == item->index) {
+                       if ((item->index == A_SYL_ACTIONS) || (item->index == A_DELETE))
+                               /* the common_toolbar_* stuff takes item->parent as data
+                                  pointer */                              
+                               toolbar_action[i].func(widget, (gpointer)item->parent);
+                       else /* to be removed */
+                               toolbar_action[i].func(widget, (gpointer)item->parent->data);
                        break;
                }
        }
 }
 
-static void toolbar_actions_execute_cb(GtkWidget *widget,
-                                      gpointer   data)
-{
-       MainWindow *mainwin = (MainWindow*)data;
-
-       toolbar_action_execute(widget, mainwin->toolbar->t_action_list, data, TOOLBAR_MAIN);
-}
-
 void toolbar_set_sensitive(MainWindow *mainwin)
 {
        SensitiveCond state;
        gboolean sensitive;
-       MainToolbar *toolbar = mainwin->toolbar;
+       Toolbar *toolbar = mainwin->toolbar;
        GSList *cur;
        GSList *entry_list = NULL;
        
@@ -2549,6 +2566,8 @@ void toolbar_set_sensitive(MainWindow *mainwin)
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replyall_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replylist_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replysender_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
@@ -2558,7 +2577,7 @@ void toolbar_set_sensitive(MainWindow *mainwin)
                        M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
        SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
 
-       for (cur = toolbar->t_action_list; cur != NULL;  cur = cur->next) {
+       for (cur = toolbar->action_list; cur != NULL;  cur = cur->next) {
                ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
                
                SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
@@ -2605,6 +2624,7 @@ static void toolbar_update(MainWindow *mainwin)
        mainwin->toolbar->compose_news_btn = NULL;
        mainwin->toolbar->reply_btn        = NULL;      
        mainwin->toolbar->replyall_btn     = NULL;      
+       mainwin->toolbar->replylist_btn     = NULL;     
        mainwin->toolbar->replysender_btn  = NULL;      
        mainwin->toolbar->fwd_btn    = NULL;    
        mainwin->toolbar->delete_btn = NULL;    
@@ -2612,7 +2632,7 @@ static void toolbar_update(MainWindow *mainwin)
        mainwin->toolbar->exec_btn   = NULL;
 
        toolbar_clear_list(TOOLBAR_MAIN);
-       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
+       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
        toolbar_create(mainwin, mainwin->handlebox);    
        toolbar_set_sensitive(mainwin);
 
@@ -2629,13 +2649,14 @@ static void toolbar_create(MainWindow *mainwin,
        GtkWidget *item_news = NULL;
        GtkWidget *item;
        GtkTooltips *toolbar_tips;
-       ToolbarSylpheedActions *t_action_item;
+       ToolbarSylpheedActions *action_item;
        GSList *cur;
        GSList *toolbar_list;
 
        guint n_menu_entries;
        GtkWidget *reply_popup;
        GtkWidget *replyall_popup;
+       GtkWidget *replylist_popup;
        GtkWidget *replysender_popup;
        GtkWidget *fwd_popup;
 
@@ -2643,15 +2664,15 @@ static void toolbar_create(MainWindow *mainwin,
 
        if (mainwin->toolbar != NULL) {
                toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
                g_free(mainwin->toolbar);
        }
 
        toolbar_read_config_file(TOOLBAR_MAIN);
        toolbar_list = toolbar_get_list(TOOLBAR_MAIN);
 
-       mainwin->toolbar = g_new0(MainToolbar, 1); 
+       mainwin->toolbar = g_new0(Toolbar, 1); 
 
        toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
                                  GTK_TOOLBAR_BOTH);
@@ -2672,12 +2693,14 @@ static void toolbar_create(MainWindow *mainwin,
                toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
                toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
                toolbar_item->index = ((ToolbarItem*)cur->data)->index;
-
-               toolbar_item->parent = (gpointer)mainwin;
+               
+               toolbar_item->parent = g_new0(ToolbarParent, 1);
+               toolbar_item->parent->data = (gpointer)mainwin;
+               toolbar_item->parent->type = TOOLBAR_MAIN;
 
                /* collect toolbar items in list to keep track */
-               mainwin->toolbar->t_item_list = g_slist_append(mainwin->toolbar->t_item_list, 
-                                                             toolbar_item);
+               mainwin->toolbar->item_list = g_slist_append(mainwin->toolbar->item_list, 
+                                                            toolbar_item);
                
                icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
                item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
@@ -2776,6 +2799,24 @@ static void toolbar_create(MainWindow *mainwin,
                                           GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
                        mainwin->toolbar->replyall_popup    = replyall_popup;
                        break;
+               case A_REPLY_ML:
+                       mainwin->toolbar->replylist_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replylist_btn,
+                                          _("Reply to Mailing-list"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replylist_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replylist_popup_entries) /
+                               sizeof(replylist_popup_entries[0]);
+                       replylist_popup = popupmenu_create(mainwin->window, 
+                                                         replylist_popup_entries, n_menu_entries,
+                                                         "<ReplyMlPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replylist_popup    = replylist_popup;
+                       break;
                case A_FORWARD:
                        mainwin->toolbar->fwd_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
@@ -2813,17 +2854,17 @@ static void toolbar_create(MainWindow *mainwin,
                                           _("Goto Next Message"), NULL);
                        break;
                case A_SYL_ACTIONS:
-                       t_action_item = g_new0(ToolbarSylpheedActions, 1);
-                       t_action_item->widget = item;
-                       t_action_item->name   = g_strdup(toolbar_item->text);
+                       action_item = g_new0(ToolbarSylpheedActions, 1);
+                       action_item->widget = item;
+                       action_item->name   = g_strdup(toolbar_item->text);
 
-                       mainwin->toolbar->t_action_list = 
-                               g_slist_append(mainwin->toolbar->t_action_list,
-                                              t_action_item);
+                       mainwin->toolbar->action_list = 
+                               g_slist_append(mainwin->toolbar->action_list,
+                                              action_item);
 
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             item,
-                                            t_action_item->name, NULL);
+                                            action_item->name, NULL);
 
                        gtk_widget_show(item);
                        break;
@@ -2900,13 +2941,17 @@ static void separate_widget_cb(MainWindow *mainwin, guint action,
        prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
 }
 
-static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline)
 {
-       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+       if (offline)
                online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
-       } else {
-               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);           
-       }
+       else
+               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);
+}
+
+static void toggle_work_offline_cb (MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       main_window_toggle_work_offline(mainwin, GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
 static void online_switch_clicked (GtkButton *btn, gpointer data) 
@@ -2959,9 +3004,9 @@ static void sel_download_cb(MainWindow *mainwin, guint action,
 }
 
 static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
+                            GtkWidget *widget)
 {
-       prefs_toolbar(action);
+       prefs_toolbar_open((ToolbarType)action);
 }
 
 
@@ -2998,9 +3043,8 @@ void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                        if (procmsg_send_queue
                                (folder->queue, prefs_common.savemsg) < 0)
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       statusbar_pop_all();
                        folder_item_scan(folder->queue);
-                       folderview_update_item(folder->queue, TRUE);
+                       folder_update_item(folder->queue, TRUE);
                }
        }
 }
@@ -3008,28 +3052,35 @@ void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 void compose_mail_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
-       PrefsAccount * ac;
-       GList * list;
-       GList * cur;
+       PrefsAccount *ac = NULL;
+       FolderItem *item = mainwin->summaryview->folder_item;   
+        GList * list;
+        GList * cur;
 
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
+       if (item) {
+               ac = account_find_from_item(item);
                if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);          /* CLAWS */
                        return;
                }
        }
 
-       if(cur_account && (cur_account->protocol != A_NNTP)) {
-               compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
+       /*
+        * CLAWS - use current account
+        */
+       if (cur_account && (cur_account->protocol != A_NNTP)) {
+               compose_new_with_folderitem(cur_account, item);
                return;
        }
 
+       /*
+        * CLAWS - just get the first one
+        */
        list = account_get_list();
-       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+       for (cur = list ; cur != NULL ; cur = g_list_next(cur)) {
                ac = (PrefsAccount *) cur->data;
                if (ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);
                        return;
                }
        }
@@ -3150,13 +3201,15 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
 {
        const gchar *str;
 
-       str = conv_get_charset_str((CharSet)action);
-       g_free(prefs_common.force_charset);
-       prefs_common.force_charset = str ? g_strdup(str) : NULL;
-
-       summary_redisplay_msg(mainwin->summaryview);
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               str = conv_get_charset_str((CharSet)action);
+               g_free(prefs_common.force_charset);
+               prefs_common.force_charset = str ? g_strdup(str) : NULL;
 
-       debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
+               summary_redisplay_msg(mainwin->summaryview);
+               
+               debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
+       }
 }
 
 static void hide_read_messages (MainWindow *mainwin, guint action,
@@ -3207,7 +3260,8 @@ static void sort_summary_cb(MainWindow *mainwin, guint action,
        GtkWidget *menuitem;
 
        if (mainwin->menu_lock_count) return;
-       if (item) {
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item) {
                menuitem = gtk_item_factory_get_item
                        (mainwin->menu_factory, "/View/Sort/Ascending");
                summary_sort(mainwin->summaryview, (FolderSortKey)action,
@@ -3222,7 +3276,8 @@ static void sort_summary_type_cb(MainWindow *mainwin, guint action,
        FolderItem *item = mainwin->summaryview->folder_item;
 
        if (mainwin->menu_lock_count) return;
-       if (item)
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item)
                summary_sort(mainwin->summaryview,
                             item->sort_key, (FolderSortType)action);
 }
@@ -3371,12 +3426,6 @@ static void prefs_common_open_cb(MainWindow *mainwin, guint action,
        prefs_common_open();
 }
 
-static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
-                                GtkWidget *widget)
-{
-       prefs_filter_open(NULL, NULL);
-}
-
 static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
@@ -3400,21 +3449,20 @@ static void prefs_actions_open_cb(MainWindow *mainwin, guint action,
 {
        prefs_actions_open(mainwin);
 }
-
+#ifdef USE_OPENSSL
+static void ssl_manager_open_cb(MainWindow *mainwin, guint action,
+                                 GtkWidget *widget)
+{
+       ssl_manager_open(mainwin);
+}
+#endif
 static void prefs_account_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
        if (!cur_account) {
                new_account_cb(mainwin, 0, widget);
        } else {
-               gboolean prev_default = cur_account->is_default;
-
-               prefs_account_open(cur_account);
-               if (!prev_default && cur_account->is_default)
-                       account_set_as_default(cur_account);
-               account_save_config_all();
-               account_set_menu();
-               main_window_reflect_prefs_all();
+               account_open(cur_account);
        }
 }
 
@@ -3434,12 +3482,7 @@ static void account_menu_cb(GtkMenuItem  *menuitem, gpointer data)
 static void manual_open_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
-       manual_open((ManualLang)action);
-}
-
-static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       faq_open((ManualLang)action);
+       manual_open((ManualType)action);
 }
 
 static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
@@ -3464,7 +3507,8 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-static void key_pressed (GtkWidget *widget, GdkEventKey *event,        gpointer data)
+void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
+                                   gpointer data)
 {
        MainWindow *mainwin = (MainWindow*) data;
        
@@ -3476,6 +3520,14 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
                app_exit_cb(mainwin, 0, NULL);
                return;
+       case GDK_space:
+               if (mainwin->folderview && mainwin->summaryview
+                   && !mainwin->summaryview->displayed) {
+                       summary_lock(mainwin->summaryview);
+                       folderview_select_next_unread(mainwin->folderview);
+                       summary_unlock(mainwin->summaryview);
+               }
+               break;
        default:
                break;
        }
@@ -3483,32 +3535,6 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
 #undef BREAK_ON_MODIFIER_KEY
 
-static void set_toolbar_style(MainWindow *mainwin)
-{
-       switch (prefs_common.toolbar_style) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-               break;
-       case TOOLBAR_ICON:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_ICONS);
-               break;
-       case TOOLBAR_TEXT:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_TEXT);
-               break;
-       case TOOLBAR_BOTH:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_BOTH);
-               break;
-       }
-       
-       if (prefs_common.toolbar_style != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
-}
-
 /*
  * Harvest addresses for selected folder.
  */