2008-05-02 [wwp] 3.4.0cvs20
[claws.git] / src / prefs_folder_item.c
index a5a4b94cc4d07c975e18adda3560c441bb0c1f43..fd502334d2ad000e659fc50fe9fdc879642f85f6 100644 (file)
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include "folder.h"
+#include "alertpanel.h"
 #include "prefs_folder_item.h"
 #include "folderview.h"
 #include "folder.h"
@@ -59,6 +60,9 @@
                string = (value); \
        }
 
+static void prefs_folder_item_register_page    (PrefsPage      *page);
+static void prefs_folder_item_unregister_page  (PrefsPage      *page);
+
 typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
 typedef struct _FolderItemComposePage FolderItemComposePage;
 typedef struct _FolderItemTemplatesPage FolderItemTemplatesPage;
@@ -81,6 +85,7 @@ struct _FolderItemGeneralPage
        GtkWidget *entry_folder_chmod;
        GtkWidget *folder_color_btn;
        GtkWidget *checkbtn_enable_processing;
+       GtkWidget *checkbtn_enable_processing_when_opening;
        GtkWidget *checkbtn_newmailcheck;
        GtkWidget *checkbtn_offlinesync;
        GtkWidget *label_offlinesync;
@@ -93,6 +98,7 @@ struct _FolderItemGeneralPage
        GtkWidget *folder_chmod_rec_checkbtn;
        GtkWidget *folder_color_rec_checkbtn;
        GtkWidget *enable_processing_rec_checkbtn;
+       GtkWidget *enable_processing_when_opening_rec_checkbtn;
        GtkWidget *newmailcheck_rec_checkbtn;
        GtkWidget *offlinesync_rec_checkbtn;
 
@@ -119,8 +125,8 @@ struct _FolderItemComposePage
 #if USE_ASPELL
        GtkWidget *checkbtn_enable_default_dictionary;
        GtkWidget *checkbtn_enable_default_alt_dictionary;
-       GtkWidget *optmenu_default_dictionary;
-       GtkWidget *optmenu_default_alt_dictionary;
+       GtkWidget *combo_default_dictionary;
+       GtkWidget *combo_default_alt_dictionary;
 #endif
 
        /* apply to sub folders */
@@ -144,13 +150,16 @@ struct _FolderItemTemplatesPage
        GtkWidget *window;
        GtkWidget *table;
        GtkWidget *checkbtn_compose_with_format;
+       GtkWidget *compose_override_from_format;
        GtkWidget *compose_subject_format;
        GtkWidget *compose_body_format;
        GtkWidget *checkbtn_reply_with_format;
        GtkWidget *reply_quotemark;
+       GtkWidget *reply_override_from_format;
        GtkWidget *reply_body_format;
        GtkWidget *checkbtn_forward_with_format;
        GtkWidget *forward_quotemark;
+       GtkWidget *forward_override_from_format;
        GtkWidget *forward_body_format;
 
        /* apply to sub folders */
@@ -171,6 +180,7 @@ static gboolean templates_save_recurse_func(GNode *node, gpointer data);
 static gint prefs_folder_item_chmod_mode               (gchar *folder_chmod);
 
 static void folder_color_set_dialog(GtkWidget *widget, gpointer data);
+static void clean_cache_cb(GtkWidget *widget, gpointer data);
 static void folder_regexp_test_cb(GtkWidget *widget, gpointer data);
 static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer data);
 
@@ -192,7 +202,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkListStore *folder_type_menu;
        GtkWidget *folder_type;
        GtkTreeIter iter;
-       GtkWidget *dummy_checkbtn;
+       GtkWidget *dummy_checkbtn, *clean_cache_btn;
        SpecialFolderItemType type;
        
        GtkWidget *no_save_warning = NULL;
@@ -209,6 +219,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *folder_color;
        GtkWidget *folder_color_btn;
        GtkWidget *checkbtn_enable_processing;
+       GtkWidget *checkbtn_enable_processing_when_opening;
        GtkWidget *checkbtn_newmailcheck;
        GtkWidget *checkbtn_offlinesync;
        GtkWidget *label_offlinesync;
@@ -220,6 +231,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *folder_chmod_rec_checkbtn;
        GtkWidget *folder_color_rec_checkbtn;
        GtkWidget *enable_processing_rec_checkbtn;
+       GtkWidget *enable_processing_when_opening_rec_checkbtn;
        GtkWidget *newmailcheck_rec_checkbtn;
        GtkWidget *offlinesync_rec_checkbtn;
        GtkTooltips *tooltips;
@@ -228,7 +240,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->item         = item;
 
        /* Table */
-       table = gtk_table_new(9, 4, FALSE);
+       table = gtk_table_new(11, 4, FALSE);
        gtk_container_set_border_width (GTK_CONTAINER (table), VBOX_BORDER);
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 4);
@@ -417,7 +429,8 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        rowcount++;
 
        /* Enable processing at startup */
-       checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process at start-up"));
+       checkbtn_enable_processing =
+               gtk_check_button_new_with_label(_("Run Processing rules at start-up"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing, 0, 2, 
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
@@ -430,6 +443,21 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        
        rowcount++;
 
+       /* Enable processing rules when opening folder */
+       checkbtn_enable_processing_when_opening =
+               gtk_check_button_new_with_label(_("Run Processing rules when opening"));
+       gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing_when_opening, 0, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_processing_when_opening), 
+                                    item->prefs->enable_processing_when_opening);
+
+       enable_processing_when_opening_rec_checkbtn = gtk_check_button_new();
+       gtk_table_attach(GTK_TABLE(table), enable_processing_when_opening_rec_checkbtn, 3, 4, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+       
+       rowcount++;
+
        /* Check folder for new mail */
        checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail"));
        gtk_tooltips_set_tip(tooltips, checkbtn_newmailcheck,
@@ -501,6 +529,14 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        SET_TOGGLE_SENSITIVITY (checkbtn_offlinesync, hbox);
        SET_TOGGLE_SENSITIVITY (checkbtn_offlinesync, hbox2);
        
+       clean_cache_btn = gtk_button_new_with_label(_("Discard folder cache"));
+       gtk_widget_show (clean_cache_btn);
+       gtk_table_attach(GTK_TABLE(table), clean_cache_btn, 0, 1,
+                        rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+       g_signal_connect(G_OBJECT(clean_cache_btn), "clicked",
+                        G_CALLBACK(clean_cache_cb),
+                        page);
+
        gtk_widget_show_all(table);
 
        if (item->folder && (item->folder->klass->type != F_IMAP && 
@@ -517,6 +553,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                gtk_widget_hide(GTK_WIDGET(hbox));
                gtk_widget_hide(GTK_WIDGET(hbox2));
                gtk_widget_hide(GTK_WIDGET(offlinesync_rec_checkbtn));
+               gtk_widget_hide(GTK_WIDGET(clean_cache_btn));
        
        }
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_offlinesync),
@@ -536,6 +573,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->entry_folder_chmod = entry_folder_chmod;
        page->folder_color_btn = folder_color_btn;
        page->checkbtn_enable_processing = checkbtn_enable_processing;
+       page->checkbtn_enable_processing_when_opening = checkbtn_enable_processing_when_opening;
        page->checkbtn_newmailcheck = checkbtn_newmailcheck;
        page->checkbtn_offlinesync = checkbtn_offlinesync;
        page->label_offlinesync = label_offlinesync;
@@ -547,6 +585,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->folder_chmod_rec_checkbtn      = folder_chmod_rec_checkbtn;
        page->folder_color_rec_checkbtn      = folder_color_rec_checkbtn;
        page->enable_processing_rec_checkbtn = enable_processing_rec_checkbtn;
+       page->enable_processing_when_opening_rec_checkbtn = enable_processing_when_opening_rec_checkbtn;
        page->newmailcheck_rec_checkbtn      = newmailcheck_rec_checkbtn;
        page->offlinesync_rec_checkbtn       = offlinesync_rec_checkbtn;
 
@@ -614,6 +653,11 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_processing));
        }
 
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_when_opening_rec_checkbtn))) {
+               prefs->enable_processing_when_opening = 
+                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_processing_when_opening));
+       }
+
        if (all ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->newmailcheck_rec_checkbtn))) {
                prefs->newmailcheck = 
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_newmailcheck));
@@ -649,6 +693,7 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_chmod_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_color_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_when_opening_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->newmailcheck_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn))))
                return TRUE;
@@ -702,15 +747,12 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkTreeIter iter;
 #if USE_ASPELL
        GtkWidget *checkbtn_enable_default_dictionary = NULL;
-       GtkWidget *optmenu_default_dictionary = NULL;
+       GtkWidget *combo_default_dictionary = NULL;
        GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
-       GtkWidget *optmenu_default_alt_dictionary = NULL;
+       GtkWidget *combo_default_alt_dictionary = NULL;
        GtkWidget *default_dictionary_rec_checkbtn = NULL;
        GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
        gchar *dictionary;
-       GtkOptionMenu *optmenu;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
 #endif
        GtkWidget *request_return_receipt_rec_checkbtn = NULL;
        GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
@@ -853,7 +895,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
                        continue;
 
-               COMBOBOX_ADD (optmenu_default_account_menu,
+               COMBOBOX_ADD_ESCAPED (optmenu_default_account_menu,
                                        ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
                                        ac_prefs->account_id);
 
@@ -887,25 +929,17 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
                                     item->prefs->enable_default_dictionary);
 
-       optmenu_default_dictionary = gtk_option_menu_new();
-       gtk_table_attach(GTK_TABLE(table), optmenu_default_dictionary, 1, 2,
+       combo_default_dictionary = gtkaspell_dictionary_combo_new(
+                                               prefs_common.aspell_path, TRUE);
+       gtk_table_attach(GTK_TABLE(table), combo_default_dictionary, 1, 2,
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
 
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_dictionary), 
-                                gtkaspell_dictionary_option_menu_new(
-                                        prefs_common.aspell_path));
-
        dictionary = item->prefs->default_dictionary;
-
-       optmenu = GTK_OPTION_MENU(optmenu_default_dictionary);
-
-       menu = gtk_option_menu_get_menu(optmenu);
        if (dictionary)
-               gtkaspell_set_dictionary_menu_active_item(optmenu_default_dictionary, dictionary);
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+               gtkaspell_set_dictionary_menu_active_item(
+                       GTK_COMBO_BOX(combo_default_dictionary), dictionary);
 
-       SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, optmenu_default_dictionary);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, combo_default_dictionary);
 
        default_dictionary_rec_checkbtn = gtk_check_button_new();
        gtk_table_attach(GTK_TABLE(table), default_dictionary_rec_checkbtn, 2, 3, 
@@ -920,25 +954,17 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
                                     item->prefs->enable_default_alt_dictionary);
 
-       optmenu_default_alt_dictionary = gtk_option_menu_new();
-       gtk_table_attach(GTK_TABLE(table), optmenu_default_alt_dictionary, 1, 2,
+       combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(
+                                               prefs_common.aspell_path, FALSE);
+       gtk_table_attach(GTK_TABLE(table), combo_default_alt_dictionary, 1, 2,
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
 
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_alt_dictionary), 
-                                gtkaspell_dictionary_option_menu_new_with_refresh(
-                                        prefs_common.aspell_path, FALSE));
-
        dictionary = item->prefs->default_alt_dictionary;
-
-       optmenu = GTK_OPTION_MENU(optmenu_default_alt_dictionary);
-
-       menu = gtk_option_menu_get_menu(optmenu);
        if (dictionary)
-               gtkaspell_set_dictionary_menu_active_item(optmenu_default_alt_dictionary, dictionary);
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+               gtkaspell_set_dictionary_menu_active_item(
+                       GTK_COMBO_BOX(combo_default_alt_dictionary), dictionary);
 
-       SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, optmenu_default_alt_dictionary);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, combo_default_alt_dictionary);
 
        default_alt_dictionary_rec_checkbtn = gtk_check_button_new();
        gtk_table_attach(GTK_TABLE(table), default_alt_dictionary_rec_checkbtn, 2, 3, 
@@ -962,9 +988,9 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->optmenu_default_account = optmenu_default_account;
 #ifdef USE_ASPELL
        page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
-       page->optmenu_default_dictionary = optmenu_default_dictionary;
+       page->combo_default_dictionary = combo_default_dictionary;
        page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
-       page->optmenu_default_alt_dictionary = optmenu_default_alt_dictionary;
+       page->combo_default_alt_dictionary = combo_default_alt_dictionary;
 #endif
 
        page->request_return_receipt_rec_checkbtn = request_return_receipt_rec_checkbtn;
@@ -977,8 +1003,6 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->default_alt_dictionary_rec_checkbtn = default_alt_dictionary_rec_checkbtn;
 #endif
 
-       address_completion_start(page->window);
-
        page->page.widget = table;
 }
 
@@ -990,7 +1014,6 @@ static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
                address_completion_unregister_entry(GTK_ENTRY(page->entry_default_to));
        if (page->entry_default_reply_to)
                address_completion_unregister_entry(GTK_ENTRY(page->entry_default_reply_to));
-       address_completion_end(page->window);
 }
 
 /** \brief  Save the prefs in page to folder.
@@ -1001,9 +1024,7 @@ static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
 static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
 {
        FolderItemPrefs *prefs = folder->prefs;
-#if USE_ASPELL
-       GtkWidget *menu;
-#endif
+
        gboolean all = FALSE;
 
        if (folder->path == NULL)
@@ -1061,16 +1082,16 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))) {
                prefs->enable_default_dictionary =
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_dictionary));
-               menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_dictionary));
                ASSIGN_STRING(prefs->default_dictionary,
-                             gtkaspell_get_dictionary_menu_active_item(menu));
+                             gtkaspell_get_dictionary_menu_active_item(
+                                       GTK_COMBO_BOX(page->combo_default_dictionary)));
        }
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))) {
                prefs->enable_default_alt_dictionary =
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_alt_dictionary));
-               menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_alt_dictionary));
                ASSIGN_STRING(prefs->default_alt_dictionary,
-                             gtkaspell_get_dictionary_menu_active_item(menu));
+                             gtkaspell_get_dictionary_menu_active_item(
+                                     GTK_COMBO_BOX(page->combo_default_alt_dictionary)));
        }
 #endif
 
@@ -1132,6 +1153,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
        GtkWidget *notebook;
        GtkWidget *vbox;
        GtkWidget *page_vbox;
+       GtkWidget *no_save_warning;
        GtkWidget *new_msg_format_rec_checkbtn;
        GtkWidget *reply_format_rec_checkbtn;
        GtkWidget *forward_format_rec_checkbtn;
@@ -1141,6 +1163,17 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
        page_vbox = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (page_vbox);
        
+       if (!can_save) {
+               no_save_warning = gtk_label_new(
+                       _("<i>These preferences will not be saved as this folder "
+                       "is a top-level one. However you can use them to set them "
+                       "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
+               gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
+               gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
+               gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
+               gtk_box_pack_start(GTK_BOX(page_vbox), no_save_warning, FALSE, FALSE, 4);
+       }
+
        /* Notebook */
        notebook = gtk_notebook_new();
        gtk_widget_show(notebook);
@@ -1156,10 +1189,12 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                                window,
                                vbox,
                                &page->checkbtn_compose_with_format,
-                               _("Use a specific format for new messages"),
+                               &page->compose_override_from_format,
                                &page->compose_subject_format,
                                &page->compose_body_format,
-                               FALSE);
+                               FALSE, FALSE);
+       address_completion_register_entry(GTK_ENTRY(page->compose_override_from_format),
+                       TRUE);
 
        new_msg_format_rec_checkbtn = gtk_check_button_new_with_label(
                        _("Apply to subfolders"));
@@ -1175,10 +1210,12 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                                window,
                                vbox,
                                &page->checkbtn_reply_with_format,
-                               _("Use a specific reply quote format"),
+                               &page->reply_override_from_format,
                                &page->reply_quotemark,
                                &page->reply_body_format,
-                               FALSE);
+                               FALSE, FALSE);
+       address_completion_register_entry(GTK_ENTRY(page->reply_override_from_format),
+                       TRUE);
 
        reply_format_rec_checkbtn = gtk_check_button_new_with_label(
                        _("Apply to subfolders"));
@@ -1194,10 +1231,12 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                                window,
                                vbox,
                                &page->checkbtn_forward_with_format,
-                               _("Use a specific forward quote format"),
+                               &page->forward_override_from_format,
                                &page->forward_quotemark,
                                &page->forward_body_format,
-                               FALSE);
+                               FALSE, FALSE);
+       address_completion_register_entry(GTK_ENTRY(page->forward_override_from_format),
+                       TRUE);
 
        forward_format_rec_checkbtn = gtk_check_button_new_with_label(
                        _("Apply to subfolders"));
@@ -1209,6 +1248,8 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format),
                        item->prefs->compose_with_format);
+       pref_set_entry_from_pref(GTK_ENTRY(page->compose_override_from_format),
+                       item->prefs->compose_override_from_format);
        pref_set_entry_from_pref(GTK_ENTRY(page->compose_subject_format),
                        item->prefs->compose_subject_format);
        pref_set_textview_from_pref(GTK_TEXT_VIEW(page->compose_body_format),
@@ -1218,6 +1259,8 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                        item->prefs->reply_with_format);
        pref_set_entry_from_pref(GTK_ENTRY(page->reply_quotemark),
                        item->prefs->reply_quotemark);
+       pref_set_entry_from_pref(GTK_ENTRY(page->reply_override_from_format),
+                       item->prefs->reply_override_from_format);
        pref_set_textview_from_pref(GTK_TEXT_VIEW(page->reply_body_format),
                        item->prefs->reply_body_format);
 
@@ -1225,6 +1268,8 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                        item->prefs->forward_with_format);
        pref_set_entry_from_pref(GTK_ENTRY(page->forward_quotemark),
                        item->prefs->forward_quotemark);
+       pref_set_entry_from_pref(GTK_ENTRY(page->forward_override_from_format),
+                       item->prefs->forward_override_from_format);
        pref_set_textview_from_pref(GTK_TEXT_VIEW(page->forward_body_format),
                        item->prefs->forward_body_format);
 
@@ -1241,7 +1286,14 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
 
 static void prefs_folder_item_templates_destroy_widget_func(PrefsPage *page_) 
 {
-       /* FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_; */
+       FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_;
+
+       if (page->compose_override_from_format)
+               address_completion_unregister_entry(GTK_ENTRY(page->compose_override_from_format));             
+       if (page->reply_override_from_format)
+               address_completion_unregister_entry(GTK_ENTRY(page->reply_override_from_format));               
+       if (page->forward_override_from_format)
+               address_completion_unregister_entry(GTK_ENTRY(page->forward_override_from_format));             
 }
 
 /** \brief  Save the prefs in page to folder.
@@ -1265,15 +1317,19 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
        /* save and check formats */
 
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->new_msg_format_rec_checkbtn))) {
+               
                prefs->compose_with_format =
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format));
+               prefs->compose_override_from_format = pref_get_pref_from_entry(
+                               GTK_ENTRY(page->compose_override_from_format));
                prefs->compose_subject_format = pref_get_pref_from_entry(
                                GTK_ENTRY(page->compose_subject_format));
                prefs->compose_body_format = pref_get_pref_from_textview(
                                GTK_TEXT_VIEW(page->compose_body_format));
                quotefmt_check_new_msg_formats(prefs->compose_with_format,
-                                                                               prefs->compose_subject_format,
-                                                                               prefs->compose_body_format);
+                                               prefs->compose_override_from_format,
+                                               prefs->compose_subject_format,
+                                               prefs->compose_body_format);
        }
 
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->reply_format_rec_checkbtn))) {
@@ -1281,9 +1337,12 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_reply_with_format));
                prefs->reply_quotemark = gtk_editable_get_chars(
                                GTK_EDITABLE(page->reply_quotemark), 0, -1);
+               prefs->reply_override_from_format = pref_get_pref_from_entry(
+                               GTK_ENTRY(page->reply_override_from_format));
                prefs->reply_body_format = pref_get_pref_from_textview(
                                GTK_TEXT_VIEW(page->reply_body_format));
                quotefmt_check_reply_formats(prefs->reply_with_format,
+                                                                               prefs->reply_override_from_format,
                                                                                prefs->reply_quotemark,
                                                                                prefs->reply_body_format);
        }
@@ -1293,9 +1352,12 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_forward_with_format));
                prefs->forward_quotemark = gtk_editable_get_chars(
                                GTK_EDITABLE(page->forward_quotemark), 0, -1);
+               prefs->forward_override_from_format = pref_get_pref_from_entry(
+                               GTK_ENTRY(page->forward_override_from_format));
                prefs->forward_body_format = pref_get_pref_from_textview(
                                GTK_TEXT_VIEW(page->forward_body_format));
                quotefmt_check_forward_formats(prefs->forward_with_format,
+                                                                               prefs->forward_override_from_format,
                                                                                prefs->forward_quotemark,
                                                                                prefs->forward_body_format);
        }
@@ -1361,6 +1423,33 @@ static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
        page->folder_color = rgbcolor;
 }
 
+static void clean_cache_cb(GtkWidget *widget, gpointer data)
+{
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *) data;
+       FolderItem *item = page->item;
+       gboolean was_open = FALSE;
+       FolderView *folderview = NULL;
+
+       if (alertpanel_full(_("Discard cache"), 
+                           _("Do you really want to discard the local cached "
+                             "data for this folder?"),
+                                GTK_STOCK_CANCEL, _("+Discard"), NULL, FALSE,
+                                NULL, ALERT_WARNING, G_ALERTDEFAULT)
+               != G_ALERTALTERNATE)
+               return;
+       
+       if (mainwindow_get_mainwindow())
+               folderview = mainwindow_get_mainwindow()->folderview;
+
+       if (folderview && item->opened) {
+               folderview_close_opened(folderview);
+               was_open = TRUE;
+       }
+       folder_item_discard_cache(item);
+       if (was_open)
+               folderview_select(folderview,item);
+}
+
 static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
 {
        int err;
@@ -1460,11 +1549,12 @@ static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer dat
 
 static void register_general_page()
 {
-       static gchar *pfi_general_path[2];
+       static gchar *pfi_general_path[3];
        static FolderItemGeneralPage folder_item_general_page;
 
-       pfi_general_path[0] = _("General");
-       pfi_general_path[1] = NULL;
+       pfi_general_path[0] = _("Folder");
+       pfi_general_path[1] = _("General");
+       pfi_general_path[2] = NULL;
 
         folder_item_general_page.page.path = pfi_general_path;
         folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func;
@@ -1477,11 +1567,12 @@ static void register_general_page()
 
 static void register_compose_page(void)
 {
-       static gchar *pfi_compose_path[2];
+       static gchar *pfi_compose_path[3];
        static FolderItemComposePage folder_item_compose_page;
 
-       pfi_compose_path[0] = _("Compose");
-       pfi_compose_path[1] = NULL;
+       pfi_compose_path[0] = _("Folder");
+       pfi_compose_path[1] = _("Compose");
+       pfi_compose_path[2] = NULL;
 
         folder_item_compose_page.page.path = pfi_compose_path;
         folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func;
@@ -1493,11 +1584,12 @@ static void register_compose_page(void)
 
 static void register_templates_page(void)
 {
-       static gchar *pfi_templates_path[2];
+       static gchar *pfi_templates_path[3];
        static FolderItemTemplatesPage folder_item_templates_page;
 
-       pfi_templates_path[0] = _("Templates");
-       pfi_templates_path[1] = NULL;
+       pfi_templates_path[0] = _("Folder");
+       pfi_templates_path[1] = _("Templates");
+       pfi_templates_path[2] = NULL;
 
         folder_item_templates_page.page.path = pfi_templates_path;
         folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func;
@@ -1509,6 +1601,16 @@ static void register_templates_page(void)
 
 static GSList *prefs_pages = NULL;
 
+static void prefs_folder_item_address_completion_start(GtkWindow * window)
+{
+       address_completion_start(GTK_WIDGET(window));
+}
+
+static void prefs_folder_item_address_completion_end(GtkWindow * window)
+{
+       address_completion_end(GTK_WIDGET(window));
+}
+
 void prefs_folder_item_open(FolderItem *item)
 {
        gchar *id, *title;
@@ -1528,17 +1630,19 @@ void prefs_folder_item_open(FolderItem *item)
        title = g_strdup_printf (_("Properties for folder %s"), id);
        g_free (id);
        prefswindow_open(title, prefs_pages, item,
-                       &prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height);
-       
+                       &prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height,
+                       prefs_folder_item_address_completion_start,
+                       prefs_folder_item_address_completion_end);
+
        g_free (title);
 }
 
-void prefs_folder_item_register_page(PrefsPage *page)
+static void prefs_folder_item_register_page(PrefsPage *page)
 {
        prefs_pages = g_slist_append(prefs_pages, page);
 }
 
-void prefs_folder_item_unregister_page(PrefsPage *page)
+static void prefs_folder_item_unregister_page(PrefsPage *page)
 {
        prefs_pages = g_slist_remove(prefs_pages, page);
 }