sync with 0.8.6cvs23
[claws.git] / src / mainwindow.c
index e9dedbad7ac3c856cba0058f5f32c507908f41ed..c818ca697e1ca3f669fc9adac5266dc021bf5382 100644 (file)
@@ -60,7 +60,6 @@
 #include "import.h"
 #include "export.h"
 #include "prefs_common.h"
-#include "prefs_filter.h"
 #include "prefs_actions.h"
 #include "prefs_filtering.h"
 #include "prefs_scoring.h"
@@ -68,6 +67,7 @@
 #include "prefs_folder_item.h"
 #include "prefs_summary_column.h"
 #include "prefs_template.h"
+#include "prefs_toolbar.h"
 #include "account.h"
 #include "addressbook.h"
 #include "logwindow.h"
 #include "manual.h"
 #include "version.h"
 #include "selective_download.h"
+#include "ssl_manager.h"
+#include "sslcertwindow.h"
 
 #define AC_LABEL_WIDTH 240
 
-#define STATUSBAR_PUSH(mainwin, str) \
-{ \
-       gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar), \
-                          mainwin->mainwin_cid, str); \
-       gtkut_widget_wait_for_draw(mainwin->hbox_stat); \
-}
-
-#define STATUSBAR_POP(mainwin) \
-{ \
-       gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar), \
-                         mainwin->mainwin_cid); \
-}
-
 /* list of all instantiated MainWindow */
 static GList *mainwin_list = NULL;
 
@@ -110,64 +99,6 @@ static void main_window_show_cur_account    (MainWindow     *mainwin);
 
 static void main_window_set_widgets            (MainWindow     *mainwin,
                                                 SeparateType    type);
-static void main_window_toolbar_create         (MainWindow     *mainwin,
-                                                GtkWidget      *container);
-
-/* callback functions */
-static void toolbar_inc_cb             (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_inc_all_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_send_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_compose_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_compose_news_cb    (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_compose_mail_cb    (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_reply_cb           (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_reply_popup_cb     (GtkWidget      *widget,
-                                        GdkEventButton *event,
-                                        gpointer        data);
-static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell,
-                                        gpointer        data);
-static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_reply_to_all_popup_cb(GtkWidget    *widget,
-                                        GdkEventButton *event,
-                                        gpointer        data);
-static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell  *menu_shell,
-                                        gpointer        data);
-static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
-                                        GdkEventButton *event,
-                                        gpointer        data);
-static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell       *menu_shell,
-                                        gpointer        data);
-static void toolbar_forward_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_forward_popup_cb   (GtkWidget      *widget,
-                                        GdkEventButton *event,
-                                        gpointer        data);
-static void toolbar_forward_popup_closed_cb(GtkMenuShell       *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_delete_cb          (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_exec_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_next_unread_cb     (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_prefs_cb           (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_account_cb         (GtkWidget      *widget,
-                                        gpointer        data);
 
 #if 0
 static void toolbar_account_button_pressed     (GtkWidget      *widget,
@@ -180,9 +111,15 @@ static void ac_label_button_pressed                (GtkWidget      *widget,
 static void ac_menu_popup_closed               (GtkMenuShell   *menu_shell,
                                                 gpointer        data);
 
-static gint main_window_close_cb (GtkWidget    *widget,
-                                 GdkEventAny   *event,
-                                 gpointer       data);
+static gint main_window_close_cb       (GtkWidget      *widget,
+                                        GdkEventAny    *event,
+                                        gpointer        data);
+static gint folder_window_close_cb     (GtkWidget      *widget,
+                                        GdkEventAny    *event,
+                                        gpointer        data);
+static gint message_window_close_cb    (GtkWidget      *widget,
+                                        GdkEventAny    *event,
+                                        gpointer        data);
 
 static void add_mailbox_cb      (MainWindow    *mainwin,
                                  guint          action,
@@ -238,18 +175,9 @@ static void toggle_toolbar_cb       (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void toggle_expand_summaryview_cb        (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void toggle_expand_messageview_cb        (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void toggle_work_offline_cb      (MainWindow    *mainwin,
+static void separate_widget_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void separate_widget_cb (GtkCheckMenuItem *checkitem,
-                                guint action,
-                                GtkWidget *widget);
 
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
@@ -257,32 +185,123 @@ 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, 
+static void sel_download_cb          (MainWindow *mainwin, 
+                                guint action,
+                                GtkWidget *widget);
+static void prefs_toolbar_cb        (MainWindow *mainwin, 
                                 guint action,
                                 GtkWidget *widget);
 
-static void inc_mail_cb                        (MainWindow     *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void inc_all_account_mail_cb    (MainWindow     *mainwin,
+static void reply_cb                             (MainWindow   *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-static void inc_cancel_cb              (MainWindow     *mainwin,
+
+static void inc_mail_cb                                  (MainWindow   *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
-static void send_queue_cb              (MainWindow     *mainwin,
+static void inc_all_account_mail_cb              (MainWindow   *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
-static void compose_cb                 (MainWindow     *mainwin,
+static void send_queue_cb                        (MainWindow   *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-static void compose_mail_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget);
-static void compose_news_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget);
-static void reply_cb                   (MainWindow     *mainwin,
+
+static void compose_mail_cb                          (MainWindow       *mainwin, 
+                                        guint action,
+                                          GtkWidget         *widget);
+
+static void compose_news_cb                          (MainWindow       *mainwin, 
+                                        guint action,
+                                          GtkWidget         *widget);
+
+static void next_unread_cb                        (MainWindow  *mainwin,
+                                         guint          action,
+                                         GtkWidget     *widget);
+
+static void toolbar_inc_cb             (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_inc_all_cb         (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_send_cb            (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_compose_cb         (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_cb           (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_to_list_cb   (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_forward_cb         (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_exec_cb            (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_next_unread_cb     (GtkWidget      *widget,
+                                        gpointer        data);
+
+
+static void toolbar_reply_popup_cb            (GtkWidget       *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+static void toolbar_reply_popup_closed_cb      (GtkMenuShell   *menu_shell,
+                                               gpointer         data);
+
+static void toolbar_reply_to_all_popup_cb      (GtkWidget      *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+
+static void toolbar_reply_to_all_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void toolbar_reply_to_list_popup_cb       (GtkWidget    *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+
+static void toolbar_reply_to_list_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
+                                        GdkEventButton *event,
+                                        gpointer        data);
+static void toolbar_reply_to_sender_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void toolbar_forward_popup_cb    (GtkWidget      *widget,
+                                        GdkEventButton    *event,
+                                        gpointer        data);
+
+static void toolbar_forward_popup_closed_cb            
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void activate_compose_button     (Toolbar       *toolbar,
+                                        ToolbarStyle      style,
+                                        ComposeButtonType type);
+static void toolbar_buttons_cb          (GtkWidget         *widget, 
+                                        ToolbarItem       *item);
+static void toolbar_create              (MainWindow        *mainwin,
+                                        GtkWidget         *container);
+
+static void toolbar_update              (MainWindow        *mainwin);
+
+static void inc_cancel_cb              (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
@@ -312,6 +331,10 @@ static void delete_cb                      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void cancel_cb                   (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void mark_cb                    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -343,12 +366,22 @@ static void hide_read_messages   (MainWindow      *mainwin,
 static void thread_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void expand_threads_cb   (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void collapse_threads_cb         (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
 static void set_display_item_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 static void sort_summary_cb     (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void sort_summary_type_cb (MainWindow   *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void attract_by_subject_cb(MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -376,7 +409,11 @@ static void next_cb                 (MainWindow    *mainwin,
 static void prev_unread_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void next_unread_cb      (MainWindow    *mainwin,
+
+static void prev_new_cb                 (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void next_new_cb                 (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 static void prev_marked_cb      (MainWindow    *mainwin,
@@ -402,34 +439,37 @@ static void copy_cb                (MainWindow    *mainwin,
 static void allsel_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void selthread_cb        (MainWindow    *mainwin,
+static void select_thread_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+
 static void create_filter_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
-static void prefs_common_open_cb (MainWindow   *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_filter_open_cb (MainWindow   *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_scoring_open_cb (MainWindow  *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_filtering_open_cb (MainWindow        *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_account_open_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);
 static void prefs_actions_open_cb      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+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_filtering_open_cb    (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+#ifdef USE_OPENSSL
+static void ssl_manager_open_cb        (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+#endif
 static void new_account_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -443,27 +483,12 @@ static void online_switch_clicked(GtkButton     *btn,
 static void manual_open_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void faq_open_cb                 (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
 
 static void scan_tree_func      (Folder        *folder,
                                  FolderItem    *item,
                                  gpointer       data);
                                  
-static void activate_compose_button (MainWindow *mainwin,
-                               ToolbarStyle      style,
-                               ComposeButtonType type);
-
-static void menuitem_expandsummaryview_statechanged (GtkWidget *widget,
-                               GtkStateType state,
-                               gpointer data);
-
-static void key_pressed (GtkWidget *widget, 
-                               GdkEventKey *event,
-                               gpointer data);
-
-static void set_toolbar_style(MainWindow *mainwin);
+static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
 
 static void addr_harvest_cb     ( MainWindow  *mainwin,
                                   guint       action,
@@ -473,14 +498,15 @@ static void addr_harvest_msg_cb    ( MainWindow  *mainwin,
                                   guint       action,
                                   GtkWidget   *widget );
 
-#define  SEPARATE_ACTION  667
+#define  SEPARATE_ACTION 500 
 
 static GtkItemFactoryEntry mainwin_entries[] =
 {
        {N_("/_File"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Add mailbox..."),          NULL, add_mailbox_cb, 0, NULL},
        {N_("/_File/_Add mbox mailbox..."),     NULL, add_mbox_cb, 0, NULL},
-       {N_("/_File/_Rescan folder tree"),      NULL, update_folderview_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},
@@ -494,18 +520,23 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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/_Close"),                "<alt>W", app_exit_cb, 0, NULL}, */
        {N_("/_File/E_xit"),                    "<control>Q", app_exit_cb, 0, NULL},
 
        {N_("/_Edit"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Edit/_Copy"),                    "<control>C", copy_cb, 0, NULL},
        {N_("/_Edit/Select _all"),              "<control>A", allsel_cb, 0, NULL},
-       {N_("/_Edit/Select thread"),            "<control>Z", selthread_cb, 0, NULL},
+       {N_("/_Edit/Select _thread"),           NULL, select_thread_cb, 0, NULL},
        {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
        {N_("/_Edit/_Search folder..."),        "<shift><control>F", search_cb, 1, 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"),
+                                               NULL, toggle_folder_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show or hi_de/_Message view"),
+                                               "V", toggle_message_cb, 0, "<ToggleItem>"},
        {N_("/_View/Show or hi_de/_Toolbar"),
                                                NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
@@ -519,29 +550,35 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Show or hi_de/Status _bar"),
                                                NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Separate _Folder Tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
-       {N_("/_View/Separate _Message View"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
-       {N_("/_View/E_xpand Summary View"),     "V", toggle_expand_summaryview_cb, 0, "<ToggleItem>"},
-       {N_("/_View/Ex_pand Message View"),     "<shift>V", toggle_expand_messageview_cb, 0, "<ToggleItem>"},
+       {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/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_Sort/Sort by _number"),    NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
-       {N_("/_View/_Sort/Sort by s_ize"),      NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
-       {N_("/_View/_Sort/Sort by _date"),      NULL, sort_summary_cb, SORT_BY_DATE, NULL},
-       {N_("/_View/_Sort/Sort by _from"),      NULL, sort_summary_cb, SORT_BY_FROM, NULL},
-       {N_("/_View/_Sort/Sort by _subject"),   NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
-       {N_("/_View/_Sort/Sort by _color label"),
-                                               NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
-       {N_("/_View/_Sort/Sort by _mark"),      NULL, sort_summary_cb, SORT_BY_MARK, NULL},
-       {N_("/_View/_Sort/Sort by _unread"),    NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
-       {N_("/_View/_Sort/Sort by a_ttachment"),
-                                               NULL, sort_summary_cb, SORT_BY_MIME, NULL},
+       {N_("/_View/_Sort/by _number"),         NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
+       {N_("/_View/_Sort/by s_ize"),           NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _date"),           NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _from"),           NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _subject"),        NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _color label"),
+                                               NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _mark"),           NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _unread"),         NULL, sort_summary_cb, SORT_BY_UNREAD, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by a_ttachment"),
+                                               NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by score"),           NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by locked"),          NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"},
+       {N_("/_View/_Sort/D_on't sort"),        NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/---"),                NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Sort/Ascending"),          NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"},
+       {N_("/_View/_Sort/Descending"),         NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"},
        {N_("/_View/_Sort/---"),                NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort/_Attract by subject"),
                                                NULL, attract_by_subject_cb, 0, NULL},
-       {N_("/_View/Th_read view"),             "<control>T",        thread_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Th_read view"),             "<control>T", thread_cb, 0, "<ToggleItem>"},
+       {N_("/_View/E_xpand all threads"),      NULL, expand_threads_cb, 0, NULL},
+       {N_("/_View/Co_llapse all threads"),    NULL, collapse_threads_cb, 0, NULL},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
-       {N_("/_View/Set display _item..."),     NULL, set_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed _items..."),  NULL, set_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
@@ -553,6 +590,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Go to/N_ext unread message"),
                                                "<shift>N", next_unread_cb, 0, NULL},
        {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Prev ne_w message"), NULL, prev_new_cb, 0, NULL},
+       {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to/Prev _marked message"),
                                                NULL, prev_marked_cb, 0, NULL},
        {N_("/_View/_Go to/Next m_arked message"),
@@ -649,9 +689,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_View/Show all _header"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show all _headers"),        "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/_Update"),                  "<control><alt>U", update_summary_cb,  0, NULL},
+       {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},
@@ -664,17 +704,22 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Compose a_n email message"),     "<control>M", compose_mail_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
        {N_("/_Message/_Reply"),                "<control>R",   reply_cb, COMPOSE_REPLY, NULL},
-       {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
-       {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
-       {N_("/_Message/Reply to a_ll"),         "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to"),             NULL, NULL, 0, "<Branch>"},
+       {N_("/_Message/Repl_y to/_all"),        "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to/_sender"),     NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Repl_y to/mailing _list"),
+                                               "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+       {N_("/_Message/Follow-up and reply to"),NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/_Message/Bounce"),                NULL, reply_cb, COMPOSE_BOUNCE, NULL},
+       {N_("/_Message/Redirect"),              NULL, reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<control>O", move_to_cb, 0, NULL},
        {N_("/_Message/_Copy..."),              "<shift><control>O", copy_to_cb, 0, NULL},
        {N_("/_Message/_Delete"),               "<control>D", delete_cb,  0, NULL},
+       {N_("/_Message/Cancel a news message"), "", cancel_cb,  0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/_Mark/_Mark"),           "<shift>asterisk", mark_cb, 0, NULL},
@@ -708,25 +753,36 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                                NULL, create_filter_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/E_xecute"),                        "X", execute_summary_cb, 0, NULL},
+       {N_("/_Tools/Actio_ns"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/Delete du_plicated messages"),
                                                NULL, delete_duplicated_cb,   0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/_Log window"),             "<control>L", log_window_show_cb, 0, NULL},
+       {N_("/_Tools/E_xecute"),                "X", execute_summary_cb, 0, NULL},
+#ifdef USE_OPENSSL
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/SSL certi_ficates..."),    
+                                               NULL, ssl_manager_open_cb, 0, NULL},
+#endif
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Log window"),             "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/_Filter setting..."),
-                                               NULL, prefs_filter_open_cb, 0, NULL},
+       {N_("/_Configuration/C_ustomize toolbars"),
+                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_Configuration/C_ustomize toolbars/_Main window..."),
+                                               NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
+       {N_("/_Configuration/C_ustomize toolbars/_Compose window..."),
+                                               NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
+       {N_("/_Configuration/C_ustomize toolbars/M_essage view..."),
+                                               NULL, prefs_toolbar_cb, TOOLBAR_MSGVIEW, NULL},
        {N_("/_Configuration/_Scoring..."),
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
-       {N_("/_Configuration/_Template..."),    NULL, prefs_template_open_cb, 0, NULL},
+       {N_("/_Configuration/_Templates..."),   NULL, prefs_template_open_cb, 0, NULL},
        {N_("/_Configuration/_Actions..."),     NULL, prefs_actions_open_cb, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/_Preferences for current account..."),
@@ -739,21 +795,18 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, NULL, 0, "<Branch>"},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual/_English"),         NULL, manual_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_Manual/_German"),          NULL, manual_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_Manual/_Spanish"),         NULL, manual_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_Manual/_French"),          NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
-       {N_("/_Help/_FAQ"),                     NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_FAQ/_German"),             NULL, faq_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_FAQ/_Italian"),            NULL, faq_open_cb, MANUAL_LANG_IT, NULL},
+       {N_("/_Help/_Manual (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
+       {N_("/_Help/_Manual (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_MANUAL_SYLDOC, NULL},
+       {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
+       {N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
+
+
+
 static GtkItemFactoryEntry reply_popup_entries[] =
 {
        {N_("/Reply with _quote"), NULL, reply_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
@@ -764,6 +817,11 @@ static GtkItemFactoryEntry replyall_popup_entries[] =
        {N_("/Reply to all with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
        {N_("/_Reply to all without quote"), "a", reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
 };
+static GtkItemFactoryEntry replylist_popup_entries[] =
+{
+       {N_("/Reply to list with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
+       {N_("/_Reply to list without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
+};
 static GtkItemFactoryEntry replysender_popup_entries[] =
 {
        {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
@@ -789,8 +847,8 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;
-       GtkWidget *online_status;
-       GtkWidget *offline_status;
+       GtkWidget *online_pixmap;
+       GtkWidget *offline_pixmap;
        GtkWidget *online_switch;
        GtkWidget *offline_switch;
 
@@ -800,20 +858,15 @@ MainWindow *main_window_create(SeparateType type)
        GdkColormap *colormap;
        GdkColor color[4];
        gboolean success[4];
-       guint n_menu_entries;
        GtkItemFactory *ifactory;
        GtkWidget *ac_menu;
        GtkWidget *menuitem;
-       GtkWidget *compose_popup;
-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replysender_popup;
-       GtkWidget *fwd_popup;
        gint i;
+       guint n_menu_entries;
 
        static GdkGeometry geometry;
 
-       debug_print(_("Creating main window...\n"));
+       debug_print("Creating main window...\n");
        mainwin = g_new0(MainWindow, 1);
 
        /* main window */
@@ -833,7 +886,7 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                               GTK_SIGNAL_FUNC(key_pressed), mainwin);
+                               GTK_SIGNAL_FUNC(mainwindow_key_pressed), mainwin);
 
        gtk_widget_realize(window);
        gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
@@ -851,39 +904,20 @@ MainWindow *main_window_create(SeparateType type)
                                 n_menu_entries, "<Main>", mainwin);
        gtk_widget_show(menubar);
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+       ifactory = gtk_item_factory_from_widget(menubar);
+
+       menu_set_sensitive(ifactory, "/Help/Manual (Local)", manual_available(MANUAL_MANUAL_LOCAL));
+       menu_set_sensitive(ifactory, "/Help/FAQ (Local)", manual_available(MANUAL_FAQ_LOCAL));
 
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
 
-       /* create the popup menus for the reply buttons specials */
-       n_menu_entries = sizeof(reply_popup_entries) /
-                       sizeof(reply_popup_entries[0]);
-       reply_popup = popupmenu_create(window, reply_popup_entries, n_menu_entries,
-                                     "<ReplyPopup>", mainwin);
-       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), mainwin);
-       n_menu_entries = sizeof(replyall_popup_entries) /
-                       sizeof(replyall_popup_entries[0]);
-       replyall_popup = popupmenu_create(window, replyall_popup_entries, n_menu_entries,
-                                     "<ReplyAllPopup>", mainwin);
-       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
-       n_menu_entries = sizeof(replysender_popup_entries) /
-                       sizeof(replysender_popup_entries[0]);
-       replysender_popup = popupmenu_create(window, replysender_popup_entries, n_menu_entries,
-                                     "<ReplySenderPopup>", mainwin);
-       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), mainwin);
-       /* create the popup menu for the forward button */
-       n_menu_entries = sizeof(fwd_popup_entries) /
-                       sizeof(fwd_popup_entries[0]);
-       fwd_popup = popupmenu_create(window, fwd_popup_entries, n_menu_entries,
-                                     "<ForwardPopup>", mainwin);
-       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), mainwin);
-                          
-       main_window_toolbar_create(mainwin, handlebox);
+       /* link window to mainwin->window to avoid gdk warnings */
+       mainwin->window       = window;
+       
+       /* create toolbar */
+       toolbar_create(mainwin, handlebox);
 
        /* vbox that contains body */
        vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
@@ -901,15 +935,15 @@ MainWindow *main_window_create(SeparateType type)
        gtk_widget_set_usize(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
 
-       online_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
-       offline_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+       online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+       offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
        online_switch = gtk_button_new ();
        offline_switch = gtk_button_new ();
-       gtk_container_add (GTK_CONTAINER(online_switch), online_status);
+       gtk_container_add (GTK_CONTAINER(online_switch), online_pixmap);
        gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);
-       gtk_container_add (GTK_CONTAINER(offline_switch), offline_status);
+       gtk_container_add (GTK_CONTAINER(offline_switch), offline_pixmap);
        gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
@@ -934,7 +968,7 @@ MainWindow *main_window_create(SeparateType type)
        /* create views */
        mainwin->folderview  = folderview  = folderview_create();
        mainwin->summaryview = summaryview = summary_create();
-       mainwin->messageview = messageview = messageview_create();
+       mainwin->messageview = messageview = messageview_create(mainwin);
        mainwin->logwin      = log_window_create();
 
        folderview->mainwin      = mainwin;
@@ -945,25 +979,22 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->messageview = messageview;
        summaryview->window      = window;
 
-       messageview->mainwin     = mainwin;
-
-       mainwin->window      = window;
-       mainwin->vbox        = vbox;
-       mainwin->menubar     = menubar;
-       mainwin->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->reply_popup = reply_popup;
-       mainwin->replyall_popup = replyall_popup;
-       mainwin->replysender_popup = replysender_popup;
-       mainwin->fwd_popup = fwd_popup;
-       mainwin->online_switch = online_switch;
-       mainwin->offline_switch = offline_switch;
+       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;
+       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
@@ -999,15 +1030,16 @@ MainWindow *main_window_create(SeparateType type)
        gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
        for (i = 0; i < 4; i++) {
                if (success[i] == FALSE)
-                       g_warning(_("MainWindow: color allocation %d failed\n"), i);
+                       g_warning("MainWindow: color allocation %d failed\n", i);
        }
 
-       debug_print(_("done.\n"));
+       debug_print("done.\n");
+
+       messageview->visible = TRUE;
 
        main_window_set_widgets(mainwin, type);
 
        /* set menu items */
-       ifactory = gtk_item_factory_from_widget(menubar);
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Code set/Auto detect");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
@@ -1036,33 +1068,12 @@ MainWindow *main_window_create(SeparateType type)
                (ifactory, "/View/Show or hide/Status bar");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
-#if 0 /* FIXED SEPARATE WINDOWS */
-       /* Message view and Folder tree are always shown at startup
-        * make that in the menu visible */
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Separate Message View");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Separate Folder Tree");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-#endif 
-       /* set the check of the SEPARATE_xxx menu items. we also need the main window
-        * as a property and pass the action type to the callback */
-       menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_FOLDER);
-       g_assert(menuitem);
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_FOLDER);
-       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
-                                          GUINT_TO_POINTER(SEPARATE_FOLDER));
-
-       menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_MESSAGE);
-       g_assert(menuitem);
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_MESSAGE);
-       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
-                                          GUINT_TO_POINTER(SEPARATE_MESSAGE));
        
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Expand Summary View");
-       gtk_signal_connect(GTK_OBJECT(menuitem), "state-changed", GTK_SIGNAL_FUNC(menuitem_expandsummaryview_statechanged),
-                                               mainwin);
+       gtk_widget_hide(GTK_WIDGET(mainwin->summaryview->hbox_search));
+       
+       if (prefs_common.show_searchbar)
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mainwin->summaryview->toggle_search), TRUE);
+
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
@@ -1071,9 +1082,9 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
        mainwin->ac_menu = ac_menu;
 
-       main_window_set_toolbar_sensitive(mainwin);
+       toolbar_set_sensitive(mainwin);
 
-       /* Create actions menu */
+       /* create actions menu */
        update_mainwin_actions_menu(ifactory, mainwin);
 
        /* show main window */
@@ -1089,7 +1100,9 @@ MainWindow *main_window_create(SeparateType type)
        summary_init(summaryview);
        messageview_init(messageview);
        log_window_init(mainwin->logwin);
-
+#ifdef USE_OPENSSL
+       sslcertwindow_register_hook();
+#endif
        mainwin->lock_count = 0;
        mainwin->menu_lock_count = 0;
        mainwin->cursor_count = 0;
@@ -1137,7 +1150,7 @@ void main_window_lock(MainWindow *mainwin)
        mainwin->lock_count++;
 
        main_window_set_menu_sensitive(mainwin);
-       main_window_set_toolbar_sensitive(mainwin);
+       toolbar_set_sensitive(mainwin);
 }
 
 void main_window_unlock(MainWindow *mainwin)
@@ -1146,7 +1159,7 @@ void main_window_unlock(MainWindow *mainwin)
                mainwin->lock_count--;
 
        main_window_set_menu_sensitive(mainwin);
-       main_window_set_toolbar_sensitive(mainwin);
+       toolbar_set_sensitive(mainwin);
 
        if (mainwin->lock_count == 0)
                gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
@@ -1172,24 +1185,34 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 {
        GList *cur;
        MainWindow *mainwin;
+       GtkWidget *pixmap;
 
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;
 
                main_window_show_cur_account(mainwin);
                main_window_set_menu_sensitive(mainwin);
-               main_window_set_toolbar_sensitive(mainwin);
+               toolbar_set_sensitive(mainwin);
 
                /* pixmap themes */
-               if (pixmap_theme_changed)
-               {
-                       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), GTK_WIDGET(mainwin->toolbar));
-                       mainwin->toolbar = NULL;
-                       main_window_toolbar_create(mainwin, mainwin->handlebox);
-                       set_toolbar_style(mainwin);
-                       activate_compose_button(mainwin, prefs_common.toolbar_style, mainwin->compose_btn_type);
+               if (pixmap_theme_changed) {
+                       toolbar_update(mainwin);
+                       common_toolbar_set_style(mainwin, TOOLBAR_MAIN);
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
+
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+                       gtk_container_remove(GTK_CONTAINER(mainwin->online_switch), 
+                                            mainwin->online_pixmap);
+                       gtk_container_add (GTK_CONTAINER(mainwin->online_switch), pixmap);
+                       gtk_widget_show(pixmap);
+                       mainwin->online_pixmap = pixmap;
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+                       gtk_container_remove(GTK_CONTAINER(mainwin->offline_switch), 
+                                            mainwin->offline_pixmap);
+                       gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
+                       gtk_widget_show(pixmap);
+                       mainwin->offline_pixmap = pixmap;
                }
                
                summary_redisplay_msg(mainwin->summaryview);
@@ -1270,7 +1293,11 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
        GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
-       GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       //GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       GtkWidget *message_wid = mainwin->messageview->vbox;
+
+       debug_print("Changing window separation type from %d to %d\n",
+                   mainwin->type, type);
 
        if (mainwin->type == type) return;
 
@@ -1313,6 +1340,62 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
        gtk_widget_unref(message_wid);
 }
 
+void main_window_toggle_message_view(MainWindow *mainwin)
+{
+       SummaryView *summaryview = mainwin->summaryview;
+       union CompositeWin *cwin = &mainwin->win;
+       GtkWidget *vpaned = NULL;
+       GtkWidget *container = NULL;
+       GtkWidget *msgwin = NULL;
+
+       switch (mainwin->type) {
+       case SEPARATE_NONE:
+               vpaned = cwin->sep_none.vpaned;
+               container = cwin->sep_none.hpaned;
+               break;
+       case SEPARATE_FOLDER:
+               vpaned = cwin->sep_folder.vpaned;
+               container = mainwin->vbox_body;
+               break;
+       case SEPARATE_MESSAGE:
+               msgwin = mainwin->win.sep_message.messagewin;
+               break;
+       case SEPARATE_BOTH:
+               msgwin = mainwin->win.sep_both.messagewin;
+               break;
+       }
+
+       if (msgwin) {
+               if (GTK_WIDGET_VISIBLE(msgwin)) {
+                       gtk_widget_hide(msgwin);
+                       mainwin->messageview->visible = FALSE;
+                       summaryview->displayed = NULL;
+               } else {
+                       gtk_widget_show(msgwin);
+                       mainwin->messageview->visible = TRUE;
+               }
+       } else if (vpaned->parent != NULL) {
+               mainwin->messageview->visible = FALSE;
+               summaryview->displayed = NULL;
+               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);
+       }
+
+       main_window_set_menu_sensitive(mainwin);
+
+       gtk_widget_grab_focus(summaryview->ctree);
+}
+
 void main_window_get_size(MainWindow *mainwin)
 {
        GtkAllocation *allocation;
@@ -1321,7 +1404,9 @@ void main_window_get_size(MainWindow *mainwin)
 
        prefs_common.summaryview_width  = allocation->width;
 
-       if (mainwin->summaryview->msg_is_toggled_on)
+       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;
@@ -1349,7 +1434,7 @@ 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("window position: x = %d, y = %d\n", x, y);
 }
 
 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
@@ -1378,9 +1463,8 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
                folder = list->data;
-               if (folder && folder->trash && folder->trash->total != 0) {
-                       folder_item_scan(folder->trash);
-                       folderview_update_item(folder->trash, TRUE);
+               if (folder && folder->trash) {
+                       folder_update_item(folder->trash, TRUE);
                }
        }
 
@@ -1420,7 +1504,7 @@ void main_window_add_mailbox(MainWindow *mainwin)
 
        folder_add(folder);
        folder_set_ui_func(folder, scan_tree_func, mainwin);
-       folder->scan_tree(folder);
+       folder_scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);
 
        folderview_set(mainwin->folderview);
@@ -1461,38 +1545,20 @@ void main_window_add_mbox(MainWindow *mainwin)
 
        folder_add(folder);
 
-       item = folder_item_new(folder->name, NULL);
+       item = folder_item_new(folder, folder->name, NULL);
        item->folder = folder;
        folder->node = g_node_new(item);
 
-       folder->create_folder(folder, item, "inbox");
-       folder->create_folder(folder, item, "outbox");
-       folder->create_folder(folder, item, "queue");
-       folder->create_folder(folder, item, "draft");
-       folder->create_folder(folder, item, "trash");
+       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);
 }
 
-typedef enum
-{
-       M_UNLOCKED            = 1 << 0,
-       M_MSG_EXIST           = 1 << 1,
-       M_TARGET_EXIST        = 1 << 2,
-       M_SINGLE_TARGET_EXIST = 1 << 3,
-       M_EXEC                = 1 << 4,
-       M_ALLOW_REEDIT        = 1 << 5,
-       M_HAVE_ACCOUNT        = 1 << 6,
-       M_THREADED            = 1 << 7,
-       M_UNTHREADED          = 1 << 8,
-       M_ALLOW_DELETE        = 1 << 9,
-       M_INC_ACTIVE          = 1 << 10,
-       M_NEWS                = 1 << 11,
-       M_HAVE_NEWS_ACCOUNT   = 1 << 12,
-       M_HIDE_READ_MSG       = 1 << 13
-} SensitiveCond;
-
-static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
+SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 {
        SensitiveCond state = 0;
        SummarySelection selection;
@@ -1505,19 +1571,23 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                state |= M_UNLOCKED;
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;
-       if (item) {
+       if (item && item->path && item->parent && !item->no_select) {
                state |= M_EXEC;
-               if (item->threaded)
-                       state |= M_THREADED;
-               else
-                       state |= M_UNTHREADED;  
                /*              if (item->folder->type != F_NEWS) */
                state |= M_ALLOW_DELETE;
 
-               if (selection == SUMMARY_NONE && item->hide_read_msgs
+               if (prefs_common.immediate_exec == 0
+                   && mainwin->lock_count == 0)
+                       state |= M_DELAY_EXEC;
+
+               if ((selection == SUMMARY_NONE && item->hide_read_msgs)
                    || selection != SUMMARY_NONE)
                        state |= M_HIDE_READ_MSG;       
        }               
+       if (mainwin->summaryview->threaded)
+               state |= M_THREADED;
+       else
+               state |= M_UNTHREADED;  
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
                state |= M_TARGET_EXIST;
@@ -1526,6 +1596,8 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->folder->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 ||
@@ -1547,97 +1619,55 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        return state;
 }
 
-void main_window_set_toolbar_sensitive(MainWindow *mainwin)
-{
-       SensitiveCond state;
-       gboolean sensitive;
-       gint i = 0;
-
-       struct {
-               GtkWidget *widget;
-               SensitiveCond cond;
-       } entry[11];
-
-#define SET_WIDGET_COND(w, c)  \
-{                              \
-       entry[i].widget = w;    \
-       entry[i].cond = c;      \
-       i++;                    \
-}
-
-       SET_WIDGET_COND(mainwin->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       SET_WIDGET_COND(mainwin->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       SET_WIDGET_COND(mainwin->compose_news_btn, M_HAVE_ACCOUNT);
-       SET_WIDGET_COND(mainwin->reply_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(mainwin->replyall_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(mainwin->replysender_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(mainwin->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
-#if 0
-       SET_WIDGET_COND(mainwin->prefs_btn, M_UNLOCKED);
-       SET_WIDGET_COND(mainwin->account_btn, M_UNLOCKED);
-#endif
-       SET_WIDGET_COND(mainwin->next_btn, M_MSG_EXIST);
-       SET_WIDGET_COND(mainwin->delete_btn,
-                       M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
-       SET_WIDGET_COND(mainwin->exec_btn, M_MSG_EXIST|M_EXEC|M_UNLOCKED);
-       SET_WIDGET_COND(NULL, 0);
-
-#undef SET_WIDGET_COND
-
-       state = main_window_get_current_state(mainwin);
-
-       for (i = 0; entry[i].widget != NULL; i++) {
-               sensitive = ((entry[i].cond & state) == entry[i].cond);
-               gtk_widget_set_sensitive(entry[i].widget, sensitive);
-       }
 
-       activate_compose_button(mainwin, 
-                       prefs_common.toolbar_style,
-                       mainwin->compose_btn_type);
-}
 
 void main_window_set_menu_sensitive(MainWindow *mainwin)
 {
-       GtkItemFactory *ifactory;
+       GtkItemFactory *ifactory = mainwin->menu_factory;
        SensitiveCond state;
        gboolean sensitive;
        GtkWidget *menuitem;
+       SummaryView *summaryview;
+       gchar *menu_path;
        gint i;
 
        static const struct {
                gchar *const entry;
                SensitiveCond cond;
        } entry[] = {
-               {"/File/Add mailbox..."        , M_UNLOCKED},
-                {"/File/Add mbox mailbox..."   , M_UNLOCKED},
-               {"/File/Rescan folder tree"    , M_UNLOCKED},
-               {"/File/Folder"                , M_UNLOCKED},
-               {"/File/Import mbox file..."   , M_UNLOCKED},
-               {"/File/Export to mbox file...", M_UNLOCKED},
-               {"/File/Empty trash"           , M_UNLOCKED},
-               {"/File/Work offline"          , M_UNLOCKED},
+               {"/File/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/Export to mbox file..."               , M_UNLOCKED},
+               {"/File/Empty trash"                          , M_UNLOCKED},
+               {"/File/Work offline"                         , M_UNLOCKED},
+
                {"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
-               /* {"/File/Close", M_UNLOCKED}, */
-               {"/File/Exit" , M_UNLOCKED},
+               /* {"/File/Close"  , M_UNLOCKED}, */
+               {"/File/Exit"      , M_UNLOCKED},
 
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
-               {"/View/Sort"                      , M_MSG_EXIST},
+
+               {"/View/Sort"                      , M_EXEC},
                {"/View/Thread view"               , M_EXEC},
+               {"/View/Expand all threads"        , M_MSG_EXIST},
+               {"/View/Collapse all threads"      , M_MSG_EXIST},
                {"/View/Hide read messages"        , M_HIDE_READ_MSG},
                {"/View/Go to/Prev message"        , M_MSG_EXIST},
                {"/View/Go to/Next message"        , M_MSG_EXIST},
                {"/View/Go to/Prev unread message" , M_MSG_EXIST},
                {"/View/Go to/Next unread message" , M_MSG_EXIST},
+               {"/View/Go to/Prev new message"    , M_MSG_EXIST},
+               {"/View/Go to/Next new message"    , M_MSG_EXIST},
                {"/View/Go to/Prev marked message" , M_MSG_EXIST},
                {"/View/Go to/Next marked message" , M_MSG_EXIST},
                {"/View/Go to/Prev labeled message", M_MSG_EXIST},
                {"/View/Go to/Next labeled message", M_MSG_EXIST},
                {"/View/Open in new window"        , M_SINGLE_TARGET_EXIST},
-               {"/View/Show all header          , M_SINGLE_TARGET_EXIST},
+               {"/View/Show all headers"          , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
                {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
@@ -1645,15 +1675,15 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Cancel receiving"      , M_INC_ACTIVE},
                {"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
                {"/Message/Reply"                 , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to sender"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to all"          , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Message/Bounce"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+               {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
 
                {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
@@ -1661,8 +1691,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/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/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Tools/Actions"                   , M_MSG_EXIST},
+               {"/Tools/Actions"                   , M_TARGET_EXIST|M_UNLOCKED},
+               {"/Tools/Execute"                   , M_DELAY_EXEC},
                {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
                {"/Configuration", M_UNLOCKED},
@@ -1670,7 +1700,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {NULL, 0}
        };
 
-       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
        state = main_window_get_current_state(mainwin);
 
        for (i = 0; entry[i].entry != NULL; i++) {
@@ -1679,63 +1708,85 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        }
 
        main_window_menu_callback_block(mainwin);
-       menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all header");
-       gtk_check_menu_item_set_active
-               (GTK_CHECK_MENU_ITEM(menuitem),
-                mainwin->messageview->textview->show_all_headers);
-       menuitem = gtk_item_factory_get_widget(ifactory, "/View/Thread view");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      (state & M_THREADED) != 0);
+
+#define SET_CHECK_MENU_ACTIVE(path, active) \
+{ \
+       menuitem = gtk_item_factory_get_widget(ifactory, path); \
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
+}
+
+       SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
+                             messageview_is_visible(mainwin->messageview));
+
+       summaryview = mainwin->summaryview;
+       menu_path = "/View/Sort/Don't sort";
+
+       switch (summaryview->sort_key) {
+       case SORT_BY_NUMBER:
+               menu_path = "/View/Sort/by number"; break;
+       case SORT_BY_SIZE:
+               menu_path = "/View/Sort/by size"; break;
+       case SORT_BY_DATE:
+               menu_path = "/View/Sort/by date"; break;
+       case SORT_BY_FROM:
+               menu_path = "/View/Sort/by from"; break;
+       case SORT_BY_SUBJECT:
+               menu_path = "/View/Sort/by subject"; break;
+       case SORT_BY_LABEL:
+               menu_path = "/View/Sort/by color label"; break;
+       case SORT_BY_MARK:
+               menu_path = "/View/Sort/by mark"; break;
+       case SORT_BY_UNREAD:
+               menu_path = "/View/Sort/by unread"; break;
+       case SORT_BY_MIME:
+               menu_path = "/View/Sort/by attachment"; break;
+       case SORT_BY_SCORE:
+               menu_path = "/View/Sort/by score"; break;
+       case SORT_BY_LOCKED:
+               menu_path = "/View/Sort/by locked"; break;
+       case SORT_BY_NONE:
+       default:
+               menu_path = "/View/Sort/Don't sort"; break;
+       }
+       SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
+
+       if (summaryview->sort_type == SORT_ASCENDING) {
+               SET_CHECK_MENU_ACTIVE("/View/Sort/Ascending", TRUE);
+       } else {
+               SET_CHECK_MENU_ACTIVE("/View/Sort/Descending", TRUE);
+       }
+
+       if (summaryview->sort_key != SORT_BY_NONE) {
+               menu_set_sensitive(ifactory, "/View/Sort/Ascending", TRUE);
+               menu_set_sensitive(ifactory, "/View/Sort/Descending", TRUE);
+       } else {
+               menu_set_sensitive(ifactory, "/View/Sort/Ascending", FALSE);
+               menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
+       }
+
+       SET_CHECK_MENU_ACTIVE("/View/Show all headers",
+                             mainwin->messageview->textview->show_all_headers);
+       SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
+
+#undef SET_CHECK_MENU_ACTIVE
+
        main_window_menu_callback_unblock(mainwin);
 }
 
 void main_window_popup(MainWindow *mainwin)
 {
-       gint x, y;
-       gint sx, sy;
-       GtkWidget *widget;
-
-       gdk_window_get_origin(mainwin->window->window, &x, &y);
-       sx = gdk_screen_width();
-       sy = gdk_screen_height();
-       x %= sx; if (x < 0) x = 0;
-       y %= sy; if (y < 0) y = 0;
-       gdk_window_move(mainwin->window->window, x, y);
-       gdk_window_raise(mainwin->window->window);
-       gdk_window_show(mainwin->window->window);
-
-       debug_print("window position: x = %d, y = %d\n", x, y);
+       gtkut_window_popup(mainwin->window);
 
        switch (mainwin->type) {
        case SEPARATE_FOLDER:
-               widget = mainwin->win.sep_folder.folderwin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_folder.folderwin);
                break;
        case SEPARATE_MESSAGE:
-               widget = mainwin->win.sep_message.messagewin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_message.messagewin);
                break;
        case SEPARATE_BOTH:
-               widget = mainwin->win.sep_both.folderwin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
-               widget = mainwin->win.sep_both.messagewin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_both.folderwin);
+               gtkut_window_popup(mainwin->win.sep_both.messagewin);
                break;
        default:
                break;
@@ -1749,10 +1800,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        GtkWidget *hpaned;
        GtkWidget *vpaned;
        GtkWidget *vbox_body = mainwin->vbox_body;
-       GtkItemFactory *ifactory=gtk_item_factory_from_widget(mainwin->menubar);
+       GtkItemFactory *ifactory = mainwin->menu_factory;
        GtkWidget *menuitem;
 
-       debug_print(_("Setting widgets..."));
+       debug_print("Setting widgets...");
 
        /* create separated window(s) if needed */
        if (type & SEPARATE_FOLDER) {
@@ -1768,8 +1819,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_set_border_width(GTK_CONTAINER(folderwin),
                                               BORDER_WIDTH);
                gtk_signal_connect(GTK_OBJECT(folderwin), "delete_event",
-                                  GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                                  NULL);
+                                  GTK_SIGNAL_FUNC(folder_window_close_cb),
+                                  mainwin);
        }
        if (type & SEPARATE_MESSAGE) {
                messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -1787,8 +1838,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_set_border_width(GTK_CONTAINER(messagewin),
                                               BORDER_WIDTH);
                gtk_signal_connect(GTK_OBJECT(messagewin), "delete_event",
-                                  GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                                  NULL);
+                                  GTK_SIGNAL_FUNC(message_window_close_cb),
+                                  mainwin);
        }
 
        switch (type) {
@@ -1800,7 +1851,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                               GTK_WIDGET_PTR(mainwin->folderview));
 
                vpaned = gtk_vpaned_new();
-               if (mainwin->summaryview->msg_is_toggled_on) {
+               if (messageview_is_visible(mainwin->messageview)) {
                        gtk_paned_add2(GTK_PANED(hpaned), vpaned);
                        gtk_paned_add1(GTK_PANED(vpaned),
                                       GTK_WIDGET_PTR(mainwin->summaryview));
@@ -1822,19 +1873,21 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                     prefs_common.mainwin_height);
                gtk_widget_show_all(vpaned);
 
-               menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
-               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", TRUE);
-               menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
-               menuitem = gtk_item_factory_get_widget(ifactory, "/View/Expand Message View");
-               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-               
+               /* 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));
+
                mainwin->win.sep_none.hpaned = hpaned;
                mainwin->win.sep_none.vpaned = vpaned;
+               
+               /* remove headerview if not in prefs */
+               headerview_set_visibility(mainwin->messageview->headerview,
+                                         prefs_common.display_header_pane);
                break;
        case SEPARATE_FOLDER:
                vpaned = gtk_vpaned_new();
-               if (mainwin->summaryview->msg_is_toggled_on) {
+               if (messageview_is_visible(mainwin->messageview)) {
                        gtk_box_pack_start(GTK_BOX(vbox_body), vpaned,
                                           TRUE, TRUE, 0);
                        gtk_paned_add1(GTK_PANED(vpaned),
@@ -1860,13 +1913,20 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_add(GTK_CONTAINER(folderwin),
                                  GTK_WIDGET_PTR(mainwin->folderview));
 
-               menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
-               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
-               
                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);
+               
                break;
        case SEPARATE_MESSAGE:
                hpaned = gtk_hpaned_new();
@@ -1886,16 +1946,16 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_widget_show_all(hpaned);
                gtk_container_add(GTK_CONTAINER(messagewin),
                                  GTK_WIDGET_PTR(mainwin->messageview));
-       
-               menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
-               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
-               menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
-               
+
                mainwin->win.sep_message.messagewin = messagewin;
                mainwin->win.sep_message.hpaned     = hpaned;
 
                gtk_widget_show_all(messagewin);
+               
+               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+                * lose track of its visibility state */
+               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
+                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        case SEPARATE_BOTH:
                gtk_box_pack_start(GTK_BOX(vbox_body),
@@ -1912,398 +1972,356 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_add(GTK_CONTAINER(messagewin),
                                  GTK_WIDGET_PTR(mainwin->messageview));
 
-               menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
-               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
-       
                mainwin->win.sep_both.folderwin = folderwin;
                mainwin->win.sep_both.messagewin = messagewin;
 
                gtk_widget_show_all(folderwin);
                gtk_widget_show_all(messagewin);
+
+               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+                * lose track of its visibility state */
+               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
+                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        }
 
+       /* rehide quick search if necessary */
+       if (!prefs_common.show_searchbar)
+               gtk_widget_hide(mainwin->summaryview->hbox_search);
+       
        mainwin->type = type;
 
-       debug_print(_("done.\n"));
-}
+       mainwin->messageview->visible = TRUE;
 
-static void main_window_toolbar_create(MainWindow *mainwin,
-                                      GtkWidget *container)
-{
-       GtkWidget *toolbar;
-       GtkWidget *icon_wid;
-       GtkWidget *get_btn;
-       GtkWidget *getall_btn;
-       GtkWidget *compose_mail_btn;
-       GtkWidget *compose_news_btn;
-       GtkWidget *reply_btn;
-       GtkWidget *replyall_btn;
-       GtkWidget *replysender_btn;
-       GtkWidget *fwd_btn;
-       GtkWidget *send_btn;
-#if 0
-       GtkWidget *prefs_btn;
-       GtkWidget *account_btn;
-#endif
-       GtkWidget *next_btn;
-       GtkWidget *delete_btn;
-       GtkWidget *exec_btn;
-       
-       GtkTooltips *tooltips;
+       /* 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);
+       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);
 
-       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-                                 GTK_TOOLBAR_BOTH);
-       gtk_container_add(GTK_CONTAINER(container), toolbar);
-       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
-       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
-       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
-                                   GTK_TOOLBAR_SPACE_LINE);
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Separate folder tree");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      ((type & SEPARATE_FOLDER) != 0));
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Separate message view");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      ((type & SEPARATE_MESSAGE) != 0));
 
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_RECEIVE);
-       get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                         _("Get"),
-                                         _("Get new mail from current account"),
-                                         "Get",
-                                         icon_wid, toolbar_inc_cb, mainwin);
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL);
-       getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                            _("Get all"),
-                                            _("Get new mail from all accounts"),
-                                            "Get all",
-                                            icon_wid,
-                                            toolbar_inc_all_cb,
-                                            mainwin);
-
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND);
-       send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                          _("Send"),
-                                          _("Send queued message(s)"),
-                                          "Send",
-                                          icon_wid,
-                                          toolbar_send_cb,
-                                          mainwin);
+       debug_print("done.\n");
+}
 
-       /* insert compose mail button widget */                                    
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
-       compose_mail_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("Email"),
-                                             _("Compose an email message"),
-                                             "New",
-                                             icon_wid,
-                                             toolbar_compose_mail_cb,
-                                             mainwin);
-
-       /* insert compose news button widget */
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
-       compose_news_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("News"),
-                                             _("Compose a news message"),
-                                             "New",
-                                             icon_wid,
-                                             toolbar_compose_news_cb,
-                                             mainwin);
-
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-       
-       /* reply button */
-       
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_REPLY);
-       reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                           _("Reply"),
-                                           _("Reply to the message - Right button: more options"),
-                                           "Reply",
-                                           icon_wid,
-                                           toolbar_reply_cb,
-                                           mainwin);
-
-       /* replyall button */
-
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_REPLY_TO_ALL);
-       replyall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                              _("All"),
-                                              _("Reply to all - Right button: more options"),
-                                              "Reply to all",
-                                              icon_wid,
-                                              toolbar_reply_to_all_cb,
-                                              mainwin);
-
-       /* reply to sender button */
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR);
-       replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                 _("Sender"),
-                                                 _("Reply to sender - Right button: more options"),
-                                                 "Reply to sender",
-                                                 icon_wid,
-                                                 toolbar_reply_to_sender_cb,
-                                                 mainwin);
-
-       /* forward button */
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_FORWARD);
-       fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                         _("Forward"),
-                                         _("Forward the message - Right button: more options"),
-                                         "Fwd",
-                                         icon_wid,
-                                         toolbar_forward_cb,
-                                         mainwin);
-
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_CLOSE);
-       delete_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                         _("Delete"),
-                                         _("Delete the message"),
-                                         "Delete",
-                                         icon_wid,
-                                         toolbar_delete_cb,
-                                         mainwin);
-
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EXEC);
-       exec_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                          _("Execute"),
-                                          _("Execute marked process"),
-                                          "Execute",
-                                          icon_wid,
-                                          toolbar_exec_cb,
-                                          mainwin);
+void main_window_destroy_all(void)
+{
+       while (mainwin_list != NULL) {
+               MainWindow *mainwin = (MainWindow*)mainwin_list->data;
+               
+               /* free toolbar stuff */
+               toolbar_clear_list(TOOLBAR_MAIN);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
 
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_DOWN_ARROW);
-       next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                          _("Next"),
-                                          _("Next unread message"),
-                                          "Next unread",
-                                          icon_wid,
-                                          toolbar_next_unread_cb,
-                                          mainwin);
+               g_free(mainwin->toolbar);
+               g_free(mainwin);
+               
+               mainwin_list = g_list_remove(mainwin_list, mainwin);
+       }
+       g_list_free(mainwin_list);
+}
 
 #if 0
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PREFERENCES);
-       prefs_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                           _("Prefs"),
-                                           _("Common preferences"),
-                                           "Prefs",
-                                           icon_wid,
-                                           toolbar_prefs_cb,
-                                           mainwin);
-       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PROPERTIES);
-       account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("Account"),
-                                             _("Account setting"),
-                                             "Account",
-                                             icon_wid,
-                                             toolbar_account_cb,
-                                             mainwin);
-       gtk_signal_connect(GTK_OBJECT(account_btn), "button_press_event",
-                          GTK_SIGNAL_FUNC(toolbar_account_button_pressed),
-                          mainwin);
-#endif
+static void toolbar_account_button_pressed(GtkWidget *widget,
+                                          GdkEventButton *event,
+                                          gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
 
-       gtk_signal_connect(GTK_OBJECT(reply_btn), "button_press_event",
-               GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
-               mainwin);
-       
-       gtk_signal_connect(GTK_OBJECT(replyall_btn), "button_press_event",
-               GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
-               mainwin);
-       
-       gtk_signal_connect(GTK_OBJECT(replysender_btn), "button_press_event",
-               GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
-               mainwin);
-       
-       gtk_signal_connect(GTK_OBJECT(fwd_btn), "button_press_event",
-               GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
-               mainwin);
-       
+       if (!event) return;
+       if (event->button != 3) return;
 
-       mainwin->toolbar                = toolbar;
-       mainwin->get_btn                = get_btn;
-       mainwin->getall_btn             = getall_btn;
-       mainwin->compose_mail_btn       = compose_mail_btn;
-       mainwin->compose_news_btn       = compose_news_btn;
-       mainwin->reply_btn              = reply_btn;
-       mainwin->replyall_btn           = replyall_btn;
-       mainwin->replysender_btn        = replysender_btn;
-       mainwin->fwd_btn                = fwd_btn;
-       mainwin->send_btn               = send_btn;
-       #if 0
-       mainwin->prefs_btn              = prefs_btn;
-       mainwin->account_btn            = account_btn;
-       #endif
-       mainwin->next_btn               = next_btn;
-       mainwin->delete_btn             = delete_btn;
-       mainwin->exec_btn               = exec_btn;
+       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
+                           widget);
 
-       gtk_widget_show_all(toolbar);
+       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
 }
+#endif
 
-/* callback functions */
-static void toolbar_reply_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
+                                   gpointer data)
 {
-       MainWindow *mainwindow = (MainWindow *) data;
-       
+       MainWindow *mainwin = (MainWindow *)data;
+
        if (!event) return;
 
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->reply_popup), NULL, NULL,
+       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+       gtk_object_set_data(GTK_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 toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
+       GtkWidget *button;
 
-       gtk_button_set_relief(GTK_BUTTON(mainwin->reply_btn), GTK_RELIEF_NONE);
+       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);
 }
 
-static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+                                gpointer data)
 {
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
+       MainWindow *mainwin = (MainWindow *)data;
 
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->replyall_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
+       if (mainwin->lock_count == 0)
+               app_exit_cb(data, 0, widget);
+
+       return TRUE;
 }
 
-static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+static gint folder_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+                                  gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
+       GtkWidget *menuitem;
 
-       gtk_button_set_relief(GTK_BUTTON(mainwin->replyall_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
+       menuitem = gtk_item_factory_get_item
+               (mainwin->menu_factory, "/View/Show or hide/Folder tree");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+       return TRUE;
 }
 
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+                                   gpointer data)
 {
-       MainWindow *mainwindow = (MainWindow *) data;
-       GtkWidget *replysender_menu, *replysender_item;
+       MainWindow *mainwin = (MainWindow *)data;
+       GtkWidget *menuitem;
 
-       if (!event) return;
+       menuitem = gtk_item_factory_get_item
+               (mainwin->menu_factory, "/View/Show or hide/Message view");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
 
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->replysender_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
+       return TRUE;
 }
 
-static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+static void add_mailbox_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
 {
-       MainWindow *mainwin = (MainWindow *)data;
+       main_window_add_mailbox(mainwin);
+}
 
-       gtk_button_set_relief(GTK_BUTTON(mainwin->replysender_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
+static void add_mbox_cb(MainWindow *mainwin, guint action,
+                       GtkWidget *widget)
+{
+       main_window_add_mbox(mainwin);
 }
 
-static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static void update_folderview_cb(MainWindow *mainwin, guint action,
+                                GtkWidget *widget)
 {
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
+       summary_show(mainwin->summaryview, NULL);
+       folderview_check_new_all();
+}
 
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->fwd_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
+static void new_folder_cb(MainWindow *mainwin, guint action,
+                         GtkWidget *widget)
+{
+       folderview_new_folder(mainwin->folderview);
+}
+
+static void rename_folder_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       folderview_rename_folder(mainwin->folderview);
+}
+
+static void delete_folder_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       folderview_delete_folder(mainwin->folderview);
+}
+
+static void import_mbox_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       import_mbox(mainwin->summaryview->folder_item);
+}
+
+static void export_mbox_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       export_mbox(mainwin->summaryview->folder_item);
+}
+
+static void empty_trash_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       main_window_empty_trash(mainwin, TRUE);
+}
+
+static void save_as_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_save_as(mainwin->summaryview);
+}
+
+static void print_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_print(mainwin->summaryview);
+}
+
+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)
+                       return;
+               manage_window_focus_in(mainwin->window, NULL, NULL);
        }
+
+       app_will_exit(widget, mainwin);
 }
 
-static void toolbar_forward_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       MainWindow *mainwin = (MainWindow *)data;
+       if (action == 1)
+               summary_search(mainwin->summaryview);
+       else
+               message_search(mainwin->messageview);
+}
 
-       gtk_button_set_relief(GTK_BUTTON(mainwin->fwd_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
+static void toggle_folder_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       gboolean active;
+
+       active = GTK_CHECK_MENU_ITEM(widget)->active;
+
+       switch (mainwin->type) {
+       case SEPARATE_NONE:
+       case SEPARATE_MESSAGE:
+#if 0
+               if (active)
+                       gtk_widget_show(GTK_WIDGET_PTR(mainwin->folderview));
+               else
+                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->folderview));
+#endif
+               break;
+       case SEPARATE_FOLDER:
+               debug_print("separate folder\n");
+               if (active)
+                       gtk_widget_show(mainwin->win.sep_folder.folderwin);
+               else
+                       gtk_widget_hide(mainwin->win.sep_folder.folderwin);
+               break;
+       case SEPARATE_BOTH:
+               if (active)
+                       gtk_widget_show(mainwin->win.sep_both.folderwin);
+               else
+                       gtk_widget_hide(mainwin->win.sep_both.folderwin);
+               break;
+       }
 }
 
-static void toolbar_inc_cb     (GtkWidget      *widget,
-                                gpointer        data)
+static void toggle_message_cb(MainWindow *mainwin, guint action,
+                             GtkWidget *widget)
 {
-       MainWindow *mainwin = (MainWindow *)data;
+       gboolean active;
 
-       inc_mail_cb(mainwin, 0, NULL);
+       active = GTK_CHECK_MENU_ITEM(widget)->active;
+
+       if (active != messageview_is_visible(mainwin->messageview))
+               summary_toggle_view(mainwin->summaryview);
 }
 
-static void toolbar_inc_all_cb (GtkWidget      *widget,
-                                gpointer        data)
+/* Toolbar handling */
+static void toolbar_inc_cb(GtkWidget   *widget,
+                          gpointer      data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       inc_all_account_mail_cb(mainwin, 0, NULL);
+       inc_mail_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_send_cb    (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_inc_all_cb(GtkWidget       *widget,
+                              gpointer  data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       send_queue_cb(mainwin, 0, NULL);
+       inc_all_account_mail_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_compose_cb (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_send_cb(GtkWidget  *widget,
+                           gpointer     data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       if (mainwin->compose_btn_type == COMPOSEBUTTON_MAIL)
-               compose_cb(mainwin, 0, NULL);
-       else
-               compose_news_cb(mainwin, 0, NULL);
+       send_queue_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_compose_news_cb    (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_compose_cb(GtkWidget  *widget,
+                              gpointer    data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       compose_news_cb(mainwin, 0, NULL);
+       if (mainwin->toolbar->compose_btn_type == COMPOSEBUTTON_NEWS) 
+               compose_news_cb(mainwin, 0, NULL);
+       else
+               compose_mail_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_compose_mail_cb    (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_reply_cb(GtkWidget   *widget, 
+                            gpointer     data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       compose_mail_cb(mainwin, 0, NULL);
+       if (prefs_common.default_reply_list)
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                        : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
+                        NULL);
+       else
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
+                        : COMPOSE_REPLY_WITHOUT_QUOTE,
+                        NULL);
 }
 
-static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
+static void toolbar_reply_to_all_cb(GtkWidget   *widget, 
+                                   gpointer     data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
        reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
-                : COMPOSE_REPLY_WITHOUT_QUOTE,
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, 
                 NULL);
 }
 
-static void toolbar_reply_to_all_cb(GtkWidget *widget, gpointer data)
+static void toolbar_reply_to_list_cb(GtkWidget   *widget, 
+                                   gpointer     data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
        reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
                 NULL);
 }
 
-
-static void toolbar_reply_to_sender_cb(GtkWidget *widget, gpointer data)
+static void toolbar_reply_to_sender_cb(GtkWidget   *widget, 
+                                      gpointer     data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
@@ -2313,8 +2331,8 @@ static void toolbar_reply_to_sender_cb(GtkWidget *widget, gpointer data)
                 NULL);
 }
 
-static void toolbar_forward_cb (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_forward_cb(GtkWidget       *widget,
+                              gpointer          data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
@@ -2324,248 +2342,577 @@ static void toolbar_forward_cb        (GtkWidget      *widget,
                reply_cb(mainwin, COMPOSE_FORWARD, NULL);
 }
 
-static void toolbar_delete_cb  (GtkWidget      *widget,
-                                gpointer        data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       summary_delete(mainwin->summaryview);
-}
-
-static void toolbar_exec_cb    (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_exec_cb(GtkWidget  *widget,
+                           gpointer     data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
        summary_execute(mainwin->summaryview);
 }
 
-static void toolbar_next_unread_cb     (GtkWidget      *widget,
-                                        gpointer        data)
+static void toolbar_next_unread_cb(GtkWidget   *widget,
+                                  gpointer      data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
        next_unread_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_prefs_cb   (GtkWidget      *widget,
-                                gpointer        data)
+/* popup callback functions */
+static void toolbar_reply_popup_cb(GtkWidget       *widget, 
+                                  GdkEventButton  *event, 
+                                  gpointer         data)
 {
-       prefs_common_open();
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->reply_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
 }
 
-static void toolbar_account_cb (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       prefs_account_open_cb(mainwin, 0, NULL);
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->reply_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
-#if 0
-static void toolbar_account_button_pressed(GtkWidget *widget,
-                                          GdkEventButton *event,
-                                          gpointer data)
+static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-       MainWindow *mainwin = (MainWindow *)data;
-
+       MainWindow *mainwindow = (MainWindow *) data;
+       
        if (!event) return;
-       if (event->button != 3) return;
-
-       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
-                           widget);
 
-       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replyall_popup), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+       }
 }
-#endif
 
-static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
-                                   gpointer data)
+static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       if (!event) return;
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replyall_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
 
-       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
-                           widget);
+static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
 
-       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replylist_popup), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+       }
 }
 
-static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
+static void toolbar_reply_to_list_popup_closed_cb(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");
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replylist_btn), GTK_RELIEF_NONE);
        manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
-static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
-                                gpointer data)
+static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-       MainWindow *mainwin = (MainWindow *)data;
+       MainWindow *mainwindow = (MainWindow *) data;
 
-       if (mainwin->lock_count == 0)
-               app_exit_cb(data, 0, widget);
+       if (!event) return;
 
-       return TRUE;
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replysender_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
 }
 
-static void add_mailbox_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
 {
-       main_window_add_mailbox(mainwin);
-}
+       MainWindow *mainwin = (MainWindow *)data;
 
-static void add_mbox_cb(MainWindow *mainwin, guint action,
-                       GtkWidget *widget)
-{
-       main_window_add_mbox(mainwin);
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replysender_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
-static void update_folderview_cb(MainWindow *mainwin, guint action,
-                                GtkWidget *widget)
+static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-       summary_show(mainwin->summaryview, NULL, FALSE);
-       folderview_rescan_all();
-}
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
 
-static void new_folder_cb(MainWindow *mainwin, guint action,
-                         GtkWidget *widget)
-{
-       folderview_new_folder(mainwin->folderview);
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->fwd_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
 }
 
-static void rename_folder_cb(MainWindow *mainwin, guint action,
-                            GtkWidget *widget)
+static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
+                                            gpointer     data)
 {
-       folderview_rename_folder(mainwin->folderview);
-}
+       MainWindow *mainwin = (MainWindow *)data;
 
-static void delete_folder_cb(MainWindow *mainwin, guint action,
-                            GtkWidget *widget)
-{
-       folderview_delete_folder(mainwin->folderview);
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->fwd_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
-static void import_mbox_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+static void activate_compose_button (Toolbar           *toolbar,
+                                    ToolbarStyle      style,
+                                    ComposeButtonType type)
 {
-       import_mbox(mainwin->summaryview->folder_item);
-}
+       if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
+               return;
 
-static void export_mbox_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
-{
-       export_mbox(mainwin->summaryview->folder_item);
+       gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn 
+                       : toolbar->compose_news_btn);
+       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
+                       : toolbar->compose_mail_btn);
+       toolbar->compose_btn_type = type;       
 }
 
-static void empty_trash_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+void toolbar_set_compose_button(Toolbar            *toolbar, 
+                               ComposeButtonType  compose_btn_type)
 {
-       main_window_empty_trash(mainwin, TRUE);
+       if (toolbar->compose_btn_type != compose_btn_type)
+               activate_compose_button(toolbar, 
+                                       prefs_common.toolbar_style,
+                                       compose_btn_type);
 }
 
-static void save_as_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void toolbar_buttons_cb(GtkWidget         *widget, 
+                              ToolbarItem       *item)
 {
-       summary_save_as(mainwin->summaryview);
+       struct {
+               gint   index;
+               void (*func)(GtkWidget *widget, gpointer data);
+       } toolbar_action[] = {
+               { A_RECEIVE_ALL,    toolbar_inc_all_cb                  },
+               { A_RECEIVE_CUR,    toolbar_inc_cb                      },
+               { A_SEND_QUEUED,    toolbar_send_cb                     },
+               { A_COMPOSE_EMAIL,  toolbar_compose_cb                  },
+               { A_REPLY_MESSAGE,  toolbar_reply_cb                    },
+               { A_REPLY_SENDER,   toolbar_reply_to_sender_cb          },
+               { A_REPLY_ALL,      toolbar_reply_to_all_cb             },
+               { A_REPLY_ML,       toolbar_reply_to_list_cb            },
+               { A_FORWARD,        toolbar_forward_cb                  },
+               { A_DELETE,         common_toolbar_delete_cb            },
+               { A_EXECUTE,        toolbar_exec_cb                     },
+               { A_GOTO_NEXT,      toolbar_next_unread_cb              },
+               { A_SYL_ACTIONS,    common_toolbar_actions_execute_cb   },
+               
+               { A_COMPOSE_NEWS,   toolbar_compose_cb                  },    
+               { A_SEPARATOR,      NULL                                }};
+
+       gint num_items = sizeof(toolbar_action)/sizeof(toolbar_action[0]);
+       gint i;
+
+       for (i = A_RECEIVE_ALL; i < num_items; i++) {
+
+               if (toolbar_action[i].index == item->index) {
+                       if ((item->index == A_SYL_ACTIONS) || (item->index == A_DELETE))
+                               /* the common_toolbar_* stuff takes item->parent as data
+                                  pointer */                              
+                               toolbar_action[i].func(widget, (gpointer)item->parent);
+                       else /* to be removed */
+                               toolbar_action[i].func(widget, (gpointer)item->parent->data);
+                       break;
+               }
+       }
 }
 
-static void print_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void toolbar_set_sensitive(MainWindow *mainwin)
 {
-       summary_print(mainwin->summaryview);
+       SensitiveCond state;
+       gboolean sensitive;
+       Toolbar *toolbar = mainwin->toolbar;
+       GSList *cur;
+       GSList *entry_list = NULL;
+       
+       typedef struct _Entry Entry;
+       struct _Entry {
+               GtkWidget *widget;
+               SensitiveCond cond;
+               gboolean empty;
+       };
+
+#define SET_WIDGET_COND(w, c)     \
+{ \
+       Entry *e = g_new0(Entry, 1); \
+       e->widget = w; \
+       e->cond   = c; \
+       entry_list = g_slist_append(entry_list, e); \
 }
 
-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)
-                       return;
-               manage_window_focus_in(mainwin->window, NULL, NULL);
+       SET_WIDGET_COND(toolbar->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
+       SET_WIDGET_COND(toolbar->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
+       SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
+       SET_WIDGET_COND(toolbar->reply_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replyall_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replylist_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replysender_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
+
+       SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
+       SET_WIDGET_COND(toolbar->delete_btn,
+                       M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
+       SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
+
+       for (cur = toolbar->action_list; cur != NULL;  cur = cur->next) {
+               ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
+               
+               SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
+       }
+
+#undef SET_WIDGET_COND
+
+       state = main_window_get_current_state(mainwin);
+
+       for (cur = entry_list; cur != NULL; cur = cur->next) {
+               Entry *e = (Entry*) cur->data;
+
+               if (e->widget != NULL) {
+                       sensitive = ((e->cond & state) == e->cond);
+                       gtk_widget_set_sensitive(e->widget, sensitive); 
+               }
+       }
+       
+       while (entry_list != NULL) {
+               Entry *e = (Entry*) entry_list->data;
+
+               if (e)
+                       g_free(e);
+               entry_list = g_slist_remove(entry_list, e);
        }
 
-       app_will_exit(widget, mainwin);
+       g_slist_free(entry_list);
+
+       activate_compose_button(toolbar, 
+                               prefs_common.toolbar_style,
+                               toolbar->compose_btn_type);
 }
 
-static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void toolbar_update(MainWindow *mainwin)
 {
-       if (action == 1)
-               summary_search(mainwin->summaryview);
-       else
-               message_search(mainwin->messageview);
+       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), 
+                            GTK_WIDGET(mainwin->toolbar->toolbar));
+       
+       mainwin->toolbar->toolbar    = NULL;
+       mainwin->toolbar->get_btn    = NULL;
+       mainwin->toolbar->getall_btn = NULL;
+       mainwin->toolbar->send_btn   = NULL;
+       mainwin->toolbar->compose_mail_btn = NULL;
+       mainwin->toolbar->compose_news_btn = NULL;
+       mainwin->toolbar->reply_btn        = NULL;      
+       mainwin->toolbar->replyall_btn     = NULL;      
+       mainwin->toolbar->replylist_btn     = NULL;     
+       mainwin->toolbar->replysender_btn  = NULL;      
+       mainwin->toolbar->fwd_btn    = NULL;    
+       mainwin->toolbar->delete_btn = NULL;    
+       mainwin->toolbar->next_btn   = NULL;    
+       mainwin->toolbar->exec_btn   = NULL;
+
+       toolbar_clear_list(TOOLBAR_MAIN);
+       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+       toolbar_create(mainwin, mainwin->handlebox);    
+       toolbar_set_sensitive(mainwin);
+
 }
 
-static void toggle_folder_cb(MainWindow *mainwin, guint action,
-                            GtkWidget *widget)
+static void toolbar_create(MainWindow *mainwin,
+                          GtkWidget  *container)
 {
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-       case SEPARATE_MESSAGE:
-               break;
-       case SEPARATE_FOLDER:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
-                       gtk_widget_show(mainwin->win.sep_folder.folderwin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_folder.folderwin);
-               break;
-       case SEPARATE_BOTH:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
-                       gtk_widget_show(mainwin->win.sep_both.folderwin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_both.folderwin);
-               break;
+       ToolbarItem *toolbar_item;
+
+       GtkWidget *toolbar;
+       GtkWidget *icon_wid  = NULL;
+       GtkWidget *icon_news = NULL;
+       GtkWidget *item_news = NULL;
+       GtkWidget *item;
+       GtkTooltips *toolbar_tips;
+       ToolbarSylpheedActions *action_item;
+       GSList *cur;
+       GSList *toolbar_list;
+
+       guint n_menu_entries;
+       GtkWidget *reply_popup;
+       GtkWidget *replyall_popup;
+       GtkWidget *replylist_popup;
+       GtkWidget *replysender_popup;
+       GtkWidget *fwd_popup;
+
+       toolbar_tips = gtk_tooltips_new();
+
+       if (mainwin->toolbar != NULL) {
+               toolbar_clear_list(TOOLBAR_MAIN);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
+               g_free(mainwin->toolbar);
+       }
+
+       toolbar_read_config_file(TOOLBAR_MAIN);
+       toolbar_list = toolbar_get_list(TOOLBAR_MAIN);
+
+       mainwin->toolbar = g_new0(Toolbar, 1); 
+
+       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
+                                 GTK_TOOLBAR_BOTH);
+       gtk_container_add(GTK_CONTAINER(container), toolbar);
+       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
+       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
+                                   GTK_TOOLBAR_SPACE_LINE);
+       
+       for (cur = toolbar_list; cur != NULL; cur = cur->next) {
+       
+               if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
+                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+                       continue;
+               }
+               
+               toolbar_item = g_new0(ToolbarItem, 1); 
+               toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
+               toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
+               toolbar_item->index = ((ToolbarItem*)cur->data)->index;
+               
+               toolbar_item->parent = g_new0(ToolbarParent, 1);
+               toolbar_item->parent->data = (gpointer)mainwin;
+               toolbar_item->parent->type = TOOLBAR_MAIN;
+
+               /* collect toolbar items in list to keep track */
+               mainwin->toolbar->item_list = g_slist_append(mainwin->toolbar->item_list, 
+                                                            toolbar_item);
+               
+               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
+               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                               toolbar_item->text,
+                                               (""),
+                                               (""),
+                                               icon_wid, toolbar_buttons_cb, 
+                                               toolbar_item);
+               
+               switch (toolbar_item->index) {
+               case A_RECEIVE_ALL:
+                       mainwin->toolbar->getall_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->getall_btn, 
+                                          _("Receive Mail on all Accounts"), NULL);
+                       break;
+               case A_RECEIVE_CUR:
+                       mainwin->toolbar->get_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->get_btn,
+                                          _("Receive Mail on current Account"), NULL);
+                       break;
+               case A_SEND_QUEUED:
+                       mainwin->toolbar->send_btn = item; 
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->send_btn,
+                                          _("Send Queued Message(s)"), NULL);
+                       break;
+               case A_COMPOSE_EMAIL:
+                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+                       item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                                           _("News"),
+                                                           (""),
+                                                           (""),
+                                                           icon_news, toolbar_buttons_cb, 
+                                                           toolbar_item);
+                       mainwin->toolbar->compose_mail_btn = item; 
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->compose_mail_btn,
+                                          _("Compose Email"), NULL);
+                       mainwin->toolbar->compose_news_btn = item_news;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->compose_news_btn,
+                                          _("Compose News"), NULL);
+                       break;
+               case A_REPLY_MESSAGE:
+                       mainwin->toolbar->reply_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->reply_btn,
+                                          _("Reply to Message"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->reply_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(reply_popup_entries) /
+                               sizeof(reply_popup_entries[0]);
+                       reply_popup = popupmenu_create(mainwin->window, reply_popup_entries, n_menu_entries,
+                                                      "<ReplyPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), mainwin);
+                       mainwin->toolbar->reply_popup       = reply_popup;
+                       break;
+               case A_REPLY_SENDER:
+                       mainwin->toolbar->replysender_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replysender_btn,
+                                          _("Reply to Sender"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replysender_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replysender_popup_entries) /
+                               sizeof(replysender_popup_entries[0]);
+                       replysender_popup = popupmenu_create(mainwin->window, 
+                                                            replysender_popup_entries, n_menu_entries,
+                                                            "<ReplySenderPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replysender_popup = replysender_popup;
+                       break;
+               case A_REPLY_ALL:
+                       mainwin->toolbar->replyall_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replyall_btn,
+                                          _("Reply to All"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replyall_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replyall_popup_entries) /
+                               sizeof(replyall_popup_entries[0]);
+                       replyall_popup = popupmenu_create(mainwin->window, 
+                                                         replyall_popup_entries, n_menu_entries,
+                                                         "<ReplyAllPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replyall_popup    = replyall_popup;
+                       break;
+               case A_REPLY_ML:
+                       mainwin->toolbar->replylist_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replylist_btn,
+                                          _("Reply to Mailing-list"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replylist_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replylist_popup_entries) /
+                               sizeof(replylist_popup_entries[0]);
+                       replylist_popup = popupmenu_create(mainwin->window, 
+                                                         replylist_popup_entries, n_menu_entries,
+                                                         "<ReplyMlPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replylist_popup    = replylist_popup;
+                       break;
+               case A_FORWARD:
+                       mainwin->toolbar->fwd_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->fwd_btn,
+                                          _("Forward Message"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->fwd_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(fwd_popup_entries) /
+                               sizeof(fwd_popup_entries[0]);
+                       fwd_popup = popupmenu_create(mainwin->window, 
+                                                    fwd_popup_entries, n_menu_entries,
+                                                    "<ForwardPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), mainwin);
+                       mainwin->toolbar->fwd_popup         = fwd_popup;
+                       break;
+               case A_DELETE:
+                       mainwin->toolbar->delete_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->delete_btn,
+                                          _("Delete Message"), NULL);
+                       break;
+               case A_EXECUTE:
+                       mainwin->toolbar->exec_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->exec_btn,
+                                          _("Execute"), NULL);
+                       break;
+               case A_GOTO_NEXT:
+                       mainwin->toolbar->next_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->next_btn,
+                                          _("Goto Next Message"), NULL);
+                       break;
+               case A_SYL_ACTIONS:
+                       action_item = g_new0(ToolbarSylpheedActions, 1);
+                       action_item->widget = item;
+                       action_item->name   = g_strdup(toolbar_item->text);
+
+                       mainwin->toolbar->action_list = 
+                               g_slist_append(mainwin->toolbar->action_list,
+                                              action_item);
+
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            item,
+                                            action_item->name, NULL);
+
+                       gtk_widget_show(item);
+                       break;
+               default:
+                       break;
+               }
        }
+
+       mainwin->toolbar->toolbar = toolbar;
+
+       activate_compose_button(mainwin->toolbar, 
+                               prefs_common.toolbar_style, 
+                               mainwin->toolbar->compose_btn_type);
+
+       gtk_widget_show_all(toolbar);
 }
 
-static void toggle_message_cb(MainWindow *mainwin, guint action,
+static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-       case SEPARATE_FOLDER:
+       switch ((ToolbarStyle)action) {
+       case TOOLBAR_NONE:
+               gtk_widget_hide(mainwin->handlebox);
+       case TOOLBAR_ICON:
+               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
+                                     GTK_TOOLBAR_ICONS);
                break;
-       case SEPARATE_MESSAGE:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
-                       gtk_widget_show(mainwin->win.sep_message.messagewin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_message.messagewin);
+       case TOOLBAR_TEXT:
+               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
+                                     GTK_TOOLBAR_TEXT);
                break;
-       case SEPARATE_BOTH:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
-                       gtk_widget_show(mainwin->win.sep_both.messagewin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_both.messagewin);
+       case TOOLBAR_BOTH:
+               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
+                                     GTK_TOOLBAR_BOTH);
                break;
        }
-}
 
-static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
-                             GtkWidget *widget)
-{
-/*     activate_compose_button(mainwin, (ToolbarStyle)action, 
-                       mainwin->compose_btn_type);
-       set_toolbar_reply_button(mainwin, (ToolbarStyle)action);
-       set_toolbar_replyall_button(mainwin, (ToolbarStyle)action);
-       set_toolbar_replysender_button(mainwin, (ToolbarStyle)action);
-       set_toolbar_forward_button(mainwin, (ToolbarStyle)action);*/
-       
+       if (action != TOOLBAR_NONE) {
+               gtk_widget_show(mainwin->handlebox);
+               gtk_widget_queue_resize(mainwin->handlebox);
+       }
+
        mainwin->toolbar_style = (ToolbarStyle)action;
        prefs_common.toolbar_style = (ToolbarStyle)action;
-       
-       set_toolbar_style(mainwin);
 }
 
+/* END Toolbar Stuff */
+
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -2578,23 +2925,33 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void toggle_expand_summaryview_cb(MainWindow *mainwin, guint action,    GtkWidget *widget)
+static void separate_widget_cb(MainWindow *mainwin, guint action,
+                              GtkWidget *widget)
 {
-       summary_toggle_view_real(mainwin->summaryview);
+       SeparateType type;
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active)
+               type = mainwin->type | action;
+       else
+               type = mainwin->type & ~action;
+
+       main_window_separation_change(mainwin, type);
+
+       prefs_common.sep_folder = (type & SEPARATE_FOLDER)  != 0;
+       prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
 }
 
-static void toggle_expand_messageview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline)
 {
-       messageview_toggle_view_real(mainwin->messageview);
+       if (offline)
+               online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
+       else
+               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);
 }
 
-static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void toggle_work_offline_cb (MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       if (GTK_CHECK_MENU_ITEM(widget)->active) {
-               online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
-       } else {
-               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);           
-       }
+       main_window_toggle_work_offline(mainwin, GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
 static void online_switch_clicked (GtkButton *btn, gpointer data) 
@@ -2628,21 +2985,6 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
        }
 }
 
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
-{
-       MainWindow *mainwin;
-       SeparateType type;
-
-       mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
-       g_return_if_fail(mainwin != NULL);
-
-       type = mainwin->type ^ action;
-       main_window_separation_change(mainwin, type);
-
-       prefs_common.sep_folder = (type & SEPARATE_FOLDER)  != 0;
-       prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
-}
-
 static void addressbook_open_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -2661,12 +3003,19 @@ static void sel_download_cb(MainWindow *mainwin, guint action,
        selective_download(mainwin);
 }
 
-static void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       prefs_toolbar_open((ToolbarType)action);
+}
+
+
+void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        inc_mail(mainwin, prefs_common.newmail_notify_manu);
 }
 
-static void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
+void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
                                    GtkWidget *widget)
 {
        inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
@@ -2677,7 +3026,7 @@ static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        inc_cancel_all();
 }
 
-static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        GList *list;
 
@@ -2694,57 +3043,50 @@ static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                        if (procmsg_send_queue
                                (folder->queue, prefs_common.savemsg) < 0)
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       statusbar_pop_all();
                        folder_item_scan(folder->queue);
-                       folderview_update_item(folder->queue, TRUE);
+                       folder_update_item(folder->queue, TRUE);
                }
        }
 }
 
-static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       if (mainwin->summaryview->folder_item) {
-               if (mainwin->summaryview->folder_item->folder->account != NULL
-                   && mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP)
-                       compose_new_with_recipient(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item->path);
-               else
-                       compose_new_with_folderitem(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item);
-       }
-       else
-               compose_new(NULL);
-}
-
-static void compose_mail_cb(MainWindow *mainwin, guint action,
+void compose_mail_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
-       PrefsAccount * ac;
-       GList * list;
-       GList * cur;
+       PrefsAccount *ac = NULL;
+       FolderItem *item = mainwin->summaryview->folder_item;   
+        GList * list;
+        GList * cur;
 
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
+       if (item) {
+               ac = account_find_from_item(item);
                if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);          /* CLAWS */
                        return;
                }
        }
 
-       if(cur_account && (cur_account->protocol != A_NNTP)) {
-               compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
+       /*
+        * CLAWS - use current account
+        */
+       if (cur_account && (cur_account->protocol != A_NNTP)) {
+               compose_new_with_folderitem(cur_account, item);
                return;
        }
 
+       /*
+        * CLAWS - just get the first one
+        */
        list = account_get_list();
-       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+       for (cur = list ; cur != NULL ; cur = g_list_next(cur)) {
                ac = (PrefsAccount *) cur->data;
                if (ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);
                        return;
                }
        }
 }
 
-static void compose_news_cb(MainWindow *mainwin, guint action,
+void compose_news_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
        PrefsAccount * ac = NULL;
@@ -2754,8 +3096,9 @@ static void compose_news_cb(MainWindow *mainwin, guint action,
        if (mainwin->summaryview->folder_item) {
                ac = mainwin->summaryview->folder_item->folder->account;
                if (ac && ac->protocol == A_NNTP) {
-                       compose_new_with_recipient
-                               (ac, mainwin->summaryview->folder_item->path);
+                       compose_new(ac,
+                                   mainwin->summaryview->folder_item->path,
+                                   NULL);
                        return;
                }
        }
@@ -2764,13 +3107,13 @@ static void compose_news_cb(MainWindow *mainwin, guint action,
        for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
                ac = (PrefsAccount *) cur->data;
                if (ac->protocol == A_NNTP) {
-                       compose_new(ac);
+                       compose_new(ac, NULL, NULL);
                        return;
                }
        }
 }
 
-static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_reply(mainwin->summaryview, (ComposeMode)action);
 }
@@ -2790,6 +3133,11 @@ static void delete_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_delete(mainwin->summaryview);
 }
 
+static void cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_cancel(mainwin->summaryview);
+}
+
 static void open_msg_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_open_msg(mainwin->summaryview);
@@ -2853,13 +3201,15 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
 {
        const gchar *str;
 
-       str = conv_get_charset_str((CharSet)action);
-       g_free(prefs_common.force_charset);
-       prefs_common.force_charset = str ? g_strdup(str) : NULL;
-
-       summary_redisplay_msg(mainwin->summaryview);
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               str = conv_get_charset_str((CharSet)action);
+               g_free(prefs_common.force_charset);
+               prefs_common.force_charset = str ? g_strdup(str) : NULL;
 
-       debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
+               summary_redisplay_msg(mainwin->summaryview);
+               
+               debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
+       }
 }
 
 static void hide_read_messages (MainWindow *mainwin, guint action,
@@ -2873,22 +3223,30 @@ static void hide_read_messages (MainWindow *mainwin, guint action,
 
 static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       GtkItemFactory *ifactory;
-
        if (mainwin->menu_lock_count) return;
        if (!mainwin->summaryview->folder_item) return;
 
-       ifactory = gtk_item_factory_from_widget(widget);
-
        if (GTK_CHECK_MENU_ITEM(widget)->active) {
                summary_thread_build(mainwin->summaryview);
-               mainwin->summaryview->folder_item->threaded = TRUE;
+/*             mainwin->summaryview->folder_item->threaded = TRUE; */
        } else {
                summary_unthread(mainwin->summaryview);
-               mainwin->summaryview->folder_item->threaded = FALSE;
+/*             mainwin->summaryview->folder_item->threaded = FALSE; */
        }
 }
 
+static void expand_threads_cb(MainWindow *mainwin, guint action,
+                             GtkWidget *widget)
+{
+       summary_expand_threads(mainwin->summaryview);
+}
+
+static void collapse_threads_cb(MainWindow *mainwin, guint action,
+                               GtkWidget *widget)
+{
+       summary_collapse_threads(mainwin->summaryview);
+}
+
 static void set_display_item_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -2898,7 +3256,30 @@ static void set_display_item_cb(MainWindow *mainwin, guint action,
 static void sort_summary_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
-       summary_sort(mainwin->summaryview, (SummarySortType)action);
+       FolderItem *item = mainwin->summaryview->folder_item;
+       GtkWidget *menuitem;
+
+       if (mainwin->menu_lock_count) return;
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item) {
+               menuitem = gtk_item_factory_get_item
+                       (mainwin->menu_factory, "/View/Sort/Ascending");
+               summary_sort(mainwin->summaryview, (FolderSortKey)action,
+                            GTK_CHECK_MENU_ITEM(menuitem)->active
+                            ? SORT_ASCENDING : SORT_DESCENDING);
+       }
+}
+
+static void sort_summary_type_cb(MainWindow *mainwin, guint action,
+                                GtkWidget *widget)
+{
+       FolderItem *item = mainwin->summaryview->folder_item;
+
+       if (mainwin->menu_lock_count) return;
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item)
+               summary_sort(mainwin->summaryview,
+                            item->sort_key, (FolderSortType)action);
 }
 
 static void attract_by_subject_cb(MainWindow *mainwin, guint action,
@@ -2939,7 +3320,8 @@ static void update_summary_cb(MainWindow *mainwin, guint action,
                                            folderview->opened);
        if (!fitem) return;
 
-       summary_show(mainwin->summaryview, fitem, TRUE);
+       folder_item_scan(fitem);
+       summary_show(mainwin->summaryview, fitem);
 }
 
 static void prev_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
@@ -2958,12 +3340,22 @@ static void prev_unread_cb(MainWindow *mainwin, guint action,
        summary_select_prev_unread(mainwin->summaryview);
 }
 
-static void next_unread_cb(MainWindow *mainwin, guint action,
+void next_unread_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_unread(mainwin->summaryview);
 }
 
+static void prev_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_select_prev_new(mainwin->summaryview);
+}
+
+static void next_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_select_next_new(mainwin->summaryview);
+}
+
 static void prev_marked_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -3006,20 +3398,20 @@ static void copy_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 
 static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
+       MessageView *msgview = mainwin->messageview;
+
        if (GTK_WIDGET_HAS_FOCUS(mainwin->summaryview->ctree))
                summary_select_all(mainwin->summaryview);
-       else if (mainwin->summaryview->msg_is_toggled_on && (
-                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->textview->text) ||
-                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->ctree) ||
-                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->notebook) ||
-                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->textview->text)))
+       else if (messageview_is_visible(msgview) &&
+                (GTK_WIDGET_HAS_FOCUS(msgview->textview->text) ||
+                 GTK_WIDGET_HAS_FOCUS(msgview->mimeview->textview->text)))
                messageview_select_all(mainwin->messageview);
 }
 
-static void selthread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void select_thread_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
 {
-       if (mainwin->summaryview->msg_is_toggled_on)
-               summary_select_thread(mainwin->summaryview);
+       summary_select_thread(mainwin->summaryview);
 }
 
 static void create_filter_cb(MainWindow *mainwin, guint action,
@@ -3034,12 +3426,6 @@ static void prefs_common_open_cb(MainWindow *mainwin, guint action,
        prefs_common_open();
 }
 
-static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
-                                GtkWidget *widget)
-{
-       prefs_filter_open(NULL, NULL);
-}
-
 static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
@@ -3063,21 +3449,20 @@ static void prefs_actions_open_cb(MainWindow *mainwin, guint action,
 {
        prefs_actions_open(mainwin);
 }
-
+#ifdef USE_OPENSSL
+static void ssl_manager_open_cb(MainWindow *mainwin, guint action,
+                                 GtkWidget *widget)
+{
+       ssl_manager_open(mainwin);
+}
+#endif
 static void prefs_account_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
        if (!cur_account) {
                new_account_cb(mainwin, 0, widget);
        } else {
-               gboolean prev_default = cur_account->is_default;
-
-               prefs_account_open(cur_account);
-               if (!prev_default && cur_account->is_default)
-                       account_set_as_default(cur_account);
-               account_save_config_all();
-               account_set_menu();
-               main_window_reflect_prefs_all();
+               account_open(cur_account);
        }
 }
 
@@ -3097,12 +3482,7 @@ static void account_menu_cb(GtkMenuItem  *menuitem, gpointer data)
 static void manual_open_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
-       manual_open((ManualLang)action);
-}
-
-static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       faq_open((ManualLang)action);
+       manual_open((ManualType)action);
 }
 
 static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
@@ -3124,43 +3504,11 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        g_free(str);
 }
 
-static void activate_compose_button (MainWindow *mainwin,
-                               ToolbarStyle style,
-                               ComposeButtonType type)
-{
-       SensitiveCond state = main_window_get_current_state(mainwin);
-
-       if (style == TOOLBAR_NONE) 
-               return;
-
-       gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn 
-               : mainwin->compose_news_btn);
-       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn
-               : mainwin->compose_mail_btn);
-       mainwin->compose_btn_type = type;       
-}
-
-void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonType compose_btn_type)
-{
-       if (mainwin->compose_btn_type != compose_btn_type)
-               activate_compose_button(mainwin, 
-                                       prefs_common.toolbar_style,
-                                       compose_btn_type);
-}
-
-static void menuitem_expandsummaryview_statechanged (GtkWidget *widget, GtkStateType state, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow*) data;
-       
-       if (!mainwin) return;
-               
-       gtk_widget_set_sensitive(GTK_WIDGET(mainwin->summaryview->toggle_view_btn), GTK_WIDGET_IS_SENSITIVE(widget));
-}
-
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-static void key_pressed (GtkWidget *widget, GdkEventKey *event,        gpointer data)
+void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
+                                   gpointer data)
 {
        MainWindow *mainwin = (MainWindow*) data;
        
@@ -3172,6 +3520,14 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
                app_exit_cb(mainwin, 0, NULL);
                return;
+       case GDK_space:
+               if (mainwin->folderview && mainwin->summaryview
+                   && !mainwin->summaryview->displayed) {
+                       summary_lock(mainwin->summaryview);
+                       folderview_select_next_unread(mainwin->folderview);
+                       summary_unlock(mainwin->summaryview);
+               }
+               break;
        default:
                break;
        }
@@ -3179,37 +3535,6 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
 #undef BREAK_ON_MODIFIER_KEY
 
-static void set_toolbar_style(MainWindow *mainwin)
-{
-       switch (prefs_common.toolbar_style) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-               break;
-       case TOOLBAR_ICON:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
-                                     GTK_TOOLBAR_ICONS);
-               break;
-       case TOOLBAR_TEXT:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
-                                     GTK_TOOLBAR_TEXT);
-               break;
-       case TOOLBAR_BOTH:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
-                                     GTK_TOOLBAR_BOTH);
-               break;
-       }
-       
-       if (prefs_common.toolbar_style != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-
-               if (prefs_common.immediate_exec)
-                       gtk_widget_hide(mainwin->exec_btn);
-               else
-                       gtk_widget_show(mainwin->exec_btn);
-       }
-}
-
 /*
  * Harvest addresses for selected folder.
  */