2007-09-28 [paul] 3.0.1cvs43
[claws.git] / src / account.c
index 0cff9f2915fcbf35e3d7384c36b408fa49ce132d..757f931b7090e614f2e5d04cb38476f23a3b9e2e 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
@@ -37,6 +37,7 @@
 #include "account.h"
 #include "prefs_gtk.h"
 #include "prefs_account.h"
+#include "prefs_common.h"
 #include "folder_item_prefs.h"
 #include "compose.h"
 #include "manage_window.h"
@@ -48,6 +49,8 @@
 #include "procheader.h"
 #include "customheader.h"
 #include "remotefolder.h"
+#include "manual.h"
+#include "filtering.h"
 
 enum {
        ACCOUNT_IS_DEFAULT,             /* GDK_TYPE_PIXMAP! */
@@ -76,6 +79,7 @@ typedef enum
 PrefsAccount *cur_account;
 
 static GList *account_list = NULL;
+static gboolean account_list_dirty = FALSE;
 
 static struct EditAccount {
        GtkWidget *window;
@@ -86,6 +90,9 @@ static struct EditAccount {
 static GdkPixbuf *mark_pixbuf;
 
 static void account_edit_create                (void);
+static void          account_destroy           (PrefsAccount   *ac_prefs);
+static void          account_set_as_default    (PrefsAccount   *ac_prefs);
+static void          account_set_menu          (void);
 
 static void account_edit_prefs         (GtkWidget *widget, gpointer data);
 static void account_delete             (GtkWidget *widget, gpointer data);
@@ -101,6 +108,8 @@ static void account_edit_close              (GtkWidget *widget, gpointer data);
 static gint account_delete_event       (GtkWidget      *widget,
                                         GdkEventAny    *event,
                                         gpointer        data);
+static void account_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation);
 static gboolean account_key_pressed    (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
@@ -131,9 +140,9 @@ static void account_create_list_view_images (GtkWidget *list_view);
 static void account_create_list_view_columns   (GtkWidget *list_view);
 
 static gint account_list_view_get_selected_account_id          (GtkWidget *list_view);
-GtkTreePath *account_list_view_get_selected_account_path       (GtkWidget *list_view);
-PrefsAccount *account_list_view_get_selected_account           (GtkWidget *list_view);
-gboolean account_list_view_select_account                      (GtkWidget *list_view, 
+static GtkTreePath *account_list_view_get_selected_account_path        (GtkWidget *list_view);
+static PrefsAccount *account_list_view_get_selected_account            (GtkWidget *list_view);
+static gboolean account_list_view_select_account                       (GtkWidget *list_view, 
                                                                 gint       account_id);
 
 static void account_list_view_set_default_by_id(GtkWidget *list_view,
@@ -172,6 +181,14 @@ static void account_row_changed_while_drag_drop    (GtkTreeModel *model,
                                                 gpointer      arg3,
                                                 GtkTreeView  *list_view);
 
+void account_flush_state(void)
+{
+       account_set_menu();
+       main_window_reflect_prefs_all();
+
+       account_list_dirty = FALSE;
+}
+
 void account_read_config_all(void)
 {
        GSList *ac_label_list = NULL, *cur;
@@ -183,7 +200,7 @@ void account_read_config_all(void)
        debug_print("Reading all config for each account...\n");
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
-       if ((fp = fopen(rcpath, "rb")) == NULL) {
+       if ((fp = g_fopen(rcpath, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
                g_free(rcpath);
                return;
@@ -219,7 +236,7 @@ void account_read_config_all(void)
        }
 
        account_set_menu();
-       main_window_reflect_prefs_all();
+       main_window_reflect_prefs_all_now();
 
        while (ac_label_list) {
                g_free(ac_label_list->data);
@@ -341,18 +358,14 @@ PrefsAccount *account_find_from_item(FolderItem *item)
        return ac;
 }
 
-void account_set_menu(void)
+static void account_set_menu(void)
 {
        main_window_set_account_menu(account_list);
 }
 
-void account_foreach(AccountFunc func, gpointer user_data)
+void account_set_menu_only_toolbar(void)
 {
-       GList *cur;
-
-       for (cur = account_list; cur != NULL; cur = cur->next)
-               if (func((PrefsAccount *)cur->data, user_data) != 0)
-                       return;
+       main_window_set_account_menu_only_toolbar(account_list);
 }
 
 GList *account_get_list(void)
@@ -364,6 +377,8 @@ void account_edit_open(void)
 {
        inc_lock();
 
+       account_list_dirty = FALSE;
+
        if (compose_get_compose_list()) {
                alertpanel_error(_("Some composing windows are open.\n"
                                   "Please close all the composing "
@@ -390,7 +405,7 @@ void account_add(void)
 {
        PrefsAccount *ac_prefs;
 
-       ac_prefs = prefs_account_open(NULL);
+       ac_prefs = prefs_account_open(NULL, &account_list_dirty);
 
        if (!ac_prefs) return;
 
@@ -411,13 +426,17 @@ void account_add(void)
                        folder = folder_new(folder_get_class_from_string("news"), ac_prefs->account_name,
                                            ac_prefs->nntp_server);
                }
-
+               if (folder == NULL) {
+                       alertpanel_error(_("Can't create folder."));
+                       return;
+               }
                folder->account = ac_prefs;
                ac_prefs->folder = folder;
                folder_add(folder);
                if (ac_prefs->protocol == A_IMAP4)
                        folder->klass->create_tree(folder);
                folderview_set_all();
+               folder_write_list();
        }
 }
 
@@ -425,6 +444,7 @@ void account_open(PrefsAccount *ac_prefs)
 {
        gboolean prev_default;
        gchar *ac_name;
+       gboolean account_dirty = FALSE;
 
        g_return_if_fail(ac_prefs != NULL);
 
@@ -432,23 +452,25 @@ void account_open(PrefsAccount *ac_prefs)
        Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
                  return);
 
-       prefs_account_open(ac_prefs);
+       prefs_account_open(ac_prefs, &account_dirty);
 
-       if (!prev_default && ac_prefs->is_default)
-               account_set_as_default(ac_prefs);
+       if (account_dirty) {
+               if (!prev_default && ac_prefs->is_default)
+                       account_set_as_default(ac_prefs);
 
-       if (ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
-               folder_set_name(FOLDER(ac_prefs->folder),
-                               ac_prefs->account_name);
-               folderview_set_all();
-       }
+               if (ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
+                       folder_set_name(FOLDER(ac_prefs->folder),
+                                       ac_prefs->account_name);
+                       folderview_set_all();
+               }
 
-       account_write_config_all();
-       account_set_menu();
-       main_window_reflect_prefs_all();
+               account_write_config_all();
+
+               account_flush_state();
+       }
 }
 
-void account_set_as_default(PrefsAccount *ac_prefs)
+static void account_set_as_default(PrefsAccount *ac_prefs)
 {
        PrefsAccount *ap;
        GList *cur;
@@ -494,16 +516,50 @@ void account_set_missing_folder(void)
                                folder = folder_new(folder_get_class_from_string("news"), ap->account_name,
                                                    ap->nntp_server);
                        }
-
+                       if (folder == NULL)
+                               return;
                        folder->account = ap;
                        ap->folder = folder;
                        folder_add(folder);
                        if (ap->protocol == A_IMAP4)
                                folder->klass->create_tree(folder);
+                       folder_write_list();
+
                }
        }
 }
 
+#define CHECK_CHANGE_FOLDER(folder) {                                          \
+       if (folder && !strncmp(folder, old_id, strlen(old_id))) {               \
+               if (strlen(folder) == strlen(old_id)) {                         \
+                       g_free(folder);                                         \
+                       folder = g_strdup(new_id);                              \
+               } else if (strlen(folder) > strlen(old_id)                      \
+                 && folder[strlen(old_id)] == G_DIR_SEPARATOR) {               \
+                       gchar *new_path = g_strdup_printf("%s%s",               \
+                                       new_id, (folder + strlen(old_id)));     \
+                       g_free(folder);                                         \
+                       folder = new_path;                                      \
+               }                                                               \
+       }                                                                       \
+}
+
+void account_rename_path(const gchar *old_id, const gchar *new_id)
+{
+       GList *cur = account_list;
+       for (; cur != NULL; cur = g_list_next(cur)) {
+               PrefsAccount *ap = (PrefsAccount *)cur->data;
+               CHECK_CHANGE_FOLDER(ap->inbox);
+               CHECK_CHANGE_FOLDER(ap->local_inbox);
+               CHECK_CHANGE_FOLDER(ap->queue_folder);
+               CHECK_CHANGE_FOLDER(ap->sent_folder);
+               CHECK_CHANGE_FOLDER(ap->draft_folder);
+               CHECK_CHANGE_FOLDER(ap->trash_folder);
+       }
+}
+
+#undef CHECK_CHANGE_FOLDER
+
 FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                                       SpecialFolderItemType type)
 {
@@ -526,6 +582,8 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                if (!item) {
                        if (ac_prefs->folder)
                                item = FOLDER(ac_prefs->folder)->outbox;
+                       if (!item)
+                               item = folder_get_default_outbox_for_class(F_MH);
                        if (!item)
                                item = folder_get_default_outbox();
                }
@@ -538,15 +596,25 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                if (!item) {
                        if (ac_prefs->folder)
                                item = FOLDER(ac_prefs->folder)->draft;
+                       if (!item)
+                               item = folder_get_default_draft_for_class(F_MH);
                        if (!item)
                                item = folder_get_default_draft();
                }
                break;
        case F_QUEUE:
-               if (ac_prefs->folder)
-                       item = FOLDER(ac_prefs->folder)->queue;
-               if (!item)
-                       item = folder_get_default_queue();
+               if (ac_prefs->set_queue_folder && ac_prefs->queue_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->queue_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->queue;
+                       if (!item)
+                               item = folder_get_default_queue_for_class(F_MH);
+                       if (!item)
+                               item = folder_get_default_queue();
+               }
                break;
        case F_TRASH:
                if (ac_prefs->set_trash_folder && ac_prefs->trash_folder) {
@@ -556,6 +624,8 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                if (!item) {
                        if (ac_prefs->folder)
                                item = FOLDER(ac_prefs->folder)->trash;
+                       if (!item)
+                               item = folder_get_default_trash_for_class(F_MH);
                        if (!item)
                                item = folder_get_default_trash();
                }
@@ -587,6 +657,17 @@ void account_destroy(PrefsAccount *ac_prefs)
        }
 }
 
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void account_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.accountswin_width = allocation->width;
+       prefs_common.accountswin_height = allocation->height;
+}
 
 static void account_edit_create(void)
 {
@@ -596,8 +677,6 @@ static void account_edit_create(void)
        GtkWidget *hbox;
        GtkWidget *scrolledwin;
        GtkWidget *list_view;
-       gchar *titles[N_EDIT_ACCOUNT_COLS];
-       gint i;
 
        GtkWidget *vbox2;
        GtkWidget *add_btn;
@@ -609,20 +688,26 @@ static void account_edit_create(void)
 
        GtkWidget *default_btn;
 
-       GtkWidget *hbbox;
+       GtkWidget *confirm_area;
+       GtkWidget *help_btn;
        GtkWidget *close_btn;
 
+       static GdkGeometry geometry;
+
        debug_print("Creating account edit window...\n");
 
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_usize (window, 500, 350);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "account");
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
        gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        g_signal_connect (G_OBJECT (window), "delete_event",
                          G_CALLBACK (account_delete_event), NULL);
+#ifdef MAEMO
+       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
+#else
        g_signal_connect (G_OBJECT (window), "key_press_event",
                          G_CALLBACK (account_key_pressed), NULL);
+#endif                   
        MANAGE_WINDOW_SIGNALS_CONNECT (window);
        gtk_widget_realize(window);
 
@@ -635,11 +720,15 @@ static void account_edit_create(void)
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               (_("New messages will be checked in this order. Check the boxes\n"
-                  "on the `G' column to enable message retrieval by `Get all'."));
+               (_("Using 'Get Mail' will retrieve messages from your Accounts "
+                  "in the order given, the checkbox in the 'G' column indicates "
+                  "which accounts will be included."));
        gtk_widget_show (label);
+       gtk_widget_set_size_request(GTK_WIDGET(label), 
+                                   prefs_common.accountswin_width-8, -1);
        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
@@ -661,19 +750,19 @@ static void account_edit_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 
-       add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+       add_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
        gtk_widget_show (add_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), add_btn, FALSE, FALSE, 4);
        g_signal_connect (G_OBJECT(add_btn), "clicked",
                          G_CALLBACK (account_add), NULL);
 
-       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+       edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
        gtk_widget_show (edit_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
        g_signal_connect (G_OBJECT(edit_btn), "clicked",
                          G_CALLBACK (account_edit_prefs), NULL);
 
-       del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+       del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), del_btn, FALSE, FALSE, 4);
        g_signal_connect (G_OBJECT(del_btn), "clicked",
@@ -701,36 +790,49 @@ static void account_edit_create(void)
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
-       vbox2 = gtk_vbox_new(FALSE, 0);
-       gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-
-       default_btn = gtk_button_new_with_label (_(" Set as default account "));
+       default_btn = gtk_button_new_with_mnemonic
+               (_(" _Set as default account "));
        gtk_widget_show (default_btn);
-       gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), default_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT(default_btn), "clicked",
                          G_CALLBACK (account_set_default), NULL);
 
-       hbbox = gtk_hbutton_box_new();
-       gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
-       gtk_box_set_spacing(GTK_BOX(hbbox), 5);
-
-       gtkut_button_set_create_stock(&hbbox, &close_btn, GTK_STOCK_CLOSE,
-                                     NULL, NULL, NULL, NULL);
-       gtk_widget_show(hbbox);
+       gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
+                       &close_btn, GTK_STOCK_CLOSE,
+                       NULL, NULL, NULL, NULL);
+       gtk_widget_show(confirm_area);
 
-       gtk_box_pack_end (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0);
+       gtk_box_pack_end (GTK_BOX (hbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default (close_btn);
 
        g_signal_connect (G_OBJECT (close_btn), "clicked",
                          G_CALLBACK (account_edit_close),
                          NULL);
+       g_signal_connect(G_OBJECT(help_btn), "clicked",
+                       G_CALLBACK(manual_open_with_anchor_cb),
+                       MANUAL_ANCHOR_ACCOUNTPREFS);
 
        account_create_list_view_images(list_view);
 
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(account_size_allocate_cb), NULL);
+
+       if (!geometry.min_height) {
+               geometry.min_width = 500;
+               geometry.min_height = 380;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.accountswin_width,
+                                   prefs_common.accountswin_height);
+
        edit_account.window    = window;
        edit_account.list_view = list_view;
        edit_account.close_btn = close_btn;
+#ifdef MAEMO
+       maemo_window_full_screen_if_needed(GTK_WINDOW(edit_account.window));
+#endif
 }
 
 static void account_edit_prefs(GtkWidget *widget, gpointer data)
@@ -782,13 +884,14 @@ static void account_clone(GtkWidget *widget, gpointer data)
                return;
 
        if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
-               alertpanel_error(_("Accounts with remote folders cannot be cloned"));
+               alertpanel_error(_("Accounts with remote folders cannot be copied."));
                return;
        }
+       account_list_dirty = TRUE;
        
        ac_clon = prefs_account_new();
        /* copy fields */
-       ac_clon->account_name = g_strdup_printf(_("Cloned %s"), 
+       ac_clon->account_name = g_strdup_printf(_("Copy of %s"),
                                                ac_prefs->account_name);
        /* personal */
        ACP_FDUP(name);
@@ -809,34 +912,31 @@ static void account_clone(GtkWidget *widget, gpointer data)
        ACP_FASSIGN(use_mail_command);
        ACP_FDUP(mail_command);
        
-#if USE_OPENSSL
        ACP_FASSIGN(ssl_pop);
        ACP_FASSIGN(ssl_imap);
        ACP_FASSIGN(ssl_nntp);
        ACP_FASSIGN(ssl_smtp);
        ACP_FASSIGN(use_nonblocking_ssl);
-#endif /* USE_OPENSSL */
        
        ac_clon->tmp_pass = NULL;
 
        /* receive */
+       ACP_FASSIGN(use_apop_auth);
        ACP_FASSIGN(rmmail);
        ACP_FASSIGN(msg_leave_time);
-       ACP_FASSIGN(getall);
        ACP_FASSIGN(recv_at_getall);
        ACP_FASSIGN(sd_rmmail_on_download);
-       ACP_FASSIGN(sd_filter_on_recv);
        ACP_FASSIGN(enable_size_limit);
        ACP_FASSIGN(size_limit);
        ACP_FASSIGN(filter_on_recv);
+       ACP_FASSIGN(filterhook_on_recv);
        ACP_FDUP(inbox);
+       ACP_FDUP(local_inbox);
        ACP_FASSIGN(max_articles);
 
        ACP_FASSIGN(imap_auth_type);
 
        /* send */
-       ACP_FASSIGN(add_date);
-       ACP_FASSIGN(gen_msgid);
        ACP_FASSIGN(add_customhdr);
        ACP_FASSIGN(use_smtp_auth);
        ACP_FASSIGN(smtp_auth_type);
@@ -875,10 +975,27 @@ static void account_clone(GtkWidget *widget, gpointer data)
         ACP_FDUP(auto_bcc);
         ACP_FASSIGN(set_autoreplyto);
         ACP_FDUP(auto_replyto);
+       ACP_FASSIGN(enable_default_dictionary);
+       ACP_FDUP(default_dictionary);
+       ACP_FASSIGN(enable_default_alt_dictionary);
+       ACP_FDUP(default_alt_dictionary);
+       ACP_FASSIGN(compose_with_format);
+       ACP_FDUP(compose_subject_format);
+       ACP_FDUP(compose_body_format);
+       ACP_FASSIGN(reply_with_format);
+       ACP_FDUP(reply_quotemark);
+       ACP_FDUP(reply_body_format);
+       ACP_FASSIGN(forward_with_format);
+       ACP_FDUP(forward_quotemark);
+       ACP_FDUP(forward_body_format);
 
         /* privacy */
+       ACP_FDUP(default_privacy_system);
         ACP_FASSIGN(default_encrypt);
+       ACP_FASSIGN(default_encrypt_reply);
         ACP_FASSIGN(default_sign);
+       ACP_FASSIGN(save_encrypted_as_clear_text);
+       ACP_FASSIGN(encrypt_to_self);
        
         /* advanced */
         ACP_FASSIGN(set_smtpport);
@@ -898,9 +1015,13 @@ static void account_clone(GtkWidget *widget, gpointer data)
         ACP_FDUP(tunnelcmd);
 
         ACP_FDUP(imap_dir);
+       ACP_FASSIGN(imap_subsonly);
+       ACP_FASSIGN(low_bandwidth);
 
         ACP_FASSIGN(set_sent_folder);
         ACP_FDUP(sent_folder);
+       ACP_FASSIGN(set_queue_folder);
+       ACP_FDUP(queue_folder);
         ACP_FASSIGN(set_draft_folder);
         ACP_FDUP(draft_folder);
         ACP_FASSIGN(set_trash_folder);
@@ -918,18 +1039,24 @@ static void account_clone(GtkWidget *widget, gpointer data)
 static void account_delete(GtkWidget *widget, gpointer data)
 {
        PrefsAccount *ac_prefs;
-       gint account_id;
+       gchar buf[BUFFSIZE];
        GList *list;
        Folder *folder;
+       GSList *cur;
  
        ac_prefs = account_list_view_get_selected_account(edit_account.list_view);
        if (ac_prefs == NULL)
                return;
 
-       if (alertpanel(_("Delete account"),
-                      _("Do you really want to delete this account?"),
-                      _("Yes"), _("+No"), NULL) != G_ALERTDEFAULT)
+       g_snprintf(buf, sizeof(buf),
+                  _("Do you really want to delete the account '%s'?"),
+                  ac_prefs->account_name ? ac_prefs->account_name :
+                  _("(Untitled)"));
+       if (alertpanel_full(_("Delete account"), buf,
+                           GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
+                           NULL, ALERT_WARNING, G_ALERTDEFAULT) != G_ALERTALTERNATE)
                return;
+       account_list_dirty = TRUE;
 
        if (ac_prefs->folder) {
                FolderItem *item;
@@ -953,6 +1080,23 @@ static void account_delete(GtkWidget *widget, gpointer data)
                                account_delete_references_func,
                                GINT_TO_POINTER(ac_prefs->account_id));
        }
+
+       debug_print("Removing filter rules relative to this account...\n");
+       for(cur = filtering_rules ; cur != NULL ;) {
+               FilteringProp * prop = (FilteringProp *) cur->data;
+
+               if (prop && (prop->account_id == ac_prefs->account_id)) {
+                       /* get next item before we kill the current one */
+                       cur = g_slist_next(cur);
+
+                       /* unallocate filteringprop and unchain it from the list */
+                       filteringprop_free(prop);
+                       filtering_rules = g_slist_remove(filtering_rules, prop);
+               } else {
+                       cur = g_slist_next(cur);
+               }
+       }
+       folder_write_list();
 }
 
 static void account_up(GtkWidget *widget, gpointer data)
@@ -966,6 +1110,7 @@ static void account_up(GtkWidget *widget, gpointer data)
        
        if (!sel) 
                return;
+       account_list_dirty = TRUE;
 
        up = gtk_tree_path_copy(sel);
        if (!up) {
@@ -1005,6 +1150,7 @@ static void account_down(GtkWidget *widget, gpointer data)
        
        if (!sel) 
                return;
+       account_list_dirty = TRUE;
 
        dn = gtk_tree_path_copy(sel);
        if (!dn) {
@@ -1049,8 +1195,7 @@ static void account_set_default(GtkWidget *widget, gpointer data)
        account_list_view_set();
        
        cur_account = ac_prefs;
-       account_set_menu();
-       main_window_reflect_prefs_all();
+       account_flush_state();
 }
 
 static void account_edit_close(GtkWidget *widget, gpointer data)
@@ -1064,8 +1209,8 @@ static void account_edit_close(GtkWidget *widget, gpointer data)
                cur_account = ac_prefs;
        }
 
-       account_set_menu();
-       main_window_reflect_prefs_all();
+       if (account_list_dirty)
+               account_flush_state();
 
        gtk_widget_hide(edit_account.window);
 
@@ -1110,15 +1255,19 @@ static void account_list_view_add(PrefsAccount *ac_prefs)
                   ac_prefs->protocol == A_NNTP ?
                  (ac_prefs->ssl_nntp == SSL_TUNNEL ?
                   "NNTP (SSL)" : "NNTP") :
-                  "";
+                  ac_prefs->protocol == A_LOCAL ? "Local" :
+                  ac_prefs->protocol == A_NONE ?  "SMTP" : "-";
 #else
        protocol = ac_prefs->protocol == A_POP3  ? "POP3" :
                   ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
                   ac_prefs->protocol == A_LOCAL ? "Local" :
-                  ac_prefs->protocol == A_NNTP  ? "NNTP" : "";
+                  ac_prefs->protocol == A_NNTP  ? "NNTP" :
+                  ac_prefs->protocol == A_NONE ?  "SMTP" : "-";
 #endif
-       server= ac_prefs->protocol == A_NNTP
-               ? ac_prefs->nntp_server : ac_prefs->recv_server;
+       server= ac_prefs->protocol == A_NNTP ? ac_prefs->nntp_server :
+                  ac_prefs->protocol == A_LOCAL ?  "-" :
+                  ac_prefs->protocol == A_NONE ? ac_prefs->smtp_server :
+                  ac_prefs->recv_server;
 
        has_getallbox = (ac_prefs->protocol == A_POP3  ||
                         ac_prefs->protocol == A_IMAP4 ||
@@ -1233,6 +1382,15 @@ PrefsAccount *account_get_reply_account(MsgInfo *msginfo, gboolean reply_autosel
                                }
                        }
                }
+               if (!account) {
+                       gchar deliveredto[BUFFSIZE];
+                       if (!procheader_get_header_from_msginfo
+                               (msginfo, deliveredto,sizeof deliveredto , "Delivered-To:")) { 
+                               gchar *buf = deliveredto + strlen("Delivered-To:");
+                               extract_address(buf);
+                               account = account_find_from_address(buf);
+                       }
+               }
        }
 
        /* select the account for the whole folder (IMAP / NNTP) */
@@ -1308,7 +1466,8 @@ static GtkWidget *account_list_view_create(void)
        list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
        g_object_unref(G_OBJECT(store));
 
-       gtk_tree_view_set_rules_hint(list_view, TRUE);
+       gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
        
        selector = gtk_tree_view_get_selection(list_view);
        gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
@@ -1335,34 +1494,24 @@ static GtkWidget *account_list_view_create(void)
 
 static void account_create_list_view_images(GtkWidget *list_view)
 {
-       GdkPixmap *markxpm;
-       GdkBitmap *markxpmmask;
-       const guchar *pixdata;
-       GdkPixbuf *pbuf;
-       
-       stock_pixmap_gdk(list_view, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
-
-       pbuf = gdk_pixbuf_get_from_drawable(NULL, markxpm, NULL,
-                                           0, 0, 0, 0, -1, -1);
-       pixdata = gdk_pixbuf_get_pixels(pbuf);
-       mark_pixbuf = gdk_pixbuf_add_alpha(pbuf, TRUE, 
-                                          pixdata[0],
-                                          pixdata[1],
-                                          pixdata[2]);
-       g_object_unref(pbuf);
+       stock_pixbuf_gdk(list_view, STOCK_PIXMAP_MARK, &mark_pixbuf);
 }
 
 static void account_create_list_view_columns(GtkWidget *list_view)
 {
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
+       GtkTooltips *tooltips = gtk_tooltips_new();
 
        renderer = gtk_cell_renderer_pixbuf_new();
        column = gtk_tree_view_column_new_with_attributes
-               ("D", renderer,
+               (Q_("Accounts List Default Column Name|D"), renderer,
                 "pixbuf", ACCOUNT_IS_DEFAULT,
                 NULL);
        gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);           
+       gtk_tree_view_column_set_alignment (column, 0.5);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), column->button,
+                       _("Default account"), NULL);
 
        renderer = gtk_cell_renderer_toggle_new();
        g_object_set(renderer, 
@@ -1370,14 +1519,17 @@ static void account_create_list_view_columns(GtkWidget *list_view)
                     "activatable", TRUE,
                      NULL);
        column = gtk_tree_view_column_new_with_attributes
-               ("G", renderer,
+               (Q_("Accounts List Get Column Name|G"), renderer,
                 "active", ACCOUNT_ENABLE_GET_ALL,
                 NULL);
        gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+       gtk_tree_view_column_set_alignment (column, 0.5);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), column->button,
+                       _("'Get Mail' retrieves mail from the checked accounts"), NULL);
        g_signal_connect(G_OBJECT(renderer), "toggled",                      
                         G_CALLBACK(account_get_all_toggled),
                         list_view);
-       
+
        renderer = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes
                (_("Name"), renderer,
@@ -1423,12 +1575,11 @@ static gint account_list_view_get_selected_account_id(GtkWidget *list_view)
 /*!
  *\brief       Get the tree path of the currently selected account
  */
-GtkTreePath *account_list_view_get_selected_account_path(GtkWidget *list_view)
+static GtkTreePath *account_list_view_get_selected_account_path(GtkWidget *list_view)
 {
        GtkTreeSelection *selector;
        GtkTreeModel *model;
        GtkTreeIter iter;
-       GtkTreePath *res;
 
        selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
        
@@ -1442,7 +1593,7 @@ GtkTreePath *account_list_view_get_selected_account_path(GtkWidget *list_view)
 /*!
  *\brief       Get the account data of the currently selected account
  */
-PrefsAccount *account_list_view_get_selected_account(GtkWidget *list_view)
+static PrefsAccount *account_list_view_get_selected_account(GtkWidget *list_view)
 {
        GtkTreeSelection *selector;
        GtkTreeModel *model;
@@ -1464,7 +1615,7 @@ PrefsAccount *account_list_view_get_selected_account(GtkWidget *list_view)
  *
  *\return      gboolean TRUE if found and selected, FALSE if not.
  */
-gboolean account_list_view_select_account(GtkWidget *list_view, gint account_id)
+static gboolean account_list_view_select_account(GtkWidget *list_view, gint account_id)
 {
        FindAccountInStore fis;
        GtkTreeModel *model;