2005-08-30 [colin] 1.9.13cvs72
[claws.git] / src / mainwindow.c
index 8aeeadbb0b8a6b29d88be47d53607b693667fd73..aa9b27bee20304168bb306972eeb2d1021e4e3e5 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-2005 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
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
@@ -39,9 +40,9 @@
 #include <gtk/gtkhandlebox.h>
 #include <gtk/gtktoolbar.h>
 #include <gtk/gtkbutton.h>
+#include <gtk/gtktooltips.h>
 #include <string.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.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_folder_column.h"
 #include "prefs_template.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
 
@@ -104,50 +108,60 @@ 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,
+
+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);
 static void export_mbox_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void export_list_mbox_cb  (MainWindow   *mainwin, 
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void empty_trash_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -188,9 +202,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 inc_cancel_cb              (MainWindow     *mainwin,
                                         guint           action,
@@ -208,10 +219,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);
@@ -221,6 +228,9 @@ static void copy_to_cb                      (MainWindow     *mainwin,
 static void delete_cb                  (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+static void delete_trash_cb                    (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void cancel_cb                   (MainWindow     *mainwin,
                                         guint           action,
@@ -242,6 +252,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);
@@ -250,6 +265,10 @@ static void set_charset_cb         (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void set_decode_cb              (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void hide_read_messages   (MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -264,7 +283,10 @@ static void collapse_threads_cb     (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
-static void set_display_item_cb         (MainWindow    *mainwin,
+static void set_summary_display_item_cb         (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void set_folder_display_item_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 static void sort_summary_cb     (MainWindow    *mainwin,
@@ -280,6 +302,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);
@@ -339,10 +364,10 @@ 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,
-                                        GtkWidget      *widget);
 static void prefs_template_open_cb     (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -352,9 +377,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);
@@ -367,8 +398,10 @@ 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);
@@ -405,27 +438,30 @@ void main_window_reply_cb                 (MainWindow     *mainwin,
 gboolean mainwindow_progressindicator_hook     (gpointer        source,
                                                 gpointer        userdata);
 #define  SEPARATE_ACTION 500 
+static void mainwindow_quicksearch             (MainWindow     *mainwin, 
+                                                guint           action, 
+                                                GtkWidget      *widget);
 
 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/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_File/Change folder order"),      NULL, foldersort_cb,  0, NULL},
+       {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {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/Exp_ort selected to mbox file..."), 
+                                               NULL, export_list_mbox_cb, 0, NULL},
+       {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_File/Empty all _Trash folders"), "<shift>D", empty_trash_cb, 0, NULL},
        {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},
 
@@ -437,6 +473,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
        {N_("/_Edit/_Search folder..."),        "<shift><control>F", search_cb, 1, NULL},
+       {N_("/_Edit/_Quick search"),            "slash", mainwindow_quicksearch, 0, NULL},
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de"),            NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de/_Folder tree"),
@@ -457,7 +494,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Separate f_older tree"),    NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
-       {N_("/_View/Separate m_essage view"),   NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
+       {N_("/_View/Separate _message view"),   NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/by _number"),         NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
@@ -485,7 +522,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/E_xpand all threads"),      NULL, expand_threads_cb, 0, NULL},
        {N_("/_View/Co_llapse all threads"),    NULL, collapse_threads_cb, 0, NULL},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
-       {N_("/_View/Set displayed _items..."),  NULL, set_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed _columns"),   NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Set displayed _columns/in _Folder list..."),        NULL, set_folder_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
@@ -513,99 +552,129 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Go to/Other _folder..."),  "G", goto_folder_cb, 0, NULL},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
 
-#define CODESET_SEPARATOR \
-       {N_("/_View/_Code set/---"),            NULL, NULL, 0, "<Separator>"}
-#define CODESET_ACTION(action) \
-        NULL, set_charset_cb, action, "/View/Code set/Auto detect"
+#define ENC_SEPARATOR \
+       {N_("/_View/Character _encoding/---"),          NULL, NULL, 0, "<Separator>"}
+#define ENC_ACTION(action) \
+        NULL, set_charset_cb, action, "/View/Character encoding/Auto detect"
 
-       {N_("/_View/_Code set"),                NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_Code set/_Auto detect"),
+       {N_("/_View/Character _encoding"),              NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/_Auto detect"),
         NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
-       {N_("/_View/_Code set/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/_Code set/7bit ascii (US-ASC_II)"),
-        CODESET_ACTION(C_US_ASCII)},
-
-#if HAVE_ICONV
-       {N_("/_View/_Code set/Unicode (_UTF-8)"),
-        CODESET_ACTION(C_UTF_8)},
-       CODESET_SEPARATOR,
-#endif
-       {N_("/_View/_Code set/Western European (ISO-8859-_1)"),
-        CODESET_ACTION(C_ISO_8859_1)},
-       {N_("/_View/_Code set/Western European (ISO-8859-15)"),
-        CODESET_ACTION(C_ISO_8859_15)},
-       CODESET_SEPARATOR,
-#if HAVE_ICONV
-       {N_("/_View/_Code set/Central European (ISO-8859-_2)"),
-        CODESET_ACTION(C_ISO_8859_2)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/_Baltic (ISO-8859-13)"),
-        CODESET_ACTION(C_ISO_8859_13)},
-       {N_("/_View/_Code set/Baltic (ISO-8859-_4)"),
-        CODESET_ACTION(C_ISO_8859_4)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Greek (ISO-8859-_7)"),
-        CODESET_ACTION(C_ISO_8859_7)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Turkish (ISO-8859-_9)"),
-        CODESET_ACTION(C_ISO_8859_9)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Cyrillic (ISO-8859-_5)"),
-        CODESET_ACTION(C_ISO_8859_5)},
-       {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
-        CODESET_ACTION(C_KOI8_R)},
-       {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_ICONV
-       {N_("/_View/_Code set/Japanese (ISO-2022-JP-2)"),
-        CODESET_ACTION(C_ISO_2022_JP_2)},
-#endif
-       {N_("/_View/_Code set/Japanese (_EUC-JP)"),
-        CODESET_ACTION(C_EUC_JP)},
-       {N_("/_View/_Code set/Japanese (_Shift__JIS)"),
-        CODESET_ACTION(C_SHIFT_JIS)},
-#if HAVE_ICONV
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Simplified Chinese (_GB2312)"),
-        CODESET_ACTION(C_GB2312)},
-       {N_("/_View/_Code set/Traditional Chinese (_Big5)"),
-        CODESET_ACTION(C_BIG5)},
-       {N_("/_View/_Code set/Traditional Chinese (EUC-_TW)"),
-        CODESET_ACTION(C_EUC_TW)},
-       {N_("/_View/_Code set/Chinese (ISO-2022-_CN)"),
-        CODESET_ACTION(C_ISO_2022_CN)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Korean (EUC-_KR)"),
-        CODESET_ACTION(C_EUC_KR)},
-       {N_("/_View/_Code set/Korean (ISO-2022-KR)"),
-        CODESET_ACTION(C_ISO_2022_KR)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Thai (TIS-620)"),
-        CODESET_ACTION(C_TIS_620)},
-       {N_("/_View/_Code set/Thai (Windows-874)"),
-        CODESET_ACTION(C_WINDOWS_874)},
-#endif
-
-#undef CODESET_SEPARATOR
-#undef CODESET_ACTION
+       {N_("/_View/Character _encoding/---"),          NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"),
+        ENC_ACTION(C_US_ASCII)},
+       {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
+        ENC_ACTION(C_UTF_8)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Western European (ISO-8859-_1)"),
+        ENC_ACTION(C_ISO_8859_1)},
+       {N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
+        ENC_ACTION(C_ISO_8859_15)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Central European (ISO-8859-_2)"),
+        ENC_ACTION(C_ISO_8859_2)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/_Baltic (ISO-8859-13)"),
+        ENC_ACTION(C_ISO_8859_13)},
+       {N_("/_View/Character _encoding/Baltic (ISO-8859-_4)"),
+        ENC_ACTION(C_ISO_8859_4)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Greek (ISO-8859-_7)"),
+        ENC_ACTION(C_ISO_8859_7)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Hebrew (ISO-8859-_8)"),
+        ENC_ACTION(C_ISO_8859_8)},
+       {N_("/_View/Character _encoding/Hebrew (Windows-1255)"),
+        ENC_ACTION(C_CP1255)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Turkish (ISO-8859-_9)"),
+        ENC_ACTION(C_ISO_8859_9)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Cyrillic (ISO-8859-_5)"),
+        ENC_ACTION(C_ISO_8859_5)},
+       {N_("/_View/Character _encoding/Cyrillic (KOI8-_R)"),
+        ENC_ACTION(C_KOI8_R)},
+       {N_("/_View/Character _encoding/Cyrillic (KOI8-U)"),
+        ENC_ACTION(C_KOI8_U)},
+       {N_("/_View/Character _encoding/Cyrillic (Windows-1251)"),
+        ENC_ACTION(C_CP1251)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Japanese (ISO-2022-_JP)"),
+        ENC_ACTION(C_ISO_2022_JP)},
+       {N_("/_View/Character _encoding/Japanese (ISO-2022-JP-2)"),
+        ENC_ACTION(C_ISO_2022_JP_2)},
+       {N_("/_View/Character _encoding/Japanese (_EUC-JP)"),
+        ENC_ACTION(C_EUC_JP)},
+       {N_("/_View/Character _encoding/Japanese (_Shift__JIS)"),
+        ENC_ACTION(C_SHIFT_JIS)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
+        ENC_ACTION(C_GB2312)},
+       {N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+        ENC_ACTION(C_GBK)},
+       {N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
+        ENC_ACTION(C_BIG5)},
+       {N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
+        ENC_ACTION(C_EUC_TW)},
+       {N_("/_View/Character _encoding/Chinese (ISO-2022-_CN)"),
+        ENC_ACTION(C_ISO_2022_CN)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Korean (EUC-_KR)"),
+        ENC_ACTION(C_EUC_KR)},
+       {N_("/_View/Character _encoding/Korean (ISO-2022-KR)"),
+        ENC_ACTION(C_ISO_2022_KR)},
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/Thai (TIS-620)"),
+        ENC_ACTION(C_TIS_620)},
+       {N_("/_View/Character _encoding/Thai (Windows-874)"),
+        ENC_ACTION(C_WINDOWS_874)},
+
+#undef ENC_SEPARATOR
+#undef ENC_ACTION
+
+#define DEC_SEPARATOR \
+       {N_("/_View/Decode/---"),               NULL, NULL, 0, "<Separator>"}
+#define DEC_ACTION(action) \
+        NULL, set_decode_cb, action, "/View/Decode/Auto detect"
+       {N_("/_View/Decode"),           NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Decode/_Auto detect"),
+        NULL, set_decode_cb, 0, "<RadioItem>"},
+       {N_("/_View/Decode/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/Decode/_8bit"),             DEC_ACTION(ENC_8BIT)},
+       {N_("/_View/Decode/_Quoted printable"), DEC_ACTION(ENC_QUOTED_PRINTABLE)},
+       {N_("/_View/Decode/_Base64"),           DEC_ACTION(ENC_BASE64)},
+       {N_("/_View/Decode/_Uuencode"),         DEC_ACTION(ENC_X_UUENCODE)},
+
+#undef DEC_SEPARATOR
+#undef DEC_ACTION
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_View/Show all _headers"),        "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show all headers"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
        {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},
@@ -621,11 +690,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Forward"),              "<control><alt>F", main_window_reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/_Message/Redirect"),              NULL, main_window_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
-       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<control>O", move_to_cb, 0, NULL},
        {N_("/_Message/_Copy..."),              "<shift><control>O", copy_to_cb, 0, NULL},
-       {N_("/_Message/_Delete"),               "<control>D", delete_cb,  0, NULL},
+       {N_("/_Message/Move to _trash"),        "<control>D", delete_trash_cb,  0, NULL},
+       {N_("/_Message/_Delete..."),            NULL, delete_cb,  0, NULL},
        {N_("/_Message/Cancel a news message"), "", cancel_cb,  0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
@@ -636,10 +704,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},
@@ -649,7 +717,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},
@@ -659,16 +730,31 @@ 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/C_reate processing rule"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/C_reate processing rule/_Automatically"),
+                                               NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
+       {N_("/_Tools/C_reate processing rule/by _From"),
+                                               NULL, create_processing_cb, FILTER_BY_FROM, NULL},
+       {N_("/_Tools/C_reate processing rule/by _To"),
+                                               NULL, create_processing_cb, FILTER_BY_TO, NULL},
+       {N_("/_Tools/C_reate 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/Ch_eck 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
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/SSL certi_ficates..."),    
+       {N_("/_Tools/SSL cer_tificates..."),    
                                                NULL, ssl_manager_open_cb, 0, NULL},
 #endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
@@ -684,28 +770,49 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/_Edit accounts..."),
                                                NULL, account_edit_open, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
-       {N_("/_Configuration/_Common preferences..."),
-                                               NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/_Scoring..."),
-                                               NULL, prefs_scoring_open_cb, 0, NULL},
+       {N_("/_Configuration/P_references..."),
+                                               NULL, prefs_open_cb, 0, NULL},
+       {N_("/_Configuration/Pre-pr_ocessing..."),
+                                               NULL, prefs_pre_processing_open_cb, 0, NULL},
+       {N_("/_Configuration/Post-pro_cessing..."),
+                                               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_("/_Configuration/Plu_gins..."),     NULL, plugins_open_cb, 0, NULL},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Help/_Manual (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
-       {N_("/_Help/_Manual (Sylpheed Doc Homepage)"),
+       {N_("/_Help/Ma_nual (Sylpheed Doc Homepage)"),
                                                NULL, manual_open_cb, MANUAL_MANUAL_SYLDOC, NULL},
        {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
-       {N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
+       {N_("/_Help/FA_Q (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 gboolean main_window_accel_activate (GtkAccelGroup *accelgroup,
+                                            GObject *arg1,
+                                            guint value,
+                                            GdkModifierType mod,
+                                            gpointer user_data) 
+{
+       MainWindow *mainwin = (MainWindow *)user_data;
+
+       if (mainwin->summaryview &&
+           mainwin->summaryview->quicksearch &&
+           quicksearch_has_focus(mainwin->summaryview->quicksearch) &&
+           (mod == 0 || mod == GDK_SHIFT_MASK)) {
+               quicksearch_pass_key(mainwin->summaryview->quicksearch, value, mod);
+               return TRUE;
+       }
+       return FALSE;
+}
+
 MainWindow *main_window_create(SeparateType type)
 {
        MainWindow *mainwin;
@@ -748,8 +855,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;
@@ -758,14 +864,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), "focus_in_event",
-                          GTK_SIGNAL_FUNC(mainwindow_focus_in_event),
-                          mainwin);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                               GTK_SIGNAL_FUNC(mainwindow_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);
@@ -788,10 +894,19 @@ MainWindow *main_window_create(SeparateType type)
        menu_set_sensitive(ifactory, "/Help/Manual (Local)", manual_available(MANUAL_MANUAL_LOCAL));
        menu_set_sensitive(ifactory, "/Help/FAQ (Local)", manual_available(MANUAL_FAQ_LOCAL));
 
-       handlebox = gtk_handle_box_new();
-       gtk_widget_show(handlebox);
-       gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
-
+       if (prefs_common.toolbar_detachable) {
+               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);
+       } else {
+               handlebox = gtk_hbox_new(FALSE, 0);
+               gtk_widget_show(handlebox);
+               gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+       }
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;
        
@@ -813,26 +928,27 @@ 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, _("Go offline"), NULL);
+       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, _("Go online"), NULL);
+       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("");
@@ -844,10 +960,10 @@ MainWindow *main_window_create(SeparateType type)
                             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);
@@ -869,22 +985,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
@@ -893,6 +1009,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;
@@ -916,7 +1036,7 @@ MainWindow *main_window_create(SeparateType type)
        color[2] = folderview->color_new;
        color[3] = folderview->color_op;
 
-       colormap = gdk_window_get_colormap(window->window);
+       colormap = gdk_drawable_get_colormap(window->window);
        gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
        for (i = 0; i < 4; i++) {
                if (success[i] == FALSE)
@@ -925,13 +1045,17 @@ MainWindow *main_window_create(SeparateType type)
 
        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");
+               (ifactory, "/View/Character encoding/Auto detect");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 
        switch (prefs_common.toolbar_style) {
@@ -959,33 +1083,27 @@ 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);
-               if (prefs_common.summary_quicksearch_type != S_SEARCH_EXTENDED)
-                       gtk_widget_hide(summaryview->search_description);
-       }
-
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
                (ifactory, "/Configuration/Change current account");
-       gtk_signal_connect(GTK_OBJECT(ac_menu), "selection_done",
-                          GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
        mainwin->ac_menu = ac_menu;
 
        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)                
+#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);
+       ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu, mainwin->window);
        
        /* connect the accelerators for equivalent 
           menu items in different menus             */
@@ -994,11 +1112,6 @@ MainWindow *main_window_create(SeparateType type)
 
        
        /* 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 */
@@ -1006,6 +1119,8 @@ 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
@@ -1028,6 +1143,21 @@ MainWindow *main_window_create(SeparateType type)
        return mainwin;
 }
 
+void main_window_destroy(MainWindow *mainwin)
+{
+       /* TODO : destroy other component */
+       messageview_destroy(mainwin->messageview);
+       mainwin->messageview = NULL;    
+}
+
+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)
 {
 
@@ -1085,13 +1215,16 @@ static void main_window_menu_callback_unblock(MainWindow *mainwin)
                mainwin->menu_lock_count--;
 }
 
+static guint prefs_tag = 0;
+
 void main_window_reflect_prefs_all(void)
 {
        main_window_reflect_prefs_all_real(FALSE);
 }
 
-void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
+static gboolean reflect_prefs_timeout_cb(gpointer data) 
 {
+       gboolean pixmap_theme_changed = GPOINTER_TO_INT(data);
        GList *cur;
        MainWindow *mainwin;
        GtkWidget *pixmap;
@@ -1111,13 +1244,13 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
                        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);
@@ -1125,9 +1258,23 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
                        mainwin->offline_pixmap = pixmap;
                }
                
-               summary_redisplay_msg(mainwin->summaryview);
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
+
+               textview_reflect_prefs(mainwin->messageview->mimeview->textview);
+               folderview_reflect_prefs();
+               summary_reflect_prefs();
+               summary_redisplay_msg(mainwin->summaryview);
+       }
+       prefs_tag = 0;
+       return FALSE;
+}
+
+void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
+{
+       if (prefs_tag == 0 || pixmap_theme_changed) {
+               prefs_tag = g_timeout_add(500, reflect_prefs_timeout_cb, 
+                                               GINT_TO_POINTER(pixmap_theme_changed));
        }
 }
 
@@ -1142,38 +1289,97 @@ void main_window_set_summary_column(void)
        }
 }
 
-void main_window_set_account_menu(GList *account_list)
+void main_window_set_folder_column(void)
 {
-       GList *cur, *cur_ac, *cur_item;
-       GtkWidget *menuitem;
+       GList *cur;
        MainWindow *mainwin;
-       PrefsAccount *ac_prefs;
 
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;
+               folderview_set_column_order(mainwin->folderview);
+       }
+}
 
-               /* 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;
-               }
+static void main_window_set_account_selector_menu(MainWindow *mainwin,
+                                                 GList *account_list)
+{
+       GList *cur_ac, *cur_item;
+       GtkWidget *menuitem;
+       PrefsAccount *ac_prefs;
+
+       /* 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);
+       }
+}
 
-               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);
+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");
+
+       /* 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)
@@ -1199,11 +1405,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",
@@ -1290,19 +1520,27 @@ void main_window_toggle_message_view(MainWindow *mainwin)
                gtk_widget_ref(vpaned);
                gtkut_container_remove(GTK_CONTAINER(container), vpaned);
                gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_UP, GTK_SHADOW_OUT);
        } else {
                mainwin->messageview->visible = TRUE;
                gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
                gtk_container_add(GTK_CONTAINER(container), vpaned);
                gtk_widget_unref(vpaned);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        }
 
+       if (messageview_is_visible(mainwin->messageview))
+               gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+                             GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       else
+               gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+                             GTK_ARROW_UP, 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);
 }
 
@@ -1310,32 +1548,59 @@ void main_window_get_size(MainWindow *mainwin)
 {
        GtkAllocation *allocation;
 
+       if (mainwin->messageview == NULL) {
+               debug_print("called after messageview "
+                           "has been deallocated!\n");
+               return;
+       }
+
        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);
 
@@ -1344,7 +1609,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)
@@ -1355,21 +1657,25 @@ 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++;
+               if (folder->account && folder->account->set_trash_folder && 
+                   folder_find_item_from_identifier(folder->account->trash_folder))
+                       has_trash++;
        }
 
        if (!has_trash) return;
        
        if (confirm) {
                if (alertpanel(_("Empty trash"),
-                              _("Empty all messages in trash?"),
-                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+                              _("Delete all messages in trash folders?"),
+                              GTK_STOCK_YES, GTK_STOCK_NO, NULL)
+                   != G_ALERTDEFAULT)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
-       procmsg_empty_trash();
+       procmsg_empty_all_trash();
 
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->stype == F_TRASH)
@@ -1388,17 +1694,16 @@ void main_window_add_mailbox(MainWindow *mainwin)
                            "Mail");
        if (!path) return;
        if (folder_find_from_path(path)) {
-               alertpanel_error(_("The mailbox `%s' already exists."), path);
+               alertpanel_error(_("The mailbox '%s' already exists."), path);
                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_path_get_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);
@@ -1409,56 +1714,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)
@@ -1474,7 +1729,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;
@@ -1497,14 +1752,15 @@ 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;
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (item &&
-            (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
-             item->stype == F_QUEUE)))
+            (folder_has_parent_of_type(item, F_DRAFT) ||
+             folder_has_parent_of_type(item, F_OUTBOX) ||
+             folder_has_parent_of_type(item, F_QUEUE))))
                state |= M_ALLOW_REEDIT;
        if (cur_account)
                state |= M_HAVE_ACCOUNT;
@@ -1529,25 +1785,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/Empty all Trash folders"              , 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},
@@ -1562,9 +1819,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},
@@ -1573,30 +1828,40 @@ 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/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/Move to trash"         , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Message/Delete..."             , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
                {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
-
-               {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
-               {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
-               {"/Tools/Harvest addresses"         , M_UNLOCKED},
-               {"/Tools/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Tools/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-               {"/Tools/Actions"                   , M_TARGET_EXIST|M_UNLOCKED},
-               {"/Tools/Execute"                   , M_DELAY_EXEC},
-               {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+               {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+
+               {"/Tools/Add sender to address book"   , M_SINGLE_TARGET_EXIST},
+               {"/Tools/Harvest addresses"            , M_UNLOCKED},
+               {"/Tools/Harvest addresses/from Folder..."       
+                                                      , M_UNLOCKED|M_MSG_EXIST},
+               {"/Tools/Harvest addresses/from Messages..."
+                                                      , M_UNLOCKED|M_MSG_EXIST|M_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},
 
@@ -1610,6 +1875,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) \
@@ -1670,7 +1951,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
@@ -1698,6 +1979,61 @@ void main_window_popup(MainWindow *mainwin)
        }
 }
 
+void main_window_show(MainWindow *mainwin)
+{
+       gtk_widget_show(mainwin->window);
+       gtk_widget_show(mainwin->vbox_body);
+
+        gtk_widget_set_uposition(mainwin->window,
+                                 prefs_common.mainwin_x,
+                                 prefs_common.mainwin_y);
+
+       gtk_widget_set_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);
+
+       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;
@@ -1709,52 +2045,97 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        GtkWidget *menuitem;
        GtkItemFactory *msgview_ifactory;
 
-       debug_print("Setting widgets...");
+       debug_print("Setting widgets... ");
+
+       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);
 
        /* create separated window(s) if needed */
        if (type & SEPARATE_FOLDER) {
+               static GdkGeometry folderwin_geometry;
+               
                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_move(GTK_WINDOW(folderwin),
+                               prefs_common.folderwin_x,
+                               prefs_common.folderwin_y);
+
+               if (!folderwin_geometry.min_height) {
+                       folderwin_geometry.min_width = 320;
+                       folderwin_geometry.min_height = 200;
+               }
+               gtk_window_set_geometry_hints(GTK_WINDOW(folderwin), NULL,
+                                             &folderwin_geometry, GDK_HINT_MIN_SIZE);
+                               
+               gtk_widget_set_size_request(folderwin,
+                                           prefs_common.folderview_width,
+                                           prefs_common.folderview_height);
+
                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) {
+               static GdkGeometry msgwin_geometry;
+               
                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_move(GTK_WINDOW(messagewin), 
+                               prefs_common.main_msgwin_x,
+                               prefs_common.main_msgwin_y);
+
+               if (!msgwin_geometry.min_height) {
+                       msgwin_geometry.min_width = 320;
+                       msgwin_geometry.min_height = 200;
+               }
+               gtk_window_set_geometry_hints(GTK_WINDOW(messagewin), NULL,
+                                             &msgwin_geometry, GDK_HINT_MIN_SIZE);
+               
+               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);
+       } else {
+               mainwin->messageview->statusbar = mainwin->statusbar;
+               mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
        }
 
        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)) {
@@ -1766,23 +2147,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;
@@ -1806,29 +2174,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);
@@ -1837,20 +2188,12 @@ 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_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);
@@ -1858,56 +2201,76 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                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);
-       
+       if (messageview_is_visible(mainwin->messageview))
+               gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+                             GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       else
+               gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+                             GTK_ARROW_UP, GTK_SHADOW_OUT);
+
+       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),
+                messageview_is_visible(mainwin->messageview));
 
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Separate folder tree");
@@ -1918,6 +2281,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");
 }
 
@@ -1940,51 +2316,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_size_request(child, 1, -1);
+}
+
+static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
+                                  gpointer data)
+{
+       gtk_widget_set_size_request(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);
-}
 
-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");
-       if (!button) return;
-       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-       gtk_object_remove_data(GTK_OBJECT(mainwin->ac_menu), "menu_button");
-       manage_window_focus_in(mainwin->window, NULL, NULL);
+       return TRUE;
 }
 
 static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
@@ -2021,44 +2401,56 @@ static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                (mainwin->menu_factory, "/View/Show or hide/Message view");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
 
+       mainwin->messageview->statusbar = mainwin->statusbar;
+       mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
+
        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,
@@ -2073,6 +2465,12 @@ static void export_mbox_cb(MainWindow *mainwin, guint action,
        export_mbox(mainwin->summaryview->folder_item);
 }
 
+static void export_list_mbox_cb(MainWindow *mainwin, guint action,
+                               GtkWidget *widget)
+{
+       summaryview_export_mbox_list(mainwin->summaryview);
+}
+
 static void empty_trash_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2093,7 +2491,8 @@ static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (prefs_common.confirm_on_exit) {
                if (alertpanel(_("Exit"), _("Exit this program?"),
-                              _("OK"), _("Cancel"), NULL) != G_ALERTDEFAULT)
+                              GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL)
+                   != G_ALERTDEFAULT)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
@@ -2109,6 +2508,12 @@ static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                message_search(mainwin->messageview);
 }
 
+static void mainwindow_quicksearch(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       prefs_common.show_searchbar = TRUE;
+       quicksearch_show(mainwin->summaryview->quicksearch);
+}
+
 static void toggle_folder_cb(MainWindow *mainwin, guint action,
                             GtkWidget *widget)
 {
@@ -2140,6 +2545,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,
@@ -2164,16 +2571,12 @@ void main_window_reply_cb(MainWindow *mainwin, guint action,
 {
        MessageView *msgview = (MessageView*)mainwin->messageview;
        GSList *msginfo_list = NULL;
-       gchar *body;
 
        g_return_if_fail(msgview != NULL);
 
        msginfo_list = summary_get_selection(mainwin->summaryview);
        g_return_if_fail(msginfo_list != NULL);
-       
-       body = messageview_get_selection(msgview);
-       compose_reply_mode((ComposeMode)action, msginfo_list, body);
-       g_free(body);
+       compose_reply_from_messageview(msgview, msginfo_list, action);
        g_slist_free(msginfo_list);
 }
 
@@ -2262,12 +2665,6 @@ 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 inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        inc_cancel_all();
@@ -2288,6 +2685,11 @@ static void delete_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_delete(mainwin->summaryview);
 }
 
+static void delete_trash_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_delete_trash(mainwin->summaryview);
+}
+
 static void cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_cancel(mainwin->summaryview);
@@ -2308,15 +2710,12 @@ static void show_all_header_cb(MainWindow *mainwin, guint action,
                               GtkWidget *widget)
 {
        if (mainwin->menu_lock_count) return;
+       mainwin->summaryview->messageview->all_headers = 
+                       GTK_CHECK_MENU_ITEM(widget)->active;
        summary_display_msg_selected(mainwin->summaryview,
                                     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);
@@ -2345,6 +2744,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)
 {
@@ -2358,20 +2762,34 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
 
        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;
-
+               
+               g_free(mainwin->messageview->forced_charset);
+               mainwin->messageview->forced_charset = str ? g_strdup(str) : NULL;
+               procmime_force_charset(str);
+               
                summary_redisplay_msg(mainwin->summaryview);
                
                debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
        }
 }
 
+static void set_decode_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               mainwin->messageview->forced_encoding = (EncodingType)action;
+               
+               summary_redisplay_msg(mainwin->summaryview);
+               
+               debug_print("forced encoding: %d\n", action);
+       }
+}
+
 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);
 }
@@ -2402,12 +2820,18 @@ static void collapse_threads_cb(MainWindow *mainwin, guint action,
        summary_collapse_threads(mainwin->summaryview);
 }
 
-static void set_display_item_cb(MainWindow *mainwin, guint action,
+static void set_summary_display_item_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
        prefs_summary_column_open();
 }
 
+static void set_folder_display_item_cb(MainWindow *mainwin, guint action,
+                               GtkWidget *widget)
+{
+       prefs_folder_column_open();
+}
+
 static void sort_summary_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
@@ -2422,6 +2846,7 @@ static void sort_summary_cb(MainWindow *mainwin, guint action,
                summary_sort(mainwin->summaryview, (FolderSortKey)action,
                             GTK_CHECK_MENU_ITEM(menuitem)->active
                             ? SORT_ASCENDING : SORT_DESCENDING);
+               item->sort_key = action;
        }
 }
 
@@ -2446,12 +2871,54 @@ 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_item(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(ngettext("Deleted %d duplicate message in %d folders.\n",
+                                  "Deleted %d duplicate messages in %d folders.\n",
+                                  data.dups),
+                         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,
@@ -2558,8 +3025,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);
 }
 
@@ -2572,25 +3038,37 @@ 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 prefs_common_open_cb(MainWindow *mainwin, guint action,
-                                GtkWidget *widget)
+static void create_processing_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
 {
-       prefs_common_open();
+       summary_filter_open(mainwin->summaryview, (PrefsFilterType)action, 1);
 }
 
-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,
@@ -2628,10 +3106,34 @@ 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();
+       FolderItem *item = NULL;
+       
+       if (!mainwindow_get_mainwindow())
+               return;
+       main_window_show_cur_account(mainwindow_get_mainwindow());
+       toolbar_update(TOOLBAR_MAIN, mainwindow_get_mainwindow());
+       main_window_set_menu_sensitive(mainwindow_get_mainwindow());
+       toolbar_main_set_sensitive(mainwindow_get_mainwindow());
+       gtk_button_set_relief(GTK_BUTTON(mainwindow_get_mainwindow()->ac_button), GTK_RELIEF_NONE);
+       item = folderview_get_selected_item(
+                       mainwindow_get_mainwindow()->folderview);
+       if (item) {
+               toolbar_set_compose_button
+                       (mainwindow_get_mainwindow()->toolbar,
+                        FOLDER_TYPE(item->folder) == F_NEWS ? 
+                        COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
+       }
+}
+
+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)
@@ -2677,6 +3179,11 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu
        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;
@@ -2685,19 +3192,23 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
+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) {
@@ -2709,6 +3220,7 @@ void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
        default:
                break;
        }
+       return FALSE;
 }
 
 #undef BREAK_ON_MODIFIER_KEY
@@ -2754,10 +3266,12 @@ gboolean mainwindow_progressindicator_hook(gpointer source, gpointer userdata)
        switch (data->cmd) {
        case PROGRESS_COMMAND_START:
        case PROGRESS_COMMAND_STOP:
-               gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), 0.0);
+               gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
                break;
        case PROGRESS_COMMAND_SET_PERCENTAGE:
-               gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), data->value);
+               gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwin->progressbar), data->value);
                break;          
        }
        while (gtk_events_pending()) gtk_main_iteration ();