* src/compose.c
[claws.git] / src / mainwindow.c
index eaf9327ce7776aee68e9aae3f4e4e394eb3859dd..defd40a8a7c7d13d5e9c2415299206a6a51e109b 100644 (file)
@@ -60,7 +60,6 @@
 #include "import.h"
 #include "export.h"
 #include "prefs_common.h"
-#include "prefs_filter.h"
 #include "prefs_actions.h"
 #include "prefs_filtering.h"
 #include "prefs_scoring.h"
@@ -175,9 +174,6 @@ static void toggle_toolbar_cb        (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void toggle_searchbar_cb         (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
 static void separate_widget_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -195,6 +191,119 @@ static void prefs_toolbar_cb        (MainWindow *mainwin,
                                 guint action,
                                 GtkWidget *widget);
 
+static void reply_cb                             (MainWindow   *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
+static void inc_mail_cb                                  (MainWindow   *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
+static void inc_all_account_mail_cb              (MainWindow   *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
+static void send_queue_cb                        (MainWindow   *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
+static void compose_mail_cb                          (MainWindow       *mainwin, 
+                                        guint action,
+                                          GtkWidget         *widget);
+
+static void compose_news_cb                          (MainWindow       *mainwin, 
+                                        guint action,
+                                          GtkWidget         *widget);
+
+static void next_unread_cb                        (MainWindow  *mainwin,
+                                         guint          action,
+                                         GtkWidget     *widget);
+
+static void toolbar_inc_cb             (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_inc_all_cb         (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_send_cb            (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_compose_cb         (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_cb           (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_to_list_cb   (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_forward_cb         (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_delete_cb          (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_exec_cb            (GtkWidget      *widget,
+                                        gpointer        data);
+
+static void toolbar_next_unread_cb     (GtkWidget      *widget,
+                                        gpointer        data);
+
+
+static void toolbar_reply_popup_cb            (GtkWidget       *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+static void toolbar_reply_popup_closed_cb      (GtkMenuShell   *menu_shell,
+                                               gpointer         data);
+
+static void toolbar_reply_to_all_popup_cb      (GtkWidget      *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+
+static void toolbar_reply_to_all_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void toolbar_reply_to_list_popup_cb       (GtkWidget    *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+
+static void toolbar_reply_to_list_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
+                                        GdkEventButton *event,
+                                        gpointer        data);
+static void toolbar_reply_to_sender_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void toolbar_forward_popup_cb    (GtkWidget      *widget,
+                                        GdkEventButton    *event,
+                                        gpointer        data);
+
+static void toolbar_forward_popup_closed_cb            
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
+static void activate_compose_button     (MainToolbar       *toolbar,
+                                        ToolbarStyle      style,
+                                        ComposeButtonType type);
+static void toolbar_actions_execute_cb  (GtkWidget         *widget,
+                                        gpointer           data);
+static void toolbar_buttons_cb          (GtkWidget         *widget, 
+                                        ToolbarItem       *toolbar_item);
+static void toolbar_create              (MainWindow        *mainwin,
+                                        GtkWidget         *container);
+
+static void toolbar_update              (MainWindow        *mainwin);
 
 static void inc_cancel_cb              (MainWindow     *mainwin,
                                         guint           action,
@@ -226,6 +335,10 @@ static void delete_cb                      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void cancel_cb                   (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void mark_cb                    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -330,9 +443,10 @@ static void copy_cb                 (MainWindow    *mainwin,
 static void allsel_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void selthread_cb        (MainWindow    *mainwin,
+static void select_thread_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+
 static void create_filter_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -340,9 +454,6 @@ static void create_filter_cb         (MainWindow    *mainwin,
 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);
@@ -372,9 +483,6 @@ static void online_switch_clicked(GtkButton     *btn,
 static void manual_open_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void faq_open_cb                 (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
 
 static void scan_tree_func      (Folder        *folder,
                                  FolderItem    *item,
@@ -424,7 +532,7 @@ 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/Select _thread"),           NULL, select_thread_cb, 0, NULL},
        {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
@@ -447,8 +555,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                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/Show or hi_de/Quick _search"),
-                                               NULL, toggle_searchbar_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>"},
@@ -478,7 +584,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/E_xpand all threads"),      NULL, expand_threads_cb, 0, NULL},
        {N_("/_View/Co_llapse all threads"),    NULL, collapse_threads_cb, 0, NULL},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
-       {N_("/_View/Set display _item..."),     NULL, set_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed _items..."),  NULL, set_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
@@ -589,7 +695,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_View/Show all _header"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show all _headers"),        "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
@@ -604,9 +710,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Compose a_n email message"),     "<control>M", compose_mail_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
        {N_("/_Message/_Reply"),                "<control>R",   reply_cb, COMPOSE_REPLY, NULL},
-       {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
-       {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
-       {N_("/_Message/Reply to a_ll"),         "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to"),             NULL, NULL, 0, "<Branch>"},
+       {N_("/_Message/Repl_y to/_all"),        "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to/_sender"),     NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Repl_y to/mailing _list"),
+                                               "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+       {N_("/_Message/Follow-up and reply to"),NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/_Message/Redirect"),              NULL, reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
@@ -615,6 +725,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/M_ove..."),              "<control>O", move_to_cb, 0, NULL},
        {N_("/_Message/_Copy..."),              "<shift><control>O", copy_to_cb, 0, NULL},
        {N_("/_Message/_Delete"),               "<control>D", delete_cb,  0, NULL},
+       {N_("/_Message/Cancel a news message"), "", cancel_cb,  0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/_Mark/_Mark"),           "<shift>asterisk", mark_cb, 0, NULL},
@@ -655,15 +766,17 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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_("/_Tools/_Log window"),             "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/C_ustom toolbar..."),
-                                               NULL, prefs_toolbar_cb, 0, NULL},
-       {N_("/_Configuration/_Filter setting..."),
-                                               NULL, prefs_filter_open_cb, 0, NULL},
+       {N_("/_Configuration/C_ustomize toolbar"),
+                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_Configuration/C_ustomize toolbar/_Main toolbar..."),
+                                               NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
+       {N_("/_Configuration/C_ustomize toolbar/_Compose toolbar..."),
+                                               NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
        {N_("/_Configuration/_Scoring..."),
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
@@ -681,22 +794,44 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, NULL, 0, "<Branch>"},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual/_English"),         NULL, manual_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_Manual/_German"),          NULL, manual_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_Manual/_Spanish"),         NULL, manual_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_Manual/_French"),          NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
-       {N_("/_Help/_FAQ"),                     NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_FAQ/_German"),             NULL, faq_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_FAQ/_Italian"),            NULL, faq_open_cb, MANUAL_LANG_IT, NULL},
+       {N_("/_Help/_Manual (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
+       {N_("/_Help/_Manual (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_MANUAL_SYLDOC, NULL},
+       {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
+       {N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
 
+
+
+static GtkItemFactoryEntry reply_popup_entries[] =
+{
+       {N_("/Reply with _quote"), NULL, reply_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
+       {N_("/_Reply without quote"), NULL, reply_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry replyall_popup_entries[] =
+{
+       {N_("/Reply to all with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
+       {N_("/_Reply to all without quote"), "a", reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry replylist_popup_entries[] =
+{
+       {N_("/Reply to list with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
+       {N_("/_Reply to list without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry replysender_popup_entries[] =
+{
+       {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
+       {N_("/_Reply to sender without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry fwd_popup_entries[] =
+{
+       {N_("/_Forward message (inline style)"), "f", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
+       {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
+};
+
 MainWindow *main_window_create(SeparateType type)
 {
        MainWindow *mainwin;
@@ -711,8 +846,8 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;
-       GtkWidget *online_status;
-       GtkWidget *offline_status;
+       GtkWidget *online_pixmap;
+       GtkWidget *offline_pixmap;
        GtkWidget *online_switch;
        GtkWidget *offline_switch;
 
@@ -770,10 +905,16 @@ MainWindow *main_window_create(SeparateType type)
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
        ifactory = gtk_item_factory_from_widget(menubar);
 
+       menu_set_sensitive(ifactory, "/Help/Manual (Local)", manual_available(MANUAL_MANUAL_LOCAL));
+       menu_set_sensitive(ifactory, "/Help/FAQ (Local)", manual_available(MANUAL_FAQ_LOCAL));
+
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
 
+       /* link window to mainwin->window to avoid gdk warnings */
+       mainwin->window       = window;
+       
        /* create toolbar */
        toolbar_create(mainwin, handlebox);
 
@@ -793,15 +934,15 @@ MainWindow *main_window_create(SeparateType type)
        gtk_widget_set_usize(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
 
-       online_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
-       offline_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+       online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+       offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
        online_switch = gtk_button_new ();
        offline_switch = gtk_button_new ();
-       gtk_container_add (GTK_CONTAINER(online_switch), online_status);
+       gtk_container_add (GTK_CONTAINER(online_switch), online_pixmap);
        gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);
-       gtk_container_add (GTK_CONTAINER(offline_switch), offline_status);
+       gtk_container_add (GTK_CONTAINER(offline_switch), offline_pixmap);
        gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
@@ -826,7 +967,7 @@ MainWindow *main_window_create(SeparateType type)
        /* create views */
        mainwin->folderview  = folderview  = folderview_create();
        mainwin->summaryview = summaryview = summary_create();
-       mainwin->messageview = messageview = messageview_create();
+       mainwin->messageview = messageview = messageview_create(mainwin);
        mainwin->logwin      = log_window_create();
 
        folderview->mainwin      = mainwin;
@@ -839,7 +980,6 @@ MainWindow *main_window_create(SeparateType type)
 
        messageview->mainwin     = mainwin;
 
-       mainwin->window       = window;
        mainwin->vbox         = vbox;
        mainwin->menubar      = menubar;
        mainwin->menu_factory = ifactory;
@@ -854,6 +994,8 @@ MainWindow *main_window_create(SeparateType type)
        
        mainwin->online_switch     = online_switch;
        mainwin->offline_switch    = offline_switch;
+       mainwin->online_pixmap     = online_pixmap;
+       mainwin->offline_pixmap    = offline_pixmap;
        
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
@@ -927,12 +1069,12 @@ MainWindow *main_window_create(SeparateType type)
                (ifactory, "/View/Show or hide/Status bar");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
+       
+       gtk_widget_hide(GTK_WIDGET(mainwin->summaryview->hbox_search));
+       
+       if (prefs_common.show_searchbar)
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mainwin->summaryview->toggle_search), TRUE);
 
-       gtk_widget_hide(mainwin->summaryview->hbox_search);
-       menuitem = gtk_item_factory_get_item
-               (ifactory, "/View/Show or hide/Quick search");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      prefs_common.show_searchbar);
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
@@ -1042,6 +1184,7 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 {
        GList *cur;
        MainWindow *mainwin;
+       GtkWidget *pixmap;
 
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;
@@ -1052,17 +1195,25 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 
                /* pixmap themes */
                if (pixmap_theme_changed) {
-                       toolbar_update();
+                       toolbar_update(mainwin);
                        set_toolbar_style(mainwin);
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
+
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+                       gtk_container_remove(GTK_CONTAINER(mainwin->online_switch), 
+                                            mainwin->online_pixmap);
+                       gtk_container_add (GTK_CONTAINER(mainwin->online_switch), pixmap);
+                       gtk_widget_show(pixmap);
+                       mainwin->online_pixmap = pixmap;
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+                       gtk_container_remove(GTK_CONTAINER(mainwin->offline_switch), 
+                                            mainwin->offline_pixmap);
+                       gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
+                       gtk_widget_show(pixmap);
+                       mainwin->offline_pixmap = pixmap;
                }
                
-               if (prefs_common.immediate_exec)
-                       gtk_widget_hide(mainwin->toolbar->exec_btn);
-               else
-                       gtk_widget_show(mainwin->toolbar->exec_btn);
-
                summary_redisplay_msg(mainwin->summaryview);
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
@@ -1311,7 +1462,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) {
-                       folderview_update_item(folder->trash, TRUE);
+                       folder_update_item(folder->trash, TRUE);
                }
        }
 
@@ -1396,11 +1547,11 @@ void main_window_add_mbox(MainWindow *mainwin)
        item->folder = folder;
        folder->node = g_node_new(item);
 
-       folder->create_folder(folder, item, "inbox");
-       folder->create_folder(folder, item, "outbox");
-       folder->create_folder(folder, item, "queue");
-       folder->create_folder(folder, item, "draft");
-       folder->create_folder(folder, item, "trash");
+       folder_create_folder(item, "inbox");
+       folder_create_folder(item, "outbox");
+       folder_create_folder(item, "queue");
+       folder_create_folder(item, "draft");
+       folder_create_folder(item, "trash");
 
        folderview_set(mainwin->folderview);
 }
@@ -1423,6 +1574,10 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                /*              if (item->folder->type != F_NEWS) */
                state |= M_ALLOW_DELETE;
 
+               if (prefs_common.immediate_exec == 0
+                   && mainwin->lock_count == 0)
+                       state |= M_DELAY_EXEC;
+
                if ((selection == SUMMARY_NONE && item->hide_read_msgs)
                    || selection != SUMMARY_NONE)
                        state |= M_HIDE_READ_MSG;       
@@ -1439,6 +1594,8 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->folder->type == F_NEWS)
                state |= M_NEWS;
+       else
+               state |= M_NOT_NEWS;
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (item &&
             (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
@@ -1491,6 +1648,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/File/Exit"      , M_UNLOCKED},
 
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
+
                {"/View/Sort"                      , M_EXEC},
                {"/View/Thread view"               , M_EXEC},
                {"/View/Expand all threads"        , M_MSG_EXIST},
@@ -1507,7 +1665,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Go to/Prev labeled message", M_MSG_EXIST},
                {"/View/Go to/Next labeled message", M_MSG_EXIST},
                {"/View/Open in new window"        , M_SINGLE_TARGET_EXIST},
-               {"/View/Show all header          , M_SINGLE_TARGET_EXIST},
+               {"/View/Show all headers"          , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
                {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
@@ -1515,15 +1673,15 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Cancel receiving"      , M_INC_ACTIVE},
                {"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
                {"/Message/Reply"                 , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to sender"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to all"          , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+               {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
 
                {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
@@ -1532,7 +1690,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/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/Execute"                   , M_DELAY_EXEC},
                {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
                {"/Configuration", M_UNLOCKED},
@@ -1604,7 +1762,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
        }
 
-       SET_CHECK_MENU_ACTIVE("/View/Show all header",
+       SET_CHECK_MENU_ACTIVE("/View/Show all headers",
                              mainwin->messageview->textview->show_all_headers);
        SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
 
@@ -1753,6 +1911,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 
                mainwin->win.sep_none.hpaned = hpaned;
                mainwin->win.sep_none.vpaned = vpaned;
+               
+               /* remove headerview if not in prefs */
+               headerview_set_visibility(mainwin->messageview->headerview,
+                                         prefs_common.display_header_pane);
                break;
        case SEPARATE_FOLDER:
                vpaned = gtk_vpaned_new();
@@ -1791,6 +1953,11 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                 * lose track of its visibility state */
                if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
                        gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+               
+               /* remove headerview if not in prefs */
+               headerview_set_visibility(mainwin->messageview->headerview,
+                                         prefs_common.display_header_pane);
+               
                break;
        case SEPARATE_MESSAGE:
                hpaned = gtk_hpaned_new();
@@ -1849,6 +2016,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                break;
        }
 
+       /* rehide quick search if necessary */
+       if (!prefs_common.show_searchbar)
+               gtk_widget_hide(mainwin->summaryview->hbox_search);
+       
        mainwin->type = type;
 
        mainwin->messageview->visible = TRUE;
@@ -1873,6 +2044,24 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        debug_print("done.\n");
 }
 
+void main_window_destroy_all(void)
+{
+       while (mainwin_list != NULL) {
+               MainWindow *mainwin = (MainWindow*)mainwin_list->data;
+               
+               /* free toolbar stuff */
+               toolbar_clear_list(TOOLBAR_MAIN);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
+
+               g_free(mainwin->toolbar);
+               g_free(mainwin);
+               
+               mainwin_list = g_list_remove(mainwin_list, mainwin);
+       }
+       g_list_free(mainwin_list);
+}
+
 #if 0
 static void toolbar_account_button_pressed(GtkWidget *widget,
                                           GdkEventButton *event,
@@ -2087,6 +2276,653 @@ static void toggle_message_cb(MainWindow *mainwin, guint action,
                summary_toggle_view(mainwin->summaryview);
 }
 
+/* Toolbar handling */
+static void toolbar_inc_cb(GtkWidget   *widget,
+                          gpointer      data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       inc_mail_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_inc_all_cb(GtkWidget       *widget,
+                              gpointer  data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       inc_all_account_mail_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_send_cb(GtkWidget  *widget,
+                           gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       send_queue_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_compose_cb(GtkWidget  *widget,
+                              gpointer    data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       if (mainwin->toolbar->compose_btn_type == COMPOSEBUTTON_NEWS) 
+               compose_news_cb(mainwin, 0, NULL);
+       else
+               compose_mail_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_reply_cb(GtkWidget   *widget, 
+                            gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       if (prefs_common.default_reply_list)
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                        : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
+                        NULL);
+       else
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
+                        : COMPOSE_REPLY_WITHOUT_QUOTE,
+                        NULL);
+}
+
+static void toolbar_reply_to_all_cb(GtkWidget   *widget, 
+                                   gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, 
+                NULL);
+}
+
+static void toolbar_reply_to_list_cb(GtkWidget   *widget, 
+                                   gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
+                NULL);
+}
+
+static void toolbar_reply_to_sender_cb(GtkWidget   *widget, 
+                                      gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, 
+                NULL);
+}
+
+static void toolbar_forward_cb(GtkWidget       *widget,
+                              gpointer          data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       if (prefs_common.forward_as_attachment)
+               reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
+       else
+               reply_cb(mainwin, COMPOSE_FORWARD, NULL);
+}
+
+static void toolbar_delete_cb(GtkWidget          *widget,
+                             gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       summary_delete(mainwin->summaryview);
+}
+
+static void toolbar_exec_cb(GtkWidget  *widget,
+                           gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       summary_execute(mainwin->summaryview);
+}
+
+static void toolbar_next_unread_cb(GtkWidget   *widget,
+                                  gpointer      data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       next_unread_cb(mainwin, 0, NULL);
+}
+
+/* popup callback functions */
+static void toolbar_reply_popup_cb(GtkWidget       *widget, 
+                                  GdkEventButton  *event, 
+                                  gpointer         data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->reply_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->reply_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replyall_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replyall_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replylist_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replylist_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replysender_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replysender_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->fwd_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
+                                            gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->fwd_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void activate_compose_button (MainToolbar       *toolbar,
+                                    ToolbarStyle      style,
+                                    ComposeButtonType type)
+{
+       if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
+               return;
+
+       gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn 
+                       : toolbar->compose_news_btn);
+       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
+                       : toolbar->compose_mail_btn);
+       toolbar->compose_btn_type = type;       
+}
+
+void toolbar_set_compose_button(MainToolbar       *toolbar, 
+                               ComposeButtonType  compose_btn_type)
+{
+       if (toolbar->compose_btn_type != compose_btn_type)
+               activate_compose_button(toolbar, 
+                                       prefs_common.toolbar_style,
+                                       compose_btn_type);
+}
+
+static void toolbar_buttons_cb(GtkWidget         *widget, 
+                              ToolbarItem       *t_item)
+{
+       struct {
+               gint   index;
+               void (*func)(GtkWidget *widget, gpointer data);
+       } toolbar_action[] = {
+               { A_RECEIVE_ALL,    toolbar_inc_all_cb         },
+               { A_RECEIVE_CUR,    toolbar_inc_cb             },
+               { A_SEND_QUEUED,    toolbar_send_cb            },
+               { A_COMPOSE_EMAIL,  toolbar_compose_cb         },
+               { A_REPLY_MESSAGE,  toolbar_reply_cb           },
+               { A_REPLY_SENDER,   toolbar_reply_to_sender_cb },
+               { A_REPLY_ALL,      toolbar_reply_to_all_cb    },
+               { A_REPLY_ML,       toolbar_reply_to_list_cb   },
+               { A_FORWARD,        toolbar_forward_cb         },
+               { A_DELETE,         toolbar_delete_cb          },
+               { A_EXECUTE,        toolbar_exec_cb            },
+               { A_GOTO_NEXT,      toolbar_next_unread_cb     },
+               { A_SYL_ACTIONS,    toolbar_actions_execute_cb },
+               
+               { A_COMPOSE_NEWS,   toolbar_compose_cb         },    
+               { A_SEPARATOR,      NULL                       }};
+
+       gint num_items = sizeof(toolbar_action)/sizeof(toolbar_action[0]);
+       gint i;
+
+       for (i = A_RECEIVE_ALL; i < num_items; i++) {
+
+               if (toolbar_action[i].index == t_item->index) {
+                       MainWindow *mainwin = (MainWindow*)t_item->parent;
+                       toolbar_action[i].func(widget, mainwin);
+                       break;
+               }
+       }
+}
+
+static void toolbar_actions_execute_cb(GtkWidget *widget,
+                                      gpointer   data)
+{
+       MainWindow *mainwin = (MainWindow*)data;
+
+       toolbar_action_execute(widget, mainwin->toolbar->t_action_list, data, TOOLBAR_MAIN);
+}
+
+void toolbar_set_sensitive(MainWindow *mainwin)
+{
+       SensitiveCond state;
+       gboolean sensitive;
+       MainToolbar *toolbar = mainwin->toolbar;
+       GSList *cur;
+       GSList *entry_list = NULL;
+       
+       typedef struct _Entry Entry;
+       struct _Entry {
+               GtkWidget *widget;
+               SensitiveCond cond;
+               gboolean empty;
+       };
+
+#define SET_WIDGET_COND(w, c)     \
+{ \
+       Entry *e = g_new0(Entry, 1); \
+       e->widget = w; \
+       e->cond   = c; \
+       entry_list = g_slist_append(entry_list, e); \
+}
+
+       SET_WIDGET_COND(toolbar->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
+       SET_WIDGET_COND(toolbar->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
+       SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
+       SET_WIDGET_COND(toolbar->reply_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replyall_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replylist_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replysender_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
+
+       SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
+       SET_WIDGET_COND(toolbar->delete_btn,
+                       M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
+       SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
+
+       for (cur = toolbar->t_action_list; cur != NULL;  cur = cur->next) {
+               ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
+               
+               SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
+       }
+
+#undef SET_WIDGET_COND
+
+       state = main_window_get_current_state(mainwin);
+
+       for (cur = entry_list; cur != NULL; cur = cur->next) {
+               Entry *e = (Entry*) cur->data;
+
+               if (e->widget != NULL) {
+                       sensitive = ((e->cond & state) == e->cond);
+                       gtk_widget_set_sensitive(e->widget, sensitive); 
+               }
+       }
+       
+       while (entry_list != NULL) {
+               Entry *e = (Entry*) entry_list->data;
+
+               if (e)
+                       g_free(e);
+               entry_list = g_slist_remove(entry_list, e);
+       }
+
+       g_slist_free(entry_list);
+
+       activate_compose_button(toolbar, 
+                               prefs_common.toolbar_style,
+                               toolbar->compose_btn_type);
+}
+
+static void toolbar_update(MainWindow *mainwin)
+{
+       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), 
+                            GTK_WIDGET(mainwin->toolbar->toolbar));
+       
+       mainwin->toolbar->toolbar    = NULL;
+       mainwin->toolbar->get_btn    = NULL;
+       mainwin->toolbar->getall_btn = NULL;
+       mainwin->toolbar->send_btn   = NULL;
+       mainwin->toolbar->compose_mail_btn = NULL;
+       mainwin->toolbar->compose_news_btn = NULL;
+       mainwin->toolbar->reply_btn        = NULL;      
+       mainwin->toolbar->replyall_btn     = NULL;      
+       mainwin->toolbar->replylist_btn     = NULL;     
+       mainwin->toolbar->replysender_btn  = NULL;      
+       mainwin->toolbar->fwd_btn    = NULL;    
+       mainwin->toolbar->delete_btn = NULL;    
+       mainwin->toolbar->next_btn   = NULL;    
+       mainwin->toolbar->exec_btn   = NULL;
+
+       toolbar_clear_list(TOOLBAR_MAIN);
+       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
+       toolbar_create(mainwin, mainwin->handlebox);    
+       toolbar_set_sensitive(mainwin);
+
+}
+
+static void toolbar_create(MainWindow *mainwin,
+                          GtkWidget  *container)
+{
+       ToolbarItem *toolbar_item;
+
+       GtkWidget *toolbar;
+       GtkWidget *icon_wid  = NULL;
+       GtkWidget *icon_news = NULL;
+       GtkWidget *item_news = NULL;
+       GtkWidget *item;
+       GtkTooltips *toolbar_tips;
+       ToolbarSylpheedActions *t_action_item;
+       GSList *cur;
+       GSList *toolbar_list;
+
+       guint n_menu_entries;
+       GtkWidget *reply_popup;
+       GtkWidget *replyall_popup;
+       GtkWidget *replylist_popup;
+       GtkWidget *replysender_popup;
+       GtkWidget *fwd_popup;
+
+       toolbar_tips = gtk_tooltips_new();
+
+       if (mainwin->toolbar != NULL) {
+               toolbar_clear_list(TOOLBAR_MAIN);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
+               g_free(mainwin->toolbar);
+       }
+
+       toolbar_read_config_file(TOOLBAR_MAIN);
+       toolbar_list = toolbar_get_list(TOOLBAR_MAIN);
+
+       mainwin->toolbar = g_new0(MainToolbar, 1); 
+
+       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
+                                 GTK_TOOLBAR_BOTH);
+       gtk_container_add(GTK_CONTAINER(container), toolbar);
+       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
+       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
+                                   GTK_TOOLBAR_SPACE_LINE);
+       
+       for (cur = toolbar_list; cur != NULL; cur = cur->next) {
+       
+               if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
+                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+                       continue;
+               }
+               
+               toolbar_item = g_new0(ToolbarItem, 1); 
+               toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
+               toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
+               toolbar_item->index = ((ToolbarItem*)cur->data)->index;
+
+               toolbar_item->parent = (gpointer)mainwin;
+
+               /* collect toolbar items in list to keep track */
+               mainwin->toolbar->t_item_list = g_slist_append(mainwin->toolbar->t_item_list, 
+                                                             toolbar_item);
+               
+               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
+               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                               toolbar_item->text,
+                                               (""),
+                                               (""),
+                                               icon_wid, toolbar_buttons_cb, 
+                                               toolbar_item);
+               
+               switch (toolbar_item->index) {
+               case A_RECEIVE_ALL:
+                       mainwin->toolbar->getall_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->getall_btn, 
+                                          _("Receive Mail on all Accounts"), NULL);
+                       break;
+               case A_RECEIVE_CUR:
+                       mainwin->toolbar->get_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->get_btn,
+                                          _("Receive Mail on current Account"), NULL);
+                       break;
+               case A_SEND_QUEUED:
+                       mainwin->toolbar->send_btn = item; 
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->send_btn,
+                                          _("Send Queued Message(s)"), NULL);
+                       break;
+               case A_COMPOSE_EMAIL:
+                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+                       item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                                           _("News"),
+                                                           (""),
+                                                           (""),
+                                                           icon_news, toolbar_buttons_cb, 
+                                                           toolbar_item);
+                       mainwin->toolbar->compose_mail_btn = item; 
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->compose_mail_btn,
+                                          _("Compose Email"), NULL);
+                       mainwin->toolbar->compose_news_btn = item_news;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->compose_news_btn,
+                                          _("Compose News"), NULL);
+                       break;
+               case A_REPLY_MESSAGE:
+                       mainwin->toolbar->reply_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->reply_btn,
+                                          _("Reply to Message"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->reply_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(reply_popup_entries) /
+                               sizeof(reply_popup_entries[0]);
+                       reply_popup = popupmenu_create(mainwin->window, reply_popup_entries, n_menu_entries,
+                                                      "<ReplyPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), mainwin);
+                       mainwin->toolbar->reply_popup       = reply_popup;
+                       break;
+               case A_REPLY_SENDER:
+                       mainwin->toolbar->replysender_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replysender_btn,
+                                          _("Reply to Sender"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replysender_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replysender_popup_entries) /
+                               sizeof(replysender_popup_entries[0]);
+                       replysender_popup = popupmenu_create(mainwin->window, 
+                                                            replysender_popup_entries, n_menu_entries,
+                                                            "<ReplySenderPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replysender_popup = replysender_popup;
+                       break;
+               case A_REPLY_ALL:
+                       mainwin->toolbar->replyall_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replyall_btn,
+                                          _("Reply to All"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replyall_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replyall_popup_entries) /
+                               sizeof(replyall_popup_entries[0]);
+                       replyall_popup = popupmenu_create(mainwin->window, 
+                                                         replyall_popup_entries, n_menu_entries,
+                                                         "<ReplyAllPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replyall_popup    = replyall_popup;
+                       break;
+               case A_REPLY_ML:
+                       mainwin->toolbar->replylist_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replylist_btn,
+                                          _("Reply to Mailing-list"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replylist_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replylist_popup_entries) /
+                               sizeof(replylist_popup_entries[0]);
+                       replylist_popup = popupmenu_create(mainwin->window, 
+                                                         replylist_popup_entries, n_menu_entries,
+                                                         "<ReplyMlPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replylist_popup    = replylist_popup;
+                       break;
+               case A_FORWARD:
+                       mainwin->toolbar->fwd_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->fwd_btn,
+                                          _("Forward Message"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->fwd_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(fwd_popup_entries) /
+                               sizeof(fwd_popup_entries[0]);
+                       fwd_popup = popupmenu_create(mainwin->window, 
+                                                    fwd_popup_entries, n_menu_entries,
+                                                    "<ForwardPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), mainwin);
+                       mainwin->toolbar->fwd_popup         = fwd_popup;
+                       break;
+               case A_DELETE:
+                       mainwin->toolbar->delete_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->delete_btn,
+                                          _("Delete Message"), NULL);
+                       break;
+               case A_EXECUTE:
+                       mainwin->toolbar->exec_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->exec_btn,
+                                          _("Execute"), NULL);
+                       break;
+               case A_GOTO_NEXT:
+                       mainwin->toolbar->next_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->next_btn,
+                                          _("Goto Next Message"), NULL);
+                       break;
+               case A_SYL_ACTIONS:
+                       t_action_item = g_new0(ToolbarSylpheedActions, 1);
+                       t_action_item->widget = item;
+                       t_action_item->name   = g_strdup(toolbar_item->text);
+
+                       mainwin->toolbar->t_action_list = 
+                               g_slist_append(mainwin->toolbar->t_action_list,
+                                              t_action_item);
+
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            item,
+                                            t_action_item->name, NULL);
+
+                       gtk_widget_show(item);
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       mainwin->toolbar->toolbar = toolbar;
+
+       activate_compose_button(mainwin->toolbar, 
+                               prefs_common.toolbar_style, 
+                               mainwin->toolbar->compose_btn_type);
+
+       gtk_widget_show_all(toolbar);
+}
+
 static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
@@ -2116,6 +2952,8 @@ static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
        prefs_common.toolbar_style = (ToolbarStyle)action;
 }
 
+/* END Toolbar Stuff */
+
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -2128,18 +2966,6 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void toggle_searchbar_cb(MainWindow *mainwin, guint action,
-                               GtkWidget *widget)
-{
-       if (GTK_CHECK_MENU_ITEM(widget)->active) {
-               gtk_widget_show(mainwin->summaryview->hbox_search);
-               prefs_common.show_searchbar = TRUE;
-       } else {
-               gtk_widget_hide(mainwin->summaryview->hbox_search);
-               prefs_common.show_searchbar = FALSE;
-       }
-}
-
 static void separate_widget_cb(MainWindow *mainwin, guint action,
                               GtkWidget *widget)
 {
@@ -2156,13 +2982,17 @@ static void separate_widget_cb(MainWindow *mainwin, guint action,
        prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
 }
 
-static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline)
 {
-       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+       if (offline)
                online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
-       } else {
-               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);           
-       }
+       else
+               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);
+}
+
+static void toggle_work_offline_cb (MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       main_window_toggle_work_offline(mainwin, GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
 static void online_switch_clicked (GtkButton *btn, gpointer data) 
@@ -2217,7 +3047,7 @@ static void sel_download_cb(MainWindow *mainwin, guint action,
 static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
                               GtkWidget *widget)
 {
-       prefs_toolbar();
+       prefs_toolbar(action);
 }
 
 
@@ -2256,7 +3086,7 @@ void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
                        statusbar_pop_all();
                        folder_item_scan(folder->queue);
-                       folderview_update_item(folder->queue, TRUE);
+                       folder_update_item(folder->queue, TRUE);
                }
        }
 }
@@ -2264,28 +3094,35 @@ void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 void compose_mail_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
-       PrefsAccount * ac;
-       GList * list;
-       GList * cur;
+       PrefsAccount *ac = NULL;
+       FolderItem *item = mainwin->summaryview->folder_item;   
+        GList * list;
+        GList * cur;
 
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
+       if (item) {
+               ac = account_find_from_item(item);
                if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);          /* CLAWS */
                        return;
                }
        }
 
-       if(cur_account && (cur_account->protocol != A_NNTP)) {
-               compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
+       /*
+        * CLAWS - use current account
+        */
+       if (cur_account && (cur_account->protocol != A_NNTP)) {
+               compose_new_with_folderitem(cur_account, item);
                return;
        }
 
+       /*
+        * CLAWS - just get the first one
+        */
        list = account_get_list();
-       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+       for (cur = list ; cur != NULL ; cur = g_list_next(cur)) {
                ac = (PrefsAccount *) cur->data;
                if (ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);
                        return;
                }
        }
@@ -2338,6 +3175,11 @@ static void delete_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_delete(mainwin->summaryview);
 }
 
+static void cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       summary_cancel(mainwin->summaryview);
+}
+
 static void open_msg_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_open_msg(mainwin->summaryview);
@@ -2604,10 +3446,10 @@ 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)
+static void select_thread_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
 {
-       if (messageview_is_visible(mainwin->summaryview->messageview))
-               summary_select_thread(mainwin->summaryview);
+       summary_select_thread(mainwin->summaryview);
 }
 
 static void create_filter_cb(MainWindow *mainwin, guint action,
@@ -2622,12 +3464,6 @@ static void prefs_common_open_cb(MainWindow *mainwin, guint action,
        prefs_common_open();
 }
 
-static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
-                                GtkWidget *widget)
-{
-       prefs_filter_open(NULL, NULL);
-}
-
 static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
@@ -2658,14 +3494,7 @@ static void prefs_account_open_cb(MainWindow *mainwin, guint action,
        if (!cur_account) {
                new_account_cb(mainwin, 0, widget);
        } else {
-               gboolean prev_default = cur_account->is_default;
-
-               prefs_account_open(cur_account);
-               if (!prev_default && cur_account->is_default)
-                       account_set_as_default(cur_account);
-               account_save_config_all();
-               account_set_menu();
-               main_window_reflect_prefs_all();
+               account_open(cur_account);
        }
 }
 
@@ -2685,12 +3514,7 @@ static void account_menu_cb(GtkMenuItem  *menuitem, gpointer data)
 static void manual_open_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
-       manual_open((ManualLang)action);
-}
-
-static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       faq_open((ManualLang)action);
+       manual_open((ManualType)action);
 }
 
 static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
@@ -2727,6 +3551,14 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
                app_exit_cb(mainwin, 0, NULL);
                return;
+       case GDK_space:
+               if (mainwin->folderview && mainwin->summaryview
+                   && !mainwin->summaryview->displayed) {
+                       summary_lock(mainwin->summaryview);
+                       folderview_select_next_unread(mainwin->folderview);
+                       summary_unlock(mainwin->summaryview);
+               }
+               break;
        default:
                break;
        }