2004-08-21 [paul] 0.9.12cvs66.4
[claws.git] / src / mainwindow.c
index d6fb53558f3e343088d8f9dadd370bcccdd6586f..bae439f14b38a966eba40bf2dbf7bcf425b218a4 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-2004 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
@@ -39,6 +39,7 @@
 #include <gtk/gtkhandlebox.h>
 #include <gtk/gtktoolbar.h>
 #include <gtk/gtkbutton.h>
+#include <gtk/gtktooltips.h>
 #include <string.h>
 
 #include "intl.h"
 #include "prefs_common.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"
+#include "localfolder.h"
+#include "filtering.h"
+#include "folderutils.h"
+#include "foldersort.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -100,44 +107,53 @@ 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 void toolbar_child_attached             (GtkWidget      *widget,
+                                                GtkWidget      *child,
+                                                gpointer        data);
+static void toolbar_child_detached             (GtkWidget      *widget,
+                                                GtkWidget      *child,
+                                                gpointer        data);
+
+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 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 add_mailbox_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,
                                  guint          action,
                                  GtkWidget     *widget);
-static void new_folder_cb       (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void rename_folder_cb    (MainWindow    *mainwin,
+static void add_mailbox_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void delete_folder_cb    (MainWindow    *mainwin,
+static void foldersort_cb       (MainWindow    *mainwin,
                                  guint          action,
-                                 GtkWidget     *widget);
+                                 GtkWidget     *widget);
 static void import_mbox_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -184,121 +200,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 reply_cb                             (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void inc_mail_cb                                  (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void inc_all_account_mail_cb              (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void send_queue_cb                        (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void compose_mail_cb                          (MainWindow       *mainwin, 
-                                        guint action,
-                                          GtkWidget         *widget);
-
-static void compose_news_cb                          (MainWindow       *mainwin, 
-                                        guint action,
-                                          GtkWidget         *widget);
-
-static void next_unread_cb                        (MainWindow  *mainwin,
-                                         guint          action,
-                                         GtkWidget     *widget);
-
-static void toolbar_inc_cb             (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_inc_all_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_send_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_compose_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_cb           (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_to_list_cb   (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_forward_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_exec_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_next_unread_cb     (GtkWidget      *widget,
-                                        gpointer        data);
-
-
-static void toolbar_reply_popup_cb            (GtkWidget       *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-static void toolbar_reply_popup_closed_cb      (GtkMenuShell   *menu_shell,
-                                               gpointer         data);
-
-static void toolbar_reply_to_all_popup_cb      (GtkWidget      *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-
-static void toolbar_reply_to_all_popup_closed_cb
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_reply_to_list_popup_cb       (GtkWidget    *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-
-static void toolbar_reply_to_list_popup_closed_cb
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
-                                        GdkEventButton *event,
-                                        gpointer        data);
-static void toolbar_reply_to_sender_popup_closed_cb
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_forward_popup_cb    (GtkWidget      *widget,
-                                        GdkEventButton    *event,
-                                        gpointer        data);
-
-static void toolbar_forward_popup_closed_cb            
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void activate_compose_button     (Toolbar       *toolbar,
-                                        ToolbarStyle      style,
-                                        ComposeButtonType type);
-static void toolbar_buttons_cb          (GtkWidget         *widget, 
-                                        ToolbarItem       *item);
-static void toolbar_create              (MainWindow        *mainwin,
-                                        GtkWidget         *container);
-
-static void toolbar_update              (MainWindow        *mainwin);
 
 static void inc_cancel_cb              (MainWindow     *mainwin,
                                         guint           action,
@@ -316,10 +217,6 @@ static void show_all_header_cb             (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
-static void reedit_cb                  (MainWindow     *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
 static void move_to_cb                 (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -350,6 +247,11 @@ static void mark_as_read_cb                (MainWindow     *mainwin,
 static void mark_all_read_cb           (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+
+static void reedit_cb                  (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void add_address_cb             (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -388,6 +290,9 @@ static void attract_by_subject_cb(MainWindow        *mainwin,
 static void delete_duplicated_cb (MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void delete_duplicated_all_cb (MainWindow       *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void filter_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -404,7 +309,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);
@@ -445,6 +352,9 @@ static void select_thread_cb         (MainWindow    *mainwin,
 static void create_filter_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void create_processing_cb (MainWindow   *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 
 static void prefs_common_open_cb       (MainWindow     *mainwin,
                                         guint           action,
@@ -458,9 +368,15 @@ static void prefs_actions_open_cb  (MainWindow     *mainwin,
 static void prefs_account_open_cb      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-static void prefs_scoring_open_cb      (MainWindow     *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
+
+static void prefs_pre_processing_open_cb  (MainWindow  *mainwin,
+                                          guint         action,
+                                          GtkWidget    *widget);
+
+static void prefs_post_processing_open_cb (MainWindow  *mainwin,
+                                          guint         action,
+                                          GtkWidget    *widget);
+
 static void prefs_filtering_open_cb    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -473,8 +389,15 @@ static void new_account_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
-static void account_menu_cb     (GtkMenuItem   *menuitem,
-                                 gpointer       data);
+static void account_selector_menu_cb    (GtkMenuItem   *menuitem,
+                                         gpointer       data);
+static void account_receive_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);
@@ -487,10 +410,6 @@ static void scan_tree_func  (Folder        *folder,
                                  FolderItem    *item,
                                  gpointer       data);
                                  
-static void key_pressed (GtkWidget *widget, 
-                               GdkEventKey *event,
-                               gpointer data);
-
 static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
 
 static void addr_harvest_cb     ( MainWindow  *mainwin,
@@ -501,28 +420,31 @@ 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 messages 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/_Add mailbox"),             NULL, NULL, 0, "<Branch>"},
+       {N_("/_File/_Add mailbox/MH..."),       NULL, add_mailbox_cb, 0, NULL},
+       {N_("/_File/Change folder order"),      NULL, foldersort_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},
-       {N_("/_File/_Work offline"),            "<control>W", toggle_work_offline_cb, 0, "<ToggleItem>"},                                               
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Save as..."),              "<control>S", save_as_cb, 0, NULL},
        {N_("/_File/_Print..."),                NULL, print_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_File/_Work offline"),            "<control>W", toggle_work_offline_cb, 0, "<ToggleItem>"},
+       {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        /* {N_("/_File/_Close"),                "<alt>W", app_exit_cb, 0, NULL}, */
        {N_("/_File/E_xit"),                    "<control>Q", app_exit_cb, 0, NULL},
 
@@ -561,11 +483,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"},
@@ -621,7 +544,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,
@@ -631,7 +554,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,
@@ -650,13 +573,15 @@ static GtkItemFactoryEntry mainwin_entries[] =
         CODESET_ACTION(C_ISO_8859_5)},
        {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
         CODESET_ACTION(C_KOI8_R)},
+       {N_("/_View/_Code set/Cyrillic (KOI8-U)"),
+        CODESET_ACTION(C_KOI8_U)},
        {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
         CODESET_ACTION(C_WINDOWS_1251)},
        CODESET_SEPARATOR,
 #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
@@ -664,7 +589,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)},
@@ -697,27 +622,28 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/Get new ma_il"),         "<control>I",   inc_mail_cb, 0, NULL},
-       {N_("/_Message/Get from _all accounts"),
+       {N_("/_Message/Recei_ve"),              NULL, NULL, 0, "<Branch>"},
+       {N_("/_Message/Recei_ve/Get from _current account"),
+                                               "<control>I",   inc_mail_cb, 0, NULL},
+       {N_("/_Message/Recei_ve/Get from _all accounts"),
                                                "<shift><control>I", inc_all_account_mail_cb, 0, NULL},
-       {N_("/_Message/Cancel receivin_g"),     NULL, inc_cancel_cb, 0, NULL},
-       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/Recei_ve/Cancel receivin_g"),
+                                               NULL, inc_cancel_cb, 0, NULL},
+       {N_("/_Message/Recei_ve/---"),          NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Send queued messages"), NULL, send_queue_cb, 0, NULL},
        {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/_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", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/Repl_y to/_sender"),     NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Repl_y to/_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", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
-       {N_("/_Message/Follow-up and reply to"),NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+                                               "<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", reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/_Message/Redirect"),              NULL, reply_cb, COMPOSE_REDIRECT, NULL},
-       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
+       {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/M_ove..."),              "<control>O", move_to_cb, 0, NULL},
        {N_("/_Message/_Copy..."),              "<shift><control>O", copy_to_cb, 0, NULL},
@@ -732,10 +658,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/Mark as rea_d"),
                                                NULL, mark_as_read_cb, 0, NULL},
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/Re-_edit"),              NULL, reedit_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},
@@ -745,7 +671,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Tools/_Harvest addresses/from _Messages..."),
                                                NULL, addr_harvest_msg_cb, 0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/_Filter messages"),                NULL, filter_cb, 0, NULL},
+       {N_("/_Tools/_Filter all messages in folder"),
+                                               NULL, filter_cb, 0, NULL},
+       {N_("/_Tools/Filter _selected messages"),
+                                               NULL, filter_cb, 1, NULL},
        {N_("/_Tools/_Create filter rule"),     NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/_Create filter rule/_Automatically"),
                                                NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
@@ -755,11 +684,26 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                                NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
+       {N_("/_Tools/_Create processing rule"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/_Create processing rule/_Automatically"),
+                                               NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
+       {N_("/_Tools/_Create processing rule/by _From"),
+                                               NULL, create_processing_cb, FILTER_BY_FROM, NULL},
+       {N_("/_Tools/_Create processing rule/by _To"),
+                                               NULL, create_processing_cb, FILTER_BY_TO, NULL},
+       {N_("/_Tools/_Create processing rule/by _Subject"),
+                                               NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/Actio_ns"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Check for new messages in all folders"),
+                                               NULL, update_folderview_cb, 0, NULL},
        {N_("/_Tools/Delete du_plicated messages"),
+                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/Delete du_plicated messages/In selected folder"),
                                                NULL, delete_duplicated_cb,   0, NULL},
+       {N_("/_Tools/Delete du_plicated messages/In all folders"),
+                                               NULL, delete_duplicated_all_cb,   0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/E_xecute"),                "X", execute_summary_cb, 0, NULL},
 #ifdef USE_OPENSSL
@@ -771,31 +715,27 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Tools/_Log window"),             "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
-       {N_("/_Configuration/_Common preferences..."),
-                                               NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/C_ustomize toolbars"),
+       {N_("/_Configuration/C_hange current account"),
                                                NULL, NULL, 0, "<Branch>"},
-       {N_("/_Configuration/C_ustomize toolbars/_Main window..."),
-                                               NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
-       {N_("/_Configuration/C_ustomize toolbars/_Compose window..."),
-                                               NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
-       {N_("/_Configuration/C_ustomize toolbars/M_essage view..."),
-                                               NULL, prefs_toolbar_cb, TOOLBAR_MSGVIEW, NULL},
-       {N_("/_Configuration/_Scoring..."),
-                                               NULL, prefs_scoring_open_cb, 0, NULL},
-       {N_("/_Configuration/_Filtering..."),
-                                               NULL, prefs_filtering_open_cb, 0, NULL},
-       {N_("/_Configuration/_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/---"),             NULL, NULL, 0, "<Separator>"},
+       {N_("/_Configuration/_Common preferences..."),
+                                               NULL, prefs_common_open_cb, 0, NULL},
+       {N_("/_Configuration/Pre-processing..."),
+                                               NULL, prefs_pre_processing_open_cb, 0, NULL},
+       {N_("/_Configuration/Post-processing..."),
+                                               NULL, prefs_post_processing_open_cb, 0, NULL},
+       {N_("/_Configuration/_Filtering..."),
+                                               NULL, prefs_filtering_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/_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 (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
@@ -804,37 +744,29 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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}
 };
 
-
-
-static GtkItemFactoryEntry reply_popup_entries[] =
-{
-       {N_("/Reply with _quote"), NULL, reply_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
-       {N_("/_Reply without quote"), NULL, reply_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replyall_popup_entries[] =
+static gboolean main_window_accel_activate (GtkAccelGroup *accelgroup,
+                                            GObject *arg1,
+                                            guint value,
+                                            GdkModifierType mod,
+                                            gpointer user_data) 
 {
-       {N_("/Reply to all with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
-       {N_("/_Reply to all without quote"), "a", reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replylist_popup_entries[] =
-{
-       {N_("/Reply to list with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
-       {N_("/_Reply to list without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replysender_popup_entries[] =
-{
-       {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
-       {N_("/_Reply to sender without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry fwd_popup_entries[] =
-{
-       {N_("/_Forward message (inline style)"), "f", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
-};
+       MainWindow *mainwin = (MainWindow *)user_data;
+
+       if (mainwin->summaryview &&
+           mainwin->summaryview->quicksearch &&
+           quicksearch_has_focus(mainwin->summaryview->quicksearch) &&
+           (mod == 0 || mod == GDK_SHIFT_MASK)) {
+               quicksearch_pass_key(mainwin->summaryview->quicksearch, value, mod);
+               return TRUE;
+       }
+       return FALSE;
+}
 
 MainWindow *main_window_create(SeparateType type)
 {
@@ -854,6 +786,9 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *offline_pixmap;
        GtkWidget *online_switch;
        GtkWidget *offline_switch;
+       GtkTooltips *offline_tip;
+       GtkTooltips *online_tip;
+       GtkTooltips *sel_ac_tip;
 
        FolderView *folderview;
        SummaryView *summaryview;
@@ -875,8 +810,7 @@ MainWindow *main_window_create(SeparateType type)
        /* main window */
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
-       gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
-       gtk_window_set_wmclass(GTK_WINDOW(window), "main_window", "Sylpheed");
+       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        if (!geometry.min_height) {
                geometry.min_width = 320;
@@ -885,11 +819,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);
@@ -915,12 +852,18 @@ MainWindow *main_window_create(SeparateType type)
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(handlebox), "child_attached",
+                        G_CALLBACK(toolbar_child_attached), mainwin);
+       g_signal_connect(G_OBJECT(handlebox), "child_detached",
+                        G_CALLBACK(toolbar_child_detached), mainwin);
 
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;
        
        /* create toolbar */
-       toolbar_create(mainwin, handlebox);
+       mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
+                                         handlebox, 
+                                         (gpointer)mainwin);
 
        /* vbox that contains body */
        vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
@@ -935,32 +878,42 @@ 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_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
-       offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+       online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
+       offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
+       online_tip = gtk_tooltips_new();
        online_switch = gtk_button_new ();
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(online_tip),online_switch, 
+                            _("You are online. Click the icon to go offline"), NULL);
+       offline_tip = gtk_tooltips_new();
        offline_switch = gtk_button_new ();
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(offline_tip),offline_switch, 
+                            _("You are offline. Click the icon to 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_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, 0);
        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);
@@ -982,22 +935,22 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->messageview = messageview;
        summaryview->window      = window;
 
-       mainwin->vbox         = vbox;
-       mainwin->menubar      = menubar;
-       mainwin->menu_factory = ifactory;
-       mainwin->handlebox    = handlebox;
-       mainwin->vbox_body    = vbox_body;
-       mainwin->hbox_stat    = hbox_stat;
-       mainwin->statusbar    = statusbar;
-       mainwin->progressbar  = progressbar;
-       mainwin->statuslabel  = statuslabel;
-       mainwin->ac_button    = ac_button;
-       mainwin->ac_label     = ac_label;
-       
-       mainwin->online_switch     = online_switch;
+       messageview->statusbar   = statusbar;
+       mainwin->vbox           = vbox;
+       mainwin->menubar        = menubar;
+       mainwin->menu_factory   = ifactory;
+       mainwin->handlebox      = handlebox;
+       mainwin->vbox_body      = vbox_body;
+       mainwin->hbox_stat      = hbox_stat;
+       mainwin->statusbar      = statusbar;
+       mainwin->progressbar    = progressbar;
+       mainwin->statuslabel    = statuslabel;
+       mainwin->online_switch  = online_switch;
+       mainwin->online_pixmap  = online_pixmap;
+       mainwin->offline_pixmap = offline_pixmap;
+       mainwin->ac_button      = ac_button;
+       mainwin->ac_label       = ac_label;
        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
@@ -1006,6 +959,10 @@ MainWindow *main_window_create(SeparateType type)
                (GTK_STATUSBAR(statusbar), "Folder View");
        mainwin->summaryview_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Summary View");
+       mainwin->messageview_cid = gtk_statusbar_get_context_id
+               (GTK_STATUSBAR(statusbar), "Message View");
+
+       messageview->statusbar_cid = mainwin->messageview_cid;
 
        /* allocate colors for summary view and folder view */
        summaryview->color_marked.red = summaryview->color_marked.green = 0;
@@ -1014,8 +971,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);
@@ -1033,15 +990,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");
 
-       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");
@@ -1072,30 +1033,37 @@ MainWindow *main_window_create(SeparateType type)
        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);
-
-
        /* 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);
+       main_window_update_actions_menu(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);      \
+       g_signal_connect(G_OBJECT(gtk_item_factory_from_widget(menu)->accel_group), \
+                       "accel_activate",                               \
+                       G_CALLBACK(main_window_accel_activate), mainwin);
+                        
+       
+       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 */
@@ -1103,11 +1071,18 @@ MainWindow *main_window_create(SeparateType type)
        summary_init(summaryview);
        messageview_init(messageview);
        log_window_init(mainwin->logwin);
-
+       log_window_set_clipping(mainwin->logwin, prefs_common.cliplog,
+                               prefs_common.loglength);
+#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);
 
@@ -1120,6 +1095,20 @@ MainWindow *main_window_create(SeparateType type)
        return mainwin;
 }
 
+void main_window_destroy(MainWindow *mainwin)
+{
+       /* TODO : destroy other component */
+       messageview_destroy(mainwin->messageview);
+}
+
+void main_window_update_actions_menu(MainWindow *mainwin)
+{
+       GtkItemFactory *ifactory;
+
+       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       action_update_mainwin_menu(ifactory, "/Tools/Actions", mainwin);
+}
+
 void main_window_cursor_wait(MainWindow *mainwin)
 {
 
@@ -1151,7 +1140,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)
@@ -1160,7 +1149,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);
@@ -1193,22 +1182,23 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 
                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) {
-                       toolbar_update(mainwin);
-                       common_toolbar_set_style(mainwin, TOOLBAR_MAIN);
+                       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);
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_ONLINE);
                        gtk_container_remove(GTK_CONTAINER(mainwin->online_switch), 
                                             mainwin->online_pixmap);
                        gtk_container_add (GTK_CONTAINER(mainwin->online_switch), pixmap);
                        gtk_widget_show(pixmap);
                        mainwin->online_pixmap = pixmap;
-                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_OFFLINE);
                        gtk_container_remove(GTK_CONTAINER(mainwin->offline_switch), 
                                             mainwin->offline_pixmap);
                        gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
@@ -1233,38 +1223,86 @@ void main_window_set_summary_column(void)
        }
 }
 
-void main_window_set_account_menu(GList *account_list)
+static void main_window_set_account_selector_menu(MainWindow *mainwin,
+                                                 GList *account_list)
 {
-       GList *cur, *cur_ac, *cur_item;
+       GList *cur_ac, *cur_item;
        GtkWidget *menuitem;
-       MainWindow *mainwin;
        PrefsAccount *ac_prefs;
 
-       for (cur = mainwin_list; cur != NULL; cur = cur->next) {
-               mainwin = (MainWindow *)cur->data;
+       /* destroy all previous menu item */
+       cur_item = GTK_MENU_SHELL(mainwin->ac_menu)->children;
+       while (cur_item != NULL) {
+               GList *next = cur_item->next;
+               gtk_widget_destroy(GTK_WIDGET(cur_item->data));
+               cur_item = next;
+       }
 
-               /* destroy all previous menu item */
-               cur_item = GTK_MENU_SHELL(mainwin->ac_menu)->children;
-               while (cur_item != NULL) {
-                       GList *next = cur_item->next;
-                       gtk_widget_destroy(GTK_WIDGET(cur_item->data));
-                       cur_item = next;
-               }
+       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+               ac_prefs = (PrefsAccount *)cur_ac->data;
+
+               menuitem = gtk_menu_item_new_with_label
+                       (ac_prefs->account_name
+                        ? ac_prefs->account_name : _("Untitled"));
+               gtk_widget_show(menuitem);
+               gtk_menu_append(GTK_MENU(mainwin->ac_menu), menuitem);
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(account_selector_menu_cb),
+                                ac_prefs);
+       }
+}
+
+static void main_window_set_account_receive_menu(MainWindow *mainwin,
+                                                GList *account_list)
+{
+       GList *cur_ac, *cur_item;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+       PrefsAccount *ac_prefs;
+
+       menu = gtk_item_factory_get_widget(mainwin->menu_factory,
+                                          "/Message/Receive");
 
-               for (cur_ac = account_list; cur_ac != NULL;
-                    cur_ac = cur_ac->next) {
-                       ac_prefs = (PrefsAccount *)cur_ac->data;
-
-                       menuitem = gtk_menu_item_new_with_label
-                               (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);
+       /* search for separator */
+       for (cur_item = GTK_MENU_SHELL(menu)->children; cur_item != NULL;
+            cur_item = cur_item->next) {
+               if (GTK_BIN(cur_item->data)->child == NULL) {
+                       cur_item = cur_item->next;
+                       break;
                }
        }
+
+       /* destroy all previous menu item */
+       while (cur_item != NULL) {
+               GList *next = cur_item->next;
+               gtk_widget_destroy(GTK_WIDGET(cur_item->data));
+               cur_item = next;
+       }
+
+       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+               ac_prefs = (PrefsAccount *)cur_ac->data;
+
+               menuitem = gtk_menu_item_new_with_label
+                       (ac_prefs->account_name ? ac_prefs->account_name
+                        : _("Untitled"));
+               gtk_widget_show(menuitem);
+               gtk_menu_append(GTK_MENU(menu), menuitem);
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(account_receive_menu_cb),
+                                ac_prefs);
+       }
+}
+
+void main_window_set_account_menu(GList *account_list)
+{
+       GList *cur;
+       MainWindow *mainwin;
+
+       for (cur = mainwin_list; cur != NULL; cur = cur->next) {
+               mainwin = (MainWindow *)cur->data;
+               main_window_set_account_selector_menu(mainwin, account_list);
+               main_window_set_account_receive_menu(mainwin, account_list);
+       }
 }
 
 static void main_window_show_cur_account(MainWindow *mainwin)
@@ -1290,11 +1328,35 @@ 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",
@@ -1392,8 +1454,13 @@ void main_window_toggle_message_view(MainWindow *mainwin)
                              GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        }
 
+       if (mainwin->messageview->visible == FALSE)
+               messageview_clear(mainwin->messageview);
+
        main_window_set_menu_sensitive(mainwin);
 
+       prefs_common.msgview_visible = mainwin->messageview->visible;
+
        gtk_widget_grab_focus(summaryview->ctree);
 }
 
@@ -1403,30 +1470,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);
 
@@ -1435,7 +1523,44 @@ 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_progress_on(MainWindow *mainwin)
+{
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
+}
+
+void main_window_progress_off(MainWindow *mainwin)
+{
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
+}
+
+void main_window_progress_set(MainWindow *mainwin, gint cur, gint total)
+{
+       gchar buf[32];
+
+       g_snprintf(buf, sizeof(buf), "%d / %d", cur, total);
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), buf);
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwin->progressbar),
+                               (cur == 0 && total == 0) ? 0 :
+                               (gfloat)cur / (gfloat)total);
 }
 
 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
@@ -1446,7 +1571,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++;
        }
 
@@ -1462,13 +1587,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) {
-                       folder_update_item(folder->trash, TRUE);
-               }
-       }
-
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->stype == F_TRASH)
                gtk_widget_grab_focus(mainwin->folderview->ctree);
@@ -1490,13 +1608,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);
@@ -1507,56 +1624,6 @@ void main_window_add_mailbox(MainWindow *mainwin)
        folder_set_ui_func(folder, scan_tree_func, mainwin);
        folder_scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);
-
-       folderview_set(mainwin->folderview);
-}
-
-void main_window_add_mbox(MainWindow *mainwin)
-{
-       gchar *path;
-       Folder *folder;
-       FolderItem * item;
-
-       path = input_dialog(_("Add mbox mailbox"),
-                           _("Input the location of mailbox."),
-                           "mail");
-
-       if (!path) return;
-
-       if (folder_find_from_path(path)) {
-               alertpanel_error(_("The mailbox `%s' already exists."), path);
-               g_free(path);
-               return;
-       }
-
-       /*
-       if (!strcmp(path, "Mail"))
-               folder = folder_new(F_MBOX, _("Mailbox"), path);
-               else
-       */
-
-       folder = folder_new(F_MBOX, g_basename(path), path);
-       g_free(path);
-
-       if (folder->create_tree(folder) < 0) {
-               alertpanel_error(_("Creation of the mailbox failed."));
-               folder_destroy(folder);
-               return;
-       }
-
-       folder_add(folder);
-
-       item = folder_item_new(folder, folder->name, NULL);
-       item->folder = folder;
-       folder->node = g_node_new(item);
-
-       folder_create_folder(item, "inbox");
-       folder_create_folder(item, "outbox");
-       folder_create_folder(item, "queue");
-       folder_create_folder(item, "draft");
-       folder_create_folder(item, "trash");
-
-       folderview_set(mainwin->folderview);
 }
 
 SensitiveCond main_window_get_current_state(MainWindow *mainwin)
@@ -1572,7 +1639,7 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                state |= M_UNLOCKED;
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;
-       if (item && item->path && item->parent && !item->no_select) {
+       if (item && item->path && folder_item_parent(item) && !item->no_select) {
                state |= M_EXEC;
                /*              if (item->folder->type != F_NEWS) */
                state |= M_ALLOW_DELETE;
@@ -1595,7 +1662,7 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        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;
@@ -1627,25 +1694,26 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        GtkItemFactory *ifactory = mainwin->menu_factory;
        SensitiveCond state;
        gboolean sensitive;
+       GtkWidget *menu;
        GtkWidget *menuitem;
        SummaryView *summaryview;
        gchar *menu_path;
        gint i;
+       GList *cur_item;
 
        static const struct {
                gchar *const entry;
                SensitiveCond cond;
        } entry[] = {
-               {"/File/Add mailbox..."                       , M_UNLOCKED},
-                {"/File/Add mbox mailbox..."                         , M_UNLOCKED},
-               {"/File/Check for new messages in all folders", M_UNLOCKED},
-               {"/File/Folder"                               , M_UNLOCKED},
-               {"/File/Import mbox file..."                  , M_UNLOCKED},
+               {"/File/Add mailbox"                          , M_UNLOCKED},
+
+                {"/File/Add mailbox/MH..."                   , M_UNLOCKED},
+               {"/File/Change folder order"                  , 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/Save as...", M_TARGET_EXIST|M_UNLOCKED},
                {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
                /* {"/File/Close"  , M_UNLOCKED}, */
                {"/File/Exit"      , M_UNLOCKED},
@@ -1660,9 +1728,7 @@ 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},
@@ -1671,30 +1737,34 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Show all headers"          , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
-               {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
-               {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
-               {"/Message/Cancel receiving"      , M_INC_ACTIVE},
+               {"/Message/Receive/Get from current account"
+                                                , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Message/Receive/Get from all accounts"
+                                                , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Message/Receive/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"             , 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|M_NOT_NEWS},
                {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
+               {"/Message/Re-edit"              , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
 
-               {"/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_DELAY_EXEC},
-               {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+               {"/Tools/Add sender to address book"   , M_SINGLE_TARGET_EXIST},
+               {"/Tools/Harvest addresses"            , M_UNLOCKED},
+               {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Filter selected messages"     , M_TARGET_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_DELAY_EXEC},
+               {"/Tools/Delete duplicated messages/In selected folder"   , M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
                {"/Configuration", M_UNLOCKED},
 
@@ -1708,6 +1778,22 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                menu_set_sensitive(ifactory, entry[i].entry, sensitive);
        }
 
+       menu = gtk_item_factory_get_widget(ifactory, "/Message/Receive");
+
+       /* search for separator */
+       for (cur_item = GTK_MENU_SHELL(menu)->children; cur_item != NULL;
+            cur_item = cur_item->next) {
+               if (GTK_BIN(cur_item->data)->child == NULL) {
+                       cur_item = cur_item->next;
+                       break;
+               }
+       }
+
+       for (; cur_item != NULL; cur_item = cur_item->next) {
+               gtk_widget_set_sensitive(GTK_WIDGET(cur_item->data),
+                                        (M_UNLOCKED & state) != 0);
+       }
+
        main_window_menu_callback_block(mainwin);
 
 #define SET_CHECK_MENU_ACTIVE(path, active) \
@@ -1731,14 +1817,16 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                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_UNREAD:
-               menu_path = "/View/Sort/by unread"; 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:
@@ -1766,7 +1854,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        }
 
        SET_CHECK_MENU_ACTIVE("/View/Show all headers",
-                             mainwin->messageview->textview->show_all_headers);
+                             mainwin->messageview->mimeview->textview->show_all_headers);
        SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
 
 #undef SET_CHECK_MENU_ACTIVE
@@ -1794,62 +1882,131 @@ void main_window_popup(MainWindow *mainwin)
        }
 }
 
-static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
+void main_window_show(MainWindow *mainwin)
 {
-       GtkWidget *folderwin = NULL;
-       GtkWidget *messagewin = NULL;
-       GtkWidget *hpaned;
+       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;
+       GtkWidget *messagewin = NULL;
+       GtkWidget *hpaned;
        GtkWidget *vpaned;
        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) {
                folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
                gtk_window_set_title(GTK_WINDOW(folderwin),
                                     _("Sylpheed - Folder View"));
-               gtk_window_set_wmclass(GTK_WINDOW(folderwin),
-                                      "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_set_resizable(GTK_WINDOW(folderwin), TRUE);
+               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);
                gtk_window_set_title(GTK_WINDOW(messagewin),
                                     _("Sylpheed - Message View"));
-               gtk_window_set_wmclass(GTK_WINDOW(messagewin),
-                                      "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_set_resizable(GTK_WINDOW(messagewin), TRUE);
+               gtk_window_move(GTK_WINDOW(messagewin), 
+                               prefs_common.main_msgwin_x,
+                               prefs_common.main_msgwin_y);
+               gtk_widget_set_size_request(messagewin, 
+                                           prefs_common.msgwin_width,
+                                           prefs_common.msgwin_height);
                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);
+               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)) {
@@ -1861,23 +2018,10 @@ 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;
@@ -1901,29 +2045,12 @@ 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);
-               
-               /* 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));
-               
                /* remove headerview if not in prefs */
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
@@ -1932,75 +2059,82 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        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_realize(messagewin);
+               gtk_widget_show_all(GTK_WIDGET_PTR(mainwin->messageview));
                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));
+               toolbar_set_style(mainwin->messageview->toolbar->toolbar, 
+                                 mainwin->messageview->handlebox, 
+                                 prefs_common.toolbar_style);
+
                break;
        case SEPARATE_BOTH:
+               messageview_add_toolbar(mainwin->messageview, messagewin);
+               msgview_ifactory = gtk_item_factory_from_widget(mainwin->messageview->menubar);
+               menu_set_sensitive(msgview_ifactory, "/File/Close", FALSE);
+
                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_realize(messagewin);
+               gtk_widget_show_all(GTK_WIDGET_PTR(mainwin->messageview));
                gtk_widget_show_all(messagewin);
+               toolbar_set_style(mainwin->messageview->toolbar->toolbar, 
+                                 mainwin->messageview->handlebox, 
+                                 prefs_common.toolbar_style);          
 
-               /* 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;
        }
 
-       /* rehide quick search if necessary */
-       if (!prefs_common.show_searchbar)
-               gtk_widget_hide(mainwin->summaryview->hbox_search);
-       
+       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 (!noticeview_is_visible(mainwin->messageview->mimeview->siginfoview)) 
+               gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->mimeview->siginfoview));
+       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);
+
        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");
@@ -2011,6 +2145,19 @@ 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));
 
+       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");
 }
 
@@ -2033,39 +2180,55 @@ void main_window_destroy_all(void)
 }
 
 #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,
+static void toolbar_child_attached(GtkWidget *widget, GtkWidget *child,
+                                  gpointer data)
+{
+       gtk_widget_set_usize(child, 1, -1);
+}
+
+static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
+                                  gpointer data)
+{
+       gtk_widget_set_usize(child, -1, -1);
+}
+
+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)
@@ -2073,10 +2236,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);
 }
 
@@ -2117,41 +2280,50 @@ static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
        return TRUE;
 }
 
-static void add_mailbox_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+static void main_window_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation,
+                                        gpointer data)
 {
-       main_window_add_mailbox(mainwin);
+       MainWindow *mainwin = (MainWindow *)data;
+
+       main_window_get_size(mainwin);
 }
 
-static void add_mbox_cb(MainWindow *mainwin, guint action,
-                       GtkWidget *widget)
+static void folder_window_size_allocate_cb(GtkWidget *widget,
+                                          GtkAllocation *allocation,
+                                          gpointer data)
 {
-       main_window_add_mbox(mainwin);
+       MainWindow *mainwin = (MainWindow *)data;
+
+       main_window_get_size(mainwin);
 }
 
-static void update_folderview_cb(MainWindow *mainwin, guint action,
-                                GtkWidget *widget)
+static void message_window_size_allocate_cb(GtkWidget *widget,
+                                           GtkAllocation *allocation,
+                                           gpointer data)
 {
-       summary_show(mainwin->summaryview, NULL);
-       folderview_check_new_all();
+       MainWindow *mainwin = (MainWindow *)data;
+
+       main_window_get_size(mainwin);
 }
 
-static void new_folder_cb(MainWindow *mainwin, guint action,
-                         GtkWidget *widget)
+static void add_mailbox_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
 {
-       folderview_new_folder(mainwin->folderview);
+       main_window_add_mailbox(mainwin);
 }
 
-static void rename_folder_cb(MainWindow *mainwin, guint action,
-                            GtkWidget *widget)
+static void update_folderview_cb(MainWindow *mainwin, guint action,
+                                GtkWidget *widget)
 {
-       folderview_rename_folder(mainwin->folderview);
+       summary_show(mainwin->summaryview, NULL);
+       folderview_check_new_all();
 }
 
-static void delete_folder_cb(MainWindow *mainwin, guint action,
-                            GtkWidget *widget)
+static void foldersort_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
 {
-       folderview_delete_folder(mainwin->folderview);
+       foldersort_open();
 }
 
 static void import_mbox_cb(MainWindow *mainwin, guint action,
@@ -2233,6 +2405,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,
@@ -2246,673 +2420,30 @@ static void toggle_message_cb(MainWindow *mainwin, guint action,
                summary_toggle_view(mainwin->summaryview);
 }
 
-/* Toolbar handling */
-static void toolbar_inc_cb(GtkWidget   *widget,
-                          gpointer      data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       inc_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_inc_all_cb(GtkWidget       *widget,
-                              gpointer  data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       inc_all_account_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_send_cb(GtkWidget  *widget,
-                           gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       send_queue_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_compose_cb(GtkWidget  *widget,
-                              gpointer    data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (mainwin->toolbar->compose_btn_type == COMPOSEBUTTON_NEWS) 
-               compose_news_cb(mainwin, 0, NULL);
-       else
-               compose_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_reply_cb(GtkWidget   *widget, 
-                            gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (prefs_common.default_reply_list)
-               reply_cb(mainwin, 
-                        prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
-                        : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
-                        NULL);
-       else
-               reply_cb(mainwin, 
-                        prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
-                        : COMPOSE_REPLY_WITHOUT_QUOTE,
-                        NULL);
-}
-
-static void toolbar_reply_to_all_cb(GtkWidget   *widget, 
-                                   gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, 
-                NULL);
-}
-
-static void toolbar_reply_to_list_cb(GtkWidget   *widget, 
-                                   gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
-                NULL);
-}
-
-static void toolbar_reply_to_sender_cb(GtkWidget   *widget, 
-                                      gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, 
-                NULL);
-}
-
-static void toolbar_forward_cb(GtkWidget       *widget,
-                              gpointer          data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (prefs_common.forward_as_attachment)
-               reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
-       else
-               reply_cb(mainwin, COMPOSE_FORWARD, NULL);
-}
-
-static void toolbar_exec_cb(GtkWidget  *widget,
-                           gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       summary_execute(mainwin->summaryview);
-}
-
-static void toolbar_next_unread_cb(GtkWidget   *widget,
-                                  gpointer      data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       next_unread_cb(mainwin, 0, NULL);
-}
-
-/* popup callback functions */
-static void toolbar_reply_popup_cb(GtkWidget       *widget, 
-                                  GdkEventButton  *event, 
-                                  gpointer         data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->reply_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->reply_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replyall_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replyall_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replylist_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replylist_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replysender_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replysender_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->fwd_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
-                                            gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->fwd_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void activate_compose_button (Toolbar           *toolbar,
-                                    ToolbarStyle      style,
-                                    ComposeButtonType type)
-{
-       if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
-               return;
-
-       gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn 
-                       : toolbar->compose_news_btn);
-       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
-                       : toolbar->compose_mail_btn);
-       toolbar->compose_btn_type = type;       
-}
-
-void toolbar_set_compose_button(Toolbar            *toolbar, 
-                               ComposeButtonType  compose_btn_type)
-{
-       if (toolbar->compose_btn_type != compose_btn_type)
-               activate_compose_button(toolbar, 
-                                       prefs_common.toolbar_style,
-                                       compose_btn_type);
-}
-
-static void toolbar_buttons_cb(GtkWidget         *widget, 
-                              ToolbarItem       *item)
-{
-       struct {
-               gint   index;
-               void (*func)(GtkWidget *widget, gpointer data);
-       } toolbar_action[] = {
-               { A_RECEIVE_ALL,    toolbar_inc_all_cb                  },
-               { A_RECEIVE_CUR,    toolbar_inc_cb                      },
-               { A_SEND_QUEUED,    toolbar_send_cb                     },
-               { A_COMPOSE_EMAIL,  toolbar_compose_cb                  },
-               { A_REPLY_MESSAGE,  toolbar_reply_cb                    },
-               { A_REPLY_SENDER,   toolbar_reply_to_sender_cb          },
-               { A_REPLY_ALL,      toolbar_reply_to_all_cb             },
-               { A_REPLY_ML,       toolbar_reply_to_list_cb            },
-               { A_FORWARD,        toolbar_forward_cb                  },
-               { A_DELETE,         common_toolbar_delete_cb            },
-               { A_EXECUTE,        toolbar_exec_cb                     },
-               { A_GOTO_NEXT,      toolbar_next_unread_cb              },
-               { A_SYL_ACTIONS,    common_toolbar_actions_execute_cb   },
-               
-               { A_COMPOSE_NEWS,   toolbar_compose_cb                  },    
-               { A_SEPARATOR,      NULL                                }};
-
-       gint num_items = sizeof(toolbar_action)/sizeof(toolbar_action[0]);
-       gint i;
-
-       for (i = A_RECEIVE_ALL; i < num_items; i++) {
-
-               if (toolbar_action[i].index == item->index) {
-                       if ((item->index == A_SYL_ACTIONS) || (item->index == A_DELETE))
-                               /* the common_toolbar_* stuff takes item->parent as data
-                                  pointer */                              
-                               toolbar_action[i].func(widget, (gpointer)item->parent);
-                       else /* to be removed */
-                               toolbar_action[i].func(widget, (gpointer)item->parent->data);
-                       break;
-               }
-       }
-}
-
-void toolbar_set_sensitive(MainWindow *mainwin)
+static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
+                             GtkWidget *widget)
 {
-       SensitiveCond state;
-       gboolean sensitive;
-       Toolbar *toolbar = mainwin->toolbar;
-       GSList *cur;
-       GSList *entry_list = NULL;
-       
-       typedef struct _Entry Entry;
-       struct _Entry {
-               GtkWidget *widget;
-               SensitiveCond cond;
-               gboolean empty;
-       };
-
-#define SET_WIDGET_COND(w, c)     \
-{ \
-       Entry *e = g_new0(Entry, 1); \
-       e->widget = w; \
-       e->cond   = c; \
-       entry_list = g_slist_append(entry_list, e); \
-}
-
-       SET_WIDGET_COND(toolbar->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
-       SET_WIDGET_COND(toolbar->reply_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->replyall_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->replylist_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->replysender_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
-
-       SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
-       SET_WIDGET_COND(toolbar->delete_btn,
-                       M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
-
-       for (cur = toolbar->action_list; cur != NULL;  cur = cur->next) {
-               ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
-               
-               SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
-       }
-
-#undef SET_WIDGET_COND
-
-       state = main_window_get_current_state(mainwin);
-
-       for (cur = entry_list; cur != NULL; cur = cur->next) {
-               Entry *e = (Entry*) cur->data;
-
-               if (e->widget != NULL) {
-                       sensitive = ((e->cond & state) == e->cond);
-                       gtk_widget_set_sensitive(e->widget, sensitive); 
-               }
-       }
-       
-       while (entry_list != NULL) {
-               Entry *e = (Entry*) entry_list->data;
-
-               if (e)
-                       g_free(e);
-               entry_list = g_slist_remove(entry_list, e);
-       }
-
-       g_slist_free(entry_list);
-
-       activate_compose_button(toolbar, 
-                               prefs_common.toolbar_style,
-                               toolbar->compose_btn_type);
+       toolbar_toggle(action, mainwin);
 }
 
-static void toolbar_update(MainWindow *mainwin)
+void main_window_reply_cb(MainWindow *mainwin, guint action,
+                         GtkWidget *widget)
 {
-       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), 
-                            GTK_WIDGET(mainwin->toolbar->toolbar));
-       
-       mainwin->toolbar->toolbar    = NULL;
-       mainwin->toolbar->get_btn    = NULL;
-       mainwin->toolbar->getall_btn = NULL;
-       mainwin->toolbar->send_btn   = NULL;
-       mainwin->toolbar->compose_mail_btn = NULL;
-       mainwin->toolbar->compose_news_btn = NULL;
-       mainwin->toolbar->reply_btn        = NULL;      
-       mainwin->toolbar->replyall_btn     = NULL;      
-       mainwin->toolbar->replylist_btn     = NULL;     
-       mainwin->toolbar->replysender_btn  = NULL;      
-       mainwin->toolbar->fwd_btn    = NULL;    
-       mainwin->toolbar->delete_btn = NULL;    
-       mainwin->toolbar->next_btn   = NULL;    
-       mainwin->toolbar->exec_btn   = NULL;
-
-       toolbar_clear_list(TOOLBAR_MAIN);
-       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
-       toolbar_create(mainwin, mainwin->handlebox);    
-       toolbar_set_sensitive(mainwin);
-
-}
-
-static void toolbar_create(MainWindow *mainwin,
-                          GtkWidget  *container)
-{
-       ToolbarItem *toolbar_item;
-
-       GtkWidget *toolbar;
-       GtkWidget *icon_wid  = NULL;
-       GtkWidget *icon_news = NULL;
-       GtkWidget *item_news = NULL;
-       GtkWidget *item;
-       GtkTooltips *toolbar_tips;
-       ToolbarSylpheedActions *action_item;
-       GSList *cur;
-       GSList *toolbar_list;
-
-       guint n_menu_entries;
-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;
-       GtkWidget *fwd_popup;
-
-       toolbar_tips = gtk_tooltips_new();
-
-       if (mainwin->toolbar != NULL) {
-               toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
-               g_free(mainwin->toolbar);
-       }
-
-       toolbar_read_config_file(TOOLBAR_MAIN);
-       toolbar_list = toolbar_get_list(TOOLBAR_MAIN);
+       MessageView *msgview = (MessageView*)mainwin->messageview;
+       GSList *msginfo_list = NULL;
+       gchar *body;
 
-       mainwin->toolbar = g_new0(Toolbar, 1); 
+       g_return_if_fail(msgview != NULL);
 
-       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-                                 GTK_TOOLBAR_BOTH);
-       gtk_container_add(GTK_CONTAINER(container), toolbar);
-       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
-       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
-       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
-                                   GTK_TOOLBAR_SPACE_LINE);
+       msginfo_list = summary_get_selection(mainwin->summaryview);
+       g_return_if_fail(msginfo_list != NULL);
        
-       for (cur = toolbar_list; cur != NULL; cur = cur->next) {
-       
-               if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
-                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-                       continue;
-               }
-               
-               toolbar_item = g_new0(ToolbarItem, 1); 
-               toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
-               toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
-               toolbar_item->index = ((ToolbarItem*)cur->data)->index;
-               
-               toolbar_item->parent = g_new0(ToolbarParent, 1);
-               toolbar_item->parent->data = (gpointer)mainwin;
-               toolbar_item->parent->type = TOOLBAR_MAIN;
-
-               /* collect toolbar items in list to keep track */
-               mainwin->toolbar->item_list = g_slist_append(mainwin->toolbar->item_list, 
-                                                            toolbar_item);
-               
-               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
-               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                               toolbar_item->text,
-                                               (""),
-                                               (""),
-                                               icon_wid, toolbar_buttons_cb, 
-                                               toolbar_item);
-               
-               switch (toolbar_item->index) {
-               case A_RECEIVE_ALL:
-                       mainwin->toolbar->getall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->getall_btn, 
-                                          _("Receive Mail on all Accounts"), NULL);
-                       break;
-               case A_RECEIVE_CUR:
-                       mainwin->toolbar->get_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->get_btn,
-                                          _("Receive Mail on current Account"), NULL);
-                       break;
-               case A_SEND_QUEUED:
-                       mainwin->toolbar->send_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->send_btn,
-                                          _("Send Queued Message(s)"), NULL);
-                       break;
-               case A_COMPOSE_EMAIL:
-                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
-                       item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                           _("News"),
-                                                           (""),
-                                                           (""),
-                                                           icon_news, toolbar_buttons_cb, 
-                                                           toolbar_item);
-                       mainwin->toolbar->compose_mail_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->compose_mail_btn,
-                                          _("Compose Email"), NULL);
-                       mainwin->toolbar->compose_news_btn = item_news;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->compose_news_btn,
-                                          _("Compose News"), NULL);
-                       break;
-               case A_REPLY_MESSAGE:
-                       mainwin->toolbar->reply_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->reply_btn,
-                                          _("Reply to Message"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->reply_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(reply_popup_entries) /
-                               sizeof(reply_popup_entries[0]);
-                       reply_popup = popupmenu_create(mainwin->window, reply_popup_entries, n_menu_entries,
-                                                      "<ReplyPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), mainwin);
-                       mainwin->toolbar->reply_popup       = reply_popup;
-                       break;
-               case A_REPLY_SENDER:
-                       mainwin->toolbar->replysender_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replysender_btn,
-                                          _("Reply to Sender"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replysender_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replysender_popup_entries) /
-                               sizeof(replysender_popup_entries[0]);
-                       replysender_popup = popupmenu_create(mainwin->window, 
-                                                            replysender_popup_entries, n_menu_entries,
-                                                            "<ReplySenderPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), mainwin);
-                       mainwin->toolbar->replysender_popup = replysender_popup;
-                       break;
-               case A_REPLY_ALL:
-                       mainwin->toolbar->replyall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replyall_btn,
-                                          _("Reply to All"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replyall_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replyall_popup_entries) /
-                               sizeof(replyall_popup_entries[0]);
-                       replyall_popup = popupmenu_create(mainwin->window, 
-                                                         replyall_popup_entries, n_menu_entries,
-                                                         "<ReplyAllPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
-                       mainwin->toolbar->replyall_popup    = replyall_popup;
-                       break;
-               case A_REPLY_ML:
-                       mainwin->toolbar->replylist_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replylist_btn,
-                                          _("Reply to Mailing-list"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replylist_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replylist_popup_entries) /
-                               sizeof(replylist_popup_entries[0]);
-                       replylist_popup = popupmenu_create(mainwin->window, 
-                                                         replylist_popup_entries, n_menu_entries,
-                                                         "<ReplyMlPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), mainwin);
-                       mainwin->toolbar->replylist_popup    = replylist_popup;
-                       break;
-               case A_FORWARD:
-                       mainwin->toolbar->fwd_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->fwd_btn,
-                                          _("Forward Message"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->fwd_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(fwd_popup_entries) /
-                               sizeof(fwd_popup_entries[0]);
-                       fwd_popup = popupmenu_create(mainwin->window, 
-                                                    fwd_popup_entries, n_menu_entries,
-                                                    "<ForwardPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), mainwin);
-                       mainwin->toolbar->fwd_popup         = fwd_popup;
-                       break;
-               case A_DELETE:
-                       mainwin->toolbar->delete_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->delete_btn,
-                                          _("Delete Message"), NULL);
-                       break;
-               case A_EXECUTE:
-                       mainwin->toolbar->exec_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->exec_btn,
-                                          _("Execute"), NULL);
-                       break;
-               case A_GOTO_NEXT:
-                       mainwin->toolbar->next_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->next_btn,
-                                          _("Goto Next Message"), NULL);
-                       break;
-               case A_SYL_ACTIONS:
-                       action_item = g_new0(ToolbarSylpheedActions, 1);
-                       action_item->widget = item;
-                       action_item->name   = g_strdup(toolbar_item->text);
-
-                       mainwin->toolbar->action_list = 
-                               g_slist_append(mainwin->toolbar->action_list,
-                                              action_item);
-
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            item,
-                                            action_item->name, NULL);
-
-                       gtk_widget_show(item);
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       mainwin->toolbar->toolbar = toolbar;
-
-       activate_compose_button(mainwin->toolbar, 
-                               prefs_common.toolbar_style, 
-                               mainwin->toolbar->compose_btn_type);
-
-       gtk_widget_show_all(toolbar);
-}
-
-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;
-       }
-
-       if (action != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
-
-       mainwin->toolbar_style = (ToolbarStyle)action;
-       prefs_common.toolbar_style = (ToolbarStyle)action;
+       body = messageview_get_selection(msgview);
+       compose_reply_mode((ComposeMode)action, msginfo_list, body);
+       g_free(body);
+       g_slist_free(msginfo_list);
 }
 
-/* END Toolbar Stuff */
 
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
@@ -2998,128 +2529,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_open((ToolbarType)action);
-}
-
-
-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);
-                       folder_update_item(folder->queue, TRUE);
-               }
-       }
-}
-
-void compose_mail_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget)
-{
-       PrefsAccount *ac = NULL;
-       FolderItem *item = mainwin->summaryview->folder_item;   
-        GList * list;
-        GList * cur;
-
-       if (item) {
-               ac = account_find_from_item(item);
-               if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, item);          /* CLAWS */
-                       return;
-               }
-       }
-
-       /*
-        * CLAWS - use current account
-        */
-       if (cur_account && (cur_account->protocol != A_NNTP)) {
-               compose_new_with_folderitem(cur_account, item);
-               return;
-       }
-
-       /*
-        * CLAWS - just get the first one
-        */
-       list = account_get_list();
-       for (cur = list ; cur != NULL ; cur = g_list_next(cur)) {
-               ac = (PrefsAccount *) cur->data;
-               if (ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, 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);
@@ -3159,11 +2573,6 @@ static void show_all_header_cb(MainWindow *mainwin, guint action,
                                     GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
-static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       summary_reedit(mainwin->summaryview);
-}
-
 static void mark_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_mark(mainwin->summaryview);
@@ -3192,6 +2601,11 @@ static void mark_all_read_cb(MainWindow *mainwin, guint action,
        summary_mark_all_read(mainwin->summaryview);
 }
 
+static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_reedit(mainwin->summaryview);
+}
+
 static void add_address_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -3203,20 +2617,22 @@ 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,
                                GtkWidget *widget)
 {
        if (!mainwin->summaryview->folder_item
-           || gtk_object_get_data(GTK_OBJECT(widget), "dont_toggle"))
+           || g_object_get_data(G_OBJECT(widget), "dont_toggle"))
                return;
        summary_toggle_show_read_messages(mainwin->summaryview);
 }
@@ -3260,12 +2676,14 @@ 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,
                             GTK_CHECK_MENU_ITEM(menuitem)->active
                             ? SORT_ASCENDING : SORT_DESCENDING);
+               item->sort_key = action;
        }
 }
 
@@ -3275,7 +2693,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);
 }
@@ -3289,12 +2708,52 @@ static void attract_by_subject_cb(MainWindow *mainwin, guint action,
 static void delete_duplicated_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
-       summary_delete_duplicated(mainwin->summaryview);
+       FolderItem *item;
+
+       item = folderview_get_selected(mainwin->folderview);
+       if (item) {
+               main_window_cursor_wait(mainwin);
+               STATUSBAR_PUSH(mainwin, _("Deleting duplicated messages..."));
+
+               folderutils_delete_duplicates(item, prefs_common.immediate_exec ?
+                                             DELETE_DUPLICATES_REMOVE : DELETE_DUPLICATES_SETFLAG);
+
+               STATUSBAR_POP(mainwin);
+               main_window_cursor_normal(mainwin);
+       }
+}
+
+struct DelDupsData
+{
+       guint   dups;
+       guint   folders;
+};
+
+static void deldup_all(FolderItem *item, gpointer _data)
+{
+       struct DelDupsData *data = _data;
+       gint result;
+       
+       result = folderutils_delete_duplicates(item, DELETE_DUPLICATES_REMOVE);
+       if (result >= 0) {
+               data->dups += result;
+               data->folders += 1;
+       }
+}
+
+static void delete_duplicated_all_cb(MainWindow *mainwin, guint action,
+                                GtkWidget *widget)
+{
+       struct DelDupsData data = {0, 0};
+
+       folder_func_to_all_folders(deldup_all, &data);
+       alertpanel_notice(_("Deleted %d duplicate message(s) in %d folders.\n"),
+                         data.dups, data.folders);
 }
 
 static void filter_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       summary_filter(mainwin->summaryview);
+       summary_filter(mainwin->summaryview, (gboolean)action);
 }
 
 static void execute_summary_cb(MainWindow *mainwin, guint action,
@@ -3338,7 +2797,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);
@@ -3401,8 +2860,7 @@ static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        if (GTK_WIDGET_HAS_FOCUS(mainwin->summaryview->ctree))
                summary_select_all(mainwin->summaryview);
        else if (messageview_is_visible(msgview) &&
-                (GTK_WIDGET_HAS_FOCUS(msgview->textview->text) ||
-                 GTK_WIDGET_HAS_FOCUS(msgview->mimeview->textview->text)))
+                (GTK_WIDGET_HAS_FOCUS(msgview->mimeview->textview->text)))
                messageview_select_all(mainwin->messageview);
 }
 
@@ -3415,7 +2873,13 @@ static void select_thread_cb(MainWindow *mainwin, guint action,
 static void create_filter_cb(MainWindow *mainwin, guint action,
                             GtkWidget *widget)
 {
-       summary_filter_open(mainwin->summaryview, (PrefsFilterType)action);
+       summary_filter_open(mainwin->summaryview, (PrefsFilterType)action, 0);
+}
+
+static void create_processing_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       summary_filter_open(mainwin->summaryview, (PrefsFilterType)action, 1);
 }
 
 static void prefs_common_open_cb(MainWindow *mainwin, guint action,
@@ -3424,16 +2888,28 @@ static void prefs_common_open_cb(MainWindow *mainwin, guint action,
        prefs_common_open();
 }
 
-static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
-                                 GtkWidget *widget)
+static void prefs_pre_processing_open_cb(MainWindow *mainwin, guint action,
+                                        GtkWidget *widget)
+{
+       prefs_filtering_open(&pre_global_processing,
+                            _("Processing rules to apply before folder rules"),
+                            NULL, NULL);
+}
+
+static void prefs_post_processing_open_cb(MainWindow *mainwin, guint action,
+                                         GtkWidget *widget)
 {
-       prefs_scoring_open(NULL);
+       prefs_filtering_open(&post_global_processing,
+                            _("Processing rules to apply after folder rules"),
+                            NULL, NULL);
 }
 
 static void prefs_filtering_open_cb(MainWindow *mainwin, guint action,
                                    GtkWidget *widget)
 {
-       prefs_filtering_open(NULL, NULL, NULL);
+       prefs_filtering_open(&filtering_rules,
+                            _("Filtering configuration"),
+                            NULL, NULL);
 }
 
 static void prefs_template_open_cb(MainWindow *mainwin, guint action,
@@ -3471,12 +2947,30 @@ static void new_account_cb(MainWindow *mainwin, guint action,
        if (!compose_get_compose_list()) account_add();
 }
 
-static void account_menu_cb(GtkMenuItem        *menuitem, gpointer data)
+static void account_selector_menu_cb(GtkMenuItem *menuitem, gpointer data)
 {
        cur_account = (PrefsAccount *)data;
        main_window_reflect_prefs_all();
 }
 
+static void account_receive_menu_cb(GtkMenuItem *menuitem, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)mainwin_list->data;
+       PrefsAccount *account = (PrefsAccount *)data;
+
+       inc_account_mail(mainwin, account);
+}
+
+static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
+{
+       prefs_gtk_open();
+}
+
+static void plugins_open_cb(GtkMenuItem *menuitem, gpointer data)
+{
+       pluginwindow_create();
+}
+
 static void manual_open_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -3502,21 +2996,44 @@ 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 (GTK_CLIST(summary->ctree)->selection && 
+           g_list_length(GTK_CLIST(summary->ctree)->selection) > 1)
+               return 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)
+gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
+                                   gpointer data)
 {
        MainWindow *mainwin = (MainWindow*) data;
        
-       if (!mainwin || !event) return;
-               
+       if (!mainwin || !event) 
+               return FALSE;
+
+       if (quicksearch_has_focus(mainwin->summaryview->quicksearch))
+               return FALSE;
+
        switch (event->keyval) {
        case GDK_Q:             /* Quit */
                BREAK_ON_MODIFIER_KEY();
 
                app_exit_cb(mainwin, 0, NULL);
-               return;
+               return FALSE;
        case GDK_space:
                if (mainwin->folderview && mainwin->summaryview
                    && !mainwin->summaryview->displayed) {
@@ -3528,6 +3045,7 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,   gpointer data)
        default:
                break;
        }
+       return FALSE;
 }
 
 #undef BREAK_ON_MODIFIER_KEY
@@ -3552,6 +3070,40 @@ 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_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+               break;
+       case PROGRESS_COMMAND_SET_PERCENTAGE:
+               gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwin->progressbar), data->value);
+               break;          
+       }
+       while (gtk_events_pending()) gtk_main_iteration ();
+
+       return FALSE;
+}
+
 /*
 * End of Source.
 */