* src/filter.c
[claws.git] / src / mainwindow.c
index 9e2fd0b9d4206ef228f79700ddd66c4def254739..62c427c3d5a817ba69f6ae3fc3e946d3194928ee 100644 (file)
 
 #define AC_LABEL_WIDTH 240
 
-#define STATUSBAR_PUSH(mainwin, str) \
-{ \
-       gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar), \
-                          mainwin->mainwin_cid, str); \
-       gtkut_widget_wait_for_draw(mainwin->hbox_stat); \
-}
-
-#define STATUSBAR_POP(mainwin) \
-{ \
-       gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar), \
-                         mainwin->mainwin_cid); \
-}
-
 /* list of all instantiated MainWindow */
 static GList *mainwin_list = NULL;
 
@@ -121,8 +108,6 @@ static void toolbar_inc_all_cb              (GtkWidget      *widget,
 static void toolbar_send_cb            (GtkWidget      *widget,
                                         gpointer        data);
 
-static void toolbar_compose_cb         (GtkWidget      *widget,
-                                        gpointer        data);
 static void toolbar_compose_news_cb    (GtkWidget      *widget,
                                         gpointer        data);
 static void toolbar_compose_mail_cb    (GtkWidget      *widget,
@@ -164,23 +149,27 @@ static void toolbar_exec_cb               (GtkWidget      *widget,
 static void toolbar_next_unread_cb     (GtkWidget      *widget,
                                         gpointer        data);
 
-static void toolbar_prefs_cb           (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_account_cb         (GtkWidget      *widget,
-                                        gpointer        data);
 
+#if 0
 static void toolbar_account_button_pressed     (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
+#endif
 static void ac_label_button_pressed            (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
 static void ac_menu_popup_closed               (GtkMenuShell   *menu_shell,
                                                 gpointer        data);
 
-static gint main_window_close_cb (GtkWidget    *widget,
-                                 GdkEventAny   *event,
-                                 gpointer       data);
+static gint main_window_close_cb       (GtkWidget      *widget,
+                                        GdkEventAny    *event,
+                                        gpointer        data);
+static gint folder_window_close_cb     (GtkWidget      *widget,
+                                        GdkEventAny    *event,
+                                        gpointer        data);
+static gint message_window_close_cb    (GtkWidget      *widget,
+                                        GdkEventAny    *event,
+                                        gpointer        data);
 
 static void add_mailbox_cb      (MainWindow    *mainwin,
                                  guint          action,
@@ -236,15 +225,9 @@ static void toggle_toolbar_cb       (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void toggle_expand_summaryview_cb        (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void toggle_expand_messageview_cb        (MainWindow    *mainwin,
+static void separate_widget_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void separate_widget_cb (GtkCheckMenuItem *checkitem,
-                                guint action,
-                                GtkWidget *widget);
 
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
@@ -270,9 +253,6 @@ static void send_queue_cb           (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
-static void compose_cb                 (MainWindow     *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
 static void compose_mail_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget);
 static void compose_news_cb(MainWindow *mainwin, guint action,
@@ -338,12 +318,22 @@ static void hide_read_messages   (MainWindow      *mainwin,
 static void thread_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void expand_threads_cb   (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void collapse_threads_cb         (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
 static void set_display_item_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 static void sort_summary_cb     (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void sort_summary_type_cb (MainWindow   *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void attract_by_subject_cb(MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -374,6 +364,12 @@ static void prev_unread_cb  (MainWindow    *mainwin,
 static void next_unread_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void prev_new_cb                 (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void next_new_cb                 (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void prev_marked_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -404,27 +400,28 @@ static void create_filter_cb       (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
-static void prefs_common_open_cb (MainWindow   *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_filter_open_cb (MainWindow   *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_scoring_open_cb (MainWindow  *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_filtering_open_cb (MainWindow        *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
-static void prefs_account_open_cb(MainWindow   *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
+static void prefs_common_open_cb       (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void prefs_filter_open_cb       (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
 static void prefs_template_open_cb     (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 static void prefs_actions_open_cb      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+static void prefs_account_open_cb      (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void prefs_scoring_open_cb      (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void prefs_filtering_open_cb (MainWindow        *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void new_account_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -432,6 +429,9 @@ 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);
@@ -447,17 +447,23 @@ static void activate_compose_button (MainWindow *mainwin,
                                ToolbarStyle      style,
                                ComposeButtonType type);
 
-static void menuitem_expandsummaryview_statechanged (GtkWidget *widget,
-                               GtkStateType state,
-                               gpointer data);
-
 static void key_pressed (GtkWidget *widget, 
                                GdkEventKey *event,
                                gpointer data);
 
 static void set_toolbar_style(MainWindow *mainwin);
 
-#define  SEPARATE_ACTION  667
+static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
+
+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 500 
 
 static GtkItemFactoryEntry mainwin_entries[] =
 {
@@ -473,10 +479,12 @@ 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},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
+       /* {N_("/_File/_Close"),                "<alt>W", app_exit_cb, 0, NULL}, */
        {N_("/_File/E_xit"),                    "<control>Q", app_exit_cb, 0, NULL},
 
        {N_("/_Edit"),                          NULL, NULL, 0, "<Branch>"},
@@ -487,39 +495,79 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
        {N_("/_Edit/_Search folder..."),        "<shift><control>F", search_cb, 1, NULL},
-       {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit/Actio_ns"),                 NULL, NULL, 0, "<Branch>"},
-
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
-       {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/_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/_Folder tree"),
+                                               NULL, toggle_folder_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show or hi_de/_Message view"),
+                                               "V", toggle_message_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show or hi_de/_Toolbar"),
+                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
+                                               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 f_older tree"),    NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
+       {N_("/_View/Separate m_essage view"),   NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_Sort/Sort by _number"),    NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
-       {N_("/_View/_Sort/Sort by s_ize"),      NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
-       {N_("/_View/_Sort/Sort by _date"),      NULL, sort_summary_cb, SORT_BY_DATE, NULL},
-       {N_("/_View/_Sort/Sort by _from"),      NULL, sort_summary_cb, SORT_BY_FROM, NULL},
-       {N_("/_View/_Sort/Sort by _subject"),   NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
-       {N_("/_View/_Sort/Sort by _color label"),
-                                               NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
-       {N_("/_View/_Sort/Sort by _mark"),      NULL, sort_summary_cb, SORT_BY_MARK, NULL},
-       {N_("/_View/_Sort/Sort by _unread"),    NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
-       {N_("/_View/_Sort/Sort by a_ttachment"),
-                                               NULL, sort_summary_cb, SORT_BY_MIME, NULL},
+       {N_("/_View/_Sort/by _number"),         NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
+       {N_("/_View/_Sort/by s_ize"),           NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _date"),           NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _from"),           NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _subject"),        NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _color label"),
+                                               NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _mark"),           NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _unread"),         NULL, sort_summary_cb, SORT_BY_UNREAD, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by a_ttachment"),
+                                               NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by score"),           NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by locked"),          NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"},
+       {N_("/_View/_Sort/D_on't sort"),        NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"},
+       {N_("/_View/_Sort/---"),                NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Sort/Ascending"),          NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"},
+       {N_("/_View/_Sort/Descending"),         NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"},
        {N_("/_View/_Sort/---"),                NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort/_Attract by subject"),
                                                NULL, attract_by_subject_cb, 0, NULL},
-       {N_("/_View/Th_read view"),             "<control>T",        thread_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Th_read view"),             "<control>T", thread_cb, 0, "<ToggleItem>"},
+       {N_("/_View/E_xpand all threads"),      NULL, expand_threads_cb, 0, NULL},
+       {N_("/_View/Co_llapse all threads"),    NULL, collapse_threads_cb, 0, NULL},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
        {N_("/_View/Set display _item..."),     NULL, set_display_item_cb, 0, NULL},
+
+       {N_("/_View/---"),                      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 ne_w message"), NULL, prev_new_cb, 0, NULL},
+       {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Prev _marked message"),
+                                               NULL, prev_marked_cb, 0, NULL},
+       {N_("/_View/_Go to/Next m_arked message"),
+                                               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 \
@@ -564,7 +612,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
         CODESET_ACTION(C_KOI8_R)},
        {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
-        CODESET_ACTION(C_CP1251)},
+        CODESET_ACTION(C_WINDOWS_1251)},
        CODESET_SEPARATOR,
 #endif
        {N_("/_View/_Code set/Japanese (ISO-2022-_JP)"),
@@ -602,33 +650,12 @@ 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/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},
+       {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/Get new ma_il"),         "<control>I",   inc_mail_cb, 0, NULL},
@@ -645,7 +672,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/Reply to a_ll"),         "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/_Message/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/_Message/Bounce"),                NULL, reply_cb, COMPOSE_BOUNCE, NULL},
+       {N_("/_Message/Redirect"),              NULL, reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
@@ -653,47 +680,55 @@ 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_("/_Tool/_Selective Download"),      "<alt>S", sel_download_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/Delete du_plicated messages"),
+                                               NULL, delete_duplicated_cb,   0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/E_xecute"),                "X", execute_summary_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},
@@ -710,12 +745,16 @@ 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/_German"),          NULL, manual_open_cb, MANUAL_LANG_DE, NULL},
+       {N_("/_Help/_Manual/_Spanish"),         NULL, manual_open_cb, MANUAL_LANG_ES, NULL},
        {N_("/_Help/_Manual/_French"),          NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
        {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
        {N_("/_Help/_FAQ"),                     NULL, NULL, 0, "<Branch>"},
        {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
+       {N_("/_Help/_FAQ/_German"),             NULL, faq_open_cb, MANUAL_LANG_DE, NULL},
        {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
        {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
+       {N_("/_Help/_FAQ/_Italian"),            NULL, faq_open_cb, MANUAL_LANG_IT, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
@@ -740,7 +779,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;
@@ -755,6 +793,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;
@@ -766,13 +808,14 @@ MainWindow *main_window_create(SeparateType type)
        GtkItemFactory *ifactory;
        GtkWidget *ac_menu;
        GtkWidget *menuitem;
-       GtkWidget *compose_popup;
        GtkWidget *reply_popup;
        GtkWidget *replyall_popup;
        GtkWidget *replysender_popup;
        GtkWidget *fwd_popup;
        gint i;
 
+       static GdkGeometry geometry;
+
        debug_print(_("Creating main window...\n"));
        mainwin = g_new0(MainWindow, 1);
 
@@ -781,6 +824,14 @@ MainWindow *main_window_create(SeparateType type)
        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);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
@@ -803,6 +854,7 @@ MainWindow *main_window_create(SeparateType type)
                                 n_menu_entries, "<Main>", mainwin);
        gtk_widget_show(menubar);
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+       ifactory = gtk_item_factory_from_widget(menubar);
 
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
@@ -853,6 +905,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);
 
@@ -869,6 +934,7 @@ 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();
@@ -885,21 +951,25 @@ MainWindow *main_window_create(SeparateType type)
 
        messageview->mainwin     = mainwin;
 
-       mainwin->window      = window;
-       mainwin->vbox        = vbox;
-       mainwin->menubar     = menubar;
-       mainwin->handlebox   = handlebox;
-       mainwin->vbox_body   = vbox_body;
-       mainwin->hbox_stat   = hbox_stat;
-       mainwin->statusbar   = statusbar;
-       mainwin->progressbar = progressbar;
-       mainwin->statuslabel = statuslabel;
-       mainwin->ac_button   = ac_button;
-       mainwin->ac_label    = ac_label;
-       mainwin->reply_popup = reply_popup;
-       mainwin->replyall_popup = replyall_popup;
+       mainwin->window       = window;
+       mainwin->vbox         = vbox;
+       mainwin->menubar      = menubar;
+       mainwin->menu_factory = ifactory;
+       mainwin->handlebox    = handlebox;
+       mainwin->vbox_body    = vbox_body;
+       mainwin->hbox_stat    = hbox_stat;
+       mainwin->statusbar    = statusbar;
+       mainwin->progressbar  = progressbar;
+       mainwin->statuslabel  = statuslabel;
+       mainwin->ac_button    = ac_button;
+       mainwin->ac_label     = ac_label;
+       
+       mainwin->reply_popup       = reply_popup;
+       mainwin->replyall_popup    = replyall_popup;
        mainwin->replysender_popup = replysender_popup;
-       mainwin->fwd_popup = fwd_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
@@ -923,7 +993,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;
@@ -940,10 +1010,11 @@ MainWindow *main_window_create(SeparateType type)
 
        debug_print(_("done.\n"));
 
+       messageview->visible = TRUE;
+
        main_window_set_widgets(mainwin, type);
 
        /* set menu items */
-       ifactory = gtk_item_factory_from_widget(menubar);
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Code set/Auto detect");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
@@ -951,53 +1022,27 @@ 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");
-       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);
-       g_assert(menuitem);
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_FOLDER);
-       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
-                                          GUINT_TO_POINTER(SEPARATE_FOLDER));
-
-       menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_MESSAGE);
-       g_assert(menuitem);
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_MESSAGE);
-       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
-                                          GUINT_TO_POINTER(SEPARATE_MESSAGE));
-       
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Expand Summary View");
-       gtk_signal_connect(GTK_OBJECT(menuitem), "state-changed", GTK_SIGNAL_FUNC(menuitem_expandsummaryview_statechanged),
-                                               mainwin);
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
@@ -1008,7 +1053,7 @@ MainWindow *main_window_create(SeparateType type)
 
        main_window_set_toolbar_sensitive(mainwin);
 
-       /* Create actions menu */
+       /* create actions menu */
        update_mainwin_actions_menu(ifactory, mainwin);
 
        /* show main window */
@@ -1034,6 +1079,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;
 }
 
@@ -1112,8 +1161,7 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
                main_window_set_toolbar_sensitive(mainwin);
 
                /* pixmap themes */
-               if (pixmap_theme_changed)
-               {
+               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);
@@ -1121,8 +1169,14 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
                        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);
+                       sd_reflect_prefs_pixmap_theme();
                }
                
+               if (prefs_common.immediate_exec)
+                       gtk_widget_hide(mainwin->exec_btn);
+               else
+                       gtk_widget_show(mainwin->exec_btn);
+
                summary_redisplay_msg(mainwin->summaryview);
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
@@ -1203,6 +1257,9 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
        GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
        GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
 
+       debug_print(_("Changing window separation type from %d to %d\n"),
+                   mainwin->type, type);
+
        if (mainwin->type == type) return;
 
        /* remove widgets from those containers */
@@ -1244,6 +1301,62 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
        gtk_widget_unref(message_wid);
 }
 
+void main_window_toggle_message_view(MainWindow *mainwin)
+{
+       SummaryView *summaryview = mainwin->summaryview;
+       union CompositeWin *cwin = &mainwin->win;
+       GtkWidget *vpaned = NULL;
+       GtkWidget *container = NULL;
+       GtkWidget *msgwin = NULL;
+
+       switch (mainwin->type) {
+       case SEPARATE_NONE:
+               vpaned = cwin->sep_none.vpaned;
+               container = cwin->sep_none.hpaned;
+               break;
+       case SEPARATE_FOLDER:
+               vpaned = cwin->sep_folder.vpaned;
+               container = mainwin->vbox_body;
+               break;
+       case SEPARATE_MESSAGE:
+               msgwin = mainwin->win.sep_message.messagewin;
+               break;
+       case SEPARATE_BOTH:
+               msgwin = mainwin->win.sep_both.messagewin;
+               break;
+       }
+
+       if (msgwin) {
+               if (GTK_WIDGET_VISIBLE(msgwin)) {
+                       gtk_widget_hide(msgwin);
+                       mainwin->messageview->visible = FALSE;
+                       summaryview->displayed = NULL;
+               } else {
+                       gtk_widget_show(msgwin);
+                       mainwin->messageview->visible = TRUE;
+               }
+       } else if (vpaned->parent != NULL) {
+               mainwin->messageview->visible = FALSE;
+               summaryview->displayed = NULL;
+               gtk_widget_ref(vpaned);
+               gtkut_container_remove(GTK_CONTAINER(container), vpaned);
+               gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
+               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
+                             GTK_ARROW_UP, GTK_SHADOW_OUT);
+       } else {
+               mainwin->messageview->visible = TRUE;
+               gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
+               gtk_container_add(GTK_CONTAINER(container), vpaned);
+               gtk_widget_unref(vpaned);
+               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
+                             GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       }
+
+       main_window_set_menu_sensitive(mainwin);
+
+       gtk_widget_grab_focus(summaryview->ctree);
+}
+
 void main_window_get_size(MainWindow *mainwin)
 {
        GtkAllocation *allocation;
@@ -1252,7 +1365,9 @@ void main_window_get_size(MainWindow *mainwin)
 
        prefs_common.summaryview_width  = allocation->width;
 
-       if (mainwin->summaryview->msg_is_toggled_on)
+       if ((mainwin->type == SEPARATE_NONE ||
+            mainwin->type == SEPARATE_FOLDER) &&
+           messageview_is_visible(mainwin->messageview))
                prefs_common.summaryview_height = allocation->height;
 
        prefs_common.mainview_width     = allocation->width;
@@ -1309,8 +1424,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
                folder = list->data;
-               if (folder && folder->trash && folder->trash->total != 0) {
-                       folder_item_scan(folder->trash);
+               if (folder && folder->trash) {
                        folderview_update_item(folder->trash, TRUE);
                }
        }
@@ -1351,7 +1465,7 @@ void main_window_add_mailbox(MainWindow *mainwin)
 
        folder_add(folder);
        folder_set_ui_func(folder, scan_tree_func, mainwin);
-       folder->scan_tree(folder);
+       folder_scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);
 
        folderview_set(mainwin->folderview);
@@ -1392,7 +1506,7 @@ void main_window_add_mbox(MainWindow *mainwin)
 
        folder_add(folder);
 
-       item = folder_item_new(folder->name, NULL);
+       item = folder_item_new(folder, folder->name, NULL);
        item->folder = folder;
        folder->node = g_node_new(item);
 
@@ -1436,7 +1550,7 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                state |= M_UNLOCKED;
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;
-       if (item) {
+       if (item && item->path && item->parent && !item->no_select) {
                state |= M_EXEC;
                if (item->threaded)
                        state |= M_THREADED;
@@ -1445,7 +1559,7 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                /*              if (item->folder->type != F_NEWS) */
                state |= M_ALLOW_DELETE;
 
-               if (selection == SUMMARY_NONE && item->hide_read_msgs
+               if ((selection == SUMMARY_NONE && item->hide_read_msgs)
                    || selection != SUMMARY_NONE)
                        state |= M_HIDE_READ_MSG;       
        }               
@@ -1482,39 +1596,41 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin)
 {
        SensitiveCond state;
        gboolean sensitive;
-       gint i;
+       gint i = 0;
 
        struct {
                GtkWidget *widget;
                SensitiveCond cond;
        } 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;
+#define SET_WIDGET_COND(w, c)  \
+{                              \
+       entry[i].widget = w;    \
+       entry[i].cond = c;      \
+       i++;                    \
+}
+
+       SET_WIDGET_COND(mainwin->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
+       SET_WIDGET_COND(mainwin->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
+       SET_WIDGET_COND(mainwin->compose_news_btn, M_HAVE_ACCOUNT);
+       SET_WIDGET_COND(mainwin->reply_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(mainwin->replyall_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(mainwin->replysender_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(mainwin->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
+#if 0
+       SET_WIDGET_COND(mainwin->prefs_btn, M_UNLOCKED);
+       SET_WIDGET_COND(mainwin->account_btn, M_UNLOCKED);
+#endif
+       SET_WIDGET_COND(mainwin->next_btn, M_MSG_EXIST);
+       SET_WIDGET_COND(mainwin->delete_btn,
+                       M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
+       SET_WIDGET_COND(mainwin->exec_btn, M_MSG_EXIST|M_EXEC|M_UNLOCKED);
+       SET_WIDGET_COND(NULL, 0);
+
+#undef SET_WIDGET_COND
 
        state = main_window_get_current_state(mainwin);
 
@@ -1530,10 +1646,12 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin)
 
 void main_window_set_menu_sensitive(MainWindow *mainwin)
 {
-       GtkItemFactory *ifactory;
+       GtkItemFactory *ifactory = mainwin->menu_factory;
        SensitiveCond state;
        gboolean sensitive;
        GtkWidget *menuitem;
+       FolderItem *item;
+       gchar *menu_path;
        gint i;
 
        static const struct {
@@ -1547,27 +1665,31 @@ 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/Actions"                   , M_MSG_EXIST},
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
-               {"/View/Sort"                      , M_MSG_EXIST},
+               {"/View/Sort"                      , M_EXEC},
                {"/View/Thread view"               , M_EXEC},
+               {"/View/Expand all threads"        , M_MSG_EXIST},
+               {"/View/Collapse all threads"      , M_MSG_EXIST},
                {"/View/Hide read messages"        , M_HIDE_READ_MSG},
                {"/View/Go to/Prev message"        , M_MSG_EXIST},
                {"/View/Go to/Next message"        , M_MSG_EXIST},
                {"/View/Go to/Prev unread message" , M_MSG_EXIST},
                {"/View/Go to/Next unread message" , M_MSG_EXIST},
+               {"/View/Go to/Prev new message"    , M_MSG_EXIST},
+               {"/View/Go to/Next new message"    , M_MSG_EXIST},
                {"/View/Go to/Prev marked message" , M_MSG_EXIST},
                {"/View/Go to/Next marked message" , M_MSG_EXIST},
                {"/View/Go to/Prev labeled message", M_MSG_EXIST},
                {"/View/Go to/Next labeled message", M_MSG_EXIST},
                {"/View/Open in new window"        , M_SINGLE_TARGET_EXIST},
                {"/View/Show all header"           , M_SINGLE_TARGET_EXIST},
-               {"/View/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},
@@ -1578,25 +1700,27 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/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_TARGET_EXIST},
-               {"/Message/Bounce"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/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},
+               {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
+               {"/Tools/Harvest addresses"         , M_UNLOCKED},
+               {"/Tools/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/Tools/Actions"                   , M_TARGET_EXIST|M_UNLOCKED},
+               {"/Tools/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
                {"/Configuration", M_UNLOCKED},
 
                {NULL, 0}
        };
 
-       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
        state = main_window_get_current_state(mainwin);
 
        for (i = 0; entry[i].entry != NULL; i++) {
@@ -1605,13 +1729,69 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        }
 
        main_window_menu_callback_block(mainwin);
-       menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all header");
-       gtk_check_menu_item_set_active
-               (GTK_CHECK_MENU_ITEM(menuitem),
-                mainwin->messageview->textview->show_all_headers);
-       menuitem = gtk_item_factory_get_widget(ifactory, "/View/Thread view");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      (state & M_THREADED) != 0);
+
+#define SET_CHECK_MENU_ACTIVE(path, active) \
+{ \
+       menuitem = gtk_item_factory_get_widget(ifactory, path); \
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
+}
+
+       SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
+                             messageview_is_visible(mainwin->messageview));
+
+       item = mainwin->summaryview->folder_item;
+       menu_path = "/View/Sort/Don't sort";
+       if (item) {
+               switch (item->sort_key) {
+               case SORT_BY_NUMBER:
+                       menu_path = "/View/Sort/by number"; break;
+               case SORT_BY_SIZE:
+                       menu_path = "/View/Sort/by size"; break;
+               case SORT_BY_DATE:
+                       menu_path = "/View/Sort/by date"; break;
+               case SORT_BY_FROM:
+                       menu_path = "/View/Sort/by from"; break;
+               case SORT_BY_SUBJECT:
+                       menu_path = "/View/Sort/by subject"; break;
+               case SORT_BY_LABEL:
+                       menu_path = "/View/Sort/by color label"; break;
+               case SORT_BY_MARK:
+                       menu_path = "/View/Sort/by mark"; break;
+               case SORT_BY_UNREAD:
+                       menu_path = "/View/Sort/by unread"; break;
+               case SORT_BY_MIME:
+                       menu_path = "/View/Sort/by attachment"; break;
+               case SORT_BY_SCORE:
+                       menu_path = "/View/Sort/by score"; break;
+               case SORT_BY_LOCKED:
+                       menu_path = "/View/Sort/by locked"; break;
+               case SORT_BY_NONE:
+               default:
+                       menu_path = "/View/Sort/Don't sort"; break;
+               }
+       }
+       SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
+
+       if (!item || item->sort_type == SORT_ASCENDING) {
+               SET_CHECK_MENU_ACTIVE("/View/Sort/Ascending", TRUE);
+       } else {
+               SET_CHECK_MENU_ACTIVE("/View/Sort/Descending", TRUE);
+       }
+
+       if (item && item->sort_key != SORT_BY_NONE) {
+               menu_set_sensitive(ifactory, "/View/Sort/Ascending", TRUE);
+               menu_set_sensitive(ifactory, "/View/Sort/Descending", TRUE);
+       } else {
+               menu_set_sensitive(ifactory, "/View/Sort/Ascending", FALSE);
+               menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
+       }
+
+       SET_CHECK_MENU_ACTIVE("/View/Show all header",
+                             mainwin->messageview->textview->show_all_headers);
+       SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
+
+#undef SET_CHECK_MENU_ACTIVE
+
        main_window_menu_callback_unblock(mainwin);
 }
 
@@ -1675,7 +1855,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        GtkWidget *hpaned;
        GtkWidget *vpaned;
        GtkWidget *vbox_body = mainwin->vbox_body;
-       GtkItemFactory *ifactory=gtk_item_factory_from_widget(mainwin->menubar);
+       GtkItemFactory *ifactory = mainwin->menu_factory;
        GtkWidget *menuitem;
 
        debug_print(_("Setting widgets..."));
@@ -1694,8 +1874,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_set_border_width(GTK_CONTAINER(folderwin),
                                               BORDER_WIDTH);
                gtk_signal_connect(GTK_OBJECT(folderwin), "delete_event",
-                                  GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                                  NULL);
+                                  GTK_SIGNAL_FUNC(folder_window_close_cb),
+                                  mainwin);
        }
        if (type & SEPARATE_MESSAGE) {
                messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -1713,8 +1893,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_set_border_width(GTK_CONTAINER(messagewin),
                                               BORDER_WIDTH);
                gtk_signal_connect(GTK_OBJECT(messagewin), "delete_event",
-                                  GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                                  NULL);
+                                  GTK_SIGNAL_FUNC(message_window_close_cb),
+                                  mainwin);
        }
 
        switch (type) {
@@ -1726,7 +1906,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                               GTK_WIDGET_PTR(mainwin->folderview));
 
                vpaned = gtk_vpaned_new();
-               if (mainwin->summaryview->msg_is_toggled_on) {
+               if (messageview_is_visible(mainwin->messageview)) {
                        gtk_paned_add2(GTK_PANED(hpaned), vpaned);
                        gtk_paned_add1(GTK_PANED(vpaned),
                                       GTK_WIDGET_PTR(mainwin->summaryview));
@@ -1748,19 +1928,17 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                     prefs_common.mainwin_height);
                gtk_widget_show_all(vpaned);
 
-               menu_set_sensitive(ifactory, "/View/Message view", TRUE);
-               menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", TRUE);
-               menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
-               menuitem = gtk_item_factory_get_widget(ifactory, "/View/Expand Message View");
-               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-               
+               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+                * lose track of its visibility state */
+               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
+                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+
                mainwin->win.sep_none.hpaned = hpaned;
                mainwin->win.sep_none.vpaned = vpaned;
                break;
        case SEPARATE_FOLDER:
                vpaned = gtk_vpaned_new();
-               if (mainwin->summaryview->msg_is_toggled_on) {
+               if (messageview_is_visible(mainwin->messageview)) {
                        gtk_box_pack_start(GTK_BOX(vbox_body), vpaned,
                                           TRUE, TRUE, 0);
                        gtk_paned_add1(GTK_PANED(vpaned),
@@ -1786,9 +1964,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_add(GTK_CONTAINER(folderwin),
                                  GTK_WIDGET_PTR(mainwin->folderview));
 
-               menu_set_sensitive(ifactory, "/View/Message view", TRUE);
-               menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
-               
                mainwin->win.sep_folder.folderwin = folderwin;
                mainwin->win.sep_folder.vpaned    = vpaned;
 
@@ -1812,16 +1987,16 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_widget_show_all(hpaned);
                gtk_container_add(GTK_CONTAINER(messagewin),
                                  GTK_WIDGET_PTR(mainwin->messageview));
-       
-               menu_set_sensitive(ifactory, "/View/Message view", TRUE);
-               menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
-               menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
-               
+
                mainwin->win.sep_message.messagewin = messagewin;
                mainwin->win.sep_message.hpaned     = hpaned;
 
                gtk_widget_show_all(messagewin);
+               
+               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+                * lose track of its visibility state */
+               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
+                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        case SEPARATE_BOTH:
                gtk_box_pack_start(GTK_BOX(vbox_body),
@@ -1838,19 +2013,40 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_container_add(GTK_CONTAINER(messagewin),
                                  GTK_WIDGET_PTR(mainwin->messageview));
 
-               menu_set_sensitive(ifactory, "/View/Message view", TRUE);
-               menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
-       
                mainwin->win.sep_both.folderwin = folderwin;
                mainwin->win.sep_both.messagewin = messagewin;
 
                gtk_widget_show_all(folderwin);
                gtk_widget_show_all(messagewin);
+               
+               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+                * lose track of its visibility state */
+               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
+                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        }
 
        mainwin->type = type;
 
+       mainwin->messageview->visible = TRUE;
+
+       /* toggle menu state */
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Show or hide/Folder tree");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Show or hide/Message view");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Separate folder tree");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      ((type & SEPARATE_FOLDER) != 0));
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Separate message view");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      ((type & SEPARATE_MESSAGE) != 0));
+
        debug_print(_("done.\n"));
 }
 
@@ -1868,16 +2064,14 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *replysender_btn;
        GtkWidget *fwd_btn;
        GtkWidget *send_btn;
-       /*
+#if 0
        GtkWidget *prefs_btn;
        GtkWidget *account_btn;
-       */
+#endif
        GtkWidget *next_btn;
        GtkWidget *delete_btn;
        GtkWidget *exec_btn;
        
-       GtkTooltips *tooltips;
-
        toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
                                  GTK_TOOLBAR_BOTH);
        gtk_container_add(GTK_CONTAINER(container), toolbar);
@@ -2005,13 +2199,13 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_next_unread_cb,
                                           mainwin);
 
-       /*
+#if 0
        gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
        icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PREFERENCES);
        prefs_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                            _("Prefs"),
-                                           _("Common preference"),
+                                           _("Common preferences"),
                                            "Prefs",
                                            icon_wid,
                                            toolbar_prefs_cb,
@@ -2027,7 +2221,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        gtk_signal_connect(GTK_OBJECT(account_btn), "button_press_event",
                           GTK_SIGNAL_FUNC(toolbar_account_button_pressed),
                           mainwin);
-       */
+#endif
 
        gtk_signal_connect(GTK_OBJECT(reply_btn), "button_press_event",
                GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
@@ -2046,23 +2240,23 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                mainwin);
        
 
-       mainwin->toolbar                         = toolbar;
-       mainwin->get_btn                         = get_btn;
-       mainwin->getall_btn                      = getall_btn;
-       mainwin->compose_mail_btn                = compose_mail_btn;
-       mainwin->compose_news_btn                = compose_news_btn;
-       mainwin->reply_btn                       = reply_btn;
-       mainwin->replyall_btn                    = replyall_btn;
-       mainwin->replysender_btn                 = replysender_btn;
-       mainwin->fwd_btn         = fwd_btn;
-       mainwin->send_btn        = send_btn;
-       /*
-       mainwin->prefs_btn       = prefs_btn;
-       mainwin->account_btn     = account_btn;
-       */
-       mainwin->next_btn        = next_btn;
-       mainwin->delete_btn      = delete_btn;
-       mainwin->exec_btn        = exec_btn;
+       mainwin->toolbar                = toolbar;
+       mainwin->get_btn                = get_btn;
+       mainwin->getall_btn             = getall_btn;
+       mainwin->compose_mail_btn       = compose_mail_btn;
+       mainwin->compose_news_btn       = compose_news_btn;
+       mainwin->reply_btn              = reply_btn;
+       mainwin->replyall_btn           = replyall_btn;
+       mainwin->replysender_btn        = replysender_btn;
+       mainwin->fwd_btn                = fwd_btn;
+       mainwin->send_btn               = send_btn;
+       #if 0
+       mainwin->prefs_btn              = prefs_btn;
+       mainwin->account_btn            = account_btn;
+       #endif
+       mainwin->next_btn               = next_btn;
+       mainwin->delete_btn             = delete_btn;
+       mainwin->exec_btn               = exec_btn;
 
        gtk_widget_show_all(toolbar);
 }
@@ -2115,7 +2309,6 @@ static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpoin
 static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        MainWindow *mainwindow = (MainWindow *) data;
-       GtkWidget *replysender_menu, *replysender_item;
 
        if (!event) return;
 
@@ -2181,17 +2374,6 @@ static void toolbar_send_cb      (GtkWidget      *widget,
        send_queue_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_compose_cb (GtkWidget      *widget,
-                                gpointer        data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (mainwin->compose_btn_type == COMPOSEBUTTON_MAIL)
-               compose_cb(mainwin, 0, NULL);
-       else
-               compose_news_cb(mainwin, 0, NULL);
-}
-
 static void toolbar_compose_news_cb    (GtkWidget      *widget,
                                 gpointer        data)
 {
@@ -2274,20 +2456,7 @@ static void toolbar_next_unread_cb       (GtkWidget      *widget,
        next_unread_cb(mainwin, 0, NULL);
 }
 
-static void toolbar_prefs_cb   (GtkWidget      *widget,
-                                gpointer        data)
-{
-       prefs_common_open();
-}
-
-static void toolbar_account_cb (GtkWidget      *widget,
-                                gpointer        data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       prefs_account_open_cb(mainwin, 0, NULL);
-}
-
+#if 0
 static void toolbar_account_button_pressed(GtkWidget *widget,
                                           GdkEventButton *event,
                                           gpointer data)
@@ -2305,6 +2474,7 @@ static void toolbar_account_button_pressed(GtkWidget *widget,
                       menu_button_position, widget,
                       event->button, event->time);
 }
+#endif
 
 static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    gpointer data)
@@ -2345,6 +2515,32 @@ static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
        return TRUE;
 }
 
+static gint folder_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+                                  gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+       GtkWidget *menuitem;
+
+       menuitem = gtk_item_factory_get_item
+               (mainwin->menu_factory, "/View/Show or hide/Folder tree");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+       return TRUE;
+}
+
+static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+                                   gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+       GtkWidget *menuitem;
+
+       menuitem = gtk_item_factory_get_item
+               (mainwin->menu_factory, "/View/Show or hide/Message view");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+       return TRUE;
+}
+
 static void add_mailbox_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2360,7 +2556,7 @@ static void add_mbox_cb(MainWindow *mainwin, guint action,
 static void update_folderview_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
-       summary_show(mainwin->summaryview, NULL, FALSE);
+       summary_show(mainwin->summaryview, NULL);
        folderview_rescan_all();
 }
 
@@ -2433,18 +2629,29 @@ static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 static void toggle_folder_cb(MainWindow *mainwin, guint action,
                             GtkWidget *widget)
 {
+       gboolean active;
+
+       active = GTK_CHECK_MENU_ITEM(widget)->active;
+
        switch (mainwin->type) {
        case SEPARATE_NONE:
        case SEPARATE_MESSAGE:
+#if 0
+               if (active)
+                       gtk_widget_show(GTK_WIDGET_PTR(mainwin->folderview));
+               else
+                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->folderview));
+#endif
                break;
        case SEPARATE_FOLDER:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
+               debug_print("separate folder\n");
+               if (active)
                        gtk_widget_show(mainwin->win.sep_folder.folderwin);
                else
                        gtk_widget_hide(mainwin->win.sep_folder.folderwin);
                break;
        case SEPARATE_BOTH:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
+               if (active)
                        gtk_widget_show(mainwin->win.sep_both.folderwin);
                else
                        gtk_widget_hide(mainwin->win.sep_both.folderwin);
@@ -2455,39 +2662,41 @@ static void toggle_folder_cb(MainWindow *mainwin, guint action,
 static void toggle_message_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-       case SEPARATE_FOLDER:
-               break;
-       case SEPARATE_MESSAGE:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
-                       gtk_widget_show(mainwin->win.sep_message.messagewin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_message.messagewin);
-               break;
-       case SEPARATE_BOTH:
-               if (GTK_CHECK_MENU_ITEM(widget)->active)
-                       gtk_widget_show(mainwin->win.sep_both.messagewin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_both.messagewin);
-               break;
-       }
+       gboolean active;
+
+       active = GTK_CHECK_MENU_ITEM(widget)->active;
+
+       if (active != messageview_is_visible(mainwin->messageview))
+               summary_toggle_view(mainwin->summaryview);
 }
 
 static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
-/*     activate_compose_button(mainwin, (ToolbarStyle)action, 
-                       mainwin->compose_btn_type);
-       set_toolbar_reply_button(mainwin, (ToolbarStyle)action);
-       set_toolbar_replyall_button(mainwin, (ToolbarStyle)action);
-       set_toolbar_replysender_button(mainwin, (ToolbarStyle)action);
-       set_toolbar_forward_button(mainwin, (ToolbarStyle)action);*/
-       
+       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,
@@ -2502,30 +2711,60 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void toggle_expand_summaryview_cb(MainWindow *mainwin, guint action,    GtkWidget *widget)
+static void separate_widget_cb(MainWindow *mainwin, guint action,
+                              GtkWidget *widget)
 {
-       summary_toggle_view_real(mainwin->summaryview);
+       SeparateType type;
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active)
+               type = mainwin->type | action;
+       else
+               type = mainwin->type & ~action;
+
+       main_window_separation_change(mainwin, type);
+
+       prefs_common.sep_folder = (type & SEPARATE_FOLDER)  != 0;
+       prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
 }
 
-static void toggle_expand_messageview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       messageview_toggle_view_real(mainwin->messageview);
+       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 separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
-
+static void online_switch_clicked (GtkButton *btn, gpointer data) 
 {
        MainWindow *mainwin;
-       SeparateType type;
+       GtkItemFactory *ifactory;
+       GtkCheckMenuItem *menuitem;
 
-       mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
+       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);
-
-       type = mainwin->type ^ action;
-       main_window_separation_change(mainwin, type);
-
-       prefs_common.sep_folder = (type & SEPARATE_FOLDER)  != 0;
-       prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
+       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 addressbook_open_cb(MainWindow *mainwin, guint action,
@@ -2566,35 +2805,26 @@ 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);
                }
        }
 }
 
-static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       if (mainwin->summaryview->folder_item) {
-               if (mainwin->summaryview->folder_item->folder->account != NULL
-                   && mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP)
-                       compose_new_with_recipient(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item->path);
-               else
-                       compose_new_with_folderitem(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item);
-       }
-       else
-               compose_new(NULL);
-}
-
 static void compose_mail_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
@@ -2754,13 +2984,9 @@ static void hide_read_messages (MainWindow *mainwin, guint action,
 
 static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       GtkItemFactory *ifactory;
-
        if (mainwin->menu_lock_count) return;
        if (!mainwin->summaryview->folder_item) return;
 
-       ifactory = gtk_item_factory_from_widget(widget);
-
        if (GTK_CHECK_MENU_ITEM(widget)->active) {
                summary_thread_build(mainwin->summaryview);
                mainwin->summaryview->folder_item->threaded = TRUE;
@@ -2770,6 +2996,18 @@ static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        }
 }
 
+static void expand_threads_cb(MainWindow *mainwin, guint action,
+                             GtkWidget *widget)
+{
+       summary_expand_threads(mainwin->summaryview);
+}
+
+static void collapse_threads_cb(MainWindow *mainwin, guint action,
+                               GtkWidget *widget)
+{
+       summary_collapse_threads(mainwin->summaryview);
+}
+
 static void set_display_item_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -2779,7 +3017,28 @@ static void set_display_item_cb(MainWindow *mainwin, guint action,
 static void sort_summary_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
-       summary_sort(mainwin->summaryview, (SummarySortType)action);
+       FolderItem *item = mainwin->summaryview->folder_item;
+       GtkWidget *menuitem;
+
+       if (mainwin->menu_lock_count) return;
+       if (item) {
+               menuitem = gtk_item_factory_get_item
+                       (mainwin->menu_factory, "/View/Sort/Ascending");
+               summary_sort(mainwin->summaryview, (FolderSortKey)action,
+                            GTK_CHECK_MENU_ITEM(menuitem)->active
+                            ? SORT_ASCENDING : SORT_DESCENDING);
+       }
+}
+
+static void sort_summary_type_cb(MainWindow *mainwin, guint action,
+                                GtkWidget *widget)
+{
+       FolderItem *item = mainwin->summaryview->folder_item;
+
+       if (mainwin->menu_lock_count) return;
+       if (item)
+               summary_sort(mainwin->summaryview,
+                            item->sort_key, (FolderSortType)action);
 }
 
 static void attract_by_subject_cb(MainWindow *mainwin, guint action,
@@ -2820,7 +3079,8 @@ static void update_summary_cb(MainWindow *mainwin, guint action,
                                            folderview->opened);
        if (!fitem) return;
 
-       summary_show(mainwin->summaryview, fitem, TRUE);
+       folder_item_scan(fitem);
+       summary_show(mainwin->summaryview, fitem);
 }
 
 static void prev_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
@@ -2845,6 +3105,16 @@ static void next_unread_cb(MainWindow *mainwin, guint action,
        summary_select_next_unread(mainwin->summaryview);
 }
 
+static void prev_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_select_prev_new(mainwin->summaryview);
+}
+
+static void next_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_select_next_new(mainwin->summaryview);
+}
+
 static void prev_marked_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2887,16 +3157,19 @@ static void copy_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 
 static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
+       MessageView *msgview = mainwin->messageview;
+
        if (GTK_WIDGET_HAS_FOCUS(mainwin->summaryview->ctree))
                summary_select_all(mainwin->summaryview);
-       else if (mainwin->summaryview->msg_is_toggled_on &&
-                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->textview->text))
+       else if (messageview_is_visible(msgview) &&
+                (GTK_WIDGET_HAS_FOCUS(msgview->textview->text) ||
+                 GTK_WIDGET_HAS_FOCUS(msgview->mimeview->textview->text)))
                messageview_select_all(mainwin->messageview);
 }
 
 static void selthread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       if (mainwin->summaryview->msg_is_toggled_on)
+       if (messageview_is_visible(mainwin->summaryview->messageview))
                summary_select_thread(mainwin->summaryview);
 }
 
@@ -2927,7 +3200,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,
@@ -3006,8 +3279,6 @@ static void activate_compose_button (MainWindow *mainwin,
                                ToolbarStyle style,
                                ComposeButtonType type)
 {
-       SensitiveCond state = main_window_get_current_state(mainwin);
-
        if (style == TOOLBAR_NONE) 
                return;
 
@@ -3026,15 +3297,6 @@ void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonTy
                                        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
 
@@ -3080,11 +3342,30 @@ static void set_toolbar_style(MainWindow *mainwin)
        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.
+*/
+