fix Re-edit bug in Message menu
[claws.git] / src / mainwindow.c
index a2dc3ac6c4aa5f42097be163813c1feb30552aaf..5f1f6dc20a5e916eefc98c7535bcbb121ec8baf7 100644 (file)
@@ -48,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"
@@ -76,6 +77,7 @@
 #include "about.h"
 #include "manual.h"
 #include "prefs_templates.h"
+#include "version.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -195,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);
@@ -275,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,
@@ -313,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);
 
@@ -381,7 +400,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Add mailbox..."),          NULL, add_mailbox_cb, 0, NULL},
        {N_("/_File/_Add mbox mailbox..."),     NULL, add_mbox_cb, 0, NULL},
-       {N_("/_File/_Update folder tree"),      NULL, update_folderview_cb, 0, NULL},
+       {N_("/_File/_Rescan folder tree"),      NULL, update_folderview_cb, 0, NULL},
        {N_("/_File/_Folder"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Folder/Create _new folder..."),
                                                NULL, new_folder_cb, 0, NULL},
@@ -401,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>"},
@@ -416,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>"},
@@ -504,13 +527,16 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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},
@@ -520,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"),
@@ -531,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},
@@ -545,8 +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 _label"),  NULL, sort_summary_cb, SORT_BY_LABEL, 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},
@@ -627,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);
@@ -819,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 */
@@ -828,6 +871,7 @@ MainWindow *main_window_create(SeparateType type)
        header_window_init(mainwin->headerwin);
        log_window_init(mainwin->logwin);
 
+
        mainwin->lock_count = 0;
        mainwin->cursor_count = 0;
 
@@ -1177,7 +1221,10 @@ typedef enum
        M_SINGLE_TARGET_EXIST = 1 << 3,
        M_EXEC                = 1 << 4,
        M_ALLOW_REEDIT        = 1 << 5,
-       M_HAVE_ACCOUNT        = 1 << 6
+       M_HAVE_ACCOUNT        = 1 << 6,
+       M_THREADED            = 1 << 7,
+       M_UNTHREADED          = 1 << 8,
+       M_NEWS                = 1 << 9
 } SensitiveCond;
 
 static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
@@ -1191,6 +1238,12 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                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;
@@ -1199,9 +1252,14 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        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)
+               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_DRAFT ||
+             mainwin->summaryview->folder_item->stype == F_OUTBOX ||
+             mainwin->summaryview->folder_item->stype == F_QUEUE)))
                state |= M_ALLOW_REEDIT;
        if (cur_account)
                state |= M_HAVE_ACCOUNT;
@@ -1256,7 +1314,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        } entry[] = {
                {"/File/Add mailbox..."        , M_UNLOCKED},
                 {"/File/Add mbox mailbox..."   , M_UNLOCKED},
-               {"/File/Update folder tree"    , M_UNLOCKED},
+               {"/File/Rescan folder tree"    , M_UNLOCKED},
                {"/File/Folder"                , M_UNLOCKED},
                {"/File/Import mbox file..."   , M_UNLOCKED},
                {"/File/Export to mbox file...", M_UNLOCKED},
@@ -1266,32 +1324,40 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/File/Close", M_UNLOCKED},
                {"/File/Exit" , M_UNLOCKED},
 
-               {"/Message/Get new mail"         , M_UNLOCKED},
-               {"/Message/Get from all accounts", M_UNLOCKED},
-               {"/Message/Reply"                , M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to sender"      , M_SINGLE_TARGET_EXIST},
-                {"/Message/Follow-up and reply to", M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to all"         , M_SINGLE_TARGET_EXIST},
-               {"/Message/Forward"              , M_SINGLE_TARGET_EXIST},
-               {"/Message/Forward as attachment", M_SINGLE_TARGET_EXIST},
-               {"/Message/Open in new window"   , M_SINGLE_TARGET_EXIST},
-               {"/Message/Show all header"      , M_SINGLE_TARGET_EXIST},
-               {"/Message/View source"          , M_SINGLE_TARGET_EXIST},
+               {"/View/Show all header"      , M_SINGLE_TARGET_EXIST},
+               {"/View/View source"          , M_SINGLE_TARGET_EXIST},
+
+               {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
+/*             {"/Message/Compose new message"   , M_HAVE_ACCOUNT}, */
+               {"/Message/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/Re-edit", M_ALLOW_REEDIT},
+               {"/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_UNLOCKED},
-               {"/Summary/Prev message"       , M_MSG_EXIST},
-               {"/Summary/Next message"       , M_MSG_EXIST},
-               {"/Summary/Prev marked message", M_MSG_EXIST},
-               {"/Summary/Next marked message", M_MSG_EXIST},
-               {"/Summary/Next unread message", M_MSG_EXIST},
-               {"/Summary/Sort"               , M_MSG_EXIST},
+               {"/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},
 
@@ -1316,8 +1382,8 @@ void main_window_popup(MainWindow *mainwin)
        gdk_window_get_origin(mainwin->window->window, &x, &y);
        sx = gdk_screen_width();
        sy = gdk_screen_height();
-       x %= sx; if (x < 0) x += sx;
-       y %= sy; if (y < 0) y += sy;
+       x %= sx; if (x < 0) x = 0;
+       y %= sy; if (y < 0) y = 0;
        gdk_window_move(mainwin->window->window, x, y);
        gdk_window_raise(mainwin->window->window);
        gdk_window_show(mainwin->window->window);
@@ -1328,30 +1394,30 @@ void main_window_popup(MainWindow *mainwin)
        case SEPARATE_FOLDER:
                widget = mainwin->win.sep_folder.folderwin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                break;
        case SEPARATE_MESSAGE:
                widget = mainwin->win.sep_message.messagewin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                break;
        case SEPARATE_BOTH:
                widget = mainwin->win.sep_both.folderwin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                widget = mainwin->win.sep_both.messagewin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                break;
@@ -2031,14 +2097,19 @@ static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer 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;
 }
@@ -2120,6 +2191,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)
 {
@@ -2252,7 +2331,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();
 
@@ -2363,7 +2442,7 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE);
+                             TRUE, TRUE);
                break;
        case COMPOSE_FORWARD:
                if (!sel->next) {
@@ -2442,6 +2521,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)
 {
@@ -2456,60 +2547,22 @@ 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)
-{
-       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, TRUE);
-               }
-               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);
-       }
-}*/
-
 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);
-        */
+       GtkItemFactory *ifactory;
 
-        GtkItemFactory *ifactory;
+       if (!mainwin->summaryview->folder_item) return;
 
        ifactory = gtk_item_factory_from_widget(widget);
 
        if (0 == action) {
-               summary_thread_build(mainwin->summaryview, FALSE);
-               prefs_common.enable_thread = TRUE;
+               summary_thread_build(mainwin->summaryview);
+               mainwin->summaryview->folder_item->threaded = TRUE;
                menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
                menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
        } else {
                summary_unthread(mainwin->summaryview);
-               prefs_common.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);
        }
@@ -2578,22 +2631,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,
@@ -2707,7 +2778,7 @@ static void activate_compose_button (MainWindow *mainwin,
        if (style == TOOLBAR_NONE) 
                return;
 
-       if (style == TOOLBAR_BOTH) {    
+       if (style == TOOLBAR_BOTH) {
                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 
@@ -2727,6 +2798,14 @@ static void activate_compose_button (MainWindow *mainwin,
        }
 }
 
+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)
 {