more sync with sylpheed 0.5.0pre1
[claws.git] / src / mainwindow.c
index d9508fbfed6178cb4386d7a795c2f5ba2991e8f7..ba5fc1095a638ecab1163ce39e216e86f9c487ae 100644 (file)
 #include "export.h"
 #include "prefs_common.h"
 #include "prefs_filter.h"
+#include "prefs_filtering.h"
+#include "prefs_scoring.h"
 #include "prefs_account.h"
+#include "prefs_folder_item.h"
 #include "account.h"
 #include "addressbook.h"
 #include "headerwindow.h"
@@ -109,10 +112,16 @@ static void toolbar_send_cb               (GtkWidget      *widget,
 
 static void toolbar_compose_cb         (GtkWidget      *widget,
                                         gpointer        data);
+static void toolbar_compose_news_cb            (GtkWidget      *widget,
+                                        gpointer        data);
+static void toolbar_compose_mail_cb            (GtkWidget      *widget,
+                                        gpointer        data);
 static void toolbar_reply_cb           (GtkWidget      *widget,
                                         gpointer        data);
 static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
                                         gpointer        data);
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
+                                        gpointer        data);
 static void toolbar_forward_cb         (GtkWidget      *widget,
                                         gpointer        data);
 
@@ -143,6 +152,9 @@ static gint main_window_close_cb (GtkWidget *widget,
 static void add_mailbox_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void add_mbox_cb         (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void update_folderview_cb (MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -187,9 +199,7 @@ static void toggle_toolbar_cb        (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void separate_widget_cb  (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action);
 
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
@@ -212,6 +222,10 @@ static void send_queue_cb          (MainWindow     *mainwin,
 static void compose_cb                 (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget);
+static void compose_news_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget);
 static void reply_cb                   (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -293,6 +307,14 @@ static void next_unread_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,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
 static void goto_folder_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -310,6 +332,12 @@ static void prefs_common_open_cb (MainWindow       *mainwin,
 static void prefs_filter_open_cb (MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void prefs_scoring_open_cb (MainWindow  *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void prefs_filtering_open_cb (MainWindow        *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void prefs_account_open_cb(MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -328,10 +356,13 @@ static void scan_tree_func         (Folder        *folder,
                                  FolderItem    *item,
                                  gpointer       data);
 
+#define  SEPARATE_ACTION  667
+
 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/_Folder"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Folder/Create _new folder..."),
@@ -361,11 +392,11 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Toolbar/Icon _and text"),  NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
        {N_("/_View/_Toolbar/_Icon"),           NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"},
        {N_("/_View/_Toolbar/_Text"),           NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
-       {N_("/_View/_Toolbar/_Non-display"),    NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
+       {N_("/_View/_Toolbar/_None"),           NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
        {N_("/_View/_Status bar"),              NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Separate f_older tree"),    NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
-       {N_("/_View/Separate m_essage view"),   NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
+       {N_("/_View/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/_Code set"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Code set/_Auto detect"),
@@ -442,18 +473,21 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #undef CODESET_ACTION
 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/Rece_ive new mail"),     "<alt>I",       inc_mail_cb, 0, NULL},
-       {N_("/_Message/Receive from _all accounts"),
+       {N_("/_Message/Get new ma_il"),         "<alt>I",       inc_mail_cb, 0, NULL},
+       {N_("/_Message/Get from _all accounts"),
                                                "<shift><alt>I", inc_all_account_mail_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Send queued messa_ges"),
                                                NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Compose _new message"),  "<alt>N",       compose_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 as an a_ttachment"),
+       {N_("/_Message/_Forward"),              "<control>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/M_ove..."),              "<alt>O", move_to_cb, 0, NULL},
@@ -464,13 +498,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/_Unmark"),         NULL, unmark_cb, 0, NULL},
        {N_("/_Message/_Mark/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
-       {N_("/_Message/_Mark/Mark it as _being read"),
+       {N_("/_Message/_Mark/Mark as rea_d"),
                                                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_("/_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"),
@@ -482,6 +516,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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/---"),                   NULL, NULL, 0, "<Separator>"},
@@ -491,6 +527,7 @@ 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/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Summary/_Sort/_Attract by subject"),
                                                NULL, attract_by_subject_cb, 0, NULL},
@@ -507,6 +544,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, prefs_common_open_cb, 0, NULL},
        {N_("/_Configuration/_Filter setting..."),
                                                NULL, prefs_filter_open_cb, 0, NULL},
+       {N_("/_Configuration/_Scoring ..."),
+                                               NULL, prefs_scoring_open_cb, 0, NULL},
+       {N_("/_Configuration/_Filtering ..."),
+                                               NULL, prefs_filtering_open_cb, 0, NULL},
        {N_("/_Configuration/_Preferences per account..."),
                                                NULL, prefs_account_open_cb, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
@@ -659,6 +700,10 @@ MainWindow *main_window_create(SeparateType type)
        folderview->color_normal.red = folderview->color_normal.green =
                folderview->color_normal.blue = 0;
 
+       summaryview->color_important.red = 0;
+       summaryview->color_marked.green = 0;
+       summaryview->color_important.blue = (guint16)65535;
+
        color[0] = summaryview->color_marked;
        color[1] = summaryview->color_dim;
        color[2] = summaryview->color_normal;
@@ -685,7 +730,7 @@ MainWindow *main_window_create(SeparateType type)
        switch (prefs_common.toolbar_style) {
        case TOOLBAR_NONE:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Non-display");
+                       (ifactory, "/View/Toolbar/None");
                break;
        case TOOLBAR_ICON:
                menuitem = gtk_item_factory_get_item
@@ -706,10 +751,30 @@ MainWindow *main_window_create(SeparateType type)
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
 
+       /* set the check of the SEPARATE_xxx menu items. we also need the main window
+        * as a property and pass the action type to the callback */
+       menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_FOLDER);
+       g_assert(menuitem);
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_FOLDER);
+       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
+       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
+                                          GUINT_TO_POINTER(SEPARATE_FOLDER));
+
+       menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_MESSAGE);
+       g_assert(menuitem);
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_MESSAGE);
+       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
+       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
+                                          GUINT_TO_POINTER(SEPARATE_MESSAGE));
+
+       /*
        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);
+
        menu_set_sensitive(ifactory, "/Help/Manual/English", FALSE);
 
        /* set account selection menu */
@@ -782,7 +847,13 @@ void main_window_reflect_prefs_all(void)
                        gtk_widget_set_sensitive(mainwin->getall_btn, FALSE);
                }
 
+               if (prefs_common.immediate_exec)
+                       gtk_widget_hide(mainwin->exec_btn);
+               else
+                       gtk_widget_show(mainwin->exec_btn);
+
                summary_change_display_item(mainwin->summaryview);
+               summary_redisplay_msg(mainwin->summaryview);
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
        }
@@ -942,6 +1013,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
                               _("Empty all messages in trash?"),
                               _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
                        return;
+               manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
        procmsg_empty_trash();
@@ -977,10 +1049,12 @@ 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) {
@@ -998,13 +1072,62 @@ void main_window_add_mailbox(MainWindow *mainwin)
        folderview_set(mainwin->folderview);
 }
 
+void main_window_add_mbox(MainWindow *mainwin)
+{
+       gchar *path;
+       Folder *folder;
+       FolderItem * item;
+
+       path = input_dialog(_("Add mbox mailbox"),
+                           _("Input the location of mailbox."),
+                           "mail");
+
+       if (!path) return;
+
+       if (folder_find_from_path(path)) {
+               alertpanel_error(_("The mailbox `%s' already exists."), path);
+               g_free(path);
+               return;
+       }
+
+       /*
+       if (!strcmp(path, "Mail"))
+               folder = folder_new(F_MBOX, _("Mailbox"), path);
+               else
+       */
+
+       folder = folder_new(F_MBOX, g_basename(path), path);
+       g_free(path);
+
+       if (folder->create_tree(folder) < 0) {
+               alertpanel_error(_("Creation of the mailbox failed."));
+               folder_destroy(folder);
+               return;
+       }
+
+       folder_add(folder);
+
+       item = folder_item_new(folder->name, NULL);
+       item->folder = folder;
+       folder->node = g_node_new(item);
+
+       folder->create_folder(folder, item, "inbox");
+       folder->create_folder(folder, item, "outbox");
+       folder->create_folder(folder, item, "queue");
+       folder->create_folder(folder, item, "draft");
+       folder->create_folder(folder, item, "trash");
+
+       folderview_set(mainwin->folderview);
+}
+
 void main_window_set_toolbar_sensitive(MainWindow *mainwin, gboolean sensitive)
 {
-       gtk_widget_set_sensitive(mainwin->reply_btn,    sensitive);
-       gtk_widget_set_sensitive(mainwin->replyall_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);
+       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);
 
        if (!mainwin->summaryview->folder_item ||
            mainwin->summaryview->folder_item->folder->type == F_NEWS)
@@ -1033,16 +1156,17 @@ void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection)
 
        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 an attachment", 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/Reedit", sens);
+       menu_set_sensitive(ifactory, "/Message/Re-edit", sens);
 
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
@@ -1068,6 +1192,13 @@ void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection)
        menu_set_sensitive(ifactory, "/Summary/Next message", sens);
        menu_set_sensitive(ifactory, "/Summary/Next unread message", sens);
        menu_set_sensitive(ifactory, "/Summary/Sort", sens);
+
+       if (mainwin->summaryview->folder_item &&
+           mainwin->summaryview->folder_item->folder->account)
+               sens = mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP;
+       else
+               sens = FALSE;
+       menu_set_sensitive(ifactory, "/Message/Follow-up and reply to", sens);
 }
 
 void main_window_popup(MainWindow *mainwin)
@@ -1282,8 +1413,10 @@ 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"
 #include "pixmaps/stock_mail_forward.xpm"
 #include "pixmaps/stock_mail_send.xpm"
 #include "pixmaps/stock_preferences.xpm"
@@ -1312,10 +1445,13 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *compose_btn;
        GtkWidget *reply_btn;
        GtkWidget *replyall_btn;
+       GtkWidget *replysender_btn;
        GtkWidget *fwd_btn;
        GtkWidget *send_btn;
+       /*
        GtkWidget *prefs_btn;
        GtkWidget *account_btn;
+       */
        GtkWidget *next_btn;
        GtkWidget *delete_btn;
        GtkWidget *exec_btn;
@@ -1331,13 +1467,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,
@@ -1358,11 +1494,19 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 
        CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
        compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("Compose"),
-                                             _("Compose new message"),
+                                             _("Compose email"),
+                                             _("Compose an email message"),
                                              "New",
                                              icon_wid,
-                                             toolbar_compose_cb,
+                                             toolbar_compose_mail_cb,
+                                             mainwin);
+       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+       compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                             _("Compose news"),
+                                             _("Compose a news message"),
+                                             "New",
+                                             icon_wid,
+                                             toolbar_compose_news_cb,
                                              mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
        reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
@@ -1380,6 +1524,14 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                               icon_wid,
                                               toolbar_reply_to_all_cb,
                                               mainwin);
+       CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
+       replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                                 _("Reply sender"),
+                                                 _("Reply to sender"),
+                                                 "Reply to sender",
+                                                 icon_wid,
+                                                 toolbar_reply_to_sender_cb,
+                                                 mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_forward_xpm);
        fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                          _("Forward"),
@@ -1409,8 +1561,6 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_exec_cb,
                                           mainwin);
 
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
        CREATE_TOOLBAR_ICON(stock_down_arrow_xpm);
        next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                           _("Next"),
@@ -1420,6 +1570,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_next_unread_cb,
                                           mainwin);
 
+       /*
        gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
        CREATE_TOOLBAR_ICON(stock_preferences_xpm);
@@ -1441,20 +1592,24 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        gtk_signal_connect(GTK_OBJECT(account_btn), "button_press_event",
                           GTK_SIGNAL_FUNC(toolbar_account_button_pressed),
                           mainwin);
-
-       mainwin->toolbar      = toolbar;
-       mainwin->get_btn      = get_btn;
-       mainwin->getall_btn   = getall_btn;
-       mainwin->compose_btn  = compose_btn;
-       mainwin->reply_btn    = reply_btn;
-       mainwin->replyall_btn = replyall_btn;
-       mainwin->fwd_btn      = fwd_btn;
-       mainwin->send_btn     = send_btn;
-       mainwin->prefs_btn    = prefs_btn;
-       mainwin->account_btn  = account_btn;
-       mainwin->next_btn     = next_btn;
-       mainwin->delete_btn   = delete_btn;
-       mainwin->exec_btn     = exec_btn;
+       */
+
+       mainwin->toolbar         = toolbar;
+       mainwin->get_btn         = get_btn;
+       mainwin->getall_btn      = getall_btn;
+       mainwin->compose_btn     = compose_btn;
+       mainwin->reply_btn       = reply_btn;
+       mainwin->replyall_btn    = replyall_btn;
+       mainwin->replysender_btn = replysender_btn;
+       mainwin->fwd_btn         = fwd_btn;
+       mainwin->send_btn        = send_btn;
+       /*
+       mainwin->prefs_btn       = prefs_btn;
+       mainwin->account_btn     = account_btn;
+       */
+       mainwin->next_btn        = next_btn;
+       mainwin->delete_btn      = delete_btn;
+       mainwin->exec_btn        = exec_btn;
 
        gtk_widget_show_all(toolbar);
 }
@@ -1493,6 +1648,22 @@ static void toolbar_compose_cb   (GtkWidget      *widget,
        compose_cb(mainwin, 0, NULL);
 }
 
+static void toolbar_compose_news_cb    (GtkWidget      *widget,
+                                gpointer        data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       compose_news_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_compose_mail_cb    (GtkWidget      *widget,
+                                gpointer        data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       compose_mail_cb(mainwin, 0, NULL);
+}
+
 static void toolbar_reply_cb   (GtkWidget      *widget,
                                 gpointer        data)
 {
@@ -1509,12 +1680,23 @@ static void toolbar_reply_to_all_cb     (GtkWidget      *widget,
        reply_cb(mainwin, COMPOSE_REPLY_TO_ALL, NULL);
 }
 
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
+                                        gpointer        data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER, NULL);
+}
+
 static void toolbar_forward_cb (GtkWidget      *widget,
                                 gpointer        data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, COMPOSE_FORWARD, NULL);
+       if (prefs_common.forward_as_attachment)
+               reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
+       else
+               reply_cb(mainwin, COMPOSE_FORWARD, NULL);
 }
 
 static void toolbar_delete_cb  (GtkWidget      *widget,
@@ -1593,6 +1775,12 @@ static void add_mailbox_cb(MainWindow *mainwin, guint action,
        main_window_add_mailbox(mainwin);
 }
 
+static void add_mbox_cb(MainWindow *mainwin, guint action,
+                       GtkWidget *widget)
+{
+       main_window_add_mbox(mainwin);
+}
+
 static void update_folderview_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
@@ -1646,29 +1834,15 @@ static void print_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_print(mainwin->summaryview);
 }
 
-static gint queued_messages(void)
-{
-       FolderItem *queue = folder_get_default_queue();
-       folder_item_scan(queue);
-       return queue->total;
-}
-
 static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (prefs_common.confirm_on_exit) {
                if (alertpanel(_("Exit"), _("Exit this program?"),
                               _("OK"), _("Cancel"), NULL) != G_ALERTDEFAULT)
                        return;
+               manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
-       if (prefs_common.warn_queued_on_exit && queued_messages() > 0) {
-               if (alertpanel(_("Queued messages"), 
-                              _("Some unsent messages are queued. Exit now?"),
-                              _("OK"), _("Cancel"), NULL) != G_ALERTDEFAULT)
-                       return;
-       }
-
-       manage_window_focus_in(mainwin->window, NULL, NULL);
        app_will_exit(widget, mainwin);
 }
 
@@ -1757,11 +1931,14 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void separate_widget_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action)
 {
+       MainWindow *mainwin;
        SeparateType type;
 
+       mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
+       g_return_if_fail(mainwin != NULL);
+
        type = mainwin->type ^ action;
        main_window_separation_change(mainwin, type);
 
@@ -1814,12 +1991,68 @@ static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 
 static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       if (mainwin->summaryview->folder_item)
-               compose_new(mainwin->summaryview->folder_item->folder->account);
+       if (mainwin->summaryview->folder_item) {
+               if (mainwin->summaryview->folder_item->folder->account != NULL
+                   && mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP)
+                       compose_new_with_recipient(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item->path);
+               else
+                       compose_new(mainwin->summaryview->folder_item->folder->account);
+       }
        else
                compose_new(NULL);
 }
 
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       PrefsAccount * ac;
+       GList * list;
+       GList * cur;
+
+       if (mainwin->summaryview->folder_item) {
+               ac = mainwin->summaryview->folder_item->folder->account;
+               if (ac && ac->protocol != A_NNTP) {
+                       compose_new(ac);
+                       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);
+                       return;
+               }
+       }
+}
+
+static void compose_news_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       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) {
+                       compose_new_with_recipient
+                               (ac, mainwin->summaryview->folder_item->path);
+                       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);
+                       return;
+               }
+       }
+}
+
 static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        MsgInfo *msginfo;
@@ -1832,19 +2065,30 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 
        switch (action) {
        case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER:
+               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);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             TRUE, FALSE);
                break;
        case COMPOSE_FORWARD:
-               compose_forward(msginfo, FALSE);
+               compose_forward(NULL, msginfo, FALSE);
                break;
        case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward(msginfo, TRUE);
+               compose_forward(NULL, msginfo, TRUE);
                break;
        default:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               g_warning("reply_cb(): invalid action type: %d\n", action);
        }
 
        summary_set_marks_selected(mainwin->summaryview);
@@ -1917,23 +2161,62 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
        debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
 }
 
-static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+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);
+               }
+               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);
+       }
+}
 
-       ifactory = gtk_item_factory_from_widget(widget);
+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);
 
+       /*
        if (0 == action) {
                summary_thread_build(mainwin->summaryview);
-               prefs_common.enable_thread = TRUE;
+               mainwin->summaryview->folder_item->prefs->enable_thread =
+                       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->prefs->enable_thread =
+                       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,
@@ -2003,6 +2286,18 @@ static void next_unread_cb(MainWindow *mainwin, guint action,
        summary_select_next_unread(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)
+{
+       summary_select_prev_marked(mainwin->summaryview);
+}
+
 static void goto_folder_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2040,6 +2335,18 @@ static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
        prefs_filter_open();
 }
 
+static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
+                                 GtkWidget *widget)
+{
+       prefs_scoring_open(NULL);
+}
+
+static void prefs_filtering_open_cb(MainWindow *mainwin, guint action,
+                                   GtkWidget *widget)
+{
+       prefs_filtering_open();
+}
+
 static void prefs_account_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {