sync with sylpheed 0.7.0cvs38
[claws.git] / src / mainwindow.c
index 31e6e37ebb85e4ad32a88109cf48fde5259a3a92..ecfe4019b3897dff1620a2b9fd8cb83614e33f02 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
@@ -52,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"
@@ -60,6 +61,7 @@
 #include "export.h"
 #include "prefs_common.h"
 #include "prefs_filter.h"
+#include "prefs_actions.h"
 #include "prefs_filtering.h"
 #include "prefs_scoring.h"
 #include "prefs_account.h"
@@ -231,6 +233,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);
@@ -272,6 +280,10 @@ static void view_source_cb         (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void show_all_header_cb         (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void reedit_cb                  (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -377,6 +389,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);
@@ -395,6 +411,9 @@ static void prefs_account_open_cb(MainWindow        *mainwin,
 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 new_account_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -414,6 +433,14 @@ 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);
+
 #define  SEPARATE_ACTION  667
 
 static GtkItemFactoryEntry mainwin_entries[] =
@@ -429,46 +456,64 @@ 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_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_Edit/Actio_ns"),                 NULL, NULL, 0, "<Branch>"},
 
        {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/_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/---"),                      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)},
@@ -539,90 +584,88 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #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", show_all_header_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"),     "<control>M", 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/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/_Mark/Mark all read"),   NULL, mark_all_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/_Hide read messages"),   NULL, hide_read_messages, 0, "<ToggleItem>"},
-       {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..."),
@@ -634,9 +677,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/_Filtering ..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
        {N_("/_Configuration/_Template..."),    NULL, prefs_template_open_cb, 0, NULL},
+       {N_("/_Configuration/_Actions..."),     NULL, prefs_actions_open_cb, 0, NULL},
+       {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/_Preferences for current account..."),
                                                NULL, prefs_account_open_cb, 0, NULL},
-       {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/Create _new account..."),
                                                NULL, new_account_cb, 0, NULL},
        {N_("/_Configuration/_Edit accounts..."),
@@ -644,7 +688,7 @@ 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},
@@ -658,8 +702,8 @@ static GtkItemFactoryEntry reply_popup_entries[] =
 };
 static GtkItemFactoryEntry replyall_popup_entries[] =
 {
-       {N_("/Reply to all with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
-       {N_("/_Reply to all without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
+       {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[] =
 {
@@ -668,8 +712,8 @@ static GtkItemFactoryEntry replysender_popup_entries[] =
 };
 static GtkItemFactoryEntry fwd_popup_entries[] =
 {
-       {N_("/_Forward message (inline style)"), NULL, reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/Forward message as _attachment"), NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
+       {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}
 };
 
 
@@ -718,6 +762,8 @@ 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);
@@ -904,14 +950,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);
@@ -927,15 +973,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
@@ -946,13 +992,15 @@ MainWindow *main_window_create(SeparateType type)
 
        main_window_set_toolbar_sensitive(mainwin);
 
+       /* Create actions menu */
+       update_mainwin_actions_menu(ifactory, mainwin);
+
        /* show main window */
        gtk_widget_set_uposition(mainwin->window,
                                 prefs_common.mainwin_x,
                                 prefs_common.mainwin_y);
        gtk_widget_set_usize(window, prefs_common.mainwin_width,
                             prefs_common.mainwin_height);
-                            
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -962,7 +1010,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;
 
@@ -1200,21 +1247,17 @@ void main_window_get_position(MainWindow *mainwin)
 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 {
        GList *list;
-       gboolean hasTrash = 0;
-
-       for (list = folder_get_list(); list != NULL; list = list->next) {
-               Folder *folder;
+       guint has_trash;
+       Folder *folder;
 
-               folder = list->data;
-               if (folder->trash) {
-                       hasTrash = (folder->trash->total > 0);
-               }
+       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 (!hasTrash) {
-         return;
-       }
+       if (!has_trash) return;
+       
        if (confirm) {
                if (alertpanel(_("Empty trash"),
                               _("Empty all messages in trash?"),
@@ -1226,10 +1269,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);
                }
@@ -1334,10 +1375,12 @@ 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_HAVE_NEWS_ACCOUNT   = 1 << 10
+       M_ALLOW_DELETE        = 1 << 9,
+       M_NEWS                = 1 << 10,
+       M_HAVE_NEWS_ACCOUNT   = 1 << 11,
+       M_HIDE_READ_MSG       = 1 << 12
 } SensitiveCond;
 
 static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
@@ -1354,18 +1397,23 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;
        if (item) {
+               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
+                   || selection != SUMMARY_NONE)
+                       state |= M_HIDE_READ_MSG;       
        }               
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
                state |= M_TARGET_EXIST;
        if (selection == SUMMARY_SELECTED_SINGLE)
                state |= M_SINGLE_TARGET_EXIST;
-       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;
@@ -1404,11 +1452,11 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin)
                {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},
-               {mainwin->delete_btn      , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {mainwin->delete_btn      , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {mainwin->exec_btn        , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
                {NULL, 0}
        };
@@ -1445,49 +1493,52 @@ 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},
+               {"/Edit/Actions"                   , M_MSG_EXIST},
+               {"/View/Sort"                      , M_MSG_EXIST},
+               {"/View/Thread view"               , M_UNTHREADED},
+               {"/View/Unthread view"             , M_THREADED},
+               {"/View/Hide read messages"        , M_HIDE_READ_MSG},
+               {"/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"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Message/Bounce"                , 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},
-
-               {"/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/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/Mark"                  , M_TARGET_EXIST},
+               {"/Message/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|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},
 
                {NULL, 0}
        };
-       
+
        ifactory = gtk_item_factory_from_widget(mainwin->menubar);
        state = main_window_get_current_state(mainwin);
 
@@ -1558,14 +1609,17 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        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), "separate folderview", "Sylpheed");
+               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,
@@ -1578,8 +1632,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), "separate messageview", "Sylpheed");
+               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
@@ -1625,8 +1681,12 @@ 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", FALSE);
-               menu_set_sensitive(ifactory, "/View/Folder tree", FALSE);
+               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;
@@ -1659,7 +1719,7 @@ 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", FALSE);
+               menu_set_sensitive(ifactory, "/View/Message view", TRUE);
                menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
                
                mainwin->win.sep_folder.folderwin = folderwin;
@@ -1687,8 +1747,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                  GTK_WIDGET_PTR(mainwin->messageview));
        
                menu_set_sensitive(ifactory, "/View/Message view", TRUE);
-               menu_set_sensitive(ifactory, "/View/Folder tree", FALSE);
-
+               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;
 
@@ -1725,35 +1787,10 @@ 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;
@@ -1782,13 +1819,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"),
@@ -1799,7 +1836,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)"),
@@ -1809,8 +1846,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           mainwin);
 
        /* insert compose mail button widget */                                    
-
-       CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
+       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"),
@@ -1820,8 +1856,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                              mainwin);
 
        /* insert compose news button widget */
-
-       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+       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"),
@@ -1834,7 +1869,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        
        /* reply button */
        
-       CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
+       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"),
@@ -1844,8 +1879,8 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                            mainwin);
 
        /* replyall button */
-       
-       CREATE_TOOLBAR_ICON(stock_mail_reply_to_all_xpm);
+
+       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"),
@@ -1855,8 +1890,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                               mainwin);
 
        /* reply to sender button */
-       
-       CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
+       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"),
@@ -1866,8 +1900,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                                  mainwin);
 
        /* forward button */
-       
-       CREATE_TOOLBAR_ICON(stock_mail_forward_xpm);
+       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"),
@@ -1878,7 +1911,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"),
@@ -1887,7 +1920,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"),
@@ -1896,7 +1929,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"),
@@ -1908,7 +1941,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"),
@@ -1916,7 +1949,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"),
@@ -2422,6 +2455,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)
 
 {
@@ -2552,85 +2595,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_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, 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_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, TRUE);
-               break;
-       case COMPOSE_FORWARD:
-               if (prefs_common.forward_as_attachment) {
-                       reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, widget);
-                       return;
-               } else {
-                       reply_cb(mainwin, COMPOSE_FORWARD_INLINE, widget);
-                       return;
-               }
-               break;
-       case COMPOSE_FORWARD_INLINE:
-               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;
-       case COMPOSE_BOUNCE:
-                       compose_bounce(NULL, msginfo);
-                       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)
@@ -2659,6 +2624,12 @@ static void view_source_cb(MainWindow *mainwin, guint action,
        summary_view_source(mainwin->summaryview);
 }
 
+static void show_all_header_cb(MainWindow *mainwin, guint action,
+                              GtkWidget *widget)
+{
+       summary_display_msg_selected(mainwin->summaryview, TRUE);
+}
+
 static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_reedit(mainwin->summaryview);
@@ -2732,13 +2703,13 @@ static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        if (0 == action) {
                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);
        }
 }
 
@@ -2846,7 +2817,7 @@ static void goto_folder_cb(MainWindow *mainwin, guint action,
 {
        FolderItem *to_folder;
 
-       to_folder = foldersel_folder_sel(NULL, NULL);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL);
 
        if (to_folder)
                folderview_select(mainwin->folderview, to_folder);
@@ -2866,6 +2837,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)
 {
@@ -2875,7 +2852,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,
@@ -2896,6 +2873,12 @@ static void prefs_template_open_cb(MainWindow *mainwin, guint action,
        prefs_template_open();
 }
 
+static void prefs_actions_open_cb(MainWindow *mainwin, guint action,
+                                 GtkWidget *widget)
+{
+       prefs_actions_open(mainwin);
+}
+
 static void prefs_account_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
@@ -2974,3 +2957,34 @@ void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonTy
                                        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)
+{
+       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