auto-chango compose toolbar button depending on folder selection
[claws.git] / src / mainwindow.c
index 1e2a861eb4aa83d2947fafd743d9dd86f76d3ce8..efe554b2043578e570f59ad32e37b15287355496 100644 (file)
@@ -27,6 +27,7 @@
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkstatusbar.h>
+#include <gtk/gtkprogressbar.h>
 #include <gtk/gtkhpaned.h>
 #include <gtk/gtkvpaned.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -47,6 +48,7 @@
 #include "summaryview.h"
 #include "summary_search.h"
 #include "messageview.h"
+#include "message_search.h"
 #include "headerview.h"
 #include "menu.h"
 #include "folder.h"
@@ -74,6 +76,8 @@
 #include "codeconv.h"
 #include "about.h"
 #include "manual.h"
+#include "prefs_templates.h"
+#include "version.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -112,6 +116,10 @@ static void toolbar_send_cb                (GtkWidget      *widget,
 
 static void toolbar_compose_cb         (GtkWidget      *widget,
                                         gpointer        data);
+static void toolbar_popup_compose_type_cb(GtkWidget    *widget,
+                                        gpointer        data);
+static void toolbar_popup_compose_type_set(GtkWidget   *widget,
+                                        gpointer        data);
 static void toolbar_compose_news_cb            (GtkWidget      *widget,
                                         gpointer        data);
 static void toolbar_compose_mail_cb            (GtkWidget      *widget,
@@ -144,6 +152,8 @@ static void toolbar_account_button_pressed  (GtkWidget      *widget,
 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,
@@ -187,6 +197,10 @@ static void app_exit_cb             (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
+static void search_cb           (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
 static void toggle_folder_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -199,7 +213,9 @@ static void toggle_toolbar_cb        (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action);
+static void separate_widget_cb (GtkCheckMenuItem *checkitem,
+                                guint action,
+                                GtkWidget *widget);
 
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
@@ -265,6 +281,12 @@ static void mark_as_unread_cb              (MainWindow     *mainwin,
 static void mark_as_read_cb            (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+static void mark_all_read_cb           (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void add_address_cb             (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void set_charset_cb             (MainWindow     *mainwin,
                                         guint           action,
@@ -303,15 +325,22 @@ static void next_cb                (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
+static void prev_unread_cb      (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void next_unread_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
+static void prev_marked_cb      (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void next_marked_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
-static void prev_marked_cb      (MainWindow    *mainwin,
+static void prev_labeled_cb     (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void next_labeled_cb     (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
@@ -355,6 +384,14 @@ static void manual_open_cb  (MainWindow    *mainwin,
 static void scan_tree_func      (Folder        *folder,
                                  FolderItem    *item,
                                  gpointer       data);
+                                 
+static void activate_compose_button (MainWindow *mainwin,
+                               ToolbarStyle      style,
+                               ComposeButtonType type);
+
+static void prefs_templates_open_cb(MainWindow *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 
 #define  SEPARATE_ACTION  667
 
@@ -383,7 +420,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Copy"),                    "<control>C", copy_cb, 0, NULL},
        {N_("/_Edit/Select _all"),              "<control>A", allsel_cb, 0, NULL},
        {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit/_Search"),                  "<control>S", summary_search_cb, 0, NULL},
+       {N_("/_Edit/_Find in current message"), "<control>F", search_cb, 0, NULL},
+       {N_("/_Edit/_Search folder"),           "<control>S", search_cb, 1, NULL},
 
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Folder tree"),             NULL, toggle_folder_cb, 0, "<ToggleItem>"},
@@ -398,6 +436,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Separate f_older tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
        {N_("/_View/Separate m_essage view"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/View _source"),             "<control>U", view_source_cb, 0, NULL},
+       {N_("/_View/Show all _header"),         "<control>H", header_window_show_cb, 0, NULL},
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Code set"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Code set/_Auto detect"),
         NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
@@ -480,18 +521,22 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Send queued messa_ges"),
                                                NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Compose a _new mail"),   "<alt>N", compose_mail_cb, 0, NULL},
+       {N_("/_Message/Compose a_n email message"),     "<alt>N", compose_mail_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
        {N_("/_Message/_Reply"),                "<alt>R",       reply_cb, COMPOSE_REPLY, NULL},
        {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/Reply to a_ll"),         "<shift><alt>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/_Forward"),              "<control>F", reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/_Forward"),              "<shift><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/_Message/Forward as a_ttachment"),
                                                "<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<alt>O", move_to_cb, 0, NULL},
        {N_("/_Message/_Copy..."),              NULL, copy_to_cb, 0, NULL},
        {N_("/_Message/_Delete"),               "<alt>D", delete_cb,  0, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/_Mark/_Mark"),           NULL, mark_cb,   0, NULL},
        {N_("/_Message/_Mark/_Unmark"),         NULL, unmark_cb, 0, NULL},
@@ -501,9 +546,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, mark_as_read_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Open in new _window"),   "<shift><control>N", open_msg_cb, 0, NULL},
-       {N_("/_Message/View _source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_Message/Show all _header"),      "<control>H", header_window_show_cb, 0, NULL},
-       {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
 
        {N_("/_Summary"),                       NULL, NULL, 0, "<Branch>"},
        {N_("/_Summary/_Delete duplicated messages"),
@@ -512,13 +554,25 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Summary/E_xecute"),              "<alt>X", execute_summary_cb, 0, NULL},
        {N_("/_Summary/_Update"),               "<alt>U", update_summary_cb,  0, NULL},
        {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/_Prev message"),         NULL, prev_cb, 0, NULL},
-       {N_("/_Summary/_Next message"),         NULL, next_cb, 0, NULL},
-       {N_("/_Summary/N_ext unread message"),  NULL, next_unread_cb, 0, NULL},
-       {N_("/_Summary/Prev marked message"),   NULL, prev_marked_cb, 0, NULL},
-       {N_("/_Summary/Next marked message"),   NULL, next_marked_cb, 0, NULL},
-       {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/_Go to other folder"),   "<alt>G", goto_folder_cb, 0, NULL},
+       {N_("/_Summary/Go _to"),                NULL, NULL, 0, "<Branch>"},
+       {N_("/_Summary/Go _to/_Prev message"),  NULL, prev_cb, 0, NULL},
+       {N_("/_Summary/Go _to/_Next message"),  NULL, next_cb, 0, NULL},
+       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/_Summary/Go _to/P_rev unread message"),
+                                               NULL, prev_unread_cb, 0, NULL},
+       {N_("/_Summary/Go _to/N_ext unread message"),
+                                               NULL, next_unread_cb, 0, NULL},
+       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/_Summary/Go _to/Prev _marked message"),
+                                               NULL, prev_marked_cb, 0, NULL},
+       {N_("/_Summary/Go _to/Next m_arked message"),
+                                               NULL, next_marked_cb, 0, NULL},
+       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/_Summary/Go _to/Prev _labeled message"),
+                                               NULL, prev_labeled_cb, 0, NULL},
+       {N_("/_Summary/Go _to/Next la_beled message"),
+                                               NULL, next_labeled_cb, 0, NULL},
+       {N_("/_Summary/_Go to other folder..."),"<alt>G", goto_folder_cb, 0, NULL},
        {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Summary/_Sort"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Summary/_Sort/Sort by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
@@ -526,7 +580,12 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Summary/_Sort/Sort by _date"),   NULL, sort_summary_cb, SORT_BY_DATE, NULL},
        {N_("/_Summary/_Sort/Sort by _from"),   NULL, sort_summary_cb, SORT_BY_FROM, NULL},
        {N_("/_Summary/_Sort/Sort by _subject"),NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
-       {N_("/_Summary/_Sort/Sort by sco_re"),  NULL, sort_summary_cb, SORT_BY_SCORE, NULL},
+       {N_("/_Summary/_Sort/Sort by _color label"),
+                                               NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
+       {N_("/_Summary/_Sort/Sort by _mark"),   NULL, sort_summary_cb, SORT_BY_MARK, NULL},
+       {N_("/_Summary/_Sort/Sort by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
+       {N_("/_Summary/_Sort/Sort by a_ttachment"),
+                                               NULL, sort_summary_cb, SORT_BY_MIME, NULL},
        {N_("/_Summary/_Sort/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Summary/_Sort/_Attract by subject"),
                                                NULL, attract_by_subject_cb, 0, NULL},
@@ -547,6 +606,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering ..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
+       {N_("/_Configuration/_Templates ..."),
+                                               NULL, prefs_templates_open_cb, 0, NULL},
        {N_("/_Configuration/_Preferences per account..."),
                                                NULL, prefs_account_open_cb, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
@@ -559,7 +620,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
 
        {N_("/_Help"),                          NULL, NULL, 0, "<LastBranch>"},
        {N_("/_Help/_Manual"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual/_English"),         NULL, NULL, MANUAL_LANG_EN, NULL},
+       {N_("/_Help/_Manual/_English"),         NULL, manual_open_cb, MANUAL_LANG_EN, NULL},
        {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
@@ -575,6 +636,8 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *vbox_body;
        GtkWidget *hbox_stat;
        GtkWidget *statusbar;
+       GtkWidget *progressbar;
+       GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;
 
@@ -582,8 +645,8 @@ MainWindow *main_window_create(SeparateType type)
        SummaryView *summaryview;
        MessageView *messageview;
        GdkColormap *colormap;
-       GdkColor color[5];
-       gboolean success[5];
+       GdkColor color[4];
+       gboolean success[4];
        guint n_menu_entries;
        GtkItemFactory *ifactory;
        GtkWidget *ac_menu;
@@ -603,8 +666,11 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+
        gtk_widget_realize(window);
 
+       gtkut_widget_set_app_icon(window);
+
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -634,6 +700,13 @@ MainWindow *main_window_create(SeparateType type)
        statusbar = statusbar_create();
        gtk_box_pack_start(GTK_BOX(hbox_stat), statusbar, TRUE, TRUE, 0);
 
+       progressbar = gtk_progress_bar_new();
+       gtk_widget_set_usize(progressbar, 120, 1);
+       gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
+
+       statuslabel = gtk_label_new("");
+       gtk_box_pack_start(GTK_BOX(hbox_stat), statuslabel, FALSE, FALSE, 0);
+
        ac_button = gtk_button_new();
        gtk_button_set_relief(GTK_BUTTON(ac_button), GTK_RELIEF_NONE);
        GTK_WIDGET_UNSET_FLAGS(ac_button, GTK_CAN_FOCUS);
@@ -665,15 +738,17 @@ 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->ac_button = ac_button;
-       mainwin->ac_label  = ac_label;
+       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;
 
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
@@ -690,14 +765,11 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->color_dim.red = summaryview->color_dim.green =
                summaryview->color_dim.blue = COLOR_DIM;
 
-       summaryview->color_normal.red = summaryview->color_normal.green =
-               summaryview->color_normal.blue = 0;
-
        folderview->color_new.red = (guint16)55000;
        folderview->color_new.green = folderview->color_new.blue = 15000;
 
-       folderview->color_normal.red = folderview->color_normal.green =
-               folderview->color_normal.blue = 0;
+       gtkut_convert_int_to_gdk_color(prefs_common.tgt_folder_col,
+                                      &folderview->color_op);
 
        summaryview->color_important.red = 0;
        summaryview->color_marked.green = 0;
@@ -705,13 +777,12 @@ MainWindow *main_window_create(SeparateType type)
 
        color[0] = summaryview->color_marked;
        color[1] = summaryview->color_dim;
-       color[2] = summaryview->color_normal;
-       color[3] = folderview->color_new;
-       color[4] = folderview->color_normal;
+       color[2] = folderview->color_new;
+       color[3] = folderview->color_op;
 
        colormap = gdk_window_get_colormap(window->window);
-       gdk_colormap_alloc_colors(colormap, color, 5, FALSE, TRUE, success);
-       for (i = 0; i < 5; i++) {
+       gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
+       for (i = 0; i < 4; i++) {
                if (success[i] == FALSE)
                        g_warning(_("MainWindow: color allocation %d failed\n"), i);
        }
@@ -766,22 +837,23 @@ MainWindow *main_window_create(SeparateType type)
        gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
                                           GUINT_TO_POINTER(SEPARATE_MESSAGE));
 
-       /*
+
        menu_set_sensitive(ifactory, "/Summary/Thread view",
                           prefs_common.enable_thread ? FALSE : TRUE);
        menu_set_sensitive(ifactory, "/Summary/Unthread view",
                           prefs_common.enable_thread ? TRUE : FALSE);
-       */
-       main_window_set_thread_option(mainwin);
+       
+       /*main_window_set_thread_option(mainwin);*/
 
-       menu_set_sensitive(ifactory, "/Help/Manual/English", FALSE);
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
                (ifactory, "/Configuration/Change current account");
+       gtk_signal_connect(GTK_OBJECT(ac_menu), "selection_done",
+                          GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
        mainwin->ac_menu = ac_menu;
 
-       main_window_set_toolbar_sensitive(mainwin, FALSE);
+       main_window_set_toolbar_sensitive(mainwin);
 
        /* show main window */
        gtk_widget_set_uposition(mainwin->window,
@@ -789,6 +861,7 @@ MainWindow *main_window_create(SeparateType type)
                                 prefs_common.mainwin_y);
        gtk_widget_set_usize(window, prefs_common.mainwin_width,
                             prefs_common.mainwin_height);
+                            
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -798,6 +871,8 @@ MainWindow *main_window_create(SeparateType type)
        header_window_init(mainwin->headerwin);
        log_window_init(mainwin->logwin);
 
+
+       mainwin->lock_count = 0;
        mainwin->cursor_count = 0;
 
        if (!watch_cursor)
@@ -810,6 +885,7 @@ MainWindow *main_window_create(SeparateType type)
 
 void main_window_cursor_wait(MainWindow *mainwin)
 {
+
        if (mainwin->cursor_count == 0)
                gdk_window_set_cursor(mainwin->window->window, watch_cursor);
 
@@ -829,6 +905,30 @@ void main_window_cursor_normal(MainWindow *mainwin)
        gdk_flush();
 }
 
+/* lock / unlock the user-interface */
+void main_window_lock(MainWindow *mainwin)
+{
+       if (mainwin->lock_count == 0)
+               gtk_widget_set_sensitive(mainwin->ac_button, FALSE);
+
+       mainwin->lock_count++;
+
+       main_window_set_menu_sensitive(mainwin);
+       main_window_set_toolbar_sensitive(mainwin);
+}
+
+void main_window_unlock(MainWindow *mainwin)
+{
+       if (mainwin->lock_count)
+               mainwin->lock_count--;
+
+       main_window_set_menu_sensitive(mainwin);
+       main_window_set_toolbar_sensitive(mainwin);
+
+       if (mainwin->lock_count == 0)
+               gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
+}
+
 void main_window_reflect_prefs_all(void)
 {
        GList *cur;
@@ -838,13 +938,8 @@ void main_window_reflect_prefs_all(void)
                mainwin = (MainWindow *)cur->data;
 
                main_window_show_cur_account(mainwin);
-               if (cur_account) {
-                       gtk_widget_set_sensitive(mainwin->get_btn,    TRUE);
-                       gtk_widget_set_sensitive(mainwin->getall_btn, TRUE);
-               } else {
-                       gtk_widget_set_sensitive(mainwin->get_btn,    FALSE);
-                       gtk_widget_set_sensitive(mainwin->getall_btn, FALSE);
-               }
+               main_window_set_menu_sensitive(mainwin);
+               main_window_set_toolbar_sensitive(mainwin);
 
                if (prefs_common.immediate_exec)
                        gtk_widget_hide(mainwin->exec_btn);
@@ -909,10 +1004,11 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);
 
-       buf = g_strdup_printf(_("Current account: %s"), ac_name);
-       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), buf);
+       /* buf = g_strdup_printf(_("Current account: %s"), ac_name);
+       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), buf);   */
+       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
        gtk_widget_queue_resize(mainwin->ac_button);
-       g_free(buf);
+       /* g_free(buf); */
 
        g_free(ac_name);
 }
@@ -1048,12 +1144,10 @@ void main_window_add_mailbox(MainWindow *mainwin)
                g_free(path);
                return;
        }
-
        if (!strcmp(path, "Mail"))
                folder = folder_new(F_MH, _("Mailbox"), path);
        else
                folder = folder_new(F_MH, g_basename(path), path);
-
        g_free(path);
 
        if (folder->create_tree(folder) < 0) {
@@ -1119,78 +1213,163 @@ void main_window_add_mbox(MainWindow *mainwin)
        folderview_set(mainwin->folderview);
 }
 
-void main_window_set_toolbar_sensitive(MainWindow *mainwin, gboolean sensitive)
+typedef enum
 {
-       gtk_widget_set_sensitive(mainwin->reply_btn,       sensitive);
-       gtk_widget_set_sensitive(mainwin->replyall_btn,    sensitive);
-       gtk_widget_set_sensitive(mainwin->replysender_btn, sensitive);
-       gtk_widget_set_sensitive(mainwin->fwd_btn,         sensitive);
-       gtk_widget_set_sensitive(mainwin->exec_btn,        sensitive);
-       gtk_widget_set_sensitive(mainwin->next_btn,        sensitive);
+       M_UNLOCKED            = 1 << 0,
+       M_MSG_EXIST           = 1 << 1,
+       M_TARGET_EXIST        = 1 << 2,
+       M_SINGLE_TARGET_EXIST = 1 << 3,
+       M_EXEC                = 1 << 4,
+       M_ALLOW_REEDIT        = 1 << 5,
+       M_HAVE_ACCOUNT        = 1 << 6,
+       M_THREADED            = 1 << 7,
+       M_UNTHREADED          = 1 << 8,
+       M_NEWS                = 1 << 9
+} SensitiveCond;
 
-       if (!mainwin->summaryview->folder_item ||
-           mainwin->summaryview->folder_item->folder->type == F_NEWS)
-               gtk_widget_set_sensitive(mainwin->delete_btn, FALSE);
-       else
-               gtk_widget_set_sensitive(mainwin->delete_btn, sensitive);
-}
-
-void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection)
+static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 {
-       GtkItemFactory *ifactory;
-       gboolean sens;
-       gboolean exec;
+       SensitiveCond state = 0;
+       SummarySelection selection;
 
-       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       selection = summary_get_selection_type(mainwin->summaryview);
 
+       if (mainwin->lock_count == 0)
+               state |= M_UNLOCKED;
+       if (selection != SUMMARY_NONE)
+               state |= M_MSG_EXIST;
+       if (mainwin->summaryview->folder_item) {
+               if (mainwin->summaryview->folder_item->threaded)
+                       state |= M_THREADED;
+               else
+                       state |= M_UNTHREADED;  
+       }               
+       if (selection == SUMMARY_SELECTED_SINGLE ||
+           selection == SUMMARY_SELECTED_MULTIPLE)
+               state |= M_TARGET_EXIST;
        if (selection == SUMMARY_SELECTED_SINGLE)
-               sens = TRUE;
-       else
-               sens = FALSE;
-       if (!mainwin->summaryview->folder_item ||
+               state |= M_SINGLE_TARGET_EXIST;
+       if (mainwin->summaryview->folder_item &&
+           mainwin->summaryview->folder_item->folder->type != F_NEWS)
+               state |= M_EXEC;
+       if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->folder->type == F_NEWS)
-               exec = FALSE;
-       else
-               exec = TRUE;
-
-       menu_set_sensitive(ifactory, "/File/Save as...", sens);
-       menu_set_sensitive(ifactory, "/Message/Reply", sens);
-       menu_set_sensitive(ifactory, "/Message/Reply to sender", sens);
-       menu_set_sensitive(ifactory, "/Message/Reply to all", sens);
-       menu_set_sensitive(ifactory, "/Message/Forward", sens);
-       menu_set_sensitive(ifactory, "/Message/Forward as attachment", sens);
-       menu_set_sensitive(ifactory, "/Message/Open in new window", sens);
-       menu_set_sensitive(ifactory, "/Message/Show all header", sens);
-       menu_set_sensitive(ifactory, "/Message/View source", sens);
-       if (sens && (!mainwin->summaryview->folder_item ||
-                    mainwin->summaryview->folder_item->stype != F_DRAFT))
-               sens = FALSE;
-       menu_set_sensitive(ifactory, "/Message/Re-edit", sens);
+               state |= M_NEWS;
+       if (selection == SUMMARY_SELECTED_SINGLE &&
+           (mainwin->summaryview->folder_item &&
+            (mainwin->summaryview->folder_item->stype == F_DRAFT ||
+             mainwin->summaryview->folder_item->stype == F_QUEUE)))
+               state |= M_ALLOW_REEDIT;
+       if (cur_account)
+               state |= M_HAVE_ACCOUNT;
 
-       if (selection == SUMMARY_SELECTED_SINGLE ||
-           selection == SUMMARY_SELECTED_MULTIPLE)
-               sens = TRUE;
-       else
-               sens = FALSE;
+       return state;
+}
 
-       menu_set_sensitive(ifactory, "/File/Print..."  , sens);
-       menu_set_sensitive(ifactory, "/Message/Move...", sens && exec);
-       menu_set_sensitive(ifactory, "/Message/Copy...", sens && exec);
-       menu_set_sensitive(ifactory, "/Message/Delete" , sens && exec);
-       menu_set_sensitive(ifactory, "/Message/Mark"   , sens);
+void main_window_set_toolbar_sensitive(MainWindow *mainwin)
+{
+       SensitiveCond state;
+        gboolean sensitive;
+       gint i;
 
-       if (selection != SUMMARY_NONE)
-               sens = TRUE;
-       else
-               sens = FALSE;
+       const struct {
+               GtkWidget *widget;
+               SensitiveCond cond;
+       } entry[] = {
+               {mainwin->get_btn         , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {mainwin->getall_btn      , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {mainwin->compose_mail_btn, M_HAVE_ACCOUNT},
+               {mainwin->compose_news_btn, M_HAVE_ACCOUNT},
+               {mainwin->reply_btn       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {mainwin->replyall_btn    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {mainwin->replysender_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {mainwin->fwd_btn         , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               /* {mainwin->prefs_btn      , M_UNLOCKED},
+               {mainwin->account_btn    , M_UNLOCKED}, */
+               {mainwin->next_btn        , M_MSG_EXIST},
+               {mainwin->delete_btn      , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {mainwin->exec_btn        , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {NULL, 0}
+       };
+
+       state = main_window_get_current_state(mainwin);
+
+       for (i = 0; entry[i].widget != NULL; i++) {
+               sensitive = ((entry[i].cond & state) == entry[i].cond);
+               gtk_widget_set_sensitive(entry[i].widget, sensitive);
+       }
+}
+
+void main_window_set_menu_sensitive(MainWindow *mainwin)
+{
+       GtkItemFactory *ifactory;
+       SensitiveCond state;
+       gboolean sensitive;
+       gint i;
 
-       menu_set_sensitive(ifactory, "/Summary/Delete duplicated messages", sens && exec);
-       menu_set_sensitive(ifactory, "/Summary/Filter messages", sens && exec);
-       menu_set_sensitive(ifactory, "/Summary/Execute", sens);
-       menu_set_sensitive(ifactory, "/Summary/Prev message", sens);
-       menu_set_sensitive(ifactory, "/Summary/Next message", sens);
-       menu_set_sensitive(ifactory, "/Summary/Next unread message", sens);
-       menu_set_sensitive(ifactory, "/Summary/Sort", sens);
+       static const struct {
+               gchar *const entry;
+               SensitiveCond cond;
+       } entry[] = {
+               {"/File/Add mailbox..."        , M_UNLOCKED},
+                {"/File/Add mbox mailbox..."   , M_UNLOCKED},
+               {"/File/Update folder tree"    , M_UNLOCKED},
+               {"/File/Folder"                , M_UNLOCKED},
+               {"/File/Import mbox file..."   , M_UNLOCKED},
+               {"/File/Export to mbox file...", M_UNLOCKED},
+               {"/File/Empty trash"           , M_UNLOCKED},
+               {"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
+               {"/File/Close", M_UNLOCKED},
+               {"/File/Exit" , M_UNLOCKED},
+
+               {"/View/Show all header"      , M_SINGLE_TARGET_EXIST},
+               {"/View/View source"          , M_SINGLE_TARGET_EXIST},
+
+               {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
+/*             {"/Message/Compose new message"   , M_HAVE_ACCOUNT}, */
+               {"/Message/Reply"                 , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to sender"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to all"          , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
+               {"/Message/Forward"               , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Open in new window"    , M_SINGLE_TARGET_EXIST},
+               {"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+               {"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Copy...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Delete" , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Mark"   , M_TARGET_EXIST},
+               {"/Message/Add sender to address book", M_SINGLE_TARGET_EXIST},
+
+               {"/Summary/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Summary/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Summary/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Summary/Go to"                     , M_MSG_EXIST},
+               {"/Summary/Go to/Prev message"        , M_MSG_EXIST},
+               {"/Summary/Go to/Next message"        , M_MSG_EXIST},
+               {"/Summary/Go to/Next unread message" , M_MSG_EXIST},
+               {"/Summary/Go to/Prev marked message" , M_MSG_EXIST},
+               {"/Summary/Go to/Next marked message" , M_MSG_EXIST},
+               {"/Summary/Go to/Prev labeled message", M_MSG_EXIST},
+               {"/Summary/Go to/Next labeled message", M_MSG_EXIST},
+               {"/Summary/Sort"                      , M_MSG_EXIST},
+               {"/Summary/Thread view"               , M_UNTHREADED},
+               {"/Summary/Unthread view"             , M_THREADED},
+
+               {"/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++) {
+               sensitive = ((entry[i].cond & state) == entry[i].cond);
+               menu_set_sensitive(ifactory, entry[i].entry, sensitive);
+       }
 }
 
 void main_window_popup(MainWindow *mainwin)
@@ -1206,6 +1385,7 @@ void main_window_popup(MainWindow *mainwin)
        y %= sy; if (y < 0) y += sy;
        gdk_window_move(mainwin->window->window, x, y);
        gdk_window_raise(mainwin->window->window);
+       gdk_window_show(mainwin->window->window);
 
        debug_print("window position: x = %d, y = %d\n", x, y);
 
@@ -1241,6 +1421,7 @@ void main_window_popup(MainWindow *mainwin)
                gdk_window_raise(widget->window);
                break;
        default:
+               break;
        }
 }
 
@@ -1405,6 +1586,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 #include "pixmaps/stock_mail_receive.xpm"
 #include "pixmaps/stock_mail_receive_all.xpm"
 #include "pixmaps/stock_mail_compose.xpm"
+#include "pixmaps/stock_news_compose.xpm"
 #include "pixmaps/stock_mail_reply.xpm"
 #include "pixmaps/stock_mail_reply_to_all.xpm"
 #include "pixmaps/stock_mail_reply_to_author.xpm"
@@ -1433,7 +1615,10 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *icon_wid;
        GtkWidget *get_btn;
        GtkWidget *getall_btn;
-       GtkWidget *compose_btn;
+       GtkWidget *compose_mail_btn;
+       GtkWidget *compose_news_btn;
+       GtkWidget *compose_mail_btn_plain;
+       GtkWidget *compose_news_btn_plain;
        GtkWidget *reply_btn;
        GtkWidget *replyall_btn;
        GtkWidget *replysender_btn;
@@ -1446,6 +1631,11 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *next_btn;
        GtkWidget *delete_btn;
        GtkWidget *exec_btn;
+       GtkWidget *compose_type_btn;
+       GtkWidget *compose_type_arrow;
+       GtkWidget *compose_box;
+       GtkWidget *compose_label;
+       GtkTooltips *tooltips;
 
        toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
                                  GTK_TOOLBAR_BOTH);
@@ -1458,13 +1648,13 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        CREATE_TOOLBAR_ICON(stock_mail_receive_xpm);
        get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                          _("Get"),
-                                         _("Incorporate new mail"),
+                                         _("Get new mail from current account"),
                                          "Get",
                                          icon_wid, toolbar_inc_cb, mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_receive_all_xpm);
        getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                             _("Get all"),
-                                            _("Incorporate new mail of all accounts"),
+                                            _("Get new mail from all accounts"),
                                             "Get all",
                                             icon_wid,
                                             toolbar_inc_all_cb,
@@ -1481,24 +1671,99 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_send_cb,
                                           mainwin);
 
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
+       /* to implement Leandro's "combined" compose buttons, we create
+        * two sets of compose buttons, one for normal (text + icon) 
+        * toolbar, and one for both text-only and icon-only toolbar;
+        * we switch between those sets. */
+
+       /* insert compose mail button widget */                                    
+
+       compose_mail_btn = gtk_button_new();
+       gtk_widget_show(compose_mail_btn);
+       tooltips = gtk_tooltips_new();
+       gtk_tooltips_set_tip(tooltips, compose_mail_btn, 
+                                                _("Compose email message"),
+                                                _("email"));
+       compose_box = gtk_vbox_new(0, 0);
+       gtk_widget_show(compose_box);
+       
+       gtk_container_add(GTK_CONTAINER(compose_mail_btn), compose_box);
+       CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
+       gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
+
+       compose_label = gtk_label_new(_("Email"));
+       gtk_widget_show(compose_label);
+       gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
+       
+       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_mail_btn), GTK_CAN_FOCUS);
+       gtk_button_set_relief(GTK_BUTTON(compose_mail_btn), GTK_RELIEF_NONE);
+       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_mail_btn,
+               NULL, NULL);
+
+       /* insert compose news button widget */
+
+       compose_news_btn = gtk_button_new();
+       gtk_widget_show(compose_news_btn);
+       tooltips = gtk_tooltips_new();
+       gtk_tooltips_set_tip(tooltips, compose_news_btn,
+                                                _("Compose news article"),
+                                                _("news"));
+       compose_box = gtk_vbox_new(0, 0);
+       gtk_widget_show(compose_box);
+       
+       gtk_container_add(GTK_CONTAINER(compose_news_btn), compose_box);
+       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+       gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
+
+       compose_label = gtk_label_new(_("News"));
+       gtk_widget_show(compose_label);
+       gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
+       
+       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_news_btn), GTK_CAN_FOCUS);
+       gtk_button_set_relief(GTK_BUTTON(compose_news_btn), GTK_RELIEF_NONE);
+       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_news_btn,
+               NULL, NULL);
+       
+       /* insert compose btn plain */
+       
        CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
-       compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("New mail"),
-                                             _("Compose a new mail"),
+       compose_mail_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                             _("Email"),
+                                             _("Compose an email message"),
                                              "New",
                                              icon_wid,
                                              toolbar_compose_mail_cb,
                                              mainwin);
-       CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
-       compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("New news"),
+
+       /* insert compose btn plain */
+
+       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+       compose_news_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                             _("News"),
                                              _("Compose a news message"),
                                              "New",
                                              icon_wid,
                                              toolbar_compose_news_cb,
                                              mainwin);
+
+       /* insert compose button type widget */
+       
+       compose_type_btn = gtk_button_new();
+       gtk_widget_show(compose_type_btn);
+       
+       compose_type_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_widget_show(compose_type_arrow);
+       
+       gtk_container_add(GTK_CONTAINER(compose_type_btn), compose_type_arrow);
+
+       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_type_btn), GTK_CAN_FOCUS);
+       gtk_button_set_relief(GTK_BUTTON(compose_type_btn), GTK_RELIEF_NONE);
+
+       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_type_btn,
+               NULL, NULL);
+
+       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+       
        CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
        reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                            _("Reply"),
@@ -1509,7 +1774,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                            mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_reply_to_all_xpm);
        replyall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                              _("Reply all"),
+                                              _("All"),
                                               _("Reply to all"),
                                               "Reply to all",
                                               icon_wid,
@@ -1517,7 +1782,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                               mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
        replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                 _("Reply sender"),
+                                                 _("Sender"),
                                                  _("Reply to sender"),
                                                  "Reply to sender",
                                                  icon_wid,
@@ -1585,10 +1850,25 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                           mainwin);
        */
 
+       gtk_signal_connect(GTK_OBJECT(compose_type_btn), "clicked",
+               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_cb),
+               mainwin);
+
+       gtk_signal_connect(GTK_OBJECT(compose_mail_btn), "clicked",
+               GTK_SIGNAL_FUNC(toolbar_compose_mail_cb),
+               mainwin);
+
+       gtk_signal_connect(GTK_OBJECT(compose_news_btn), "clicked",
+               GTK_SIGNAL_FUNC(toolbar_compose_news_cb),
+               mainwin);
+
        mainwin->toolbar         = toolbar;
        mainwin->get_btn         = get_btn;
        mainwin->getall_btn      = getall_btn;
-       mainwin->compose_btn     = compose_btn;
+       mainwin->compose_mail_btn = compose_mail_btn;
+       mainwin->compose_news_btn = compose_news_btn;
+       mainwin->compose_mail_btn_plain = compose_mail_btn_plain;
+       mainwin->compose_news_btn_plain = compose_news_btn_plain;
        mainwin->reply_btn       = reply_btn;
        mainwin->replyall_btn    = replyall_btn;
        mainwin->replysender_btn = replysender_btn;
@@ -1603,10 +1883,55 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        mainwin->exec_btn        = exec_btn;
 
        gtk_widget_show_all(toolbar);
+
+       /* activate Leandro menu system */
+       activate_compose_button(mainwin, 
+                               prefs_common.toolbar_style,
+                               mainwin->compose_btn_type);
 }
 
 /* callback functions */
 
+static void toolbar_popup_compose_type_cb      (GtkWidget      *widget,
+                                gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       GtkWidget *compose_menu, *compose_item;
+
+       g_return_if_fail(mainwindow != NULL);
+       
+       compose_menu = gtk_menu_new();
+       
+       compose_item = gtk_menu_item_new_with_label(_("Email message"));
+       gtk_widget_show(compose_item);
+       gtk_menu_append(GTK_MENU(compose_menu), compose_item);
+       gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
+               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
+               mainwindow);
+       gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_MAIL));            
+       
+       compose_item = gtk_menu_item_new_with_label(_("News article"));
+       gtk_widget_show(compose_item);
+       gtk_menu_append(GTK_MENU(compose_menu), compose_item);
+       gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
+               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
+               mainwindow);
+       gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_NEWS));            
+               
+       gtk_menu_popup(GTK_MENU(compose_menu), NULL, NULL, NULL,
+               NULL, 1, 0);
+}
+
+static void toolbar_popup_compose_type_set(GtkWidget *widget, gpointer data)
+{
+       ComposeButtonType compose_type = GPOINTER_TO_INT( gtk_object_get_data(GTK_OBJECT(widget), "entry") );
+       MainWindow *mainwindow = (MainWindow *) data;
+
+       mainwindow->compose_btn_type = compose_type;
+
+       activate_compose_button(mainwindow, prefs_common.toolbar_style, mainwindow->compose_btn_type);
+}      
+
 static void toolbar_inc_cb     (GtkWidget      *widget,
                                 gpointer        data)
 {
@@ -1636,7 +1961,10 @@ static void toolbar_compose_cb   (GtkWidget      *widget,
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       compose_cb(mainwin, 0, NULL);
+       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,
@@ -1737,7 +2065,12 @@ static void toolbar_account_button_pressed(GtkWidget *widget,
        if (!event) return;
        if (event->button != 3) return;
 
-       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL, NULL, NULL,
+       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
+                           widget);
+
+       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+                      menu_button_position, widget,
                       event->button, event->time);
 }
 
@@ -1748,14 +2081,34 @@ static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
 
        if (!event) return;
 
-       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL, NULL, NULL,
+       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
+                           widget);
+
+       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+                      menu_button_position, widget,
                       event->button, event->time);
 }
 
+static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+       GtkWidget *button;
+
+       button = gtk_object_get_data(GTK_OBJECT(menu_shell), "menu_button");
+       if (!button) return;
+       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+       gtk_object_remove_data(GTK_OBJECT(mainwin->ac_menu), "menu_button");
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
 static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
-       app_exit_cb(data, 0, widget);
+       MainWindow *mainwin = (MainWindow *)data;
+
+       if (mainwin->lock_count == 0)
+               app_exit_cb(data, 0, widget);
 
        return TRUE;
 }
@@ -1837,6 +2190,14 @@ static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        app_will_exit(widget, mainwin);
 }
 
+static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       if (action == 1)
+               summary_search(mainwin->summaryview);
+       else
+               message_search(mainwin->messageview);
+}
+
 static void toggle_folder_cb(MainWindow *mainwin, guint action,
                             GtkWidget *widget)
 {
@@ -1884,6 +2245,9 @@ static void toggle_message_cb(MainWindow *mainwin, guint action,
 static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
+       activate_compose_button(mainwin, (ToolbarStyle)action, 
+                       mainwin->compose_btn_type);
+       
        switch ((ToolbarStyle)action) {
        case TOOLBAR_NONE:
                gtk_widget_hide(mainwin->handlebox);
@@ -1922,7 +2286,8 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action)
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
+
 {
        MainWindow *mainwin;
        SeparateType type;
@@ -1965,7 +2330,7 @@ static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        GList *list;
 
        if (procmsg_send_queue() < 0)
-               alertpanel_error(_("Sending queued message failed."));
+               alertpanel_error(_("Some errors occurred while sending queued messages."));
 
        statusbar_pop_all();
 
@@ -1987,7 +2352,7 @@ static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                    && 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(mainwin->summaryview->folder_item->folder->account);
+                       compose_new_with_folderitem(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item);
        }
        else
                compose_new(NULL);
@@ -2003,16 +2368,21 @@ static void compose_mail_cb(MainWindow *mainwin, guint action,
        if (mainwin->summaryview->folder_item) {
                ac = mainwin->summaryview->folder_item->folder->account;
                if (ac && ac->protocol != A_NNTP) {
-                       compose_new(ac);
+                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
                        return;
                }
        }
 
+       if(cur_account && (cur_account->protocol != A_NNTP)) {
+               compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
+               return;
+       }
+
        list = account_get_list();
        for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
                ac = (PrefsAccount *) cur->data;
                if (ac->protocol != A_NNTP) {
-                       compose_new(ac);
+                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
                        return;
                }
        }
@@ -2021,15 +2391,15 @@ static void compose_mail_cb(MainWindow *mainwin, guint action,
 static void compose_news_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
-       PrefsAccount * ac;
+       PrefsAccount * ac = NULL;
        GList * list;
        GList * cur;
 
        if (mainwin->summaryview->folder_item) {
                ac = mainwin->summaryview->folder_item->folder->account;
                if (ac && ac->protocol == A_NNTP) {
-                       FolderItem * item = mainwin->summaryview->folder_item;
-                       compose_new_with_recipient(ac, item->path);
+                       compose_new_with_recipient
+                               (ac, mainwin->summaryview->folder_item->path);
                        return;
                }
        }
@@ -2046,6 +2416,7 @@ static void compose_news_cb(MainWindow *mainwin, guint action,
 
 static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
+       GList  *sel = GTK_CLIST(mainwin->summaryview->ctree)->selection;
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data
@@ -2063,15 +2434,31 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                compose_reply(msginfo, prefs_common.reply_with_quote,
                              FALSE, TRUE);
                break;
+       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+               compose_followup_and_reply_to(msginfo,
+                                             prefs_common.reply_with_quote,
+                                             FALSE, TRUE);
+               break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE);
+                             TRUE, TRUE);
                break;
        case COMPOSE_FORWARD:
-               compose_forward(NULL, msginfo, FALSE);
-               break;
+               if (!sel->next) {
+                       compose_forward(NULL, msginfo, FALSE);
+                       break;
+               }
+               /* if (sel->next) FALL_THROUGH */
        case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward(NULL, msginfo, TRUE);
+               {
+                       GSList *msginfo_list = NULL;
+                       for ( ; sel != NULL; sel = sel->next)
+                               msginfo_list = g_slist_append(msginfo_list, 
+                                       gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->summaryview->ctree),
+                                               GTK_CTREE_NODE(sel->data)));
+                       compose_forward_multiple(NULL, msginfo_list);
+                       g_slist_free(msginfo_list);
+               }                       
                break;
        default:
                g_warning("reply_cb(): invalid action type: %d\n", action);
@@ -2133,6 +2520,18 @@ static void mark_as_read_cb(MainWindow *mainwin, guint action,
        summary_mark_as_read(mainwin->summaryview);
 }
 
+static void mark_all_read_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       summary_mark_all_read(mainwin->summaryview);
+}
+
+static void add_address_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_add_address(mainwin->summaryview);
+}
+
 static void set_charset_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2147,62 +2546,25 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
        debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
 }
 
-void main_window_set_thread_option(MainWindow *mainwin)
+static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        GtkItemFactory *ifactory;
-       gboolean no_item = FALSE;
-
-       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-
-       if (mainwin->summaryview == NULL)
-               no_item = TRUE;
-       else if (mainwin->summaryview->folder_item == NULL)
-               no_item = TRUE;
 
-       if (no_item) {
-               menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
-               menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
-       }
-       else {
-               if (mainwin->summaryview->folder_item->prefs->enable_thread) {
-                       menu_set_sensitive(ifactory,
-                                          "/Summary/Thread view",   FALSE);
-                       menu_set_sensitive(ifactory,
-                                          "/Summary/Unthread view", TRUE);
-                       summary_thread_build(mainwin->summaryview);
-               }
-               else {
-                       menu_set_sensitive(ifactory,
-                                          "/Summary/Thread view",   TRUE);
-                       menu_set_sensitive(ifactory,
-                                          "/Summary/Unthread view", FALSE);
-                       summary_unthread(mainwin->summaryview);
-               }
-               prefs_folder_item_save_config(mainwin->summaryview->folder_item);
-       }
-}
+       if (!mainwin->summaryview->folder_item) return;
 
-static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       mainwin->summaryview->folder_item->prefs->enable_thread =
-               !mainwin->summaryview->folder_item->prefs->enable_thread;
-       main_window_set_thread_option(mainwin);
+       ifactory = gtk_item_factory_from_widget(widget);
 
-       /*
        if (0 == action) {
-               summary_thread_build(mainwin->summaryview);
-               mainwin->summaryview->folder_item->prefs->enable_thread =
-                       TRUE;
+               summary_thread_build(mainwin->summaryview, FALSE);
+               mainwin->summaryview->folder_item->threaded = TRUE;
                menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
                menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
        } else {
                summary_unthread(mainwin->summaryview);
-               mainwin->summaryview->folder_item->prefs->enable_thread =
-                       FALSE;
+               mainwin->summaryview->folder_item->threaded = FALSE;
                menu_set_sensitive(ifactory, "/Summary/Thread view",   TRUE);
                menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
        }
-       */
 }
 
 static void set_display_item_cb(MainWindow *mainwin, guint action,
@@ -2249,6 +2611,8 @@ static void update_summary_cb(MainWindow *mainwin, guint action,
        if (!mainwin->summaryview->folder_item) return;
        if (!folderview->opened) return;
 
+       folder_update_op_count();
+
        fitem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree),
                                            folderview->opened);
        if (!fitem) return;
@@ -2266,22 +2630,40 @@ static void next_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_step(mainwin->summaryview, GTK_SCROLL_STEP_FORWARD);
 }
 
+static void prev_unread_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_select_prev_unread(mainwin->summaryview);
+}
+
 static void next_unread_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_unread(mainwin->summaryview);
 }
 
+static void prev_marked_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_select_prev_marked(mainwin->summaryview);
+}
+
 static void next_marked_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_marked(mainwin->summaryview);
 }
 
-static void prev_marked_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+static void prev_labeled_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
 {
-       summary_select_prev_marked(mainwin->summaryview);
+       summary_select_prev_labeled(mainwin->summaryview);
+}
+
+static void next_labeled_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_select_next_labeled(mainwin->summaryview);
 }
 
 static void goto_folder_cb(MainWindow *mainwin, guint action,
@@ -2289,7 +2671,7 @@ static void goto_folder_cb(MainWindow *mainwin, guint action,
 {
        FolderItem *to_folder;
 
-       to_folder = foldersel_folder_sel(NULL);
+       to_folder = foldersel_folder_sel(NULL, NULL);
 
        if (to_folder)
                folderview_select(mainwin->folderview, to_folder);
@@ -2387,3 +2769,46 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        STATUSBAR_POP(mainwin);
        g_free(str);
 }
+
+static void activate_compose_button (MainWindow *mainwin,
+                               ToolbarStyle style,
+                               ComposeButtonType type)
+{
+       if (style == TOOLBAR_NONE) 
+               return;
+
+       if (style == TOOLBAR_BOTH) {
+               debug_print("preferring %s\n",
+                           type == COMPOSEBUTTON_NEWS ? "news" : "mail");
+               gtk_widget_hide(mainwin->compose_mail_btn_plain);
+               gtk_widget_hide(mainwin->compose_news_btn_plain);
+               gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn 
+                       : mainwin->compose_news_btn);
+               gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn
+                       : mainwin->compose_mail_btn);
+               mainwin->compose_btn_type = type;       
+       }
+       else {
+               gtk_widget_hide(mainwin->compose_news_btn);
+               gtk_widget_hide(mainwin->compose_mail_btn);
+               gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn_plain 
+                       : mainwin->compose_news_btn_plain);
+               gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn_plain
+                       : mainwin->compose_mail_btn_plain);
+               mainwin->compose_btn_type = type;               
+       }
+}
+
+void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonType compose_btn_type)
+{
+       if (mainwin->compose_btn_type != compose_btn_type)
+               activate_compose_button(mainwin, 
+                                       prefs_common.toolbar_style,
+                                       compose_btn_type);
+}
+
+static void prefs_templates_open_cb(MainWindow *mainwin, guint action,
+                                   GtkWidget *widget)
+{
+       prefs_templates_open();
+}