inital gtk2 patch
[claws.git] / src / mainwindow.c
index 46e8ae3106d43752e09cb82b3167b80da3bfe428..a9c4bf783859ee2545a040e5ac65e1238dbec6c0 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "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"
 #include "prefs_account.h"
-#include "prefs_folder_item.h"
 #include "prefs_summary_column.h"
 #include "prefs_template.h"
-#include "prefs_toolbar.h"
+#include "action.h"
 #include "account.h"
 #include "addressbook.h"
 #include "logwindow.h"
 #include "about.h"
 #include "manual.h"
 #include "version.h"
-#include "selective_download.h"
-
+#include "ssl_manager.h"
+#include "sslcertwindow.h"
+#include "prefs_gtk.h"
+#include "pluginwindow.h"
+#include "hooks.h"
+#include "progressindicator.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -101,42 +103,52 @@ static void main_window_set_widgets               (MainWindow     *mainwin,
                                                 SeparateType    type);
 
 #if 0
-static void toolbar_account_button_pressed     (GtkWidget      *widget,
+static gboolean toolbar_account_button_pressed (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
 #endif
-static void ac_label_button_pressed            (GtkWidget      *widget,
+static gboolean ac_label_button_pressed                (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
 static void ac_menu_popup_closed               (GtkMenuShell   *menu_shell,
                                                 gpointer        data);
 
-static gint main_window_close_cb       (GtkWidget      *widget,
-                                        GdkEventAny    *event,
-                                        gpointer        data);
-static gint folder_window_close_cb     (GtkWidget      *widget,
-                                        GdkEventAny    *event,
-                                        gpointer        data);
-static gint message_window_close_cb    (GtkWidget      *widget,
-                                        GdkEventAny    *event,
-                                        gpointer        data);
+static gint main_window_close_cb               (GtkWidget      *widget,
+                                                GdkEventAny    *event,
+                                                gpointer        data);
+static gint folder_window_close_cb             (GtkWidget      *widget,
+                                                GdkEventAny    *event,
+                                                gpointer        data);
+static gint message_window_close_cb            (GtkWidget      *widget,
+                                                GdkEventAny    *event,
+                                                gpointer        data);
 
-static void add_mailbox_cb      (MainWindow    *mainwin,
+static void main_window_size_allocate_cb       (GtkWidget      *widget,
+                                                GtkAllocation  *allocation,
+                                                gpointer        data);
+static void folder_window_size_allocate_cb     (GtkWidget      *widget,
+                                                GtkAllocation  *allocation,
+                                                gpointer        data);
+static void message_window_size_allocate_cb    (GtkWidget      *widget,
+                                                GtkAllocation  *allocation,
+                                                gpointer        data);
+
+static void new_folder_cb       (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 static void add_mbox_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void update_folderview_cb (MainWindow   *mainwin,
+static void rename_folder_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void new_folder_cb       (MainWindow    *mainwin,
+static void delete_folder_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void rename_folder_cb    (MainWindow    *mainwin,
+static void update_folderview_cb (MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void delete_folder_cb    (MainWindow    *mainwin,
+static void add_mailbox_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 static void import_mbox_cb      (MainWindow    *mainwin,
@@ -185,13 +197,6 @@ static void addressbook_open_cb    (MainWindow     *mainwin,
 static void log_window_show_cb (MainWindow     *mainwin,
                                 guint           action,
                                 GtkWidget      *widget);
-static void sel_download_cb          (MainWindow *mainwin, 
-                                guint action,
-                                GtkWidget *widget);
-static void prefs_toolbar_cb        (MainWindow *mainwin, 
-                                guint action,
-                                GtkWidget *widget);
-
 
 static void inc_cancel_cb              (MainWindow     *mainwin,
                                         guint           action,
@@ -223,6 +228,10 @@ static void delete_cb                      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void cancel_cb                   (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void mark_cb                    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -293,7 +302,9 @@ static void prev_cb          (MainWindow    *mainwin,
 static void next_cb             (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
+static void next_unread_cb      (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void prev_unread_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -327,9 +338,10 @@ static void copy_cb                 (MainWindow    *mainwin,
 static void allsel_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void selthread_cb        (MainWindow    *mainwin,
+static void select_thread_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+
 static void create_filter_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -337,9 +349,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);
@@ -352,10 +361,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);
@@ -363,26 +376,22 @@ static void new_account_cb         (MainWindow    *mainwin,
 static void account_menu_cb     (GtkMenuItem   *menuitem,
                                  gpointer       data);
 
+static void prefs_open_cb      (GtkMenuItem    *menuitem,
+                                gpointer        data);
+static void plugins_open_cb    (GtkMenuItem    *menuitem,
+                                gpointer        data);
+
 static void online_switch_clicked(GtkButton     *btn, 
                                  gpointer data);
 
 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,
@@ -393,20 +402,30 @@ static void addr_harvest_msg_cb    ( MainWindow  *mainwin,
                                   guint       action,
                                   GtkWidget   *widget );
 
+static gboolean mainwindow_focus_in_event      (GtkWidget      *widget, 
+                                                GdkEventFocus  *focus,
+                                                gpointer        data);
+void main_window_reply_cb                      (MainWindow     *mainwin, 
+                                                guint           action,
+                                                GtkWidget      *widget);
+gboolean mainwindow_progressindicator_hook     (gpointer        source,
+                                                gpointer        userdata);
 #define  SEPARATE_ACTION 500 
 
 static GtkItemFactoryEntry mainwin_entries[] =
 {
        {N_("/_File"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_File/_Add mailbox..."),          NULL, add_mailbox_cb, 0, NULL},
-       {N_("/_File/_Add mbox mailbox..."),     NULL, add_mbox_cb, 0, NULL},
-       {N_("/_File/_Check for new mails in all folders"),
-                                               NULL, update_folderview_cb, 0, NULL},
        {N_("/_File/_Folder"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Folder/Create _new folder..."),
                                                NULL, new_folder_cb, 0, NULL},
        {N_("/_File/_Folder/_Rename folder..."),NULL, rename_folder_cb, 0, NULL},
        {N_("/_File/_Folder/_Delete folder"),   NULL, delete_folder_cb, 0, NULL},
+       {N_("/_File/_Folder/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_File/_Folder/_Check for new messages in all folders"),
+                                               NULL, update_folderview_cb, 0, NULL},
+       {N_("/_File/_Add mailbox"),             NULL, NULL, 0, "<Branch>"},
+       {N_("/_File/_Add mailbox/MH..."),       NULL, add_mailbox_cb, 0, NULL},
+       {N_("/_File/_Add mailbox/mbox..."),     NULL, add_mbox_cb, 0, NULL},
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},
        {N_("/_File/Empty _trash"),             "<shift>D", empty_trash_cb, 0, NULL},
@@ -421,7 +440,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Edit/_Copy"),                    "<control>C", copy_cb, 0, NULL},
        {N_("/_Edit/Select _all"),              "<control>A", allsel_cb, 0, NULL},
-       {N_("/_Edit/Select thread"),            "<control>Z", selthread_cb, 0, NULL},
+       {N_("/_Edit/Select _thread"),           NULL, select_thread_cb, 0, NULL},
        {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
@@ -453,11 +472,12 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Sort/by s_ize"),           NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _date"),           NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _from"),           NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _recipient"),      NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _subject"),        NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _color label"),
                                                NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _mark"),           NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
-       {N_("/_View/_Sort/by _unread"),         NULL, sort_summary_cb, SORT_BY_UNREAD, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _status"),         NULL, sort_summary_cb, SORT_BY_STATUS, "/View/Sort/by number"},
        {N_("/_View/_Sort/by a_ttachment"),
                                                NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
        {N_("/_View/_Sort/by score"),           NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
@@ -473,7 +493,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>"},
@@ -513,7 +533,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Code set/7bit ascii (US-ASC_II)"),
         CODESET_ACTION(C_US_ASCII)},
 
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        {N_("/_View/_Code set/Unicode (_UTF-8)"),
         CODESET_ACTION(C_UTF_8)},
        CODESET_SEPARATOR,
@@ -523,7 +543,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Code set/Western European (ISO-8859-15)"),
         CODESET_ACTION(C_ISO_8859_15)},
        CODESET_SEPARATOR,
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        {N_("/_View/_Code set/Central European (ISO-8859-_2)"),
         CODESET_ACTION(C_ISO_8859_2)},
        CODESET_SEPARATOR,
@@ -548,7 +568,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #endif
        {N_("/_View/_Code set/Japanese (ISO-2022-_JP)"),
         CODESET_ACTION(C_ISO_2022_JP)},
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        {N_("/_View/_Code set/Japanese (ISO-2022-JP-2)"),
         CODESET_ACTION(C_ISO_2022_JP_2)},
 #endif
@@ -556,7 +576,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
         CODESET_ACTION(C_EUC_JP)},
        {N_("/_View/_Code set/Japanese (_Shift__JIS)"),
         CODESET_ACTION(C_SHIFT_JIS)},
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        CODESET_SEPARATOR,
        {N_("/_View/_Code set/Simplified Chinese (_GB2312)"),
         CODESET_ACTION(C_GB2312)},
@@ -584,7 +604,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},
 
@@ -598,18 +618,23 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {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/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/_Message/Redirect"),              NULL, reply_cb, COMPOSE_REDIRECT, NULL},
+       {N_("/_Message/_Reply"),                "<control>R",   main_window_reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Message/Repl_y to"),             NULL, NULL, 0, "<Branch>"},
+       {N_("/_Message/Repl_y to/_all"),        "<shift><control>R", main_window_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to/_sender"),     NULL, main_window_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Repl_y to/mailing _list"),
+                                               "<control>L", main_window_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+       {N_("/_Message/Follow-up and reply to"),NULL, main_window_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/_Forward"),              "<control><alt>F", main_window_reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/Redirect"),              NULL, main_window_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<control>O", move_to_cb, 0, NULL},
        {N_("/_Message/_Copy..."),              "<shift><control>O", copy_to_cb, 0, NULL},
        {N_("/_Message/_Delete"),               "<control>D", delete_cb,  0, NULL},
+       {N_("/_Message/Cancel a news message"), "", cancel_cb,  0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/_Mark/_Mark"),           "<shift>asterisk", mark_cb, 0, NULL},
@@ -621,8 +646,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
 
        {N_("/_Tools"),                         NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Selective download..."),  "<alt>S", sel_download_cb, 0, NULL},
-       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/_Address book..."),        "<shift><control>A", addressbook_open_cb, 0, NULL},
        {N_("/_Tools/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
@@ -649,45 +672,44 @@ 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/_Log window"),             "<control>L", log_window_show_cb, 0, NULL},
+       {N_("/_Tools/SSL certi_ficates..."),    
+                                               NULL, ssl_manager_open_cb, 0, NULL},
+#endif
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Log window"),             "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
+       {N_("/_Configuration/C_hange current account"),
+                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_Configuration/_Preferences for current account..."),
+                                               NULL, prefs_account_open_cb, 0, NULL},
+       {N_("/_Configuration/Create _new account..."),
+                                               NULL, new_account_cb, 0, NULL},
+       {N_("/_Configuration/_Edit accounts..."),
+                                               NULL, account_edit_open, 0, NULL},
+       {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/C_ustom toolbar..."),
-                                               NULL, prefs_toolbar_cb, 0, NULL},
-       {N_("/_Configuration/_Filter setting..."),
-                                               NULL, prefs_filter_open_cb, 0, 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..."),
-                                               NULL, prefs_account_open_cb, 0, NULL},
-       {N_("/_Configuration/Create _new account..."),
-                                               NULL, new_account_cb, 0, NULL},
-       {N_("/_Configuration/_Edit accounts..."),
-                                               NULL, account_edit_open, 0, NULL},
-       {N_("/_Configuration/C_hange current account"),
-                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_Configuration/_Other Preferences..."),  NULL, prefs_open_cb, 0, NULL},
+       {N_("/_Configuration/Plugins..."),      NULL, plugins_open_cb, 0, NULL},
 
        {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/_Claws FAQ (Claws Documentation)"),
+                                               NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
@@ -706,10 +728,13 @@ 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;
+       GtkTooltips *offline_tip;
+       GtkTooltips *online_tip;
+       GtkTooltips *sel_ac_tip;
 
        FolderView *folderview;
        SummaryView *summaryview;
@@ -725,7 +750,7 @@ MainWindow *main_window_create(SeparateType type)
 
        static GdkGeometry geometry;
 
-       debug_print(_("Creating main window...\n"));
+       debug_print("Creating main window...\n");
        mainwin = g_new0(MainWindow, 1);
 
        /* main window */
@@ -741,11 +766,14 @@ MainWindow *main_window_create(SeparateType type)
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
                                      GDK_HINT_MIN_SIZE);
 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(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);
+       g_signal_connect(G_OBJECT(window), "focus_in_event",
+                        G_CALLBACK(mainwindow_focus_in_event),
+                        mainwin);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(mainwindow_key_pressed), mainwin);
 
        gtk_widget_realize(window);
        gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
@@ -765,15 +793,20 @@ 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);
 
-       /* create the popup menus for the reply buttons specials */
-       toolbar_popups_create(mainwin, window);
-                          
-       //main_window_toolbar_create(mainwin, handlebox);
-       toolbar_create(mainwin, handlebox);
+       /* link window to mainwin->window to avoid gdk warnings */
+       mainwin->window       = window;
+       
+       /* create toolbar */
+       mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
+                                         handlebox, 
+                                         (gpointer)mainwin);
 
        /* vbox that contains body */
        vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
@@ -788,32 +821,41 @@ MainWindow *main_window_create(SeparateType type)
        gtk_box_pack_start(GTK_BOX(hbox_stat), statusbar, TRUE, TRUE, 0);
 
        progressbar = gtk_progress_bar_new();
-       gtk_widget_set_usize(progressbar, 120, 1);
+       gtk_widget_set_size_request(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_tip = gtk_tooltips_new();
        online_switch = gtk_button_new ();
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(online_tip),
+                            online_switch, _("Go offline"), NULL);
+       offline_tip = gtk_tooltips_new();
        offline_switch = gtk_button_new ();
-       gtk_container_add (GTK_CONTAINER(online_switch), online_status);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(offline_tip),
+                            offline_switch, _("Go online"), NULL);
+       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);
+       g_signal_connect (G_OBJECT(online_switch), "clicked", G_CALLBACK(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);
+       g_signal_connect (G_OBJECT(offline_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
        
        statuslabel = gtk_label_new("");
        gtk_box_pack_start(GTK_BOX(hbox_stat), statuslabel, FALSE, FALSE, 0);
 
+       sel_ac_tip = gtk_tooltips_new();
        ac_button = gtk_button_new();
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(sel_ac_tip),
+                            ac_button, _("Select account"), NULL);
        gtk_button_set_relief(GTK_BUTTON(ac_button), GTK_RELIEF_NONE);
        GTK_WIDGET_UNSET_FLAGS(ac_button, GTK_CAN_FOCUS);
-       gtk_widget_set_usize(ac_button, -1, 1);
+       gtk_widget_set_size_request(ac_button, -1, 1);
        gtk_box_pack_end(GTK_BOX(hbox_stat), ac_button, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(ac_button), "button_press_event",
-                          GTK_SIGNAL_FUNC(ac_label_button_pressed), mainwin);
+       g_signal_connect(G_OBJECT(ac_button), "button_press_event",
+                        G_CALLBACK(ac_label_button_pressed), mainwin);
 
        ac_label = gtk_label_new("");
        gtk_container_add(GTK_CONTAINER(ac_button), ac_label);
@@ -824,7 +866,7 @@ MainWindow *main_window_create(SeparateType type)
        /* create views */
        mainwin->folderview  = folderview  = folderview_create();
        mainwin->summaryview = summaryview = summary_create();
-       mainwin->messageview = messageview = messageview_create();
+       mainwin->messageview = messageview = messageview_create(mainwin);
        mainwin->logwin      = log_window_create();
 
        folderview->mainwin      = mainwin;
@@ -835,9 +877,6 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->messageview = messageview;
        summaryview->window      = window;
 
-       messageview->mainwin     = mainwin;
-
-       mainwin->window       = window;
        mainwin->vbox         = vbox;
        mainwin->menubar      = menubar;
        mainwin->menu_factory = ifactory;
@@ -852,6 +891,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
@@ -868,8 +909,8 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->color_dim.red = summaryview->color_dim.green =
                summaryview->color_dim.blue = COLOR_DIM;
 
-       folderview->color_new.red = (guint16)55000;
-       folderview->color_new.green = folderview->color_new.blue = 15000;
+       gtkut_convert_int_to_gdk_color(prefs_common.color_new,
+                                      &folderview->color_new);
 
        gtkut_convert_int_to_gdk_color(prefs_common.tgt_folder_col,
                                       &folderview->color_op);
@@ -887,15 +928,19 @@ 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"));
+       debug_print("done.\n");
 
-       messageview->visible = TRUE;
+       messageview->visible = prefs_common.msgview_visible;
 
        main_window_set_widgets(mainwin, type);
 
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(main_window_size_allocate_cb),
+                        mainwin);
+
        /* set menu items */
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Code set/Auto detect");
@@ -925,25 +970,42 @@ MainWindow *main_window_create(SeparateType type)
                (ifactory, "/View/Show or hide/Status bar");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
+       
+       gtk_widget_hide(GTK_WIDGET(mainwin->summaryview->hbox_search));
+       
+       if (prefs_common.show_searchbar) {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mainwin->summaryview->toggle_search), TRUE);
+               if (prefs_common.summary_quicksearch_type != S_SEARCH_EXTENDED)
+                       gtk_widget_hide(summaryview->search_description);
+       }
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
                (ifactory, "/Configuration/Change current account");
-       gtk_signal_connect(GTK_OBJECT(ac_menu), "selection_done",
-                          GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
+       g_signal_connect(G_OBJECT(ac_menu), "selection_done",
+                        G_CALLBACK(ac_menu_popup_closed), mainwin);
        mainwin->ac_menu = ac_menu;
 
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 
        /* create actions menu */
-       update_mainwin_actions_menu(ifactory, mainwin);
+       action_update_mainwin_menu(ifactory, mainwin);
+
+       /* attach accel groups to main window */
+#define        ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win)        \
+       gtk_window_add_accel_group                      \
+               (GTK_WINDOW(win),                       \
+                gtk_item_factory_from_widget(menu)->accel_group)                
+       
+       ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu,mainwin->window);
+       
+       /* connect the accelerators for equivalent 
+          menu items in different menus             */
+       menu_connect_identical_items();
+
 
+       
        /* show main window */
-       gtk_widget_set_uposition(mainwin->window,
-                                prefs_common.mainwin_x,
-                                prefs_common.mainwin_y);
-       gtk_widget_set_usize(window, prefs_common.mainwin_width,
-                            prefs_common.mainwin_height);
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -951,11 +1013,16 @@ 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;
 
+       mainwin->progressindicator_hook =
+               hooks_register_hook(PROGRESSINDICATOR_HOOKLIST, mainwindow_progressindicator_hook, mainwin);
+
        if (!watch_cursor)
                watch_cursor = gdk_cursor_new(GDK_WATCH);
 
@@ -999,7 +1066,7 @@ void main_window_lock(MainWindow *mainwin)
        mainwin->lock_count++;
 
        main_window_set_menu_sensitive(mainwin);
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 }
 
 void main_window_unlock(MainWindow *mainwin)
@@ -1008,7 +1075,7 @@ void main_window_unlock(MainWindow *mainwin)
                mainwin->lock_count--;
 
        main_window_set_menu_sensitive(mainwin);
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 
        if (mainwin->lock_count == 0)
                gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
@@ -1034,31 +1101,37 @@ 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;
 
                main_window_show_cur_account(mainwin);
                main_window_set_menu_sensitive(mainwin);
-               toolbar_set_sensitive(mainwin);
+               toolbar_main_set_sensitive(mainwin);
 
                /* pixmap themes */
                if (pixmap_theme_changed) {
-                       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), 
-                                            GTK_WIDGET(mainwin->toolbar->toolbar));
-
-                       mainwin->toolbar->toolbar = NULL;
-                       toolbar_create(mainwin, mainwin->handlebox);
-                       set_toolbar_style(mainwin);
+                       toolbar_update(TOOLBAR_MAIN, mainwin);
+                       messageview_reflect_prefs_pixmap_theme();
+                       compose_reflect_prefs_pixmap_theme();
                        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;
                }
                
-               if (prefs_common.immediate_exec)
-                       gtk_widget_hide(mainwin->toolbar->exec_btn);
-               else
-                       gtk_widget_show(mainwin->toolbar->exec_btn);
-
                summary_redisplay_msg(mainwin->summaryview);
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
@@ -1102,10 +1175,11 @@ void main_window_set_account_menu(GList *account_list)
                                (ac_prefs->account_name
                                 ? ac_prefs->account_name : _("Untitled"));
                        gtk_widget_show(menuitem);
-                       gtk_menu_append(GTK_MENU(mainwin->ac_menu), menuitem);
-                       gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                                          GTK_SIGNAL_FUNC(account_menu_cb),
-                                          ac_prefs);
+                       gtk_menu_shell_append(GTK_MENU_SHELL(mainwin->ac_menu),
+                                             menuitem);
+                       g_signal_connect(G_OBJECT(menuitem), "activate",
+                                        G_CALLBACK(account_menu_cb),
+                                        ac_prefs);
                }
        }
 }
@@ -1133,13 +1207,38 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        g_free(ac_name);
 }
 
+GtkWidget *main_window_get_folder_window(MainWindow *mainwin)
+{
+       switch (mainwin->type) {
+       case SEPARATE_FOLDER:
+               return mainwin->win.sep_folder.folderwin;
+       case SEPARATE_BOTH:
+               return mainwin->win.sep_both.folderwin;
+       default:
+               return NULL;
+       }
+}
+
+GtkWidget *main_window_get_message_window(MainWindow *mainwin)
+{
+       switch (mainwin->type) {
+       case SEPARATE_MESSAGE:
+               return mainwin->win.sep_message.messagewin;
+       case SEPARATE_BOTH:
+               return mainwin->win.sep_both.messagewin;
+       default:
+               return NULL;
+       }
+}
+
 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"),
+       debug_print("Changing window separation type from %d to %d\n",
                    mainwin->type, type);
 
        if (mainwin->type == type) return;
@@ -1236,6 +1335,8 @@ void main_window_toggle_message_view(MainWindow *mainwin)
 
        main_window_set_menu_sensitive(mainwin);
 
+       prefs_common.msgview_visible = mainwin->messageview->visible;
+
        gtk_widget_grab_focus(summaryview->ctree);
 }
 
@@ -1245,30 +1346,51 @@ void main_window_get_size(MainWindow *mainwin)
 
        allocation = &(GTK_WIDGET_PTR(mainwin->summaryview)->allocation);
 
-       prefs_common.summaryview_width  = allocation->width;
+       if (allocation->width > 1 && allocation->height > 1) {
+               prefs_common.summaryview_width = allocation->width;
 
-       if ((mainwin->type == SEPARATE_NONE ||
-            mainwin->type == SEPARATE_FOLDER) &&
-           messageview_is_visible(mainwin->messageview))
-               prefs_common.summaryview_height = allocation->height;
+               if ((mainwin->type == SEPARATE_NONE ||
+                    mainwin->type == SEPARATE_FOLDER) &&
+                   messageview_is_visible(mainwin->messageview))
+                       prefs_common.summaryview_height = allocation->height;
 
-       prefs_common.mainview_width     = allocation->width;
+               prefs_common.mainview_width = allocation->width;
+       }
 
        allocation = &mainwin->window->allocation;
-
-       prefs_common.mainview_height = allocation->height;
-       prefs_common.mainwin_width   = allocation->width;
-       prefs_common.mainwin_height  = allocation->height;
+       if (allocation->width > 1 && allocation->height > 1) {
+               prefs_common.mainview_height = allocation->height;
+               prefs_common.mainwin_width   = allocation->width;
+               prefs_common.mainwin_height  = allocation->height;
+       }
 
        allocation = &(GTK_WIDGET_PTR(mainwin->folderview)->allocation);
+       if (allocation->width > 1 && allocation->height > 1) {
+               prefs_common.folderview_width  = allocation->width;
+               prefs_common.folderview_height = allocation->height;
+       }
+
+       allocation = &(GTK_WIDGET_PTR(mainwin->messageview)->allocation);
+       if (allocation->width > 1 && allocation->height > 1) {
+               prefs_common.msgview_width = allocation->width;
+               prefs_common.msgview_height = allocation->height;
+       }
 
-       prefs_common.folderview_width  = allocation->width;
-       prefs_common.folderview_height = allocation->height;
+       debug_print("summaryview size: %d x %d\n",
+                   prefs_common.summaryview_width,
+                   prefs_common.summaryview_height);
+       debug_print("folderview size: %d x %d\n",
+                   prefs_common.folderview_width,
+                   prefs_common.folderview_height);
+       debug_print("messageview size: %d x %d\n",
+                   prefs_common.msgview_width,
+                   prefs_common.msgview_height);
 }
 
 void main_window_get_position(MainWindow *mainwin)
 {
        gint x, y;
+       GtkWidget *window;
 
        gtkut_widget_get_uposition(mainwin->window, &x, &y);
 
@@ -1277,7 +1399,22 @@ void main_window_get_position(MainWindow *mainwin)
        prefs_common.mainwin_x = x;
        prefs_common.mainwin_y = y;
 
-       debug_print(_("window position: x = %d, y = %d\n"), x, y);
+       debug_print("main window position: %d, %d\n", x, y);
+
+       window = main_window_get_folder_window(mainwin);
+       if (window) {
+               gtkut_widget_get_uposition(window, &x, &y);
+               prefs_common.folderwin_x = x;
+               prefs_common.folderwin_y = y;
+               debug_print("folder window position: %d, %d\n", x, y);
+       }
+       window = main_window_get_message_window(mainwin);
+       if (window) {
+               gtkut_widget_get_uposition(window, &x, &y);
+               prefs_common.main_msgwin_x = x;
+               prefs_common.main_msgwin_y = y;
+               debug_print("message window position: %d, %d\n", x, y);
+       }
 }
 
 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
@@ -1288,7 +1425,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 
        for (has_trash = 0, list = folder_get_list(); list != NULL; list = list->next) {
                folder = FOLDER(list->data);
-               if (folder && folder->trash && folder->trash->total > 0)
+               if (folder && folder->trash && folder->trash->total_msgs > 0)
                        has_trash++;
        }
 
@@ -1304,13 +1441,6 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 
        procmsg_empty_trash();
 
-       for (list = folder_get_list(); list != NULL; list = list->next) {
-               folder = list->data;
-               if (folder && folder->trash) {
-                       folderview_update_item(folder->trash, TRUE);
-               }
-       }
-
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->stype == F_TRASH)
                gtk_widget_grab_focus(mainwin->folderview->ctree);
@@ -1332,13 +1462,12 @@ void main_window_add_mailbox(MainWindow *mainwin)
                g_free(path);
                return;
        }
-       if (!strcmp(path, "Mail"))
-               folder = folder_new(F_MH, _("Mailbox"), path);
-       else
-               folder = folder_new(F_MH, g_basename(path), path);
+       folder = folder_new(folder_get_class_from_string("mh"), 
+                           !strcmp(path, "Mail") ? _("Mailbox") : g_basename(path),
+                           path);
        g_free(path);
 
-       if (folder->create_tree(folder) < 0) {
+       if (folder->klass->create_tree(folder) < 0) {
                alertpanel_error(_("Creation of the mailbox failed.\n"
                                   "Maybe some files already exist, or you don't have the permission to write there."));
                folder_destroy(folder);
@@ -1371,16 +1500,11 @@ void main_window_add_mbox(MainWindow *mainwin)
                return;
        }
 
-       /*
-       if (!strcmp(path, "Mail"))
-               folder = folder_new(F_MBOX, _("Mailbox"), path);
-               else
-       */
-
-       folder = folder_new(F_MBOX, g_basename(path), path);
+       folder = folder_new(folder_get_class_from_string("mbox"), 
+                           g_basename(path), path);
        g_free(path);
 
-       if (folder->create_tree(folder) < 0) {
+       if (folder->klass->create_tree(folder) < 0) {
                alertpanel_error(_("Creation of the mailbox failed."));
                folder_destroy(folder);
                return;
@@ -1388,16 +1512,6 @@ void main_window_add_mbox(MainWindow *mainwin)
 
        folder_add(folder);
 
-       item = folder_item_new(folder, folder->name, NULL);
-       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");
-
        folderview_set(mainwin->folderview);
 }
 
@@ -1416,25 +1530,31 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                state |= M_MSG_EXIST;
        if (item && item->path && item->parent && !item->no_select) {
                state |= M_EXEC;
-               if (item->threaded)
-                       state |= M_THREADED;
-               else
-                       state |= M_UNTHREADED;  
                /*              if (item->folder->type != F_NEWS) */
                state |= M_ALLOW_DELETE;
 
+               if (prefs_common.immediate_exec == 0
+                   && mainwin->lock_count == 0)
+                       state |= M_DELAY_EXEC;
+
                if ((selection == SUMMARY_NONE && item->hide_read_msgs)
                    || selection != SUMMARY_NONE)
                        state |= M_HIDE_READ_MSG;       
        }               
+       if (mainwin->summaryview->threaded)
+               state |= M_THREADED;
+       else
+               state |= M_UNTHREADED;  
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
                state |= M_TARGET_EXIST;
        if (selection == SUMMARY_SELECTED_SINGLE)
                state |= M_SINGLE_TARGET_EXIST;
        if (mainwin->summaryview->folder_item &&
-           mainwin->summaryview->folder_item->folder->type == F_NEWS)
+           mainwin->summaryview->folder_item->folder->klass->type == F_NEWS)
                state |= M_NEWS;
+       else
+               state |= M_NOT_NEWS;
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (item &&
             (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
@@ -1464,7 +1584,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        SensitiveCond state;
        gboolean sensitive;
        GtkWidget *menuitem;
-       FolderItem *item;
+       SummaryView *summaryview;
        gchar *menu_path;
        gint i;
 
@@ -1472,20 +1592,22 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                gchar *const entry;
                SensitiveCond cond;
        } entry[] = {
-               {"/File/Add mailbox..."        , M_UNLOCKED},
-                {"/File/Add mbox mailbox..."   , M_UNLOCKED},
-               {"/File/Check for new mails in all folders", M_UNLOCKED},
-               {"/File/Folder"                , M_UNLOCKED},
-               {"/File/Import mbox file..."   , M_UNLOCKED},
-               {"/File/Export to mbox file...", M_UNLOCKED},
-               {"/File/Empty trash"           , M_UNLOCKED},
-               {"/File/Work offline"          , M_UNLOCKED},
-               {"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/File/Folder"                               , M_UNLOCKED},
+               {"/File/Add mailbox"                          , M_UNLOCKED},
+
+                {"/File/Add mailbox/MH..."                   , M_UNLOCKED},
+               {"/File/Add mailbox/mbox..."                  , M_UNLOCKED},
+               {"/File/Export to mbox file..."               , M_UNLOCKED},
+               {"/File/Empty trash"                          , M_UNLOCKED},
+               {"/File/Work offline"                         , M_UNLOCKED},
+
+               {"/File/Save as...", M_TARGET_EXIST|M_UNLOCKED},
                {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
-               /* {"/File/Close", M_UNLOCKED}, */
-               {"/File/Exit" , M_UNLOCKED},
+               /* {"/File/Close"  , M_UNLOCKED}, */
+               {"/File/Exit"      , M_UNLOCKED},
 
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
+
                {"/View/Sort"                      , M_EXEC},
                {"/View/Thread view"               , M_EXEC},
                {"/View/Expand all threads"        , M_MSG_EXIST},
@@ -1494,15 +1616,13 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Go to/Prev message"        , M_MSG_EXIST},
                {"/View/Go to/Next message"        , M_MSG_EXIST},
                {"/View/Go to/Prev unread message" , M_MSG_EXIST},
-               {"/View/Go to/Next unread message" , M_MSG_EXIST},
                {"/View/Go to/Prev new message"    , M_MSG_EXIST},
-               {"/View/Go to/Next new message"    , M_MSG_EXIST},
                {"/View/Go to/Prev marked message" , M_MSG_EXIST},
                {"/View/Go to/Next marked message" , M_MSG_EXIST},
                {"/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},
@@ -1510,24 +1630,23 @@ 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},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+               {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
 
-               {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
                {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
                {"/Tools/Harvest addresses"         , M_UNLOCKED},
                {"/Tools/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
                {"/Tools/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/Tools/Actions"                   , M_TARGET_EXIST|M_UNLOCKED},
-               {"/Tools/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Execute"                   , M_DELAY_EXEC},
                {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
                {"/Configuration", M_UNLOCKED},
@@ -1553,46 +1672,47 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
                              messageview_is_visible(mainwin->messageview));
 
-       item = mainwin->summaryview->folder_item;
+       summaryview = mainwin->summaryview;
        menu_path = "/View/Sort/Don't sort";
-       if (item) {
-               switch (item->sort_key) {
-               case SORT_BY_NUMBER:
-                       menu_path = "/View/Sort/by number"; break;
-               case SORT_BY_SIZE:
-                       menu_path = "/View/Sort/by size"; break;
-               case SORT_BY_DATE:
-                       menu_path = "/View/Sort/by date"; break;
-               case SORT_BY_FROM:
-                       menu_path = "/View/Sort/by from"; break;
-               case SORT_BY_SUBJECT:
-                       menu_path = "/View/Sort/by subject"; break;
-               case SORT_BY_LABEL:
-                       menu_path = "/View/Sort/by color label"; break;
-               case SORT_BY_MARK:
-                       menu_path = "/View/Sort/by mark"; break;
-               case SORT_BY_UNREAD:
-                       menu_path = "/View/Sort/by unread"; break;
-               case SORT_BY_MIME:
-                       menu_path = "/View/Sort/by attachment"; break;
-               case SORT_BY_SCORE:
-                       menu_path = "/View/Sort/by score"; break;
-               case SORT_BY_LOCKED:
-                       menu_path = "/View/Sort/by locked"; break;
-               case SORT_BY_NONE:
-               default:
-                       menu_path = "/View/Sort/Don't sort"; break;
-               }
+
+       switch (summaryview->sort_key) {
+       case SORT_BY_NUMBER:
+               menu_path = "/View/Sort/by number"; break;
+       case SORT_BY_SIZE:
+               menu_path = "/View/Sort/by size"; break;
+       case SORT_BY_DATE:
+               menu_path = "/View/Sort/by date"; break;
+       case SORT_BY_FROM:
+               menu_path = "/View/Sort/by from"; break;
+       case SORT_BY_TO:
+               menu_path = "/View/Sort/by recipient"; break;
+       case SORT_BY_SUBJECT:
+               menu_path = "/View/Sort/by subject"; break;
+       case SORT_BY_LABEL:
+               menu_path = "/View/Sort/by color label"; break;
+       case SORT_BY_MARK:
+               menu_path = "/View/Sort/by mark"; break;
+       case SORT_BY_STATUS:
+               menu_path = "/View/Sort/by status"; break;
+       case SORT_BY_MIME:
+               menu_path = "/View/Sort/by attachment"; break;
+       case SORT_BY_SCORE:
+               menu_path = "/View/Sort/by score"; break;
+       case SORT_BY_LOCKED:
+               menu_path = "/View/Sort/by locked"; break;
+       case SORT_BY_NONE:
+       default:
+               menu_path = "/View/Sort/Don't sort"; break;
        }
        SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
 
-       if (!item || item->sort_type == SORT_ASCENDING) {
+       if (summaryview->sort_type == SORT_ASCENDING) {
                SET_CHECK_MENU_ACTIVE("/View/Sort/Ascending", TRUE);
        } else {
                SET_CHECK_MENU_ACTIVE("/View/Sort/Descending", TRUE);
        }
 
-       if (item && item->sort_key != SORT_BY_NONE) {
+       if (summaryview->sort_key != SORT_BY_NONE) {
                menu_set_sensitive(ifactory, "/View/Sort/Ascending", TRUE);
                menu_set_sensitive(ifactory, "/View/Sort/Descending", TRUE);
        } else {
@@ -1600,7 +1720,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);
 
@@ -1611,57 +1731,79 @@ 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;
        }
 }
 
+void main_window_show(MainWindow *mainwin)
+{
+       gtk_widget_show(mainwin->window);
+       gtk_widget_show(mainwin->vbox_body);
+
+        gtk_widget_set_uposition(mainwin->window,
+                                 prefs_common.mainwin_x,
+                                 prefs_common.mainwin_y);
+
+       gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->folderview),
+                            prefs_common.folderview_width,
+                            prefs_common.folderview_height);
+       gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
+                            prefs_common.summaryview_width,
+                            prefs_common.summaryview_height);
+       gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->messageview),
+                            prefs_common.msgview_width,
+                            prefs_common.msgview_height);
+
+       if (mainwin->type & SEPARATE_FOLDER) {
+               GtkWidget *folderwin;
+
+               folderwin = main_window_get_folder_window(mainwin);
+               gtk_widget_show(folderwin);
+               gtk_widget_set_uposition(folderwin, prefs_common.folderwin_x,
+                                         prefs_common.folderwin_y);
+       }
+
+       if (mainwin->type & SEPARATE_MESSAGE) {
+               GtkWidget *messagewin;
+
+               messagewin = main_window_get_message_window(mainwin);
+               gtk_widget_show(messagewin);
+               gtk_widget_set_uposition(messagewin, prefs_common.main_msgwin_x,
+                                         prefs_common.main_msgwin_y);
+       }
+}
+
+void main_window_hide(MainWindow *mainwin)
+{
+       main_window_get_size(mainwin);
+       main_window_get_position(mainwin);
+
+       gtk_widget_hide(mainwin->window);
+       gtk_widget_hide(mainwin->vbox_body);
+
+       if (mainwin->type & SEPARATE_FOLDER) {
+               gtk_widget_hide(mainwin->win.sep_folder.folderwin);
+       }
+
+       if (mainwin->type & SEPARATE_MESSAGE) {
+               gtk_widget_hide(mainwin->win.sep_message.messagewin);
+       }
+}
+
 static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 {
        GtkWidget *folderwin = NULL;
@@ -1671,8 +1813,9 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        GtkWidget *vbox_body = mainwin->vbox_body;
        GtkItemFactory *ifactory = mainwin->menu_factory;
        GtkWidget *menuitem;
+       GtkItemFactory *msgview_ifactory;
 
-       debug_print(_("Setting widgets..."));
+       debug_print("Setting widgets... ");
 
        /* create separated window(s) if needed */
        if (type & SEPARATE_FOLDER) {
@@ -1683,13 +1826,18 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                       "folder_view", "Sylpheed");
                gtk_window_set_policy(GTK_WINDOW(folderwin),
                                      TRUE, TRUE, FALSE);
-               gtk_widget_set_usize(folderwin, -1,
-                                    prefs_common.mainview_height);
+               gtk_window_move(GTK_WINDOW(folderwin), prefs_common.folderwin_x,
+                               prefs_common.folderwin_y);
                gtk_container_set_border_width(GTK_CONTAINER(folderwin),
                                               BORDER_WIDTH);
-               gtk_signal_connect(GTK_OBJECT(folderwin), "delete_event",
-                                  GTK_SIGNAL_FUNC(folder_window_close_cb),
+               g_signal_connect(G_OBJECT(folderwin), "delete_event",
+                                G_CALLBACK(folder_window_close_cb),
                                   mainwin);
+               gtk_container_add(GTK_CONTAINER(folderwin),
+                                 GTK_WIDGET_PTR(mainwin->folderview));
+               gtk_widget_realize(folderwin);
+               if (prefs_common.folderview_visible)
+                       gtk_widget_show(folderwin);
        }
        if (type & SEPARATE_MESSAGE) {
                messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -1699,25 +1847,38 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                       "message_view", "Sylpheed");
                gtk_window_set_policy(GTK_WINDOW(messagewin),
                                      TRUE, TRUE, FALSE);
-               gtk_widget_set_usize
-                       (messagewin, prefs_common.mainview_width,
-                        prefs_common.mainview_height
-                        - prefs_common.summaryview_height
-                        + DEFAULT_HEADERVIEW_HEIGHT);
+               gtk_window_move(GTK_WINDOW(messagewin), prefs_common.main_msgwin_x,
+                               prefs_common.main_msgwin_y);
                gtk_container_set_border_width(GTK_CONTAINER(messagewin),
                                               BORDER_WIDTH);
-               gtk_signal_connect(GTK_OBJECT(messagewin), "delete_event",
-                                  GTK_SIGNAL_FUNC(message_window_close_cb),
-                                  mainwin);
+               g_signal_connect(G_OBJECT(messagewin), "delete_event",
+                                G_CALLBACK(message_window_close_cb),
+                                mainwin);
+               gtk_container_add(GTK_CONTAINER(messagewin),
+                                 GTK_WIDGET_PTR(mainwin->messageview));
+               gtk_widget_realize(messagewin);
+               if (messageview_is_visible(mainwin->messageview))
+                       gtk_widget_show(messagewin);
        }
 
+       gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
+                                   prefs_common.folderview_width,
+                                   prefs_common.folderview_height);
+       gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->summaryview),
+                                   prefs_common.summaryview_width,
+                                   prefs_common.summaryview_height);
+       gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->messageview),
+                                   prefs_common.msgview_width,
+                                   prefs_common.msgview_height);
+
        switch (type) {
        case SEPARATE_NONE:
                hpaned = gtk_hpaned_new();
-               gtk_widget_show(hpaned);
                gtk_box_pack_start(GTK_BOX(vbox_body), hpaned, TRUE, TRUE, 0);
                gtk_paned_add1(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->folderview));
+               gtk_widget_show(hpaned);
+               gtk_widget_queue_resize(hpaned);
 
                vpaned = gtk_vpaned_new();
                if (messageview_is_visible(mainwin->messageview)) {
@@ -1729,26 +1890,17 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                       GTK_WIDGET_PTR(mainwin->summaryview));
                        gtk_widget_ref(vpaned);
                }
-               gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
-                                    prefs_common.summaryview_width,
-                                    prefs_common.summaryview_height);
                gtk_paned_add2(GTK_PANED(vpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));
-               gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->messageview),
-                                    prefs_common.mainview_width, -1);
-               gtk_widget_set_usize(mainwin->window,
-                                    prefs_common.folderview_width +
-                                    prefs_common.mainview_width,
-                                    prefs_common.mainwin_height);
-               gtk_widget_show_all(vpaned);
-
-               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
-                * lose track of its visibility state */
-               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
-                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+               gtk_widget_show(vpaned);
+               gtk_widget_queue_resize(vpaned);
 
                mainwin->win.sep_none.hpaned = hpaned;
                mainwin->win.sep_none.vpaned = vpaned;
+               
+               /* remove headerview if not in prefs */
+               headerview_set_visibility(mainwin->messageview->headerview,
+                                         prefs_common.display_header_pane);
                break;
        case SEPARATE_FOLDER:
                vpaned = gtk_vpaned_new();
@@ -1765,92 +1917,80 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                }
                gtk_paned_add2(GTK_PANED(vpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));
-               gtk_widget_show_all(vpaned);
-               gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
-                                    prefs_common.summaryview_width,
-                                    prefs_common.summaryview_height);
-               gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->messageview),
-                                    prefs_common.mainview_width, -1);
-               gtk_widget_set_usize(mainwin->window,
-                                    prefs_common.mainview_width,
-                                    prefs_common.mainview_height);
-
-               gtk_container_add(GTK_CONTAINER(folderwin),
-                                 GTK_WIDGET_PTR(mainwin->folderview));
+               gtk_widget_show(vpaned);
+               gtk_widget_queue_resize(vpaned);
 
                mainwin->win.sep_folder.folderwin = folderwin;
                mainwin->win.sep_folder.vpaned    = vpaned;
 
-               gtk_widget_show_all(folderwin);
+               /* remove headerview if not in prefs */
+               headerview_set_visibility(mainwin->messageview->headerview,
+                                         prefs_common.display_header_pane);
+               
                break;
        case SEPARATE_MESSAGE:
                hpaned = gtk_hpaned_new();
                gtk_box_pack_start(GTK_BOX(vbox_body), hpaned, TRUE, TRUE, 0);
-
                gtk_paned_add1(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->folderview));
                gtk_paned_add2(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->summaryview));
-               gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
-                                    prefs_common.summaryview_width,
-                                    prefs_common.summaryview_height);
-               gtk_widget_set_usize(mainwin->window,
-                                    prefs_common.folderview_width +
-                                    prefs_common.mainview_width,
-                                    prefs_common.mainwin_height);
-               gtk_widget_show_all(hpaned);
-               gtk_container_add(GTK_CONTAINER(messagewin),
-                                 GTK_WIDGET_PTR(mainwin->messageview));
+               gtk_widget_show(hpaned);
+               gtk_widget_queue_resize(hpaned);
+               messageview_add_toolbar(mainwin->messageview, messagewin);
+               msgview_ifactory = gtk_item_factory_from_widget(mainwin->messageview->menubar);
+               menu_set_sensitive(msgview_ifactory, "/File/Close", FALSE);
 
                mainwin->win.sep_message.messagewin = messagewin;
                mainwin->win.sep_message.hpaned     = hpaned;
 
-               gtk_widget_show_all(messagewin);
-               
-               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
-                * lose track of its visibility state */
-               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
-                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        case SEPARATE_BOTH:
                gtk_box_pack_start(GTK_BOX(vbox_body),
                                   GTK_WIDGET_PTR(mainwin->summaryview),
                                   TRUE, TRUE, 0);
-               gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
-                                    prefs_common.summaryview_width,
-                                    prefs_common.summaryview_height);
-               gtk_widget_set_usize(mainwin->window,
-                                    prefs_common.mainview_width,
-                                    prefs_common.mainwin_height);
-               gtk_container_add(GTK_CONTAINER(folderwin),
-                                 GTK_WIDGET_PTR(mainwin->folderview));
-               gtk_container_add(GTK_CONTAINER(messagewin),
-                                 GTK_WIDGET_PTR(mainwin->messageview));
 
                mainwin->win.sep_both.folderwin = folderwin;
                mainwin->win.sep_both.messagewin = messagewin;
 
-               gtk_widget_show_all(folderwin);
-               gtk_widget_show_all(messagewin);
-
-               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
-                * lose track of its visibility state */
-               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
-                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        }
 
+       gtk_window_move(GTK_WINDOW(mainwin->window),
+                       prefs_common.mainwin_x,
+                       prefs_common.mainwin_y);
+
+       gtk_widget_queue_resize(vbox_body);
+       gtk_widget_queue_resize(mainwin->vbox);
+       gtk_widget_queue_resize(mainwin->window);
+       /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+        * and mimeview icon list/ctree lose track of their visibility states */
+       if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
+               gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mainwin->messageview->mimeview->mime_toggle)))
+               gtk_widget_hide(mainwin->messageview->mimeview->icon_mainbox);
+       else 
+               gtk_widget_hide(mainwin->messageview->mimeview->ctree_mainbox);
+
+       /* rehide quick search if necessary */
+       if (!prefs_common.show_searchbar)
+               gtk_widget_hide(mainwin->summaryview->hbox_search);
+       
        mainwin->type = type;
 
-       mainwin->messageview->visible = TRUE;
 
        /* toggle menu state */
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Show or hide/Folder tree");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      (type & SEPARATE_FOLDER) == 0 ? TRUE :
+                                      prefs_common.folderview_visible);
+       gtk_widget_set_sensitive(menuitem, ((type & SEPARATE_FOLDER) != 0));
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Show or hide/Message view");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      (type & SEPARATE_MESSAGE) == 0 ? TRUE :
+                                      prefs_common.msgview_visible);
 
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Separate folder tree");
@@ -1861,43 +2001,78 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       ((type & SEPARATE_MESSAGE) != 0));
 
-       debug_print(_("done.\n"));
+       if (folderwin) {
+               g_signal_connect
+                       (G_OBJECT(folderwin), "size_allocate",
+                        G_CALLBACK(folder_window_size_allocate_cb),
+                        mainwin);
+       }
+       if (messagewin) {
+               g_signal_connect
+                       (G_OBJECT(messagewin), "size_allocate",
+                        G_CALLBACK(message_window_size_allocate_cb),
+                        mainwin);
+       }
+
+       debug_print("done.\n");
+}
+
+void main_window_destroy_all(void)
+{
+       while (mainwin_list != NULL) {
+               MainWindow *mainwin = (MainWindow*)mainwin_list->data;
+               
+               /* free toolbar stuff */
+               toolbar_clear_list(TOOLBAR_MAIN);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
+
+               g_free(mainwin->toolbar);
+               g_free(mainwin);
+               
+               mainwin_list = g_list_remove(mainwin_list, mainwin);
+       }
+       g_list_free(mainwin_list);
 }
 
 #if 0
-static void toolbar_account_button_pressed(GtkWidget *widget,
-                                          GdkEventButton *event,
-                                          gpointer data)
+static gboolean toolbar_account_button_pressed(GtkWidget *widget,
+                                              GdkEventButton *event,
+                                              gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       if (!event) return;
-       if (event->button != 3) return;
+       if (!event) return FALSE;
+       if (event->button != 3) return FALSE;
 
        gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
-                           widget);
+       g_object_set_data(G_OBJECT(mainwin->ac_menu), "menu_button",
+                         widget);
 
        gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+
+       return FALSE;
 }
 #endif
 
-static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
-                                   gpointer data)
+static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
+                                       gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       if (!event) return;
+       if (!event) return FALSE;
 
        gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
-                           widget);
+       g_object_set_data(G_OBJECT(mainwin->ac_menu), "menu_button",
+                         widget);
 
        gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+
+       return TRUE;
 }
 
 static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
@@ -1905,10 +2080,10 @@ static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
        MainWindow *mainwin = (MainWindow *)data;
        GtkWidget *button;
 
-       button = gtk_object_get_data(GTK_OBJECT(menu_shell), "menu_button");
+       button = g_object_get_data(G_OBJECT(menu_shell), "menu_button");
        if (!button) return;
        gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-       gtk_object_remove_data(GTK_OBJECT(mainwin->ac_menu), "menu_button");
+       g_object_set_data(G_OBJECT(mainwin->ac_menu), "menu_button", NULL);
        manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
@@ -1949,6 +2124,33 @@ static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
        return TRUE;
 }
 
+static void main_window_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation,
+                                        gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       main_window_get_size(mainwin);
+}
+
+static void folder_window_size_allocate_cb(GtkWidget *widget,
+                                          GtkAllocation *allocation,
+                                          gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       main_window_get_size(mainwin);
+}
+
+static void message_window_size_allocate_cb(GtkWidget *widget,
+                                           GtkAllocation *allocation,
+                                           gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       main_window_get_size(mainwin);
+}
+
 static void add_mailbox_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2065,6 +2267,8 @@ static void toggle_folder_cb(MainWindow *mainwin, guint action,
                        gtk_widget_hide(mainwin->win.sep_both.folderwin);
                break;
        }
+
+       prefs_common.folderview_visible = active;
 }
 
 static void toggle_message_cb(MainWindow *mainwin, guint action,
@@ -2081,32 +2285,28 @@ static void toggle_message_cb(MainWindow *mainwin, guint action,
 static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
-       switch ((ToolbarStyle)action) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-       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;
-       }
+       toolbar_toggle(action, mainwin);
+}
 
-       if (action != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
+void main_window_reply_cb(MainWindow *mainwin, guint action,
+                         GtkWidget *widget)
+{
+       MessageView *msgview = (MessageView*)mainwin->messageview;
+       GSList *msginfo_list = NULL;
+       gchar *body;
+
+       g_return_if_fail(msgview != NULL);
 
-       mainwin->toolbar_style = (ToolbarStyle)action;
-       prefs_common.toolbar_style = (ToolbarStyle)action;
+       msginfo_list = summary_get_selection(mainwin->summaryview);
+       g_return_if_fail(msginfo_list != NULL);
+       
+       body = messageview_get_selection(msgview);
+       compose_reply_mode((ComposeMode)action, msginfo_list, body);
+       g_free(body);
+       g_slist_free(msginfo_list);
 }
 
+
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -2135,13 +2335,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) 
@@ -2187,121 +2391,11 @@ static void log_window_show_cb(MainWindow *mainwin, guint action,
        log_window_show(mainwin->logwin);
 }
 
-static void sel_download_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
-{
-       selective_download(mainwin);
-}
-
-static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
-{
-       prefs_toolbar();
-}
-
-
-void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       inc_mail(mainwin, prefs_common.newmail_notify_manu);
-}
-
-void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
-                                   GtkWidget *widget)
-{
-       inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
-}
-
 static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        inc_cancel_all();
 }
 
-void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       GList *list;
-
-       if (prefs_common.work_offline)
-               if (alertpanel(_("Offline warning"), 
-                              _("You're working offline. Override?"),
-                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
-               return;
-
-       for (list = folder_get_list(); list != NULL; list = list->next) {
-               Folder *folder = list->data;
-
-               if (folder->queue) {
-                       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);
-               }
-       }
-}
-
-void compose_mail_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget)
-{
-       PrefsAccount * ac;
-       GList * list;
-       GList * cur;
-
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
-               if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
-                       return;
-               }
-       }
-
-       if(cur_account && (cur_account->protocol != A_NNTP)) {
-               compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
-               return;
-       }
-
-       list = account_get_list();
-       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);
-                       return;
-               }
-       }
-}
-
-void compose_news_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget)
-{
-       PrefsAccount * ac = NULL;
-       GList * list;
-       GList * cur;
-
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
-               if (ac && ac->protocol == A_NNTP) {
-                       compose_new(ac,
-                                   mainwin->summaryview->folder_item->path,
-                                   NULL);
-                       return;
-               }
-       }
-
-       list = account_get_list();
-       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
-               ac = (PrefsAccount *) cur->data;
-               if (ac->protocol == A_NNTP) {
-                       compose_new(ac, NULL, NULL);
-                       return;
-               }
-       }
-}
-
-void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       summary_reply(mainwin->summaryview, (ComposeMode)action);
-}
-
 static void move_to_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_move_to(mainwin->summaryview);
@@ -2317,6 +2411,11 @@ static void delete_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_delete(mainwin->summaryview);
 }
 
+static void cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_cancel(mainwin->summaryview);
+}
+
 static void open_msg_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_open_msg(mainwin->summaryview);
@@ -2380,13 +2479,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,
@@ -2405,10 +2506,10 @@ static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 
        if (GTK_CHECK_MENU_ITEM(widget)->active) {
                summary_thread_build(mainwin->summaryview);
-               mainwin->summaryview->folder_item->threaded = TRUE;
+/*             mainwin->summaryview->folder_item->threaded = TRUE; */
        } else {
                summary_unthread(mainwin->summaryview);
-               mainwin->summaryview->folder_item->threaded = FALSE;
+/*             mainwin->summaryview->folder_item->threaded = FALSE; */
        }
 }
 
@@ -2437,7 +2538,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,
@@ -2452,7 +2554,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);
 }
@@ -2515,7 +2618,7 @@ static void prev_unread_cb(MainWindow *mainwin, guint action,
        summary_select_prev_unread(mainwin->summaryview);
 }
 
-void next_unread_cb(MainWindow *mainwin, guint action,
+static void next_unread_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_unread(mainwin->summaryview);
@@ -2583,10 +2686,10 @@ static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                messageview_select_all(mainwin->messageview);
 }
 
-static void selthread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void select_thread_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
 {
-       if (messageview_is_visible(mainwin->summaryview->messageview))
-               summary_select_thread(mainwin->summaryview);
+       summary_select_thread(mainwin->summaryview);
 }
 
 static void create_filter_cb(MainWindow *mainwin, guint action,
@@ -2601,12 +2704,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)
 {
@@ -2630,21 +2727,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);
        }
 }
 
@@ -2661,15 +2757,20 @@ static void account_menu_cb(GtkMenuItem *menuitem, gpointer data)
        main_window_reflect_prefs_all();
 }
 
-static void manual_open_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
 {
-       manual_open((ManualLang)action);
+       prefs_gtk_open();
 }
 
-static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void plugins_open_cb(GtkMenuItem *menuitem, gpointer data)
 {
-       faq_open((ManualLang)action);
+       pluginwindow_create();
+}
+
+static void manual_open_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       manual_open((ManualType)action);
 }
 
 static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
@@ -2691,10 +2792,24 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        g_free(str);
 }
 
+static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focus,
+                                         gpointer data)
+{
+       SummaryView *summary;
+
+       g_return_val_if_fail(data, FALSE);
+       summary = ((MainWindow *)data)->summaryview;
+       g_return_val_if_fail(summary, FALSE);
+       if (summary->selected != summary->displayed)
+               summary_select_node(summary, summary->displayed, FALSE, TRUE);
+       return FALSE;
+}
+
 #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;
        
@@ -2706,6 +2821,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;
        }
@@ -2713,32 +2836,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.
  */
@@ -2759,6 +2856,38 @@ static void addr_harvest_msg_cb( MainWindow *mainwin,
        summary_harvest_address( mainwin->summaryview );
 }
 
+/*!
+ *\brief       get a MainWindow
+ *
+ *\return      MainWindow * The first mainwindow in the mainwin_list
+ */
+MainWindow *mainwindow_get_mainwindow(void)
+{
+       if (mainwin_list && mainwin_list->data)
+               return (MainWindow *)(mainwin_list->data);
+       else
+               return NULL;
+}
+
+gboolean mainwindow_progressindicator_hook(gpointer source, gpointer userdata)
+{
+       ProgressData *data = (ProgressData *) source;
+       MainWindow *mainwin = (MainWindow *) userdata;
+
+       switch (data->cmd) {
+       case PROGRESS_COMMAND_START:
+       case PROGRESS_COMMAND_STOP:
+               gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), 0.0);
+               break;
+       case PROGRESS_COMMAND_SET_PERCENTAGE:
+               gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), data->value);
+               break;          
+       }
+       while (gtk_events_pending()) gtk_main_iteration ();
+
+       return FALSE;
+}
+
 /*
 * End of Source.
 */