2008-09-17 [colin] 3.5.0cvs112
[claws.git] / src / prefs_folder_item.c
index 286b29c7ab7e66d4fdc7de689a025632c5d3c1e3..652d53689f977c13e4e77dbd4986244ffda7fb7c 100644 (file)
@@ -50,7 +50,7 @@
 #include "quote_fmt.h"
 #include "combobox.h"
 
-#if USE_ASPELL
+#if USE_ENCHANT
 #include "gtkaspell.h"
 #endif
 
@@ -85,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;
@@ -97,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;
 
@@ -120,11 +122,11 @@ struct _FolderItemComposePage
        GtkWidget *entry_default_reply_to;
        GtkWidget *checkbtn_enable_default_account;
        GtkWidget *optmenu_default_account;
-#if USE_ASPELL
+#if USE_ENCHANT
        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 */
@@ -133,7 +135,7 @@ struct _FolderItemComposePage
        GtkWidget *default_to_rec_checkbtn;
        GtkWidget *default_reply_to_rec_checkbtn;
        GtkWidget *default_account_rec_checkbtn;
-#if USE_ASPELL
+#if USE_ENCHANT
        GtkWidget *default_dictionary_rec_checkbtn;
        GtkWidget *default_alt_dictionary_rec_checkbtn;
 #endif
@@ -148,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 */
@@ -214,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;
@@ -225,15 +231,15 @@ 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;
+       CLAWS_TIP_DECL();
 
-       tooltips = gtk_tooltips_new();
        page->item         = item;
 
        /* Table */
-       table = gtk_table_new(10, 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);
@@ -361,7 +367,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        entry_regexp_test_result = gtk_entry_new();
        gtk_box_pack_end (GTK_BOX(hbox_regexp), entry_regexp_test_result, TRUE, TRUE, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_regexp_test_result);
-       gtk_entry_set_editable(GTK_ENTRY(entry_regexp_test_result), FALSE);
+       gtk_editable_set_editable(GTK_EDITABLE(entry_regexp_test_result), FALSE);
 
        rowcount++;
 
@@ -404,8 +410,8 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        folder_color_btn = gtk_button_new_with_label("");
        gtk_widget_set_size_request(folder_color_btn, 36, 26);
        gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
-       gtk_tooltips_set_tip(tooltips, folder_color_btn,
-                            _("Pick color for folder"), NULL);
+       CLAWS_SET_TIP(folder_color_btn,
+                            _("Pick color for folder"));
 
        page->folder_color = item->prefs->color;
 
@@ -422,7 +428,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);
 
@@ -435,12 +442,27 @@ 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,
+       CLAWS_SET_TIP(checkbtn_newmailcheck,
                             _("Turn this option on if mail is delivered directly "
                               "to this folder by server side filtering on IMAP or "
-                              "by an external application"), NULL);
+                              "by an external application"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        
@@ -481,7 +503,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        entry_offlinesync = gtk_entry_new();
        gtk_widget_set_size_request (entry_offlinesync, 64, -1);
        gtk_widget_show (entry_offlinesync);
-       gtk_tooltips_set_tip(tooltips, entry_offlinesync, _("0: all bodies"), NULL);
+       CLAWS_SET_TIP(entry_offlinesync, _("0: all bodies"));
        gtk_box_pack_start (GTK_BOX (hbox), entry_offlinesync, FALSE, FALSE, 0);
 
        label_end_offlinesync = gtk_label_new(_("days"));
@@ -550,6 +572,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;
@@ -561,6 +584,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;
 
@@ -628,6 +652,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));
@@ -663,6 +692,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;
@@ -714,17 +744,14 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkWidget *optmenu_default_account = NULL;
        GtkListStore *optmenu_default_account_menu = NULL;
        GtkTreeIter iter;
-#if USE_ASPELL
+#if USE_ENCHANT
        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;
@@ -740,7 +767,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->item         = item;
 
        /* Table */
-#if USE_ASPELL
+#if USE_ENCHANT
 # define TABLEHEIGHT 7
 #else
 # define TABLEHEIGHT 6
@@ -867,7 +894,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);
 
@@ -893,7 +920,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        rowcount++;
 
-#if USE_ASPELL
+#if USE_ENCHANT
        /* Default dictionary */
        checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_dictionary, 0, 1,
@@ -901,25 +928,26 @@ 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(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 && strrchr(dictionary, '/')) {
+               gchar *tmp = g_strdup(strrchr(dictionary, '/')+1);
+               g_free(item->prefs->default_dictionary);
+               item->prefs->default_dictionary = tmp;
+               dictionary = item->prefs->default_dictionary;
+       }
+       if (item->prefs->default_dictionary &&
+           strchr(item->prefs->default_dictionary, '-')) {
+               *(strchr(item->prefs->default_dictionary, '-')) = '\0';
+       }
        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, 
@@ -934,25 +962,26 @@ 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(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 && strrchr(dictionary, '/')) {
+               gchar *tmp = g_strdup(strrchr(dictionary, '/')+1);
+               g_free(item->prefs->default_alt_dictionary);
+               item->prefs->default_alt_dictionary = tmp;
+               dictionary = item->prefs->default_alt_dictionary;
+       }
+       if (item->prefs->default_alt_dictionary &&
+           strchr(item->prefs->default_alt_dictionary, '-')) {
+               *(strchr(item->prefs->default_alt_dictionary, '-')) = '\0';
+       }
        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, 
@@ -974,11 +1003,11 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->entry_default_reply_to = entry_default_reply_to;
        page->checkbtn_enable_default_account = checkbtn_enable_default_account;
        page->optmenu_default_account = optmenu_default_account;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
        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;
@@ -986,13 +1015,11 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->default_to_rec_checkbtn             = default_to_rec_checkbtn;
        page->default_reply_to_rec_checkbtn       = default_reply_to_rec_checkbtn;
        page->default_account_rec_checkbtn        = default_account_rec_checkbtn;
-#if USE_ASPELL
+#if USE_ENCHANT
        page->default_dictionary_rec_checkbtn = default_dictionary_rec_checkbtn;
        page->default_alt_dictionary_rec_checkbtn = default_alt_dictionary_rec_checkbtn;
 #endif
 
-       address_completion_start(page->window);
-
        page->page.widget = table;
 }
 
@@ -1004,7 +1031,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.
@@ -1015,9 +1041,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)
@@ -1071,20 +1095,20 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
                                GTK_COMBO_BOX(page->optmenu_default_account));
        }
 
-#if USE_ASPELL
+#if USE_ENCHANT
        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
 
@@ -1109,7 +1133,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) ||
-#if USE_ASPELL
+#if USE_ENCHANT
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn)) ||
 #endif
@@ -1117,7 +1141,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
                return TRUE;
        else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
            !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) 
-#if USE_ASPELL
+#if USE_ENCHANT
              || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))
              || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))
 #endif
@@ -1146,6 +1170,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;
@@ -1155,10 +1180,20 @@ 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);
-       gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
        gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 0);
 
        /* compose format */
@@ -1170,9 +1205,12 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                                window,
                                vbox,
                                &page->checkbtn_compose_with_format,
+                               &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"));
@@ -1188,9 +1226,12 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                                window,
                                vbox,
                                &page->checkbtn_reply_with_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"));
@@ -1206,9 +1247,12 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                                window,
                                vbox,
                                &page->checkbtn_forward_with_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"));
@@ -1220,6 +1264,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),
@@ -1229,6 +1275,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);
 
@@ -1236,6 +1284,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);
 
@@ -1252,7 +1302,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.
@@ -1276,15 +1333,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))) {
@@ -1292,9 +1353,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);
        }
@@ -1304,9 +1368,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);
        }
@@ -1550,6 +1617,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;
@@ -1569,8 +1646,10 @@ 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);
 }