2007-09-21 [paul] 3.0.1cvs19
[claws.git] / src / prefs_folder_item.c
index 0b00b81ec0154ee97fe3aa4798cf2c187aec7ed9..a5a4b94cc4d07c975e18adda3560c441bb0c1f43 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 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/>.
+ * 
  */
 
 /* alfons - all folder item specific settings should migrate into 
@@ -32,6 +32,7 @@
 #include "folder.h"
 #include "prefs_folder_item.h"
 #include "folderview.h"
+#include "folder.h"
 #include "summaryview.h"
 #include "menu.h"
 #include "account.h"
@@ -44,6 +45,9 @@
 #include "filtering.h"
 #include "folder_item_prefs.h"
 #include "gtk/colorsel.h"
+#include "string_match.h"
+#include "quote_fmt.h"
+#include "combobox.h"
 
 #if USE_ASPELL
 #include "gtkaspell.h"
@@ -57,6 +61,8 @@
 
 typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
 typedef struct _FolderItemComposePage FolderItemComposePage;
+typedef struct _FolderItemTemplatesPage FolderItemTemplatesPage;
+static gboolean can_save = TRUE;
 
 struct _FolderItemGeneralPage
 {
@@ -65,16 +71,24 @@ struct _FolderItemGeneralPage
        FolderItem *item;
 
        GtkWidget *table;
+       GtkWidget *no_save_warning;
+       GtkWidget *folder_type;
        GtkWidget *checkbtn_simplify_subject;
        GtkWidget *entry_simplify_subject;
+       GtkWidget *entry_regexp_test_string;
+       GtkWidget *entry_regexp_test_result;
        GtkWidget *checkbtn_folder_chmod;
        GtkWidget *entry_folder_chmod;
        GtkWidget *folder_color_btn;
        GtkWidget *checkbtn_enable_processing;
        GtkWidget *checkbtn_newmailcheck;
        GtkWidget *checkbtn_offlinesync;
-
-       /* appy to sub folders */
+       GtkWidget *label_offlinesync;
+       GtkWidget *entry_offlinesync;
+       GtkWidget *label_end_offlinesync;
+       GtkWidget *checkbtn_remove_old_offlinesync;
+       
+       /* apply to sub folders */
        GtkWidget *simplify_subject_rec_checkbtn;
        GtkWidget *folder_chmod_rec_checkbtn;
        GtkWidget *folder_color_rec_checkbtn;
@@ -93,6 +107,7 @@ struct _FolderItemComposePage
 
        GtkWidget *window;
        GtkWidget *table;
+       GtkWidget *no_save_warning;
        GtkWidget *checkbtn_request_return_receipt;
        GtkWidget *checkbtn_save_copy_to_folder;
        GtkWidget *checkbtn_default_to;
@@ -103,7 +118,9 @@ struct _FolderItemComposePage
        GtkWidget *optmenu_default_account;
 #if USE_ASPELL
        GtkWidget *checkbtn_enable_default_dictionary;
+       GtkWidget *checkbtn_enable_default_alt_dictionary;
        GtkWidget *optmenu_default_dictionary;
+       GtkWidget *optmenu_default_alt_dictionary;
 #endif
 
        /* apply to sub folders */
@@ -114,25 +131,53 @@ struct _FolderItemComposePage
        GtkWidget *default_account_rec_checkbtn;
 #if USE_ASPELL
        GtkWidget *default_dictionary_rec_checkbtn;
+       GtkWidget *default_alt_dictionary_rec_checkbtn;
 #endif
+};
 
+struct _FolderItemTemplatesPage
+{
+       PrefsPage page;
+
+       FolderItem *item;
+
+       GtkWidget *window;
+       GtkWidget *table;
+       GtkWidget *checkbtn_compose_with_format;
+       GtkWidget *compose_subject_format;
+       GtkWidget *compose_body_format;
+       GtkWidget *checkbtn_reply_with_format;
+       GtkWidget *reply_quotemark;
+       GtkWidget *reply_body_format;
+       GtkWidget *checkbtn_forward_with_format;
+       GtkWidget *forward_quotemark;
+       GtkWidget *forward_body_format;
+
+       /* apply to sub folders */
+       GtkWidget *new_msg_format_rec_checkbtn;
+       GtkWidget *reply_format_rec_checkbtn;
+       GtkWidget *forward_format_rec_checkbtn;
 };
 
 
 static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page);
 static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page);
+static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesPage *page);
 
 static gboolean general_save_recurse_func(GNode *node, gpointer data);
 static gboolean compose_save_recurse_func(GNode *node, gpointer data);
+static gboolean templates_save_recurse_func(GNode *node, gpointer data);
 
-gint prefs_folder_item_chmod_mode              (gchar *folder_chmod);
+static gint prefs_folder_item_chmod_mode               (gchar *folder_chmod);
 
 static void folder_color_set_dialog(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);
 
 #define SAFE_STRING(str) \
        (str) ? (str) : ""
 
-void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
+static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                                                   GtkWindow * window,
                                                   gpointer data)
 {
@@ -141,11 +186,24 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        guint rowcount;
 
        GtkWidget *table;
-       GtkWidget *hbox;
+       GtkWidget *hbox, *hbox2, *hbox_spc;
        GtkWidget *label;
        
+       GtkListStore *folder_type_menu;
+       GtkWidget *folder_type;
+       GtkTreeIter iter;
+       GtkWidget *dummy_checkbtn;
+       SpecialFolderItemType type;
+       
+       GtkWidget *no_save_warning = NULL;
        GtkWidget *checkbtn_simplify_subject;
        GtkWidget *entry_simplify_subject;
+       GtkWidget *hbox_regexp;
+       GtkWidget *label_regexp_test;
+       GtkWidget *entry_regexp_test_string;
+       GtkWidget *left_arrow;
+       GtkWidget *entry_regexp_test_result;
+
        GtkWidget *checkbtn_folder_chmod;
        GtkWidget *entry_folder_chmod;
        GtkWidget *folder_color;
@@ -153,6 +211,10 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *checkbtn_enable_processing;
        GtkWidget *checkbtn_newmailcheck;
        GtkWidget *checkbtn_offlinesync;
+       GtkWidget *label_offlinesync;
+       GtkWidget *entry_offlinesync;
+       GtkWidget *label_end_offlinesync;
+       GtkWidget *checkbtn_remove_old_offlinesync;
 
        GtkWidget *simplify_subject_rec_checkbtn;
        GtkWidget *folder_chmod_rec_checkbtn;
@@ -160,44 +222,146 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *enable_processing_rec_checkbtn;
        GtkWidget *newmailcheck_rec_checkbtn;
        GtkWidget *offlinesync_rec_checkbtn;
+       GtkTooltips *tooltips;
 
+       tooltips = gtk_tooltips_new();
        page->item         = item;
 
        /* Table */
-       table = gtk_table_new(6, 2, FALSE);
+       table = gtk_table_new(9, 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);
        rowcount = 0;
 
+       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_table_attach(GTK_TABLE(table), no_save_warning, 0, 4,
+                        rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
+               rowcount++;
+       }
+       
        /* Apply to subfolders */
        label = gtk_label_new(_("Apply to\nsubfolders"));
        gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
-       gtk_table_attach(GTK_TABLE(table), label, 2, 3,
+       gtk_table_attach(GTK_TABLE(table), label, 3, 4,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        rowcount++;
 
+       /* folder_type */
+       folder_type = gtkut_sc_combobox_create(NULL, FALSE);
+       gtk_widget_show (folder_type);
+
+       type = F_NORMAL;
+       if (item->stype == F_INBOX)
+               type = F_INBOX;
+       else if (folder_has_parent_of_type(item, F_OUTBOX))
+               type = F_OUTBOX;
+       else if (folder_has_parent_of_type(item, F_DRAFT))
+               type = F_DRAFT;
+       else if (folder_has_parent_of_type(item, F_QUEUE))
+               type = F_QUEUE;
+       else if (folder_has_parent_of_type(item, F_TRASH))
+               type = F_TRASH;
+
+       folder_type_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(folder_type)));
+
+       COMBOBOX_ADD (folder_type_menu, _("Normal"),  F_NORMAL);
+       COMBOBOX_ADD (folder_type_menu, _("Inbox"),  F_INBOX);
+       COMBOBOX_ADD (folder_type_menu, _("Outbox"),  F_OUTBOX);
+       COMBOBOX_ADD (folder_type_menu, _("Drafts"),  F_DRAFT);
+       COMBOBOX_ADD (folder_type_menu, _("Queue"),  F_QUEUE);
+       COMBOBOX_ADD (folder_type_menu, _("Trash"),  F_TRASH);
+
+       combobox_select_by_data(GTK_COMBO_BOX(folder_type), type);
+
+       dummy_checkbtn = gtk_check_button_new();
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dummy_checkbtn), type != F_INBOX);
+       gtk_widget_set_sensitive(dummy_checkbtn, FALSE);
+
+       if (type == item->stype && type == F_NORMAL)
+               gtk_widget_set_sensitive(folder_type, TRUE);
+       else
+               gtk_widget_set_sensitive(folder_type, FALSE);
+
+       label = gtk_label_new(_("Folder type"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(table), label, 0, 1, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+       gtk_table_attach(GTK_TABLE(table), folder_type, 1, 2, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+       gtk_table_attach(GTK_TABLE(table), dummy_checkbtn, 3, 4, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+       rowcount++;
+
        /* Simplify Subject */
-       checkbtn_simplify_subject = gtk_check_button_new_with_label(_("Simplify Subject RegExp"));
+       checkbtn_simplify_subject = gtk_check_button_new_with_label(_("Simplify Subject RegExp"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_simplify_subject, 0, 1, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_simplify_subject), 
                                     item->prefs->enable_simplify_subject);
 
+       g_signal_connect(G_OBJECT(checkbtn_simplify_subject), "toggled",
+                       G_CALLBACK(folder_regexp_set_subject_example_cb), page);
+
        entry_simplify_subject = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), entry_simplify_subject, 1, 2
+       gtk_table_attach(GTK_TABLE(table), entry_simplify_subject, 1, 3
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_simplify_subject);
        gtk_entry_set_text(GTK_ENTRY(entry_simplify_subject), 
                           SAFE_STRING(item->prefs->simplify_subject_regexp));
 
+       g_signal_connect(G_OBJECT(entry_simplify_subject), "changed",
+                       G_CALLBACK(folder_regexp_test_cb), page);
+
        simplify_subject_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), simplify_subject_rec_checkbtn, 2, 3
+       gtk_table_attach(GTK_TABLE(table), simplify_subject_rec_checkbtn, 3, 4
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
 
+       /* Test RegExp */
+       label_regexp_test = gtk_label_new(_("Test RegExp"));
+       gtk_misc_set_alignment(GTK_MISC(label_regexp_test), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(table), label_regexp_test, 0, 1, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, label_regexp_test);
+
+       entry_regexp_test_string = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entry_regexp_test_string, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_regexp_test_string);
+
+       g_signal_connect(G_OBJECT(entry_regexp_test_string), "changed",
+                       G_CALLBACK(folder_regexp_test_cb), page);
+
+       hbox_regexp = gtk_hbox_new (FALSE, 4);
+       gtk_widget_show (hbox_regexp);
+       gtk_table_attach(GTK_TABLE(table), hbox_regexp, 2, 3, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
+       left_arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
+       gtk_widget_show(left_arrow);
+       gtk_box_pack_start (GTK_BOX(hbox_regexp), left_arrow, FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, left_arrow);
+
+       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);
+
+       rowcount++;
+
        /* Folder chmod */
-       checkbtn_folder_chmod = gtk_check_button_new_with_label(_("Folder chmod"));
+       checkbtn_folder_chmod = gtk_check_button_new_with_label(_("Folder chmod"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_folder_chmod, 0, 1, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
 
@@ -217,13 +381,13 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        }
        
        folder_chmod_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), folder_chmod_rec_checkbtn, 2, 3
+       gtk_table_attach(GTK_TABLE(table), folder_chmod_rec_checkbtn, 3, 4
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
        
        /* Folder color */
-       folder_color = gtk_label_new(_("Folder color"));
+       folder_color = gtk_label_new(_("Folder color"));
        gtk_misc_set_alignment(GTK_MISC(folder_color), 0, 0.5);
        gtk_table_attach(GTK_TABLE(table), folder_color, 0, 1, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
@@ -235,6 +399,8 @@ 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);
 
        page->folder_color = item->prefs->color;
 
@@ -245,13 +411,13 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        gtkut_set_widget_bgcolor_rgb(folder_color_btn, item->prefs->color);
 
        folder_color_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), folder_color_rec_checkbtn, 2, 3
+       gtk_table_attach(GTK_TABLE(table), folder_color_rec_checkbtn, 3, 4
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
 
        /* Enable processing at startup */
-       checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process at startup"));
+       checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process 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);
 
@@ -259,20 +425,24 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                                     item->prefs->enable_processing);
 
        enable_processing_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), enable_processing_rec_checkbtn, 2, 3
+       gtk_table_attach(GTK_TABLE(table), enable_processing_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,
+                            _("Turn this option on if mail is delivered directly "
+                              "to this folder by server side filtering on IMAP or "
+                              "by an external application"), NULL);
        gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_newmailcheck),
                                                                 item->prefs->newmailcheck);
        newmailcheck_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), newmailcheck_rec_checkbtn, 2, 3
+       gtk_table_attach(GTK_TABLE(table), newmailcheck_rec_checkbtn, 3, 4
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
@@ -283,33 +453,95 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        
        offlinesync_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), offlinesync_rec_checkbtn, 2, 3
+       gtk_table_attach(GTK_TABLE(table), offlinesync_rec_checkbtn, 3, 4
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
+       rowcount++;
+
+       hbox = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox);
+       gtk_table_attach(GTK_TABLE(table), hbox, 0, 4,
+                        rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+       rowcount++;
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+
+       label_offlinesync = gtk_label_new(_("Fetch message bodies from the last"));
+       gtk_widget_show (label_offlinesync);
+       gtk_box_pack_start (GTK_BOX (hbox), label_offlinesync, FALSE, FALSE, 0);
+
+       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);
+       gtk_box_pack_start (GTK_BOX (hbox), entry_offlinesync, FALSE, FALSE, 0);
+
+       label_end_offlinesync = gtk_label_new(_("days"));
+       gtk_widget_show (label_end_offlinesync);
+       gtk_box_pack_start (GTK_BOX (hbox), label_end_offlinesync, FALSE, FALSE, 0);
+
+       checkbtn_remove_old_offlinesync = gtk_check_button_new_with_label(
+                                               _("Remove older messages bodies"));
+
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_table_attach(GTK_TABLE(table), hbox2, 0, 4,
+                        rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+       rowcount++;
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox2), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox2), checkbtn_remove_old_offlinesync, FALSE, FALSE, 0);
+
+       SET_TOGGLE_SENSITIVITY (checkbtn_offlinesync, hbox);
+       SET_TOGGLE_SENSITIVITY (checkbtn_offlinesync, hbox2);
+       
+       gtk_widget_show_all(table);
+
        if (item->folder && (item->folder->klass->type != F_IMAP && 
            item->folder->klass->type != F_NEWS)) {
-                item->prefs->offlinesync = TRUE;
+               item->prefs->offlinesync = TRUE;
+               item->prefs->offlinesync_days = 0;
+               item->prefs->remove_old_bodies = FALSE;
+
                gtk_widget_set_sensitive(GTK_WIDGET(checkbtn_offlinesync),
                                                                 FALSE);
                gtk_widget_set_sensitive(GTK_WIDGET(offlinesync_rec_checkbtn),
                                                                 FALSE);
+               gtk_widget_hide(GTK_WIDGET(checkbtn_offlinesync));
+               gtk_widget_hide(GTK_WIDGET(hbox));
+               gtk_widget_hide(GTK_WIDGET(hbox2));
+               gtk_widget_hide(GTK_WIDGET(offlinesync_rec_checkbtn));
        
        }
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_offlinesync),
                                                                 item->prefs->offlinesync);
-       rowcount++;
-
-       gtk_widget_show_all(table);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_remove_old_offlinesync),
+                                                                item->prefs->remove_old_bodies);
+       gtk_entry_set_text(GTK_ENTRY(entry_offlinesync), itos(item->prefs->offlinesync_days));
 
        page->table = table;
+       page->folder_type = folder_type;
+       page->no_save_warning = no_save_warning;
        page->checkbtn_simplify_subject = checkbtn_simplify_subject;
        page->entry_simplify_subject = entry_simplify_subject;
+       page->entry_regexp_test_string = entry_regexp_test_string;
+       page->entry_regexp_test_result = entry_regexp_test_result;
        page->checkbtn_folder_chmod = checkbtn_folder_chmod;
        page->entry_folder_chmod = entry_folder_chmod;
        page->folder_color_btn = folder_color_btn;
        page->checkbtn_enable_processing = checkbtn_enable_processing;
        page->checkbtn_newmailcheck = checkbtn_newmailcheck;
        page->checkbtn_offlinesync = checkbtn_offlinesync;
+       page->label_offlinesync = label_offlinesync;
+       page->entry_offlinesync = entry_offlinesync;
+       page->label_end_offlinesync = label_end_offlinesync;
+       page->checkbtn_remove_old_offlinesync = checkbtn_remove_old_offlinesync;
 
        page->simplify_subject_rec_checkbtn  = simplify_subject_rec_checkbtn;
        page->folder_chmod_rec_checkbtn      = folder_chmod_rec_checkbtn;
@@ -319,9 +551,11 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->offlinesync_rec_checkbtn       = offlinesync_rec_checkbtn;
 
        page->page.widget = table;
+
+       folder_regexp_set_subject_example_cb(NULL, page);
 }
 
-void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_) 
+static void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_) 
 {
        /* FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_; */
 }
@@ -329,19 +563,28 @@ void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_)
 /** \brief  Save the prefs in page to folder.
  *
  *  If the folder is not the one  specified in page->item, then only those properties 
- *  that have the relevant 'appy to sub folders' button checked are saved
+ *  that have the relevant 'apply to sub folders' button checked are saved
  */
 static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
 {
        FolderItemPrefs *prefs = folder->prefs;
        gchar *buf;
        gboolean all = FALSE;
+       SpecialFolderItemType type = F_NORMAL;
+
+       if (folder->path == NULL)
+               return;
 
        g_return_if_fail(prefs != NULL);
 
        if (page->item == folder) 
                all = TRUE;
 
+       type = combobox_get_active_data(GTK_COMBO_BOX(page->folder_type));
+       if (all && folder->stype != type) {
+               folder_item_change_type(folder, type);
+       }
+
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn))) {
                prefs->enable_simplify_subject =
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_simplify_subject));
@@ -379,6 +622,10 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
        if (all ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn))) {
                prefs->offlinesync = 
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_offlinesync));
+               prefs->offlinesync_days = 
+                       atoi(gtk_entry_get_text(GTK_ENTRY(page->entry_offlinesync)));
+               prefs->remove_old_bodies =
+                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_remove_old_offlinesync));
        }
 
        folder_item_prefs_save_config(folder);
@@ -409,16 +656,29 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
                return FALSE;
 }
 
-void prefs_folder_item_general_save_func(PrefsPage *page_) 
+static void prefs_folder_item_general_save_func(PrefsPage *page_) 
 {
        FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_;
 
        g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
                        -1, general_save_recurse_func, page);
+       
+       main_window_set_menu_sensitive(mainwindow_get_mainwindow());
 
 }
 
-void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
+static RecvProtocol item_protocol(FolderItem *item)
+{
+       if (!item)
+               return A_NONE;
+       if (!item->folder)
+               return A_NONE;
+       if (!item->folder->account)
+               return A_NONE;
+       return item->folder->account->protocol;
+}
+
+static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                                                   GtkWindow * window,
                                                   gpointer data)
 {
@@ -429,53 +689,67 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkWidget *table;
        GtkWidget *label;
        
-       GtkWidget *checkbtn_request_return_receipt;
-       GtkWidget *checkbtn_save_copy_to_folder;
-       GtkWidget *checkbtn_default_to;
-       GtkWidget *entry_default_to;
-       GtkWidget *checkbtn_default_reply_to;
-       GtkWidget *entry_default_reply_to;
-       GtkWidget *checkbtn_enable_default_account;
-       GtkWidget *optmenu_default_account;
-       GtkWidget *optmenu_default_account_menu;
-       GtkWidget *optmenu_default_account_menuitem;
+       GtkWidget *no_save_warning = NULL;
+       GtkWidget *checkbtn_request_return_receipt = NULL;
+       GtkWidget *checkbtn_save_copy_to_folder = NULL;
+       GtkWidget *checkbtn_default_to = NULL;
+       GtkWidget *entry_default_to = NULL;
+       GtkWidget *checkbtn_default_reply_to = NULL;
+       GtkWidget *entry_default_reply_to = NULL;
+       GtkWidget *checkbtn_enable_default_account = NULL;
+       GtkWidget *optmenu_default_account = NULL;
+       GtkListStore *optmenu_default_account_menu = NULL;
+       GtkTreeIter iter;
 #if USE_ASPELL
-       GtkWidget *checkbtn_enable_default_dictionary;
-       GtkWidget *optmenu_default_dictionary;
-#endif
-       GtkWidget *request_return_receipt_rec_checkbtn;
-       GtkWidget *save_copy_to_folder_rec_checkbtn;
-       GtkWidget *default_to_rec_checkbtn;
-       GtkWidget *default_reply_to_rec_checkbtn;
-       GtkWidget *default_account_rec_checkbtn;
-#if USE_ASPELL
-       GtkWidget *default_dictionary_rec_checkbtn;
+       GtkWidget *checkbtn_enable_default_dictionary = NULL;
+       GtkWidget *optmenu_default_dictionary = NULL;
+       GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
+       GtkWidget *optmenu_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;
+       GtkWidget *default_to_rec_checkbtn = NULL;
+       GtkWidget *default_reply_to_rec_checkbtn = NULL;
+       GtkWidget *default_account_rec_checkbtn = NULL;
 
        GList *cur_ac;
        GList *account_list;
-#if USE_ASPELL
-       gchar *dictionary;
-#endif
        PrefsAccount *ac_prefs;
-       GtkOptionMenu *optmenu;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-       gint account_index, index;
+       gboolean default_account_set = FALSE;
 
        page->item         = item;
 
        /* Table */
 #if USE_ASPELL
-# define TABLEHEIGHT 6
+# define TABLEHEIGHT 7
 #else
-# define TABLEHEIGHT 5
+# define TABLEHEIGHT 6
 #endif
-       table = gtk_table_new(TABLEHEIGHT, 2, FALSE);
+       table = gtk_table_new(TABLEHEIGHT, 3, 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);
        rowcount = 0;
 
+       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_table_attach(GTK_TABLE(table), no_save_warning, 0, 3,
+                        rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
+               rowcount++;
+       }
+       
        /* Apply to subfolders */
        label = gtk_label_new(_("Apply to\nsubfolders"));
        gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
@@ -483,121 +757,131 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        rowcount++;
 
-       /* Request Return Receipt */
-       checkbtn_request_return_receipt = gtk_check_button_new_with_label
-               (_("Request Return Receipt"));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_request_return_receipt, 
-                        0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, 
-                        GTK_FILL, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt),
-                                    item->ret_rcpt ? TRUE : FALSE);
-
-       request_return_receipt_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), request_return_receipt_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
-       /* Save Copy to Folder */
-       checkbtn_save_copy_to_folder = gtk_check_button_new_with_label
-               (_("Save copy of outgoing messages to this folder instead of Sent"));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_save_copy_to_folder, 0, 2, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_save_copy_to_folder),
-                                    item->prefs->save_copy_to_folder ? TRUE : FALSE);
-
-       save_copy_to_folder_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), save_copy_to_folder_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
-       /* Default To */
-       checkbtn_default_to = gtk_check_button_new_with_label(_("Default To: "));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), 
-                                    item->prefs->enable_default_to);
-
-       entry_default_to = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
-                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-       SET_TOGGLE_SENSITIVITY(checkbtn_default_to, entry_default_to);
-       gtk_entry_set_text(GTK_ENTRY(entry_default_to), SAFE_STRING(item->prefs->default_to));
-       address_completion_register_entry(GTK_ENTRY(entry_default_to));
-
-       default_to_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), default_to_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
-       /* Default address to reply to */
-       checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Send replies to: "));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to), 
-                                    item->prefs->enable_default_reply_to);
-
-       entry_default_reply_to = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
-                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-       SET_TOGGLE_SENSITIVITY(checkbtn_default_reply_to, entry_default_reply_to);
-       gtk_entry_set_text(GTK_ENTRY(entry_default_reply_to), SAFE_STRING(item->prefs->default_reply_to));
-       address_completion_register_entry(GTK_ENTRY(entry_default_reply_to));
-
-       default_reply_to_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), default_reply_to_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
+       if (item_protocol(item) != A_NNTP) {
+               /* Request Return Receipt */
+               checkbtn_request_return_receipt = gtk_check_button_new_with_label
+                       (_("Request Return Receipt"));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_request_return_receipt, 
+                                0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, 
+                                GTK_FILL, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt),
+                                            item->ret_rcpt ? TRUE : FALSE);
+
+               request_return_receipt_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), request_return_receipt_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Save Copy to Folder */
+               checkbtn_save_copy_to_folder = gtk_check_button_new_with_label
+                       (_("Save copy of outgoing messages to this folder instead of Sent"));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_save_copy_to_folder, 0, 2, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_save_copy_to_folder),
+                                            item->prefs->save_copy_to_folder ? TRUE : FALSE);
+
+               save_copy_to_folder_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), save_copy_to_folder_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Default To */
+               checkbtn_default_to = gtk_check_button_new_with_label(_("Default To:"));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), 
+                                            item->prefs->enable_default_to);
+
+               entry_default_to = gtk_entry_new();
+               gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
+                                rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+               SET_TOGGLE_SENSITIVITY(checkbtn_default_to, entry_default_to);
+               gtk_entry_set_text(GTK_ENTRY(entry_default_to), SAFE_STRING(item->prefs->default_to));
+               address_completion_register_entry(GTK_ENTRY(entry_default_to),
+                               TRUE);
+
+               default_to_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), default_to_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Default address to reply to */
+               checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To: for replies"));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to), 
+                                            item->prefs->enable_default_reply_to);
+
+               entry_default_reply_to = gtk_entry_new();
+               gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
+                                rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+               SET_TOGGLE_SENSITIVITY(checkbtn_default_reply_to, entry_default_reply_to);
+               gtk_entry_set_text(GTK_ENTRY(entry_default_reply_to), SAFE_STRING(item->prefs->default_reply_to));
+               address_completion_register_entry(
+                               GTK_ENTRY(entry_default_reply_to), TRUE);
+
+               default_reply_to_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), default_reply_to_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+       }
        /* Default account */
-       checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account"));
+       checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_account, 0, 1, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_account), 
                                     item->prefs->enable_default_account);
 
-       optmenu_default_account = gtk_option_menu_new ();
+       optmenu_default_account = gtkut_sc_combobox_create(NULL, FALSE);
        gtk_table_attach(GTK_TABLE(table), optmenu_default_account, 1, 2, 
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-       optmenu_default_account_menu = gtk_menu_new ();
+       optmenu_default_account_menu = GTK_LIST_STORE(
+                       gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_default_account)));
 
        account_list = account_get_list();
-       account_index = 0;
-       index = 0;
        for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
                ac_prefs = (PrefsAccount *)cur_ac->data;
-               MENUITEM_ADD (optmenu_default_account_menu, optmenu_default_account_menuitem,
+               if (item->folder->account &&
+                   ( (item_protocol(item) == A_NNTP && ac_prefs->protocol != A_NNTP)
+                   ||(item_protocol(item) != A_NNTP && ac_prefs->protocol == A_NNTP))) 
+                       continue;
+
+               if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
+                       continue;
+
+               COMBOBOX_ADD (optmenu_default_account_menu,
                                        ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
                                        ac_prefs->account_id);
-               /* get the index for menu's set_history (sad method?) */
-               if (ac_prefs->account_id == item->prefs->default_account)
-                       account_index = index;
-               index++;                        
-       }
-
-       optmenu = GTK_OPTION_MENU(optmenu_default_account);
-       gtk_option_menu_set_menu(optmenu, optmenu_default_account_menu);
 
-       gtk_option_menu_set_history(optmenu, account_index);
+               /* Set combobox to current default account id */
+               if (ac_prefs->account_id == item->prefs->default_account) {
+                       combobox_select_by_data(GTK_COMBO_BOX(optmenu_default_account),
+                                       ac_prefs->account_id);
+                       default_account_set = TRUE;
+               }
+       }
 
-       menu = gtk_option_menu_get_menu(optmenu);
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+       /* If nothing has been set (folder doesn't have a default account set),
+        * pre-select global default account, since that's what actually used
+        * anyway. We don't want nothing selected in combobox. */
+       if( !default_account_set )
+               combobox_select_by_data(GTK_COMBO_BOX(optmenu_default_account),
+                               account_get_default()->account_id);
 
        SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_account, optmenu_default_account);
 
        default_account_rec_checkbtn = gtk_check_button_new();
        gtk_table_attach(GTK_TABLE(table), default_account_rec_checkbtn, 2, 3, 
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
        rowcount++;
 
 #if USE_ASPELL
        /* Default dictionary */
-       checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("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,
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
@@ -628,12 +912,46 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        
        rowcount++;
+
+       /* Default dictionary */
+       checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
+       gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_alt_dictionary, 0, 1,
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+       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,
+                        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));
+
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, optmenu_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, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+       
+       rowcount++;
 #endif
 
        gtk_widget_show_all(table);
 
        page->window = GTK_WIDGET(window);
        page->table = table;
+       page->no_save_warning = no_save_warning;
        page->checkbtn_request_return_receipt = checkbtn_request_return_receipt;
        page->checkbtn_save_copy_to_folder = checkbtn_save_copy_to_folder;
        page->checkbtn_default_to = checkbtn_default_to;
@@ -645,6 +963,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 #ifdef USE_ASPELL
        page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
        page->optmenu_default_dictionary = optmenu_default_dictionary;
+       page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
+       page->optmenu_default_alt_dictionary = optmenu_default_alt_dictionary;
 #endif
 
        page->request_return_receipt_rec_checkbtn = request_return_receipt_rec_checkbtn;
@@ -654,6 +974,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->default_account_rec_checkbtn        = default_account_rec_checkbtn;
 #if USE_ASPELL
        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);
@@ -661,65 +982,79 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->page.widget = table;
 }
 
-void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_) 
+static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_) 
 {
        FolderItemComposePage *page = (FolderItemComposePage *) page_;
 
-       address_completion_unregister_entry(GTK_ENTRY(page->entry_default_to));
-       address_completion_unregister_entry(GTK_ENTRY(page->entry_default_reply_to));
+       if (page->entry_default_to)
+               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.
  *
  *  If the folder is not the one  specified in page->item, then only those properties 
- *  that have the relevant 'appy to sub folders' button checked are saved
+ *  that have the relevant 'apply to sub folders' button checked are saved
  */
 static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
 {
        FolderItemPrefs *prefs = folder->prefs;
+#if USE_ASPELL
        GtkWidget *menu;
-       GtkWidget *menuitem;
+#endif
        gboolean all = FALSE;
 
+       if (folder->path == NULL)
+               return;
+
        if (page->item == folder) 
                all = TRUE;
 
        g_return_if_fail(prefs != NULL);
 
-       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
-               prefs->request_return_receipt = 
-                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_request_return_receipt));
-               /* MIGRATION */    
-               folder->ret_rcpt = prefs->request_return_receipt;
+       if (item_protocol(folder) != A_NNTP) {
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
+                       prefs->request_return_receipt = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_request_return_receipt));
+                       /* MIGRATION */    
+                       folder->ret_rcpt = prefs->request_return_receipt;
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn))) {
+                       prefs->save_copy_to_folder = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_save_copy_to_folder));
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn))) {
+
+                       prefs->enable_default_to = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_to));
+                       ASSIGN_STRING(prefs->default_to,
+                                     gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_to), 0, -1));
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))) {
+                       prefs->enable_default_reply_to = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_reply_to));
+                       ASSIGN_STRING(prefs->default_reply_to,
+                                     gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_reply_to), 0, -1));
+               }
+       } else {
+               prefs->request_return_receipt = FALSE;
+               prefs->save_copy_to_folder = FALSE;
+               prefs->enable_default_to = FALSE;
+               prefs->enable_default_reply_to = FALSE;
        }
 
-       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn))) {
-               prefs->save_copy_to_folder = 
-                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_save_copy_to_folder));
-       }
-
-       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn))) {
-
-               prefs->enable_default_to = 
-                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_to));
-               ASSIGN_STRING(prefs->default_to,
-                             gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_to), 0, -1));
-       }
-
-       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))) {
-               prefs->enable_default_reply_to = 
-                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_reply_to));
-               ASSIGN_STRING(prefs->default_reply_to,
-                             gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_reply_to), 0, -1));
-       }
-
-       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))) {
+       if (all || gtk_toggle_button_get_active(
+                               GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))) {
                prefs->enable_default_account = 
-                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_account));
-               menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_account));
-               menuitem = gtk_menu_get_active(GTK_MENU(menu));
-               prefs->default_account = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+                       gtk_toggle_button_get_active(
+                                       GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_account));
+               prefs->default_account = combobox_get_active_data(
+                               GTK_COMBO_BOX(page->optmenu_default_account));
        }
 
 #if USE_ASPELL
@@ -730,6 +1065,13 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
                ASSIGN_STRING(prefs->default_dictionary,
                              gtkaspell_get_dictionary_menu_active_item(menu));
        }
+       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));
+       }
 #endif
 
        folder_item_prefs_save_config(folder);
@@ -748,14 +1090,22 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
        /* optimise by not continuing if none of the 'apply to sub folders'
           check boxes are selected - and optimise the checking by only doing
           it once */
-       if ((node == page->item->node) &&
+       if ((node == page->item->node) && item_protocol(item) != A_NNTP &&
            !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn)) ||
              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_reply_to_rec_checkbtn)) ||
-             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) 
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) ||
+#if USE_ASPELL
+             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
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))))
+               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
              || 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
                    ))
                return TRUE;
@@ -763,7 +1113,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
                return FALSE;
 }
 
-void prefs_folder_item_compose_save_func(PrefsPage *page_) 
+static void prefs_folder_item_compose_save_func(PrefsPage *page_) 
 {
        FolderItemComposePage *page = (FolderItemComposePage *) page_;
 
@@ -772,7 +1122,221 @@ void prefs_folder_item_compose_save_func(PrefsPage *page_)
 
 }
 
-gint prefs_folder_item_chmod_mode(gchar *folder_chmod) 
+static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
+                                                  GtkWindow * window,
+                                                  gpointer data)
+{
+       FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_;
+       FolderItem *item = (FolderItem *) data;
+
+       GtkWidget *notebook;
+       GtkWidget *vbox;
+       GtkWidget *page_vbox;
+       GtkWidget *new_msg_format_rec_checkbtn;
+       GtkWidget *reply_format_rec_checkbtn;
+       GtkWidget *forward_format_rec_checkbtn;
+
+       page->item = item;
+
+       page_vbox = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (page_vbox);
+       
+       /* 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 */
+       vbox = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
+
+       quotefmt_create_new_msg_fmt_widgets(
+                               window,
+                               vbox,
+                               &page->checkbtn_compose_with_format,
+                               _("Use a specific format for new messages"),
+                               &page->compose_subject_format,
+                               &page->compose_body_format,
+                               FALSE);
+
+       new_msg_format_rec_checkbtn = gtk_check_button_new_with_label(
+                       _("Apply to subfolders"));
+       gtk_box_pack_end (GTK_BOX(vbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Compose")));
+
+       /* reply format */
+       vbox = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
+
+       quotefmt_create_reply_fmt_widgets(
+                               window,
+                               vbox,
+                               &page->checkbtn_reply_with_format,
+                               _("Use a specific reply quote format"),
+                               &page->reply_quotemark,
+                               &page->reply_body_format,
+                               FALSE);
+
+       reply_format_rec_checkbtn = gtk_check_button_new_with_label(
+                       _("Apply to subfolders"));
+       gtk_box_pack_end (GTK_BOX(vbox), reply_format_rec_checkbtn, FALSE, FALSE, 0);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Reply")));
+
+       /* forward format */
+       vbox = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
+
+       quotefmt_create_forward_fmt_widgets(
+                               window,
+                               vbox,
+                               &page->checkbtn_forward_with_format,
+                               _("Use a specific forward quote format"),
+                               &page->forward_quotemark,
+                               &page->forward_body_format,
+                               FALSE);
+
+       forward_format_rec_checkbtn = gtk_check_button_new_with_label(
+                       _("Apply to subfolders"));
+       gtk_box_pack_end (GTK_BOX(vbox), forward_format_rec_checkbtn, FALSE, FALSE, 0);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Forward")));
+
+       /* information button */
+       quotefmt_add_info_button(window, page_vbox);
+
+       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_subject_format),
+                       item->prefs->compose_subject_format);
+       pref_set_textview_from_pref(GTK_TEXT_VIEW(page->compose_body_format),
+                       item->prefs->compose_body_format);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->checkbtn_reply_with_format),
+                       item->prefs->reply_with_format);
+       pref_set_entry_from_pref(GTK_ENTRY(page->reply_quotemark),
+                       item->prefs->reply_quotemark);
+       pref_set_textview_from_pref(GTK_TEXT_VIEW(page->reply_body_format),
+                       item->prefs->reply_body_format);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->checkbtn_forward_with_format),
+                       item->prefs->forward_with_format);
+       pref_set_entry_from_pref(GTK_ENTRY(page->forward_quotemark),
+                       item->prefs->forward_quotemark);
+       pref_set_textview_from_pref(GTK_TEXT_VIEW(page->forward_body_format),
+                       item->prefs->forward_body_format);
+
+       gtk_widget_show_all(page_vbox);
+
+       page->window = GTK_WIDGET(window);
+
+       page->new_msg_format_rec_checkbtn = new_msg_format_rec_checkbtn;
+       page->reply_format_rec_checkbtn = reply_format_rec_checkbtn;
+       page->forward_format_rec_checkbtn = forward_format_rec_checkbtn;
+
+       page->page.widget = page_vbox;
+}
+
+static void prefs_folder_item_templates_destroy_widget_func(PrefsPage *page_) 
+{
+       /* FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_; */
+}
+
+/** \brief  Save the prefs in page to folder.
+ *
+ *  If the folder is not the one  specified in page->item, then only those properties 
+ *  that have the relevant 'apply to sub folders' button checked are saved
+ */
+static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesPage *page)
+{
+       FolderItemPrefs *prefs = folder->prefs;
+       gboolean all = FALSE;
+
+       if (folder->path == NULL)
+               return;
+
+       if (page->item == folder) 
+               all = TRUE;
+
+       g_return_if_fail(prefs != NULL);
+
+       /* 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_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);
+       }
+
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->reply_format_rec_checkbtn))) {
+               prefs->reply_with_format =
+                       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_body_format = pref_get_pref_from_textview(
+                               GTK_TEXT_VIEW(page->reply_body_format));
+               quotefmt_check_reply_formats(prefs->reply_with_format,
+                                                                               prefs->reply_quotemark,
+                                                                               prefs->reply_body_format);
+       }
+
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->forward_format_rec_checkbtn))) {
+               prefs->forward_with_format =
+                       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_body_format = pref_get_pref_from_textview(
+                               GTK_TEXT_VIEW(page->forward_body_format));
+               quotefmt_check_forward_formats(prefs->forward_with_format,
+                                                                               prefs->forward_quotemark,
+                                                                               prefs->forward_body_format);
+       }
+
+       folder_item_prefs_save_config(folder);
+}      
+
+static gboolean templates_save_recurse_func(GNode *node, gpointer data)
+{
+       FolderItem *item = (FolderItem *) node->data;
+       FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) data;
+
+       g_return_val_if_fail(item != NULL, TRUE);
+       g_return_val_if_fail(page != NULL, TRUE);
+
+       templates_save_folder_prefs(item, page);
+
+       /* optimise by not continuing if none of the 'apply to sub folders'
+          check boxes are selected - and optimise the checking by only doing
+          it once */
+       if ((node == page->item->node) &&
+           !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->new_msg_format_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->reply_format_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->forward_format_rec_checkbtn))))
+               return TRUE;
+       else 
+               return FALSE;
+
+       return FALSE;
+}
+
+static void prefs_folder_item_templates_save_func(PrefsPage *page_) 
+{
+       FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_;
+
+       g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+                       -1, templates_save_recurse_func, page);
+
+}
+
+static gint prefs_folder_item_chmod_mode(gchar *folder_chmod) 
 {
        gint newmode = 0;
        gchar *tmp;
@@ -797,6 +1361,102 @@ static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
        page->folder_color = rgbcolor;
 }
 
+static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
+{
+       int err;
+       gchar buf[BUFFSIZE];
+       regex_t *preg = NULL;
+
+       preg = g_new0(regex_t, 1);
+
+       err = string_match_precompile(simplify_subject_regexp, 
+                                     preg, REG_EXTENDED);
+       if (err) {
+               regerror(err, preg, buf, BUFFSIZE);
+               g_free(preg);
+               preg = NULL;
+       }
+
+       return preg;
+}
+
+static void folder_regexp_test_cb(GtkWidget *widget, gpointer data)
+{
+       static GdkColor red;
+       static gboolean colors_initialised = FALSE;
+       static gchar buf[BUFFSIZE];
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *)data;
+       gchar *test_string, *regexp;
+       regex_t *preg;
+
+       regexp = g_strdup(gtk_entry_get_text(GTK_ENTRY(page->entry_simplify_subject)));
+       test_string = g_strdup(gtk_entry_get_text(GTK_ENTRY(page->entry_regexp_test_string)));
+
+       if (!regexp || !regexp[0]) {
+               gtk_widget_modify_base(page->entry_simplify_subject,
+                               GTK_STATE_NORMAL, NULL);
+               if (test_string) {
+                       gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_result), test_string);
+                       g_free(test_string);
+               }
+               return;
+       }
+
+       if (!test_string || !test_string[0]) {
+               g_free(regexp);
+               return;
+       }
+
+       if (!colors_initialised) {
+               gdk_color_parse("#ff7070", &red);
+               colors_initialised = gdk_colormap_alloc_color(
+                       gdk_colormap_get_system(), &red, FALSE, TRUE);
+       }
+
+       preg = summary_compile_simplify_regexp(regexp);
+       if (colors_initialised) {
+               gtk_widget_modify_base(page->entry_simplify_subject,
+                               GTK_STATE_NORMAL, preg ? NULL : &red);
+       }
+
+       if (preg != NULL) {
+               string_remove_match(buf, BUFFSIZE, test_string, preg);
+
+               gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_result), buf);
+
+               regfree(preg);
+               g_free(preg);
+       }
+
+       g_free(test_string);
+       g_free(regexp);
+}
+
+static gchar *folder_regexp_get_subject_example(void)
+{
+       MsgInfo *msginfo_selected;
+       SummaryView *summaryview = NULL;
+
+       if (!mainwindow_get_mainwindow())
+               return NULL;
+       summaryview = mainwindow_get_mainwindow()->summaryview;
+
+       msginfo_selected = summary_get_selected_msg(summaryview);
+       return msginfo_selected ? g_strdup(msginfo_selected->subject) : NULL;
+}
+
+static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer data)
+{
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *)data;
+
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_simplify_subject))) {
+               gchar *subject = folder_regexp_get_subject_example();
+               if (subject) {
+                       gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_string), subject);
+                       g_free(subject);
+               }
+       }
+}
 
 static void register_general_page()
 {
@@ -831,21 +1491,45 @@ static void register_compose_page(void)
        prefs_folder_item_register_page((PrefsPage *) &folder_item_compose_page);
 }
 
+static void register_templates_page(void)
+{
+       static gchar *pfi_templates_path[2];
+       static FolderItemTemplatesPage folder_item_templates_page;
+
+       pfi_templates_path[0] = _("Templates");
+       pfi_templates_path[1] = NULL;
+
+        folder_item_templates_page.page.path = pfi_templates_path;
+        folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func;
+        folder_item_templates_page.page.destroy_widget = prefs_folder_item_templates_destroy_widget_func;
+        folder_item_templates_page.page.save_page = prefs_folder_item_templates_save_func;
+        
+       prefs_folder_item_register_page((PrefsPage *) &folder_item_templates_page);
+}
+
 static GSList *prefs_pages = NULL;
 
 void prefs_folder_item_open(FolderItem *item)
 {
        gchar *id, *title;
-
        if (prefs_pages == NULL) {
                register_general_page();
                register_compose_page();
+               register_templates_page();
        }
 
-       id = folder_item_get_identifier (item);
+       if (item->path) {
+               id = folder_item_get_identifier (item);
+               can_save = TRUE;
+       } else {
+               id = g_strdup(item->name);
+               can_save = FALSE;
+       }
        title = g_strdup_printf (_("Properties for folder %s"), id);
        g_free (id);
-       prefswindow_open(title, prefs_pages, item);
+       prefswindow_open(title, prefs_pages, item,
+                       &prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height);
+       
        g_free (title);
 }