Added work offline availability.
[claws.git] / src / mainwindow.c
index 58f50a6ad98d7ab5fc7e8d62ccfd4d6df6d42e5b..e09cc23c32c7b7e9b64aae123302f95ed5b1f654 100644 (file)
@@ -61,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"
@@ -69,7 +70,6 @@
 #include "prefs_template.h"
 #include "account.h"
 #include "addressbook.h"
-#include "headerwindow.h"
 #include "logwindow.h"
 #include "manage_window.h"
 #include "alertpanel.h"
@@ -81,6 +81,7 @@
 #include "about.h"
 #include "manual.h"
 #include "version.h"
+#include "selective_download.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -102,6 +103,9 @@ static GList *mainwin_list = NULL;
 
 static GdkCursor *watch_cursor;
 
+static void main_window_menu_callback_block    (MainWindow     *mainwin);
+static void main_window_menu_callback_unblock  (MainWindow     *mainwin);
+
 static void main_window_show_cur_account       (MainWindow     *mainwin);
 
 static void main_window_set_widgets            (MainWindow     *mainwin,
@@ -238,6 +242,9 @@ static void toggle_expand_summaryview_cb     (MainWindow    *mainwin,
 static void toggle_expand_messageview_cb        (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void toggle_work_offline_cb      (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void separate_widget_cb (GtkCheckMenuItem *checkitem,
                                 guint action,
                                 GtkWidget *widget);
@@ -248,6 +255,9 @@ static void addressbook_open_cb     (MainWindow     *mainwin,
 static void log_window_show_cb (MainWindow     *mainwin,
                                 guint           action,
                                 GtkWidget      *widget);
+static void sel_download_cb     (MainWindow *mainwin, 
+                                guint action,
+                                GtkWidget *widget);
 
 static void inc_mail_cb                        (MainWindow     *mainwin,
                                         guint           action,
@@ -255,6 +265,9 @@ static void inc_mail_cb                     (MainWindow     *mainwin,
 static void inc_all_account_mail_cb    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+static void inc_cancel_cb              (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void send_queue_cb              (MainWindow     *mainwin,
                                         guint           action,
@@ -387,7 +400,9 @@ static void copy_cb          (MainWindow    *mainwin,
 static void allsel_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
+static void selthread_cb        (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void create_filter_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -410,6 +425,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);
@@ -417,9 +435,15 @@ static void new_account_cb  (MainWindow    *mainwin,
 static void account_menu_cb     (GtkMenuItem   *menuitem,
                                  gpointer       data);
 
+static void online_switch_clicked(GtkButton     *btn, 
+                                 gpointer data);
+
 static void manual_open_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void faq_open_cb                 (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 
 static void scan_tree_func      (Folder        *folder,
                                  FolderItem    *item,
@@ -437,6 +461,16 @@ static void key_pressed (GtkWidget *widget,
                                GdkEventKey *event,
                                gpointer data);
 
+static void set_toolbar_style(MainWindow *mainwin);
+
+static void addr_harvest_cb     ( MainWindow  *mainwin,
+                                  guint       action,
+                                  GtkWidget   *widget );
+
+static void addr_harvest_msg_cb         ( MainWindow  *mainwin,
+                                  guint       action,
+                                  GtkWidget   *widget );
+
 #define  SEPARATE_ACTION  667
 
 static GtkItemFactoryEntry mainwin_entries[] =
@@ -453,6 +487,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},
        {N_("/_File/Empty _trash"),             "<shift>D", empty_trash_cb, 0, NULL},
+       {N_("/_File/_Work offline"),            "<control>W", toggle_work_offline_cb, 0, "<ToggleItem>"},                                               
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Save as..."),              "<control>S", save_as_cb, 0, NULL},
        {N_("/_File/_Print..."),                NULL, print_cb, 0, NULL},
@@ -462,22 +497,30 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Edit/_Copy"),                    "<control>C", copy_cb, 0, NULL},
        {N_("/_Edit/Select _all"),              "<control>A", allsel_cb, 0, NULL},
+       {N_("/_Edit/Select thread"),            "<control>Z", selthread_cb, 0, NULL},
        {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
        {N_("/_Edit/_Search folder..."),        "<shift><control>F", search_cb, 1, NULL},
-
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_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/Show or hi_de"),            NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Show or hi_de/_Toolbar"),
+                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
+       {N_("/_View/Show or hi_de/_Toolbar/_Icon"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Icon and text"},
+       {N_("/_View/Show or hi_de/_Toolbar/_Text"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Icon and text"},
+       {N_("/_View/Show or hi_de/_Toolbar/_None"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Icon and text"},
+       {N_("/_View/Show or hi_de/Status _bar"),
+                                               NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/Separate _Folder Tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
+       {N_("/_View/Separate _Message View"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
+       {N_("/_View/E_xpand Summary View"),     "V", toggle_expand_summaryview_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Ex_pand Message View"),     "<shift>V", toggle_expand_messageview_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/Sort by _number"),    NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
@@ -494,10 +537,31 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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/Th_read view"),             "<control>T",        thread_cb, 0, "<ToggleItem>"},
        {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/_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>"},
 
 #define CODESET_SEPARATOR \
@@ -519,6 +583,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #endif
        {N_("/_View/_Code set/Western European (ISO-8859-_1)"),
         CODESET_ACTION(C_ISO_8859_1)},
+       {N_("/_View/_Code set/Western European (ISO-8859-15)"),
+        CODESET_ACTION(C_ISO_8859_15)},
        CODESET_SEPARATOR,
 #if HAVE_LIBJCONV
        {N_("/_View/_Code set/Central European (ISO-8859-_2)"),
@@ -578,31 +644,10 @@ 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/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
+       {N_("/_View/Show all _header"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update"),                  "<control><alt>U", update_summary_cb,  0, NULL},
 
@@ -610,9 +655,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Get new ma_il"),         "<control>I",   inc_mail_cb, 0, NULL},
        {N_("/_Message/Get from _all accounts"),
                                                "<shift><control>I", inc_all_account_mail_cb, 0, NULL},
+       {N_("/_Message/Cancel receivin_g"),     NULL, inc_cancel_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Send queued messa_ges"),
-                                               NULL, send_queue_cb, 0, NULL},
+       {N_("/_Message/_Send queued messages"), NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Compose a_n email message"),     "<control>M", compose_mail_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
@@ -629,48 +674,58 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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/_Mark"),           "<shift>asterisk", mark_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 unr_ead"), "<shift>exclam", 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_("/_Tool"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tool/_Address book"),            "<shift><control>A", addressbook_open_cb, 0, NULL},
-       {N_("/_Tool/Add sender to address boo_k"),
+       {N_("/_Tools"),                         NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/_Selective download..."),  "<alt>S", sel_download_cb, 0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Address book..."),        "<shift><control>A", addressbook_open_cb, 0, NULL},
+       {N_("/_Tools/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
-       {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"),
+       {N_("/_Tools/_Harvest addresses"),      NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/_Harvest addresses/from _Folder..."),
+                                               NULL, addr_harvest_cb, 0, NULL},
+       {N_("/_Tools/_Harvest addresses/from _Messages..."),
+                                               NULL, addr_harvest_msg_cb, 0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Filter messages"),                NULL, filter_cb, 0, NULL},
+       {N_("/_Tools/_Create filter rule"),     NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/_Create filter rule/_Automatically"),
                                                NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
-       {N_("/_Tool/_Create filter rule/by _From"),
+       {N_("/_Tools/_Create filter rule/by _From"),
                                                NULL, create_filter_cb, FILTER_BY_FROM, NULL},
-       {N_("/_Tool/_Create filter rule/by _To"),
+       {N_("/_Tools/_Create filter rule/by _To"),
                                                NULL, create_filter_cb, FILTER_BY_TO, NULL},
-       {N_("/_Tool/_Create filter rule/by _Subject"),
+       {N_("/_Tools/_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_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/Actio_ns"),                        NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/E_xecute"),                        "X", execute_summary_cb, 0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/Delete du_plicated messages"),
+                                               NULL, delete_duplicated_cb,   0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Log window"),             "<control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
        {N_("/_Configuration/_Filter setting..."),
                                                NULL, prefs_filter_open_cb, 0, NULL},
-       {N_("/_Configuration/_Scoring ..."),
+       {N_("/_Configuration/_Scoring..."),
                                                NULL, prefs_scoring_open_cb, 0, NULL},
-       {N_("/_Configuration/_Filtering ..."),
+       {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},
@@ -684,7 +739,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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/_French"),          NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
        {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
+       {N_("/_Help/_FAQ"),                     NULL, NULL, 0, "<Branch>"},
+       {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
+       {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
+       {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
+       {N_("/_Help/_FAQ/_Italian"),            NULL, faq_open_cb, MANUAL_LANG_IT, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
@@ -709,7 +770,6 @@ static GtkItemFactoryEntry fwd_popup_entries[] =
        {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
 };
 
-
 MainWindow *main_window_create(SeparateType type)
 {
        MainWindow *mainwin;
@@ -724,6 +784,10 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;
+       GtkWidget *online_status;
+       GtkWidget *offline_status;
+       GtkWidget *online_switch;
+       GtkWidget *offline_switch;
 
        FolderView *folderview;
        SummaryView *summaryview;
@@ -742,6 +806,8 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *fwd_popup;
        gint i;
 
+       static GdkGeometry geometry;
+
        debug_print(_("Creating main window...\n"));
        mainwin = g_new0(MainWindow, 1);
 
@@ -749,17 +815,24 @@ MainWindow *main_window_create(SeparateType type)
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
+       gtk_window_set_wmclass(GTK_WINDOW(window), "main_window", "Sylpheed");
+
+       if (!geometry.min_height) {
+               geometry.min_width = 320;
+               geometry.min_height = 200;
+       }
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
-       gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
-                          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);
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
        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);
 
@@ -823,6 +896,19 @@ MainWindow *main_window_create(SeparateType type)
        gtk_widget_set_usize(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
 
+       online_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+       offline_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+       online_switch = gtk_button_new ();
+       offline_switch = gtk_button_new ();
+       gtk_container_add (GTK_CONTAINER(online_switch), online_status);
+       gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
+       gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
+       gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);
+       gtk_container_add (GTK_CONTAINER(offline_switch), offline_status);
+       gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
+       gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
+       gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
+       
        statuslabel = gtk_label_new("");
        gtk_box_pack_start(GTK_BOX(hbox_stat), statuslabel, FALSE, FALSE, 0);
 
@@ -839,11 +925,11 @@ MainWindow *main_window_create(SeparateType type)
 
        gtk_widget_show_all(hbox_stat);
 
+       gtk_widget_hide(offline_switch);
        /* create views */
        mainwin->folderview  = folderview  = folderview_create();
        mainwin->summaryview = summaryview = summary_create();
        mainwin->messageview = messageview = messageview_create();
-       mainwin->headerwin   = header_window_create();
        mainwin->logwin      = log_window_create();
 
        folderview->mainwin      = mainwin;
@@ -852,7 +938,6 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->mainwin     = mainwin;
        summaryview->folderview  = folderview;
        summaryview->messageview = messageview;
-       summaryview->headerwin   = mainwin->headerwin;
        summaryview->window      = window;
 
        messageview->mainwin     = mainwin;
@@ -872,6 +957,8 @@ MainWindow *main_window_create(SeparateType type)
        mainwin->replyall_popup = replyall_popup;
        mainwin->replysender_popup = replysender_popup;
        mainwin->fwd_popup = fwd_popup;
+       mainwin->online_switch = online_switch;
+       mainwin->offline_switch = offline_switch;
        
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
@@ -895,7 +982,7 @@ MainWindow *main_window_create(SeparateType type)
                                       &folderview->color_op);
 
        summaryview->color_important.red = 0;
-       summaryview->color_marked.green = 0;
+       summaryview->color_important.green = 0;
        summaryview->color_important.blue = (guint16)65535;
 
        color[0] = summaryview->color_marked;
@@ -923,32 +1010,33 @@ MainWindow *main_window_create(SeparateType type)
        switch (prefs_common.toolbar_style) {
        case TOOLBAR_NONE:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/None");
+                       (ifactory, "/View/Show or hide/Toolbar/None");
                break;
        case TOOLBAR_ICON:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Icon");
+                       (ifactory, "/View/Show or hide/Toolbar/Icon");
                break;
        case TOOLBAR_TEXT:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Text");
+                       (ifactory, "/View/Show or hide/Toolbar/Text");
                break;
        case TOOLBAR_BOTH:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Icon and text");
+                       (ifactory, "/View/Show or hide/Toolbar/Icon and text");
        }
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 
        gtk_widget_hide(mainwin->hbox_stat);
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Status bar");
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Show or hide/Status bar");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
 #if 0 /* FIXED SEPARATE WINDOWS */
        /* Message view and Folder tree are always shown at startup
         * make that in the menu visible */
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Message view");
+       menuitem = gtk_item_factory_get_item(ifactory, "/View/Separate Message View");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Folder tree");
+       menuitem = gtk_item_factory_get_item(ifactory, "/View/Separate Folder Tree");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 #endif 
        /* set the check of the SEPARATE_xxx menu items. we also need the main window
@@ -970,11 +1058,6 @@ MainWindow *main_window_create(SeparateType type)
        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, "/View/Unthread view",
-                          prefs_common.enable_thread ? TRUE : FALSE);
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
@@ -985,6 +1068,9 @@ 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,
@@ -997,10 +1083,10 @@ MainWindow *main_window_create(SeparateType type)
        folderview_init(folderview);
        summary_init(summaryview);
        messageview_init(messageview);
-       header_window_init(mainwin->headerwin);
        log_window_init(mainwin->logwin);
 
        mainwin->lock_count = 0;
+       mainwin->menu_lock_count = 0;
        mainwin->cursor_count = 0;
 
        if (!watch_cursor)
@@ -1008,6 +1094,10 @@ MainWindow *main_window_create(SeparateType type)
 
        mainwin_list = g_list_append(mainwin_list, mainwin);
 
+       /* init work_offline */
+       if (prefs_common.work_offline)
+               online_switch_clicked (GTK_BUTTON(online_switch), mainwin);
+
        return mainwin;
 }
 
@@ -1057,7 +1147,23 @@ void main_window_unlock(MainWindow *mainwin)
                gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
 }
 
+static void main_window_menu_callback_block(MainWindow *mainwin)
+{
+       mainwin->menu_lock_count++;
+}
+
+static void main_window_menu_callback_unblock(MainWindow *mainwin)
+{
+       if (mainwin->menu_lock_count)
+               mainwin->menu_lock_count--;
+}
+
 void main_window_reflect_prefs_all(void)
+{
+       main_window_reflect_prefs_all_real(FALSE);
+}
+
+void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 {
        GList *cur;
        MainWindow *mainwin;
@@ -1069,12 +1175,19 @@ void main_window_reflect_prefs_all(void)
                main_window_set_menu_sensitive(mainwin);
                main_window_set_toolbar_sensitive(mainwin);
 
-               if (prefs_common.immediate_exec)
-                       gtk_widget_hide(mainwin->exec_btn);
-               else
-                       gtk_widget_show(mainwin->exec_btn);
-
-               summary_redisplay_msg(mainwin->summaryview, FALSE);
+               /* pixmap themes */
+               if (pixmap_theme_changed)
+               {
+                       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), GTK_WIDGET(mainwin->toolbar));
+                       mainwin->toolbar = NULL;
+                       main_window_toolbar_create(mainwin, mainwin->handlebox);
+                       set_toolbar_style(mainwin);
+                       activate_compose_button(mainwin, prefs_common.toolbar_style, mainwin->compose_btn_type);
+                       folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
+                       summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
+               }
+               
+               summary_redisplay_msg(mainwin->summaryview);
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
        }
@@ -1365,11 +1478,13 @@ 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_HIDE_READ_MSG       = 1 << 11
+       M_ALLOW_DELETE        = 1 << 9,
+       M_INC_ACTIVE          = 1 << 10,
+       M_NEWS                = 1 << 11,
+       M_HAVE_NEWS_ACCOUNT   = 1 << 12,
+       M_HIDE_READ_MSG       = 1 << 13
 } SensitiveCond;
 
 static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
@@ -1386,10 +1501,13 @@ 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;
+                       state |= M_UNTHREADED;  
+               /*              if (item->folder->type != F_NEWS) */
+               state |= M_ALLOW_DELETE;
 
                if (selection == SUMMARY_NONE && item->hide_read_msgs
                    || selection != SUMMARY_NONE)
@@ -1400,8 +1518,6 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                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;
@@ -1420,34 +1536,49 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                }
        }
 
+       if (inc_is_active())
+               state |= M_INC_ACTIVE;
+
        return state;
 }
 
 void main_window_set_toolbar_sensitive(MainWindow *mainwin)
 {
        SensitiveCond state;
-    gboolean sensitive;
+       gboolean sensitive;
        gint i;
 
-       const struct {
+       struct {
                GtkWidget *widget;
                SensitiveCond cond;
-       } entry[] = {
-               {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_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_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->exec_btn        , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {NULL, 0}
-       };
+       } entry[11];
+
+       entry[0].widget  = mainwin->get_btn;
+       entry[0].cond    = M_HAVE_ACCOUNT|M_UNLOCKED;
+       entry[1].widget  = mainwin->getall_btn;
+       entry[1].cond    = M_HAVE_ACCOUNT|M_UNLOCKED;
+       entry[2].widget  = mainwin->compose_news_btn;
+       entry[2].cond    = M_HAVE_NEWS_ACCOUNT;
+       entry[3].widget  = mainwin->reply_btn;
+       entry[3].cond    = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+       entry[4].widget  = mainwin->replyall_btn;
+       entry[4].cond    = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+       entry[5].widget  = mainwin->replysender_btn;
+       entry[5].cond    = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+       entry[6].widget  = mainwin->fwd_btn;
+       entry[6].cond    = M_HAVE_ACCOUNT|M_TARGET_EXIST;
+/*     entry[6].widget  = mainwin->prefs_btn;
+       entry[6].cond    = M_UNLOCKED;
+       entry[7].widget  = mainwin->account_btn;
+       entry[7].cond    = M_UNLOCKED; */
+       entry[7].widget  = mainwin->next_btn;
+       entry[7].cond    = M_MSG_EXIST;
+       entry[8].widget  = mainwin->delete_btn;
+       entry[8].cond    = M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED;
+       entry[9].widget = mainwin->exec_btn;
+       entry[9].cond   = M_MSG_EXIST|M_EXEC|M_UNLOCKED;
+       entry[10].widget = NULL;
+       entry[10].cond   = 0;
 
        state = main_window_get_current_state(mainwin);
 
@@ -1466,6 +1597,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        GtkItemFactory *ifactory;
        SensitiveCond state;
        gboolean sensitive;
+       GtkWidget *menuitem;
        gint i;
 
        static const struct {
@@ -1479,18 +1611,19 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/File/Import mbox file..."   , M_UNLOCKED},
                {"/File/Export to mbox file...", M_UNLOCKED},
                {"/File/Empty trash"           , M_UNLOCKED},
+               {"/File/Work offline"          , M_UNLOCKED},
                {"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
                /* {"/File/Close", M_UNLOCKED}, */
                {"/File/Exit" , M_UNLOCKED},
 
+               {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
                {"/View/Sort"                      , M_MSG_EXIST},
-               {"/View/Thread view"               , M_UNTHREADED},
-               {"/View/Unthread view"             , M_THREADED},
+               {"/View/Thread view"               , M_EXEC},
                {"/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/Prev unread 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},
@@ -1498,10 +1631,11 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/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},
+               {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
                {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
                {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Message/Cancel receiving"      , M_INC_ACTIVE},
                {"/Message/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},
@@ -1510,16 +1644,19 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/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/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Delete"                , 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_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},
+               {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
+               {"/Tools/Harvest addresses"         , M_UNLOCKED},
+               {"/Tools/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/Tools/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Actions"                   , M_MSG_EXIST},
+               {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
                {"/Configuration", M_UNLOCKED},
 
@@ -1533,6 +1670,16 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                sensitive = ((entry[i].cond & state) == entry[i].cond);
                menu_set_sensitive(ifactory, entry[i].entry, sensitive);
        }
+
+       main_window_menu_callback_block(mainwin);
+       menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all header");
+       gtk_check_menu_item_set_active
+               (GTK_CHECK_MENU_ITEM(menuitem),
+                mainwin->messageview->textview->show_all_headers);
+       menuitem = gtk_item_factory_get_widget(ifactory, "/View/Thread view");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      (state & M_THREADED) != 0);
+       main_window_menu_callback_unblock(mainwin);
 }
 
 void main_window_popup(MainWindow *mainwin)
@@ -1668,8 +1815,8 @@ 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/Separate Message View", TRUE);
+               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
                menu_set_sensitive(ifactory, "/View/Expand Summary View", TRUE);
                menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
                menuitem = gtk_item_factory_get_widget(ifactory, "/View/Expand Message View");
@@ -1706,8 +1853,8 @@ 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);
+               menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
+               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
                
                mainwin->win.sep_folder.folderwin = folderwin;
                mainwin->win.sep_folder.vpaned    = vpaned;
@@ -1733,8 +1880,8 @@ 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);
+               menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
+               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
                menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
                menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
                
@@ -1758,8 +1905,8 @@ 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);
+               menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
+               menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
        
                mainwin->win.sep_both.folderwin = folderwin;
                mainwin->win.sep_both.messagewin = messagewin;
@@ -2281,7 +2428,7 @@ static void update_folderview_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
        summary_show(mainwin->summaryview, NULL, FALSE);
-       folderview_update_all();
+       folderview_rescan_all();
 }
 
 static void new_folder_cb(MainWindow *mainwin, guint action,
@@ -2404,30 +2551,10 @@ static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
        set_toolbar_replysender_button(mainwin, (ToolbarStyle)action);
        set_toolbar_forward_button(mainwin, (ToolbarStyle)action);*/
        
-       switch ((ToolbarStyle)action) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-       case TOOLBAR_ICON:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
-                                     GTK_TOOLBAR_ICONS);
-               break;
-       case TOOLBAR_TEXT:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
-                                     GTK_TOOLBAR_TEXT);
-               break;
-       case TOOLBAR_BOTH:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
-                                     GTK_TOOLBAR_BOTH);
-               break;
-       }
-
-       if (action != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
-
        mainwin->toolbar_style = (ToolbarStyle)action;
        prefs_common.toolbar_style = (ToolbarStyle)action;
+       
+       set_toolbar_style(mainwin);
 }
 
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
@@ -2452,8 +2579,47 @@ static void toggle_expand_messageview_cb(MainWindow *mainwin, guint action, GtkW
        messageview_toggle_view_real(mainwin->messageview);
 }
 
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
+static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
+       } else {
+               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);           
+       }
+}
 
+static void online_switch_clicked (GtkButton *btn, gpointer data) 
+{
+       MainWindow *mainwin;
+       GtkItemFactory *ifactory;
+       GtkCheckMenuItem *menuitem;
+
+       mainwin = (MainWindow *) data;
+       
+       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       menuitem = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_widget(ifactory, "/File/Work offline"));
+       
+       g_return_if_fail(mainwin != NULL);
+       g_return_if_fail(menuitem != NULL);
+       
+       if (btn == GTK_BUTTON(mainwin->online_switch)) {
+               /* go offline */
+               gtk_widget_hide (mainwin->online_switch);
+               gtk_widget_show (mainwin->offline_switch);
+               menuitem->active = TRUE;
+               prefs_common.work_offline = TRUE;
+               inc_autocheck_timer_remove();           
+       } else {
+               /*go online */
+               gtk_widget_hide (mainwin->offline_switch);
+               gtk_widget_show (mainwin->online_switch);
+               menuitem->active = FALSE;
+               prefs_common.work_offline = FALSE;
+               inc_autocheck_timer_set();
+       }
+}
+
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
 {
        MainWindow *mainwin;
        SeparateType type;
@@ -2480,31 +2646,46 @@ static void log_window_show_cb(MainWindow *mainwin, guint action,
        log_window_show(mainwin->logwin);
 }
 
+static void sel_download_cb(MainWindow *mainwin, guint action,
+                              GtkWidget *widget)
+{
+       selective_download(mainwin);
+}
+
 static void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       inc_mail(mainwin);
+       inc_mail(mainwin, prefs_common.newmail_notify_manu);
 }
 
 static void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
                                    GtkWidget *widget)
 {
-       inc_all_account_mail(mainwin);
+       inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+}
+
+static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       inc_cancel_all();
 }
 
 static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        GList *list;
 
-       if (procmsg_send_queue() < 0)
-               alertpanel_error(_("Some errors occurred while sending queued messages."));
-
-       statusbar_pop_all();
+       if (prefs_common.work_offline)
+               if (alertpanel(_("Offline warning"), 
+                              _("You're working offline. Override?"),
+                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+               return;
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
-               Folder *folder;
+               Folder *folder = list->data;
 
-               folder = list->data;
                if (folder->queue) {
+                       if (procmsg_send_queue
+                               (folder->queue, prefs_common.savemsg) < 0)
+                               alertpanel_error(_("Some errors occurred while sending queued messages."));
+                       statusbar_pop_all();
                        folder_item_scan(folder->queue);
                        folderview_update_item(folder->queue, TRUE);
                }
@@ -2614,7 +2795,9 @@ static void view_source_cb(MainWindow *mainwin, guint action,
 static void show_all_header_cb(MainWindow *mainwin, guint action,
                               GtkWidget *widget)
 {
-       summary_redisplay_msg(mainwin->summaryview, TRUE);
+       if (mainwin->menu_lock_count) return;
+       summary_display_msg_selected(mainwin->summaryview,
+                                    GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
 static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
@@ -2665,7 +2848,7 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
        g_free(prefs_common.force_charset);
        prefs_common.force_charset = str ? g_strdup(str) : NULL;
 
-       summary_redisplay_msg(mainwin->summaryview, FALSE);
+       summary_redisplay_msg(mainwin->summaryview);
 
        debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
 }
@@ -2683,20 +2866,17 @@ static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        GtkItemFactory *ifactory;
 
+       if (mainwin->menu_lock_count) return;
        if (!mainwin->summaryview->folder_item) return;
 
        ifactory = gtk_item_factory_from_widget(widget);
 
-       if (0 == action) {
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
                summary_thread_build(mainwin->summaryview);
                mainwin->summaryview->folder_item->threaded = 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, "/View/Thread view",   TRUE);
-               menu_set_sensitive(ifactory, "/View/Unthread view", FALSE);
        }
 }
 
@@ -2804,7 +2984,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);
@@ -2824,6 +3004,12 @@ static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                messageview_select_all(mainwin->messageview);
 }
 
+static void selthread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       if (mainwin->summaryview->msg_is_toggled_on)
+               summary_select_thread(mainwin->summaryview);
+}
+
 static void create_filter_cb(MainWindow *mainwin, guint action,
                             GtkWidget *widget)
 {
@@ -2851,7 +3037,7 @@ 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(NULL);
+       prefs_filtering_open(NULL, NULL, NULL);
 }
 
 static void prefs_template_open_cb(MainWindow *mainwin, guint action,
@@ -2860,6 +3046,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)
 {
@@ -2896,6 +3088,11 @@ static void manual_open_cb(MainWindow *mainwin, guint action,
        manual_open((ManualLang)action);
 }
 
+static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       faq_open((ManualLang)action);
+}
+
 static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
@@ -2969,3 +3166,59 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 }
 
 #undef BREAK_ON_MODIFIER_KEY
+
+static void set_toolbar_style(MainWindow *mainwin)
+{
+       switch (prefs_common.toolbar_style) {
+       case TOOLBAR_NONE:
+               gtk_widget_hide(mainwin->handlebox);
+               break;
+       case TOOLBAR_ICON:
+               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+                                     GTK_TOOLBAR_ICONS);
+               break;
+       case TOOLBAR_TEXT:
+               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+                                     GTK_TOOLBAR_TEXT);
+               break;
+       case TOOLBAR_BOTH:
+               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+                                     GTK_TOOLBAR_BOTH);
+               break;
+       }
+       
+       if (prefs_common.toolbar_style != TOOLBAR_NONE) {
+               gtk_widget_show(mainwin->handlebox);
+               gtk_widget_queue_resize(mainwin->handlebox);
+
+               if (prefs_common.immediate_exec)
+                       gtk_widget_hide(mainwin->exec_btn);
+               else
+                       gtk_widget_show(mainwin->exec_btn);
+       }
+}
+
+/*
+ * Harvest addresses for selected folder.
+ */
+static void addr_harvest_cb( MainWindow *mainwin,
+                           guint action,
+                           GtkWidget *widget )
+{
+       addressbook_harvest( mainwin->summaryview->folder_item, FALSE, NULL );
+}
+
+/*
+ * Harvest addresses for selected messages in summary view.
+ */
+static void addr_harvest_msg_cb( MainWindow *mainwin,
+                           guint action,
+                           GtkWidget *widget )
+{
+       summary_harvest_address( mainwin->summaryview );
+}
+
+/*
+* End of Source.
+*/
+