sync with sylpheed 0.7.0cvs27
[claws.git] / src / mainwindow.c
index 94d4e5d5a5ba813ab2617c4e134e122c27b38a7e..0c3ea5435b2c2fada236e29cc464490a9eac5cd8 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkwidget.h>
@@ -51,6 +52,7 @@
 #include "message_search.h"
 #include "headerview.h"
 #include "menu.h"
+#include "stock_pixmap.h"
 #include "folder.h"
 #include "inc.h"
 #include "compose.h"
@@ -63,6 +65,8 @@
 #include "prefs_scoring.h"
 #include "prefs_account.h"
 #include "prefs_folder_item.h"
+#include "prefs_summary_column.h"
+#include "prefs_template.h"
 #include "account.h"
 #include "addressbook.h"
 #include "headerwindow.h"
@@ -76,7 +80,6 @@
 #include "codeconv.h"
 #include "about.h"
 #include "manual.h"
-#include "prefs_templates.h"
 #include "version.h"
 
 #define AC_LABEL_WIDTH 240
@@ -116,22 +119,38 @@ static void toolbar_send_cb               (GtkWidget      *widget,
 
 static void toolbar_compose_cb         (GtkWidget      *widget,
                                         gpointer        data);
-static void toolbar_popup_compose_type_cb(GtkWidget    *widget,
+static void toolbar_compose_news_cb    (GtkWidget      *widget,
                                         gpointer        data);
-static void toolbar_popup_compose_type_set(GtkWidget   *widget,
+static void toolbar_compose_mail_cb    (GtkWidget      *widget,
                                         gpointer        data);
-static void toolbar_compose_news_cb            (GtkWidget      *widget,
+static void toolbar_reply_cb           (GtkWidget      *widget,
                                         gpointer        data);
-static void toolbar_compose_mail_cb            (GtkWidget      *widget,
+static void toolbar_reply_popup_cb     (GtkWidget      *widget,
+                                        GdkEventButton *event,
                                         gpointer        data);
-static void toolbar_reply_cb           (GtkWidget      *widget,
+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);
@@ -213,6 +232,12 @@ 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 separate_widget_cb (GtkCheckMenuItem *checkitem,
                                 guint action,
                                 GtkWidget *widget);
@@ -292,6 +317,10 @@ static void set_charset_cb         (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void hide_read_messages   (MainWindow   *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
 static void thread_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -355,6 +384,10 @@ static void allsel_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);
@@ -370,6 +403,9 @@ static void prefs_filtering_open_cb (MainWindow     *mainwin,
 static void prefs_account_open_cb(MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void prefs_template_open_cb     (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
 static void new_account_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -389,9 +425,13 @@ static void activate_compose_button (MainWindow *mainwin,
                                ToolbarStyle      style,
                                ComposeButtonType type);
 
-static void prefs_templates_open_cb(MainWindow *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
+static void menuitem_expandsummaryview_statechanged (GtkWidget *widget,
+                               GtkStateType state,
+                               gpointer data);
+
+static void key_pressed (GtkWidget *widget, 
+                               GdkEventKey *event,
+                               gpointer data);
 
 #define  SEPARATE_ACTION  667
 
@@ -408,46 +448,62 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File/_Folder/_Delete folder"),   NULL, delete_folder_cb, 0, NULL},
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},
-       {N_("/_File/Empty _trash"),             NULL, empty_trash_cb, 0, NULL},
+       {N_("/_File/Empty _trash"),             "<shift>D", empty_trash_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_File/_Save as..."),              NULL, save_as_cb, 0, NULL},
-       {N_("/_File/_Print..."),                "<alt>P", print_cb, 0, NULL},
+       {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"),                    "<alt>Q", 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/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit/_Find in current message"), "<control>F", search_cb, 0, NULL},
-       {N_("/_Edit/_Search folder"),           "<control>S", search_cb, 1, NULL},
+       {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/_Folder tree"),             NULL, toggle_folder_cb, 0, "<ToggleItem>"},
-       {N_("/_View/_Message view"),            NULL, toggle_message_cb, 0, "<ToggleItem>"},
+       {N_("/_View/_Folder tree"),             NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
+       {N_("/_View/_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/_Toolbar"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Toolbar/Icon _and text"),  NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
        {N_("/_View/_Toolbar/_Icon"),           NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"},
        {N_("/_View/_Toolbar/_Text"),           NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
-       {N_("/_View/_Toolbar/_None"),           NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
-       {N_("/_View/_Status bar"),              NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
-       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Separate f_older tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
-       {N_("/_View/Separate m_essage view"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
+       {N_("/_View/_Toolbar/_None"),           NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
+       {N_("/_View/Status _bar"),              NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/View _source"),             "<control>U", view_source_cb, 0, NULL},
-       {N_("/_View/Show all _header"),         "<control>H", header_window_show_cb, 0, NULL},
+       {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/---"),                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, NULL},
+       {N_("/_View/U_nthread view"),           "<shift><control>T", thread_cb, 1, 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/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/_Code set"),                NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_Code set/_Auto detect"),
-        NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
 
 #define CODESET_SEPARATOR \
        {N_("/_View/_Code set/---"),            NULL, NULL, 0, "<Separator>"}
 #define CODESET_ACTION(action) \
         NULL, set_charset_cb, action, "/View/Code set/Auto detect"
 
+       {N_("/_View/_Code set"),                NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/_Code set/_Auto detect"),
+        NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
        {N_("/_View/_Code set/---"),            NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Code set/7bit ascii (US-ASC_II)"),
         CODESET_ACTION(C_US_ASCII)},
@@ -508,94 +564,98 @@ static GtkItemFactoryEntry mainwin_entries[] =
         CODESET_ACTION(C_EUC_KR)},
        {N_("/_View/_Code set/Korean (ISO-2022-KR)"),
         CODESET_ACTION(C_ISO_2022_KR)},
+       CODESET_SEPARATOR,
+       {N_("/_View/_Code set/Thai (TIS-620)"),
+        CODESET_ACTION(C_TIS_620)},
+       {N_("/_View/_Code set/Thai (Windows-874)"),
+        CODESET_ACTION(C_WINDOWS_874)},
 #endif
 
 #undef CODESET_SEPARATOR
 #undef CODESET_ACTION
 
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/_Go to/_Prev message"),     "P", prev_cb, 0, NULL},
+       {N_("/_View/_Go to/_Next message"),     "N", next_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/P_rev unread message"),
+                                               "<shift>P", prev_unread_cb, 0, NULL},
+       {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 _marked message"),
+                                               NULL, prev_marked_cb, 0, NULL},
+       {N_("/_View/_Go to/Next m_arked message"),
+                                               NULL, next_marked_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Prev _labeled message"),
+                                               NULL, prev_labeled_cb, 0, NULL},
+       {N_("/_View/_Go to/Next la_beled message"),
+                                               NULL, next_labeled_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Other _folder..."),  "G", goto_folder_cb, 0, NULL},
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
+       {N_("/_View/_View source"),             "<control>U", view_source_cb, 0, NULL},
+       {N_("/_View/Show all _header"),         "<control>H", header_window_show_cb, 0, NULL},
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Update"),                  "<control><alt>U", update_summary_cb,  0, NULL},
+
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/Get new ma_il"),         "<alt>I",       inc_mail_cb, 0, NULL},
+       {N_("/_Message/Get new ma_il"),         "<control>I",   inc_mail_cb, 0, NULL},
        {N_("/_Message/Get from _all accounts"),
-                                               "<shift><alt>I", inc_all_account_mail_cb, 0, NULL},
+                                               "<shift><control>I", inc_all_account_mail_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Send queued messa_ges"),
                                                NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Compose a_n email message"),     "<alt>N", compose_mail_cb, 0, NULL},
+       {N_("/_Message/Compose a_n email message"),     "<shift><control>N", compose_mail_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
-       {N_("/_Message/_Reply"),                "<alt>R",       reply_cb, COMPOSE_REPLY, 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><alt>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/_Forward"),              "<shift><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/_Message/Forward as a_ttachment"),
-                                               "<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/_Message/Reply to a_ll"),         "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/Bounce"),                NULL, reply_cb, COMPOSE_BOUNCE, 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..."),              "<alt>O", move_to_cb, 0, NULL},
-       {N_("/_Message/_Copy..."),              NULL, copy_to_cb, 0, NULL},
-       {N_("/_Message/_Delete"),               "<alt>D", delete_cb,  0, NULL},
+       {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/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/Delete du_plicated messages"),
+                                               NULL, delete_duplicated_cb,   0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/_Mark/_Mark"),           NULL, mark_cb,   0, NULL},
-       {N_("/_Message/_Mark/_Unmark"),         NULL, unmark_cb, 0, NULL},
+       {N_("/_Message/_Mark/_Unmark"),         "U", unmark_cb, 0, NULL},
        {N_("/_Message/_Mark/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
        {N_("/_Message/_Mark/Mark as rea_d"),
                                                NULL, mark_as_read_cb, 0, NULL},
-       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Open in new _window"),   "<shift><control>N", open_msg_cb, 0, NULL},
-
-       {N_("/_Summary"),                       NULL, NULL, 0, "<Branch>"},
-       {N_("/_Summary/_Delete duplicated messages"),
-                                               NULL, delete_duplicated_cb,   0, NULL},
-       {N_("/_Summary/_Filter messages"),      NULL, filter_cb, 0, NULL},
-       {N_("/_Summary/E_xecute"),              "<alt>X", execute_summary_cb, 0, NULL},
-       {N_("/_Summary/_Update"),               "<alt>U", update_summary_cb,  0, NULL},
-       {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/Go _to"),                NULL, NULL, 0, "<Branch>"},
-       {N_("/_Summary/Go _to/_Prev message"),  NULL, prev_cb, 0, NULL},
-       {N_("/_Summary/Go _to/_Next message"),  NULL, next_cb, 0, NULL},
-       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/Go _to/P_rev unread message"),
-                                               NULL, prev_unread_cb, 0, NULL},
-       {N_("/_Summary/Go _to/N_ext unread message"),
-                                               NULL, next_unread_cb, 0, NULL},
-       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/Go _to/Prev _marked message"),
-                                               NULL, prev_marked_cb, 0, NULL},
-       {N_("/_Summary/Go _to/Next m_arked message"),
-                                               NULL, next_marked_cb, 0, NULL},
-       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/Go _to/Prev _labeled message"),
-                                               NULL, prev_labeled_cb, 0, NULL},
-       {N_("/_Summary/Go _to/Next la_beled message"),
-                                               NULL, next_labeled_cb, 0, NULL},
-       {N_("/_Summary/_Go to other folder..."),"<alt>G", goto_folder_cb, 0, NULL},
-       {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/_Sort"),                 NULL, NULL, 0, "<Branch>"},
-       {N_("/_Summary/_Sort/Sort by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
-       {N_("/_Summary/_Sort/Sort by s_ize"),   NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
-       {N_("/_Summary/_Sort/Sort by _date"),   NULL, sort_summary_cb, SORT_BY_DATE, NULL},
-       {N_("/_Summary/_Sort/Sort by _from"),   NULL, sort_summary_cb, SORT_BY_FROM, NULL},
-       {N_("/_Summary/_Sort/Sort by _subject"),NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
-       {N_("/_Summary/_Sort/Sort by _color label"),
-                                               NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
-       {N_("/_Summary/_Sort/Sort by _mark"),   NULL, sort_summary_cb, SORT_BY_MARK, NULL},
-       {N_("/_Summary/_Sort/Sort by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
-       {N_("/_Summary/_Sort/Sort by a_ttachment"),
-                                               NULL, sort_summary_cb, SORT_BY_MIME, NULL},
-       {N_("/_Summary/_Sort/---"),             NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/_Sort/_Attract by subject"),
-                                               NULL, attract_by_subject_cb, 0, NULL},
-       {N_("/_Summary/_Thread view"),          "<control>T",        thread_cb, 0, NULL},
-       {N_("/_Summary/Unt_hread view"),        "<shift><control>T", thread_cb, 1, NULL},
-       {N_("/_Summary/Set display _item..."),  NULL, set_display_item_cb, 0, NULL},
+       {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
 
        {N_("/_Tool"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tool/_Address book"),            "<alt>A", addressbook_open_cb, 0, NULL},
-       {N_("/_Tool/_Log window"),              "<alt>L", log_window_show_cb, 0, NULL},
+       {N_("/_Tool/_Address book"),            "<shift><control>A", addressbook_open_cb, 0, NULL},
+       {N_("/_Tool/Add sender to address boo_k"),
+                                               NULL, add_address_cb, 0, NULL},
+       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tool/_Filter messages"),         NULL, filter_cb, 0, NULL},
+       {N_("/_Tool/_Create filter rule"),      NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tool/_Create filter rule/_Automatically"),
+                                               NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
+       {N_("/_Tool/_Create filter rule/by _From"),
+                                               NULL, create_filter_cb, FILTER_BY_FROM, NULL},
+       {N_("/_Tool/_Create filter rule/by _To"),
+                                               NULL, create_filter_cb, FILTER_BY_TO, NULL},
+       {N_("/_Tool/_Create filter rule/by _Subject"),
+                                               NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
+       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tool/E_xecute"),                 "X", execute_summary_cb, 0, NULL},
+       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tool/_Log window"),              "<control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
@@ -606,11 +666,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering ..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
-       {N_("/_Configuration/_Templates ..."),
-                                               NULL, prefs_templates_open_cb, 0, NULL},
-       {N_("/_Configuration/_Preferences per account..."),
-                                               NULL, prefs_account_open_cb, 0, NULL},
+       {N_("/_Configuration/_Template..."),    NULL, prefs_template_open_cb, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
+       {N_("/_Configuration/_Preferences for current account..."),
+                                               NULL, prefs_account_open_cb, 0, NULL},
        {N_("/_Configuration/Create _new account..."),
                                                NULL, new_account_cb, 0, NULL},
        {N_("/_Configuration/_Edit accounts..."),
@@ -618,13 +677,34 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/C_hange current account"),
                                                NULL, NULL, 0, "<Branch>"},
 
-       {N_("/_Help"),                          NULL, NULL, 0, "<LastBranch>"},
+       {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/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
+static GtkItemFactoryEntry reply_popup_entries[] =
+{
+       {N_("/Reply with _quote"), NULL, reply_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
+       {N_("/_Reply without quote"), NULL, reply_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry replyall_popup_entries[] =
+{
+       {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 replysender_popup_entries[] =
+{
+       {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
+       {N_("/_Reply to sender without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry fwd_popup_entries[] =
+{
+       {N_("/_Forward message (inline style)"), "f", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
+       {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
+};
+
 
 MainWindow *main_window_create(SeparateType type)
 {
@@ -651,6 +731,11 @@ MainWindow *main_window_create(SeparateType type)
        GtkItemFactory *ifactory;
        GtkWidget *ac_menu;
        GtkWidget *menuitem;
+       GtkWidget *compose_popup;
+       GtkWidget *reply_popup;
+       GtkWidget *replyall_popup;
+       GtkWidget *replysender_popup;
+       GtkWidget *fwd_popup;
        gint i;
 
        debug_print(_("Creating main window...\n"));
@@ -666,8 +751,11 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+                               GTK_SIGNAL_FUNC(key_pressed), mainwin);
 
        gtk_widget_realize(window);
+       gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
 
        gtkut_widget_set_app_icon(window);
 
@@ -686,6 +774,33 @@ MainWindow *main_window_create(SeparateType type)
        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);
 
        /* vbox that contains body */
@@ -749,7 +864,11 @@ MainWindow *main_window_create(SeparateType type)
        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;
+       
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Main Window");
@@ -820,7 +939,14 @@ MainWindow *main_window_create(SeparateType type)
        menuitem = gtk_item_factory_get_item(ifactory, "/View/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/Message view");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+       menuitem = gtk_item_factory_get_item(ifactory, "/View/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);
@@ -836,15 +962,15 @@ MainWindow *main_window_create(SeparateType type)
        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));
-
-
-       menu_set_sensitive(ifactory, "/Summary/Thread view",
+       
+       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);
+               
+       menu_set_sensitive(ifactory, "/View/Thread view",
                           prefs_common.enable_thread ? FALSE : TRUE);
-       menu_set_sensitive(ifactory, "/Summary/Unthread view",
+       menu_set_sensitive(ifactory, "/View/Unthread view",
                           prefs_common.enable_thread ? TRUE : FALSE);
-       
-       /*main_window_set_thread_option(mainwin);*/
-
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
@@ -861,7 +987,6 @@ MainWindow *main_window_create(SeparateType type)
                                 prefs_common.mainwin_y);
        gtk_widget_set_usize(window, prefs_common.mainwin_width,
                             prefs_common.mainwin_height);
-                            
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -871,7 +996,6 @@ MainWindow *main_window_create(SeparateType type)
        header_window_init(mainwin->headerwin);
        log_window_init(mainwin->logwin);
 
-
        mainwin->lock_count = 0;
        mainwin->cursor_count = 0;
 
@@ -946,13 +1070,23 @@ void main_window_reflect_prefs_all(void)
                else
                        gtk_widget_show(mainwin->exec_btn);
 
-               summary_change_display_item(mainwin->summaryview);
                summary_redisplay_msg(mainwin->summaryview);
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
        }
 }
 
+void main_window_set_summary_column(void)
+{
+       GList *cur;
+       MainWindow *mainwin;
+
+       for (cur = mainwin_list; cur != NULL; cur = cur->next) {
+               mainwin = (MainWindow *)cur->data;
+               summary_set_column_order(mainwin->summaryview);
+       }
+}
+
 void main_window_set_account_menu(GList *account_list)
 {
        GList *cur, *cur_ac, *cur_item;
@@ -1004,11 +1138,8 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);
 
-       /* buf = g_strdup_printf(_("Current account: %s"), ac_name);
-       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), buf);   */
        gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
        gtk_widget_queue_resize(mainwin->ac_button);
-       /* g_free(buf); */
 
        g_free(ac_name);
 }
@@ -1025,11 +1156,11 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
        gtk_widget_ref(folder_wid);
        gtk_widget_ref(summary_wid);
        gtk_widget_ref(message_wid);
-       gtk_container_remove
+       gtkut_container_remove
                (GTK_CONTAINER(folder_wid->parent), folder_wid);
-       gtk_container_remove
+       gtkut_container_remove
                (GTK_CONTAINER(summary_wid->parent), summary_wid);
-       gtk_container_remove
+       gtkut_container_remove
                (GTK_CONTAINER(message_wid->parent), message_wid);
 
        /* clean containers */
@@ -1102,7 +1233,17 @@ void main_window_get_position(MainWindow *mainwin)
 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 {
        GList *list;
+       guint has_trash;
+       Folder *folder;
+
+       for (has_trash = 0, list = folder_get_list(); list != NULL; list = list->next) {
+               folder = FOLDER(list->data);
+               if (folder && folder->trash && folder->trash->total > 0)
+                       has_trash++;
+       }
 
+       if (!has_trash) return;
+       
        if (confirm) {
                if (alertpanel(_("Empty trash"),
                               _("Empty all messages in trash?"),
@@ -1114,10 +1255,8 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
        procmsg_empty_trash();
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
-               Folder *folder;
-
                folder = list->data;
-               if (folder->trash) {
+               if (folder && folder->trash && folder->trash->total != 0) {
                        folder_item_scan(folder->trash);
                        folderview_update_item(folder->trash, TRUE);
                }
@@ -1222,24 +1361,27 @@ typedef enum
        M_EXEC                = 1 << 4,
        M_ALLOW_REEDIT        = 1 << 5,
        M_HAVE_ACCOUNT        = 1 << 6,
-       M_THREADED            = 1 << 7,
+       M_THREADED            = 1 << 7,
        M_UNTHREADED          = 1 << 8,
-       M_NEWS                = 1 << 9
+       M_NEWS                = 1 << 9,
+       M_HAVE_NEWS_ACCOUNT   = 1 << 10
 } SensitiveCond;
 
 static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 {
        SensitiveCond state = 0;
        SummarySelection selection;
-
+       FolderItem *item = mainwin->summaryview->folder_item;
+       GList *account_list = account_get_list();
+       
        selection = summary_get_selection_type(mainwin->summaryview);
 
        if (mainwin->lock_count == 0)
                state |= M_UNLOCKED;
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;
-       if (mainwin->summaryview->folder_item) {
-               if (mainwin->summaryview->folder_item->threaded)
+       if (item) {
+               if (item->threaded)
                        state |= M_THREADED;
                else
                        state |= M_UNTHREADED;  
@@ -1249,19 +1391,25 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                state |= M_TARGET_EXIST;
        if (selection == SUMMARY_SELECTED_SINGLE)
                state |= M_SINGLE_TARGET_EXIST;
-       if (mainwin->summaryview->folder_item &&
-           mainwin->summaryview->folder_item->folder->type != F_NEWS)
+       if (item && item->folder->type != F_NEWS)
                state |= M_EXEC;
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->folder->type == F_NEWS)
                state |= M_NEWS;
        if (selection == SUMMARY_SELECTED_SINGLE &&
-           (mainwin->summaryview->folder_item &&
-            (mainwin->summaryview->folder_item->stype == F_DRAFT ||
-             mainwin->summaryview->folder_item->stype == F_QUEUE)))
+           (item &&
+            (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
+             item->stype == F_QUEUE)))
                state |= M_ALLOW_REEDIT;
        if (cur_account)
                state |= M_HAVE_ACCOUNT;
+       
+       for ( ; account_list != NULL; account_list = account_list->next) {
+               if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
+                       state |= M_HAVE_NEWS_ACCOUNT;
+                       break;
+               }
+       }
 
        return state;
 }
@@ -1269,7 +1417,7 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 void main_window_set_toolbar_sensitive(MainWindow *mainwin)
 {
        SensitiveCond state;
-        gboolean sensitive;
+    gboolean sensitive;
        gint i;
 
        const struct {
@@ -1279,11 +1427,11 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin)
                {mainwin->get_btn         , M_HAVE_ACCOUNT|M_UNLOCKED},
                {mainwin->getall_btn      , M_HAVE_ACCOUNT|M_UNLOCKED},
                {mainwin->compose_mail_btn, M_HAVE_ACCOUNT},
-               {mainwin->compose_news_btn, M_HAVE_ACCOUNT},
+               {mainwin->compose_news_btn, M_HAVE_NEWS_ACCOUNT},
                {mainwin->reply_btn       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {mainwin->replyall_btn    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {mainwin->replysender_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {mainwin->fwd_btn         , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {mainwin->fwd_btn         , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                /* {mainwin->prefs_btn      , M_UNLOCKED},
                {mainwin->account_btn    , M_UNLOCKED}, */
                {mainwin->next_btn        , M_MSG_EXIST},
@@ -1298,6 +1446,10 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin)
                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)
@@ -1320,43 +1472,44 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/File/Empty trash"           , M_UNLOCKED},
                {"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
-               {"/File/Close", M_UNLOCKED},
+               /* {"/File/Close", M_UNLOCKED}, */
                {"/File/Exit" , M_UNLOCKED},
 
-               {"/View/Show all header"      , M_SINGLE_TARGET_EXIST},
-               {"/View/View source"          , M_SINGLE_TARGET_EXIST},
+               {"/View/Sort"                      , M_MSG_EXIST},
+               {"/View/Thread view"               , M_UNTHREADED},
+               {"/View/Unthread view"             , M_THREADED},
+               {"/View/Go to"                     , M_MSG_EXIST},
+               {"/View/Go to/Prev message"        , M_MSG_EXIST},
+               {"/View/Go to/Next message"        , M_MSG_EXIST},
+               {"/View/Go to/Next unread 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/View source"               , M_SINGLE_TARGET_EXIST},
 
                {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
                {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
-/*             {"/Message/Compose new message"   , M_HAVE_ACCOUNT}, */
+               {"/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/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
-               {"/Message/Forward"               , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Open in new window"    , M_SINGLE_TARGET_EXIST},
-               {"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
-               {"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Copy...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Delete" , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Mark"   , M_TARGET_EXIST},
-               {"/Message/Add sender to address book", M_SINGLE_TARGET_EXIST},
-
-               {"/Summary/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Summary/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Summary/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Summary/Go to"                     , M_MSG_EXIST},
-               {"/Summary/Go to/Prev message"        , M_MSG_EXIST},
-               {"/Summary/Go to/Next message"        , M_MSG_EXIST},
-               {"/Summary/Go to/Next unread message" , M_MSG_EXIST},
-               {"/Summary/Go to/Prev marked message" , M_MSG_EXIST},
-               {"/Summary/Go to/Next marked message" , M_MSG_EXIST},
-               {"/Summary/Go to/Prev labeled message", M_MSG_EXIST},
-               {"/Summary/Go to/Next labeled message", M_MSG_EXIST},
-               {"/Summary/Sort"                      , M_MSG_EXIST},
-               {"/Summary/Thread view"               , M_UNTHREADED},
-               {"/Summary/Unthread view"             , M_THREADED},
+               {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"/Message/Bounce"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+               {"/Message/Move..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Delete"                , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Mark"                  , M_TARGET_EXIST},
+               {"/Message/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+
+               {"/Tool/Add sender to address book", M_SINGLE_TARGET_EXIST},
+               {"/Tool/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tool/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/Tool/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
 
                {"/Configuration", M_UNLOCKED},
 
@@ -1364,7 +1517,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        };
 
        ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-        state = main_window_get_current_state(mainwin);
+       state = main_window_get_current_state(mainwin);
 
        for (i = 0; entry[i].entry != NULL; i++) {
                sensitive = ((entry[i].cond & state) == entry[i].cond);
@@ -1432,12 +1585,18 @@ 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);
+       GtkWidget *menuitem;
 
        debug_print(_("Setting widgets..."));
 
        /* create separated window(s) if needed */
        if (type & SEPARATE_FOLDER) {
                folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+               gtk_window_set_title(GTK_WINDOW(folderwin),
+                                    _("Sylpheed - Folder View"));
+               gtk_window_set_wmclass(GTK_WINDOW(folderwin),
+                                      "folder_view", "Sylpheed");
                gtk_window_set_policy(GTK_WINDOW(folderwin),
                                      TRUE, TRUE, FALSE);
                gtk_widget_set_usize(folderwin, -1,
@@ -1450,6 +1609,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        }
        if (type & SEPARATE_MESSAGE) {
                messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+               gtk_window_set_title(GTK_WINDOW(messagewin),
+                                    _("Sylpheed - Message View"));
+               gtk_window_set_wmclass(GTK_WINDOW(messagewin),
+                                      "message_view", "Sylpheed");
                gtk_window_set_policy(GTK_WINDOW(messagewin),
                                      TRUE, TRUE, FALSE);
                gtk_widget_set_usize
@@ -1495,6 +1658,13 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                     prefs_common.mainwin_height);
                gtk_widget_show_all(vpaned);
 
+               menu_set_sensitive(ifactory, "/View/Message view", TRUE);
+               menu_set_sensitive(ifactory, "/View/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);
+               
                mainwin->win.sep_none.hpaned = hpaned;
                mainwin->win.sep_none.vpaned = vpaned;
                break;
@@ -1526,6 +1696,9 @@ 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/Message view", TRUE);
+               menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
+               
                mainwin->win.sep_folder.folderwin = folderwin;
                mainwin->win.sep_folder.vpaned    = vpaned;
 
@@ -1549,7 +1722,12 @@ 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/Message view", TRUE);
+               menu_set_sensitive(ifactory, "/View/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;
 
@@ -1570,6 +1748,9 @@ 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/Message view", TRUE);
+               menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
+       
                mainwin->win.sep_both.folderwin = folderwin;
                mainwin->win.sep_both.messagewin = messagewin;
 
@@ -1583,42 +1764,15 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        debug_print(_("done.\n"));
 }
 
-#include "pixmaps/stock_mail_receive.xpm"
-#include "pixmaps/stock_mail_receive_all.xpm"
-#include "pixmaps/stock_mail_compose.xpm"
-#include "pixmaps/stock_news_compose.xpm"
-#include "pixmaps/stock_mail_reply.xpm"
-#include "pixmaps/stock_mail_reply_to_all.xpm"
-#include "pixmaps/stock_mail_reply_to_author.xpm"
-#include "pixmaps/stock_mail_forward.xpm"
-#include "pixmaps/stock_mail_send.xpm"
-#include "pixmaps/stock_preferences.xpm"
-#include "pixmaps/stock_properties.xpm"
-#include "pixmaps/stock_down_arrow.xpm"
-#include "pixmaps/stock_close.xpm"
-#include "pixmaps/stock_exec.xpm"
-
-#define CREATE_TOOLBAR_ICON(xpm_d) \
-{ \
-       icon = gdk_pixmap_create_from_xpm_d(container->window, &mask, \
-                                           &container->style->white, \
-                                           xpm_d); \
-       icon_wid = gtk_pixmap_new(icon, mask); \
-}
-
 static void main_window_toolbar_create(MainWindow *mainwin,
                                       GtkWidget *container)
 {
        GtkWidget *toolbar;
-       GdkPixmap *icon;
-       GdkBitmap *mask;
        GtkWidget *icon_wid;
        GtkWidget *get_btn;
        GtkWidget *getall_btn;
        GtkWidget *compose_mail_btn;
        GtkWidget *compose_news_btn;
-       GtkWidget *compose_mail_btn_plain;
-       GtkWidget *compose_news_btn_plain;
        GtkWidget *reply_btn;
        GtkWidget *replyall_btn;
        GtkWidget *replysender_btn;
@@ -1631,10 +1785,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *next_btn;
        GtkWidget *delete_btn;
        GtkWidget *exec_btn;
-       GtkWidget *compose_type_btn;
-       GtkWidget *compose_type_arrow;
-       GtkWidget *compose_box;
-       GtkWidget *compose_label;
+       
        GtkTooltips *tooltips;
 
        toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
@@ -1645,13 +1796,13 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
                                    GTK_TOOLBAR_SPACE_LINE);
 
-       CREATE_TOOLBAR_ICON(stock_mail_receive_xpm);
+       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);
-       CREATE_TOOLBAR_ICON(stock_mail_receive_all_xpm);
+       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"),
@@ -1662,7 +1813,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 
        gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-       CREATE_TOOLBAR_ICON(stock_mail_send_xpm);
+       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND);
        send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                           _("Send"),
                                           _("Send queued message(s)"),
@@ -1671,63 +1822,9 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_send_cb,
                                           mainwin);
 
-       /* to implement Leandro's "combined" compose buttons, we create
-        * two sets of compose buttons, one for normal (text + icon) 
-        * toolbar, and one for both text-only and icon-only toolbar;
-        * we switch between those sets. */
-
        /* insert compose mail button widget */                                    
-
-       compose_mail_btn = gtk_button_new();
-       gtk_widget_show(compose_mail_btn);
-       tooltips = gtk_tooltips_new();
-       gtk_tooltips_set_tip(tooltips, compose_mail_btn, 
-                                                _("Compose email message"),
-                                                _("email"));
-       compose_box = gtk_vbox_new(0, 0);
-       gtk_widget_show(compose_box);
-       
-       gtk_container_add(GTK_CONTAINER(compose_mail_btn), compose_box);
-       CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
-       gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
-
-       compose_label = gtk_label_new(_("Email"));
-       gtk_widget_show(compose_label);
-       gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
-       
-       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_mail_btn), GTK_CAN_FOCUS);
-       gtk_button_set_relief(GTK_BUTTON(compose_mail_btn), GTK_RELIEF_NONE);
-       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_mail_btn,
-               NULL, NULL);
-
-       /* insert compose news button widget */
-
-       compose_news_btn = gtk_button_new();
-       gtk_widget_show(compose_news_btn);
-       tooltips = gtk_tooltips_new();
-       gtk_tooltips_set_tip(tooltips, compose_news_btn,
-                                                _("Compose news article"),
-                                                _("news"));
-       compose_box = gtk_vbox_new(0, 0);
-       gtk_widget_show(compose_box);
-       
-       gtk_container_add(GTK_CONTAINER(compose_news_btn), compose_box);
-       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
-       gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
-
-       compose_label = gtk_label_new(_("News"));
-       gtk_widget_show(compose_label);
-       gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
-       
-       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_news_btn), GTK_CAN_FOCUS);
-       gtk_button_set_relief(GTK_BUTTON(compose_news_btn), GTK_RELIEF_NONE);
-       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_news_btn,
-               NULL, NULL);
-       
-       /* insert compose btn plain */
-       
-       CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
-       compose_mail_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+       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",
@@ -1735,10 +1832,9 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                              toolbar_compose_mail_cb,
                                              mainwin);
 
-       /* insert compose btn plain */
-
-       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
-       compose_news_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+       /* 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",
@@ -1746,52 +1842,45 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                              toolbar_compose_news_cb,
                                              mainwin);
 
-       /* insert compose button type widget */
-       
-       compose_type_btn = gtk_button_new();
-       gtk_widget_show(compose_type_btn);
-       
-       compose_type_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_widget_show(compose_type_arrow);
-       
-       gtk_container_add(GTK_CONTAINER(compose_type_btn), compose_type_arrow);
-
-       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_type_btn), GTK_CAN_FOCUS);
-       gtk_button_set_relief(GTK_BUTTON(compose_type_btn), GTK_RELIEF_NONE);
-
-       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_type_btn,
-               NULL, NULL);
-
        gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
        
-       CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
+       /* 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"),
+                                           _("Reply to the message - Right button: more options"),
                                            "Reply",
                                            icon_wid,
                                            toolbar_reply_cb,
                                            mainwin);
-       CREATE_TOOLBAR_ICON(stock_mail_reply_to_all_xpm);
+
+       /* 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"),
+                                              _("Reply to all - Right button: more options"),
                                               "Reply to all",
                                               icon_wid,
                                               toolbar_reply_to_all_cb,
                                               mainwin);
-       CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
+
+       /* 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"),
+                                                 _("Reply to sender - Right button: more options"),
                                                  "Reply to sender",
                                                  icon_wid,
                                                  toolbar_reply_to_sender_cb,
                                                  mainwin);
-       CREATE_TOOLBAR_ICON(stock_mail_forward_xpm);
+
+       /* 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"),
+                                         _("Forward the message - Right button: more options"),
                                          "Fwd",
                                          icon_wid,
                                          toolbar_forward_cb,
@@ -1799,7 +1888,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 
        gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-       CREATE_TOOLBAR_ICON(stock_close_xpm);
+       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_CLOSE);
        delete_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                          _("Delete"),
                                          _("Delete the message"),
@@ -1808,7 +1897,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                          toolbar_delete_cb,
                                          mainwin);
 
-       CREATE_TOOLBAR_ICON(stock_exec_xpm);
+       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EXEC);
        exec_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                           _("Execute"),
                                           _("Execute marked process"),
@@ -1817,7 +1906,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_exec_cb,
                                           mainwin);
 
-       CREATE_TOOLBAR_ICON(stock_down_arrow_xpm);
+       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_DOWN_ARROW);
        next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                           _("Next"),
                                           _("Next unread message"),
@@ -1829,7 +1918,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        /*
        gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-       CREATE_TOOLBAR_ICON(stock_preferences_xpm);
+       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PREFERENCES);
        prefs_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                            _("Prefs"),
                                            _("Common preference"),
@@ -1837,7 +1926,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                            icon_wid,
                                            toolbar_prefs_cb,
                                            mainwin);
-       CREATE_TOOLBAR_ICON(stock_properties_xpm);
+       icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PROPERTIES);
        account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                              _("Account"),
                                              _("Account setting"),
@@ -1850,28 +1939,31 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                           mainwin);
        */
 
-       gtk_signal_connect(GTK_OBJECT(compose_type_btn), "clicked",
-               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_cb),
+       gtk_signal_connect(GTK_OBJECT(reply_btn), "button_press_event",
+               GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
                mainwin);
-
-       gtk_signal_connect(GTK_OBJECT(compose_mail_btn), "clicked",
-               GTK_SIGNAL_FUNC(toolbar_compose_mail_cb),
+       
+       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(compose_news_btn), "clicked",
-               GTK_SIGNAL_FUNC(toolbar_compose_news_cb),
+       
+       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);
+       
 
-       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->compose_mail_btn_plain = compose_mail_btn_plain;
-       mainwin->compose_news_btn_plain = compose_news_btn_plain;
-       mainwin->reply_btn       = reply_btn;
-       mainwin->replyall_btn    = replyall_btn;
-       mainwin->replysender_btn = replysender_btn;
+       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;
        /*
@@ -1883,54 +1975,97 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        mainwin->exec_btn        = exec_btn;
 
        gtk_widget_show_all(toolbar);
-
-       /* activate Leandro menu system */
-       activate_compose_button(mainwin, 
-                               prefs_common.toolbar_style,
-                               mainwin->compose_btn_type);
 }
 
 /* callback functions */
-
-static void toolbar_popup_compose_type_cb      (GtkWidget      *widget,
-                                gpointer data)
+static void toolbar_reply_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        MainWindow *mainwindow = (MainWindow *) data;
-       GtkWidget *compose_menu, *compose_item;
-
-       g_return_if_fail(mainwindow != NULL);
-       
-       compose_menu = gtk_menu_new();
        
-       compose_item = gtk_menu_item_new_with_label(_("Email message"));
-       gtk_widget_show(compose_item);
-       gtk_menu_append(GTK_MENU(compose_menu), compose_item);
-       gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
-               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
-               mainwindow);
-       gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_MAIL));            
+       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,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->reply_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
        
-       compose_item = gtk_menu_item_new_with_label(_("News article"));
-       gtk_widget_show(compose_item);
-       gtk_menu_append(GTK_MENU(compose_menu), compose_item);
-       gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
-               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
-               mainwindow);
-       gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_NEWS));            
-               
-       gtk_menu_popup(GTK_MENU(compose_menu), NULL, NULL, NULL,
-               NULL, 1, 0);
+       if (!event) return;
+
+       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);
+       }
+}
+
+static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->replyall_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
-static void toolbar_popup_compose_type_set(GtkWidget *widget, gpointer data)
+static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-       ComposeButtonType compose_type = GPOINTER_TO_INT( gtk_object_get_data(GTK_OBJECT(widget), "entry") );
        MainWindow *mainwindow = (MainWindow *) data;
+       GtkWidget *replysender_menu, *replysender_item;
 
-       mainwindow->compose_btn_type = compose_type;
+       if (!event) return;
+
+       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);
+       }
+}
+
+static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->replysender_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
 
-       activate_compose_button(mainwindow, prefs_common.toolbar_style, mainwindow->compose_btn_type);
-}      
+static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->fwd_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_forward_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->fwd_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
 
 static void toolbar_inc_cb     (GtkWidget      *widget,
                                 gpointer        data)
@@ -1983,28 +2118,35 @@ static void toolbar_compose_mail_cb     (GtkWidget      *widget,
        compose_mail_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_reply_cb   (GtkWidget      *widget,
-                                gpointer        data)
+static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, COMPOSE_REPLY, NULL);
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
+                : COMPOSE_REPLY_WITHOUT_QUOTE,
+                NULL);
 }
 
-static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
-                                        gpointer        data)
+static void toolbar_reply_to_all_cb(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, COMPOSE_REPLY_TO_ALL, NULL);
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, 
+                NULL);
 }
 
-static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
-                                        gpointer        data)
+
+static void toolbar_reply_to_sender_cb(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER, NULL);
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, 
+                NULL);
 }
 
 static void toolbar_forward_cb (GtkWidget      *widget,
@@ -2245,8 +2387,12 @@ static void toggle_message_cb(MainWindow *mainwin, guint action,
 static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
-       activate_compose_button(mainwin, (ToolbarStyle)action, 
+/*     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);*/
        
        switch ((ToolbarStyle)action) {
        case TOOLBAR_NONE:
@@ -2286,6 +2432,16 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
+static void toggle_expand_summaryview_cb(MainWindow *mainwin, guint action,    GtkWidget *widget)
+{
+       summary_toggle_view_real(mainwin->summaryview);
+}
+
+static void toggle_expand_messageview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       messageview_toggle_view_real(mainwin->messageview);
+}
+
 static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
 
 {
@@ -2416,55 +2572,7 @@ static void compose_news_cb(MainWindow *mainwin, guint action,
 
 static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       GList  *sel = GTK_CLIST(mainwin->summaryview->ctree)->selection;
-       MsgInfo *msginfo;
-
-       msginfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mainwin->summaryview->ctree),
-                mainwin->summaryview->selected);
-
-       if (!msginfo) return;
-
-       switch (action) {
-       case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE);
-               break;
-       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
-               compose_followup_and_reply_to(msginfo,
-                                             prefs_common.reply_with_quote,
-                                             FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, TRUE);
-               break;
-       case COMPOSE_FORWARD:
-               if (!sel->next) {
-                       compose_forward(NULL, msginfo, FALSE);
-                       break;
-               }
-               /* if (sel->next) FALL_THROUGH */
-       case COMPOSE_FORWARD_AS_ATTACH:
-               {
-                       GSList *msginfo_list = NULL;
-                       for ( ; sel != NULL; sel = sel->next)
-                               msginfo_list = g_slist_append(msginfo_list, 
-                                       gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->summaryview->ctree),
-                                               GTK_CTREE_NODE(sel->data)));
-                       compose_forward_multiple(NULL, msginfo_list);
-                       g_slist_free(msginfo_list);
-               }                       
-               break;
-       default:
-               g_warning("reply_cb(): invalid action type: %d\n", action);
-       }
-
-       summary_set_marks_selected(mainwin->summaryview);
+       summary_reply(mainwin->summaryview, (ComposeMode)action);
 }
 
 static void move_to_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
@@ -2546,6 +2654,15 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
        debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
 }
 
+static void hide_read_messages (MainWindow *mainwin, guint action,
+                               GtkWidget *widget)
+{
+       if (!mainwin->summaryview->folder_item
+           || gtk_object_get_data(GTK_OBJECT(widget), "dont_toggle"))
+               return;
+       summary_toggle_show_read_messages(mainwin->summaryview);
+}
+
 static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        GtkItemFactory *ifactory;
@@ -2555,22 +2672,22 @@ static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        ifactory = gtk_item_factory_from_widget(widget);
 
        if (0 == action) {
-               summary_thread_build(mainwin->summaryview, FALSE);
+               summary_thread_build(mainwin->summaryview);
                mainwin->summaryview->folder_item->threaded = TRUE;
-               menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
-               menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
+               menu_set_sensitive(ifactory, "/View/Thread view",   FALSE);
+               menu_set_sensitive(ifactory, "/View/Unthread view", TRUE);
        } else {
                summary_unthread(mainwin->summaryview);
                mainwin->summaryview->folder_item->threaded = FALSE;
-               menu_set_sensitive(ifactory, "/Summary/Thread view",   TRUE);
-               menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
+               menu_set_sensitive(ifactory, "/View/Thread view",   TRUE);
+               menu_set_sensitive(ifactory, "/View/Unthread view", FALSE);
        }
 }
 
 static void set_display_item_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
-       prefs_summary_display_item_set();
+       prefs_summary_column_open();
 }
 
 static void sort_summary_cb(MainWindow *mainwin, guint action,
@@ -2691,6 +2808,12 @@ static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                messageview_select_all(mainwin->messageview);
 }
 
+static void create_filter_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       summary_filter_open(mainwin->summaryview, (PrefsFilterType)action);
+}
+
 static void prefs_common_open_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
@@ -2700,7 +2823,7 @@ static void prefs_common_open_cb(MainWindow *mainwin, guint action,
 static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
-       prefs_filter_open();
+       prefs_filter_open(NULL, NULL);
 }
 
 static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
@@ -2712,7 +2835,13 @@ static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
 static void prefs_filtering_open_cb(MainWindow *mainwin, guint action,
                                    GtkWidget *widget)
 {
-       prefs_filtering_open();
+       prefs_filtering_open(NULL);
+}
+
+static void prefs_template_open_cb(MainWindow *mainwin, guint action,
+                                  GtkWidget *widget)
+{
+       prefs_template_open();
 }
 
 static void prefs_account_open_cb(MainWindow *mainwin, guint action,
@@ -2774,27 +2903,16 @@ static void activate_compose_button (MainWindow *mainwin,
                                ToolbarStyle style,
                                ComposeButtonType type)
 {
+       SensitiveCond state = main_window_get_current_state(mainwin);
+
        if (style == TOOLBAR_NONE) 
                return;
 
-       if (style == TOOLBAR_BOTH) {
-               gtk_widget_hide(mainwin->compose_mail_btn_plain);
-               gtk_widget_hide(mainwin->compose_news_btn_plain);
-               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;       
-       }
-       else {
-               gtk_widget_hide(mainwin->compose_news_btn);
-               gtk_widget_hide(mainwin->compose_mail_btn);
-               gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn_plain 
-                       : mainwin->compose_news_btn_plain);
-               gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn_plain
-                       : mainwin->compose_mail_btn_plain);
-               mainwin->compose_btn_type = type;               
-       }
+       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)
@@ -2805,8 +2923,33 @@ void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonTy
                                        compose_btn_type);
 }
 
-static void prefs_templates_open_cb(MainWindow *mainwin, guint action,
-                                   GtkWidget *widget)
+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)
 {
-       prefs_templates_open();
+       MainWindow *mainwin = (MainWindow*) data;
+       
+       if (!mainwin || !event) return;
+               
+       switch (event->keyval) {
+       case GDK_Q:             /* Quit */
+               BREAK_ON_MODIFIER_KEY();
+
+               app_exit_cb(mainwin, 0, NULL);
+               return;
+       default:
+               break;
+       }
 }
+
+#undef BREAK_ON_MODIFIER_KEY