2004-10-26 [colin] 0.9.12cvs132.2
[claws.git] / src / prefs_folder_item.c
index f90f48ef2010b460fe473ca97d507fe87cc61f82..c45acb312921538a95b68f923da127e5da7853e6 100644 (file)
 #include "summaryview.h"
 #include "menu.h"
 #include "account.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "manage_window.h"
 #include "utils.h"
 #include "addr_compl.h"
-#include "prefs_scoring.h"
+#include "prefs_common.h"
 #include "gtkutils.h"
 #include "filtering.h"
+#include "folder_item_prefs.h"
+#include "gtk/colorsel.h"
 
-PrefsFolderItem tmp_prefs;
+#if USE_ASPELL
+#include "gtkaspell.h"
+#endif
+
+#define ASSIGN_STRING(string, value) \
+       { \
+               g_free(string); \
+               string = (value); \
+       }
+
+typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
+typedef struct _FolderItemComposePage FolderItemComposePage;
 
-struct PrefsFolderItemDialog
+struct _FolderItemGeneralPage
 {
-       FolderView *folderview;
+       PrefsPage page;
+
        FolderItem *item;
+
+       GtkWidget *table;
+       GtkWidget *checkbtn_simplify_subject;
+       GtkWidget *entry_simplify_subject;
+       GtkWidget *checkbtn_folder_chmod;
+       GtkWidget *entry_folder_chmod;
+       GtkWidget *folder_color_btn;
+       GtkWidget *checkbtn_enable_processing;
+       GtkWidget *checkbtn_newmailcheck;
+
+       /* appy to sub folders */
+       GtkWidget *simplify_subject_rec_checkbtn;
+       GtkWidget *folder_chmod_rec_checkbtn;
+       GtkWidget *folder_color_rec_checkbtn;
+       GtkWidget *enable_processing_rec_checkbtn;
+       GtkWidget *newmailcheck_rec_checkbtn;
+
+       gint       folder_color;
+};
+
+struct _FolderItemComposePage
+{
+       PrefsPage page;
+
+       FolderItem *item;
+
        GtkWidget *window;
+       GtkWidget *table;
        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_simplify_subject;
-       GtkWidget *entry_simplify_subject;
-       GtkWidget *checkbtn_folder_chmod;
-       GtkWidget *entry_folder_chmod;
        GtkWidget *checkbtn_enable_default_account;
        GtkWidget *optmenu_default_account;
-       GtkWidget *folder_color;
-       GtkWidget *folder_color_btn;
-};
+#if USE_ASPELL
+       GtkWidget *checkbtn_enable_default_dictionary;
+       GtkWidget *optmenu_default_dictionary;
+#endif
+
+       /* apply to sub folders */
+       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;
+#endif
 
-static GtkWidget *color_dialog;
-
-static PrefParam param[] = {
-       {"sort_by_number", "FALSE", &tmp_prefs.sort_by_number, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_size", "FALSE", &tmp_prefs.sort_by_size, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_date", "FALSE", &tmp_prefs.sort_by_date, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_from", "FALSE", &tmp_prefs.sort_by_from, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_subject", "FALSE", &tmp_prefs.sort_by_subject, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_score", "FALSE", &tmp_prefs.sort_by_score, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_descending", "FALSE", &tmp_prefs.sort_descending, P_BOOL,
-        NULL, NULL, NULL},
-       /*{"enable_thread", "TRUE", &tmp_prefs.enable_thread, P_BOOL,
-        NULL, NULL, NULL},*/
-       {"hide_score", "-9999", &tmp_prefs.kill_score, P_INT,
-        NULL, NULL, NULL},
-       {"important_score", "1", &tmp_prefs.important_score, P_INT,
-        NULL, NULL, NULL},
-       /* MIGRATION */  
-       {"request_return_receipt", "", &tmp_prefs.request_return_receipt, P_BOOL,
-        NULL, NULL, NULL},
-       {"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
-        NULL, NULL, NULL},
-       {"default_to", "", &tmp_prefs.default_to, P_STRING,
-        NULL, NULL, NULL},
-       {"enable_default_reply_to", "", &tmp_prefs.enable_default_reply_to, P_BOOL,
-        NULL, NULL, NULL},
-       {"default_reply_to", "", &tmp_prefs.default_reply_to, P_STRING,
-        NULL, NULL, NULL},
-       {"enable_simplify_subject", "", &tmp_prefs.enable_simplify_subject, P_BOOL,
-        NULL, NULL, NULL},
-       {"simplify_subject_regexp", "", &tmp_prefs.simplify_subject_regexp, P_STRING,
-        NULL, NULL, NULL},
-       {"enable_folder_chmod", "", &tmp_prefs.enable_folder_chmod, P_BOOL,
-        NULL, NULL, NULL},
-       {"folder_chmod", "", &tmp_prefs.folder_chmod, P_INT,
-        NULL, NULL, NULL},
-       {"enable_default_account", "", &tmp_prefs.enable_default_account, P_BOOL,
-        NULL, NULL, NULL},
-       {"default_account", NULL, &tmp_prefs.default_account, P_INT,
-        NULL, NULL, NULL},
-       {"save_copy_to_folder", NULL, &tmp_prefs.save_copy_to_folder, P_BOOL,
-        NULL, NULL, NULL},
-       {"folder_color", "", &tmp_prefs.color, P_INT,
-        NULL, NULL, NULL},
-       {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
-void prefs_folder_item_delete_cb               (GtkWidget *widget, GdkEventAny *event, 
-                                                struct PrefsFolderItemDialog *dialog);
-void prefs_folder_item_cancel_cb               (GtkWidget *widget, 
-                                                struct PrefsFolderItemDialog *dialog);
-void prefs_folder_item_ok_cb                   (GtkWidget *widget, 
-                                                struct PrefsFolderItemDialog *dialog);
+
+static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page);
+static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page);
+
+static gboolean general_save_recurse_func(GNode *node, gpointer data);
+static gboolean compose_save_recurse_func(GNode *node, gpointer data);
+
 gint prefs_folder_item_chmod_mode              (gchar *folder_chmod);
 
-static void set_button_color(guint rgbvalue, GtkWidget *button);
 static void folder_color_set_dialog(GtkWidget *widget, gpointer data);
-static void folder_color_set_dialog_ok(GtkWidget *widget, gpointer data);
-static void folder_color_set_dialog_cancel(GtkWidget *widget, gpointer data);
-static void folder_color_set_dialog_key_pressed(GtkWidget *widget,
-                                               GdkEventKey *event,
-                                               gpointer data);
 
+#define SAFE_STRING(str) \
+       (str) ? (str) : ""
 
-void prefs_folder_item_read_config(FolderItem * item)
+void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
+                                                  GtkWindow * window,
+                                                  gpointer data)
 {
-       gchar * id;
-
-       id = folder_item_get_identifier(item);
-
-       tmp_prefs.scoring = NULL;
-       tmp_prefs.processing = NULL;
-       prefs_read_config(param, id, FOLDERITEM_RC);
-       g_free(id);
-
-       *item->prefs = tmp_prefs;
-
-       /*
-        * MIGRATION: next lines are migration code. the idea is that
-        *            if used regularly, claws folder config ends up
-        *            in the same file as sylpheed-main
-        */
-
-       item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
-
-       /* MIGRATION: 0.7.8main+ has persistent sort order. claws had the sort
-        *            order in different members, which is ofcourse a little
-        *            bit phoney. */
-       if (item->sort_key == SORT_BY_NONE) {
-               item->sort_key  = (tmp_prefs.sort_by_number  ? SORT_BY_NUMBER  :
-                                  tmp_prefs.sort_by_size    ? SORT_BY_SIZE    :
-                                  tmp_prefs.sort_by_date    ? SORT_BY_DATE    :
-                                  tmp_prefs.sort_by_from    ? SORT_BY_FROM    :
-                                  tmp_prefs.sort_by_subject ? SORT_BY_SUBJECT :
-                                  tmp_prefs.sort_by_score   ? SORT_BY_SCORE   :
-                                                                SORT_BY_NONE);
-               item->sort_type = tmp_prefs.sort_descending ? SORT_DESCENDING : SORT_ASCENDING;
-       }                                                               
-}
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_;
+       FolderItem *item = (FolderItem *) data;
+       guint rowcount;
 
-void prefs_folder_item_save_config(FolderItem * item)
-{      
-       gchar * id;
+       GtkWidget *table;
+       GtkWidget *hbox;
+       GtkWidget *label;
+       
+       GtkWidget *checkbtn_simplify_subject;
+       GtkWidget *entry_simplify_subject;
+       GtkWidget *checkbtn_folder_chmod;
+       GtkWidget *entry_folder_chmod;
+       GtkWidget *folder_color;
+       GtkWidget *folder_color_btn;
+       GtkWidget *checkbtn_enable_processing;
+       GtkWidget *checkbtn_newmailcheck;
+
+       GtkWidget *simplify_subject_rec_checkbtn;
+       GtkWidget *folder_chmod_rec_checkbtn;
+       GtkWidget *folder_color_rec_checkbtn;
+       GtkWidget *enable_processing_rec_checkbtn;
+       GtkWidget *newmailcheck_rec_checkbtn;
+       
+       page->item         = item;
 
-       tmp_prefs = * item->prefs;
+       /* Table */
+       table = gtk_table_new(5, 2, FALSE);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+       gtk_table_set_col_spacings(GTK_TABLE(table), 4);
+       rowcount = 0;
 
-       id = folder_item_get_identifier(item);
+       /* 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,
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+       rowcount++;
 
-       prefs_save_config(param, id, FOLDERITEM_RC);
-       g_free(id);
+       /* Simplify Subject */
+       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);
 
-       /* MIGRATION: make sure migrated items are not saved
-        */
+       entry_simplify_subject = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entry_simplify_subject, 1, 2, 
+                        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));
+
+       simplify_subject_rec_checkbtn = gtk_check_button_new();
+       gtk_table_attach(GTK_TABLE(table), simplify_subject_rec_checkbtn, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+       rowcount++;
+
+       /* 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);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod), 
+                                    item->prefs->enable_folder_chmod);
+
+       entry_folder_chmod = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entry_folder_chmod, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_folder_chmod, entry_folder_chmod);
+       if (item->prefs->folder_chmod) {
+               gchar *buf;
+
+               buf = g_strdup_printf("%o", item->prefs->folder_chmod);
+               gtk_entry_set_text(GTK_ENTRY(entry_folder_chmod), buf);
+               g_free(buf);
+       }
+       
+       folder_chmod_rec_checkbtn = gtk_check_button_new();
+       gtk_table_attach(GTK_TABLE(table), folder_chmod_rec_checkbtn, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+       rowcount++;
+       
+       /* 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);
+
+       hbox = gtk_hbox_new(FALSE, 0);
+       gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
+       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);
+
+       page->folder_color = item->prefs->color;
+
+       g_signal_connect(G_OBJECT(folder_color_btn), "clicked",
+                        G_CALLBACK(folder_color_set_dialog),
+                        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, 
+                        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"));
+       gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing, 0, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_processing), 
+                                    item->prefs->enable_processing);
+
+       enable_processing_rec_checkbtn = gtk_check_button_new();
+       gtk_table_attach(GTK_TABLE(table), enable_processing_rec_checkbtn, 2, 3, 
+                        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_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, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+       rowcount++;
+
+       gtk_widget_show_all(table);
+
+       page->table = table;
+       page->checkbtn_simplify_subject = checkbtn_simplify_subject;
+       page->entry_simplify_subject = entry_simplify_subject;
+       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->simplify_subject_rec_checkbtn  = simplify_subject_rec_checkbtn;
+       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->newmailcheck_rec_checkbtn      = newmailcheck_rec_checkbtn;
+
+       page->page.widget = table;
 }
 
-void prefs_folder_item_set_config(FolderItem * item,
-                                 int sort_type, gint sort_mode)
+void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_) 
 {
-       g_assert(item);
-       g_warning("prefs_folder_item_set_config() should never be called\n");
-       item->sort_key  = sort_type;
-       item->sort_type = sort_mode;
+       /* FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_; */
 }
 
-PrefsFolderItem * prefs_folder_item_new(void)
+/** \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
+ */
+static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
 {
-       PrefsFolderItem * prefs;
-
-       prefs = g_new0(PrefsFolderItem, 1);
-
-       tmp_prefs.sort_by_number = FALSE;
-       tmp_prefs.sort_by_size = FALSE;
-       tmp_prefs.sort_by_date = FALSE;
-       tmp_prefs.sort_by_from = FALSE;
-       tmp_prefs.sort_by_subject = FALSE;
-       tmp_prefs.sort_by_score = FALSE;
-       tmp_prefs.sort_descending = FALSE;
-       tmp_prefs.kill_score = -9999;
-       tmp_prefs.important_score = 9999;
-
-       tmp_prefs.request_return_receipt = FALSE;
-       tmp_prefs.enable_default_to = FALSE;
-       tmp_prefs.default_to = NULL;
-       tmp_prefs.enable_default_reply_to = FALSE;
-       tmp_prefs.default_reply_to = NULL;
-       tmp_prefs.enable_simplify_subject = FALSE;
-       tmp_prefs.simplify_subject_regexp = NULL;
-       tmp_prefs.enable_folder_chmod = FALSE;
-       tmp_prefs.folder_chmod = 0;
-       tmp_prefs.enable_default_account = FALSE;
-       tmp_prefs.default_account = 0;
-       tmp_prefs.save_copy_to_folder = FALSE;
-       tmp_prefs.color = 0;
-
-       tmp_prefs.scoring = NULL;
-       tmp_prefs.processing = NULL;
-
-       * prefs = tmp_prefs;
+       FolderItemPrefs *prefs = folder->prefs;
+       gchar *buf;
+       gboolean all = FALSE;
+
+       g_return_if_fail(prefs != NULL);
+
+       if (page->item == folder) 
+               all = TRUE;
+
+       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));
+               ASSIGN_STRING(prefs->simplify_subject_regexp,
+                             gtk_editable_get_chars(GTK_EDITABLE(page->entry_simplify_subject), 0, -1));
+       }
        
-       return prefs;
-}
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_chmod_rec_checkbtn))) {
+               prefs->enable_folder_chmod = 
+                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_folder_chmod));
+               buf = gtk_editable_get_chars(GTK_EDITABLE(page->entry_folder_chmod), 0, -1);
+               prefs->folder_chmod = prefs_folder_item_chmod_mode(buf);
+               g_free(buf);
+       }
 
-void prefs_folder_item_free(PrefsFolderItem * prefs)
-{
-       if (prefs->default_to) 
-               g_free(prefs->default_to);
-       if (prefs->default_reply_to) 
-               g_free(prefs->default_reply_to);
-       if (prefs->scoring != NULL)
-               prefs_scoring_free(prefs->scoring);
-       g_free(prefs);
-}
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_color_rec_checkbtn))) {
+               prefs->color = page->folder_color;
+       
+               /* update folder view */
+               if (prefs->color > 0)
+                       folder_item_update(folder, F_ITEM_UPDATE_MSGCNT);
+       }
 
-gint prefs_folder_item_get_sort_mode(FolderItem * item)
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_rec_checkbtn))) {
+               prefs->enable_processing = 
+                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_processing));
+       }
+
+       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));
+       }
+
+       folder_item_prefs_save_config(folder);
+}      
+
+static gboolean general_save_recurse_func(GNode *node, gpointer data)
 {
-       g_assert(item != NULL);
-       g_warning("prefs_folder_item_get_sort_mode() should never be called\n");
-       return item->sort_key;
+       FolderItem *item = (FolderItem *) node->data;
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *) data;
+
+       g_return_val_if_fail(item != NULL, TRUE);
+       g_return_val_if_fail(page != NULL, TRUE);
+
+       general_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->simplify_subject_rec_checkbtn)) ||
+             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->newmailcheck_rec_checkbtn))))
+               return TRUE;
+       else 
+               return FALSE;
 }
 
-gint prefs_folder_item_get_sort_type(FolderItem * item)
+void prefs_folder_item_general_save_func(PrefsPage *page_) 
 {
-       g_assert(item != NULL);
-       g_warning("prefs_folder_item_get_sort_type() should never be called\n");
-       return item->sort_type;
-}
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_;
 
-#define SAFE_STRING(str) \
-       (str) ? (str) : ""
+       g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+                       -1, general_save_recurse_func, page);
 
-void prefs_folder_item_create(void *folderview, FolderItem *item) 
+}
+
+void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
+                                                  GtkWindow * window,
+                                                  gpointer data)
 {
-       struct PrefsFolderItemDialog *dialog;
+       FolderItemComposePage *page = (FolderItemComposePage *) page_;
+       FolderItem *item = (FolderItem *) data;
        guint rowcount;
-       gchar *folder_identifier, *infotext;
 
-       GtkWidget *window;
        GtkWidget *table;
-       GtkWidget *infolabel;
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-       GtkWidget *confirm_area;
+       GtkWidget *label;
        
        GtkWidget *checkbtn_request_return_receipt;
        GtkWidget *checkbtn_save_copy_to_folder;
@@ -279,166 +398,133 @@ void prefs_folder_item_create(void *folderview, FolderItem *item)
        GtkWidget *entry_default_to;
        GtkWidget *checkbtn_default_reply_to;
        GtkWidget *entry_default_reply_to;
-       GtkWidget *checkbtn_simplify_subject;
-       GtkWidget *entry_simplify_subject;
-       GtkWidget *checkbtn_folder_chmod;
-       GtkWidget *entry_folder_chmod;
        GtkWidget *checkbtn_enable_default_account;
        GtkWidget *optmenu_default_account;
        GtkWidget *optmenu_default_account_menu;
        GtkWidget *optmenu_default_account_menuitem;
-       GtkWidget *folder_color;
-       GtkWidget *folder_color_btn;
+#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;
+#endif
+
        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;
 
-       dialog = g_new0(struct PrefsFolderItemDialog, 1);
-       dialog->folderview = folderview;
-       dialog->item       = item;
-
-       /* Window */
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
-       gtk_window_set_title (GTK_WINDOW(window),
-                             _("Folder Properties"));
-       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
-       gtk_signal_connect (GTK_OBJECT(window), "delete_event",
-                           GTK_SIGNAL_FUNC(prefs_folder_item_delete_cb), dialog);
-       MANAGE_WINDOW_SIGNALS_CONNECT (window);
+       page->item         = item;
 
        /* Table */
-       table = gtk_table_new(8, 2, FALSE);
-       gtk_widget_show(table);
-       gtk_table_set_row_spacings(GTK_TABLE(table), VSPACING_NARROW);
-       gtk_container_add(GTK_CONTAINER (window), table);
+#if USE_ASPELL
+# define TABLEHEIGHT 6
+#else
+# define TABLEHEIGHT 5
+#endif
+       table = gtk_table_new(TABLEHEIGHT, 2, FALSE);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+       gtk_table_set_col_spacings(GTK_TABLE(table), 4);
        rowcount = 0;
 
-       /* Label */
-       folder_identifier = folder_item_get_identifier(item);
-       infotext = g_strconcat(_("Folder Properties for "), folder_identifier, NULL);
-       infolabel = gtk_label_new(infotext);
-       gtk_table_attach(GTK_TABLE(table), infolabel, 0, 2, rowcount, 
-                        rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-       gtk_widget_show(infolabel);
+       /* 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,
+                        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_widget_show(checkbtn_request_return_receipt);
        gtk_table_attach(GTK_TABLE(table), checkbtn_request_return_receipt, 
                         0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, 
-                        GTK_SHRINK, 0, 0);
+                        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_widget_show(checkbtn_save_copy_to_folder);
        gtk_table_attach(GTK_TABLE(table), checkbtn_save_copy_to_folder, 0, 2, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+                        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_widget_show(checkbtn_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_widget_show(entry_default_to);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_default_to, 1, 2, rowcount, rowcount + 1);
+       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 Reply-To */
-       checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default Reply-To: "));
-       gtk_widget_show(checkbtn_default_reply_to);
+       /* 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_widget_show(entry_default_reply_to);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_default_reply_to, 1, 2, rowcount, rowcount + 1);
+       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));
 
-       rowcount++;
-
-       /* Simplify Subject */
-       checkbtn_simplify_subject = gtk_check_button_new_with_label(_("Simplify Subject RegExp: "));
-       gtk_widget_show(checkbtn_simplify_subject);
-       gtk_table_attach(GTK_TABLE(table), checkbtn_simplify_subject, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_simplify_subject), 
-                                    item->prefs->enable_simplify_subject);
-
-       entry_simplify_subject = gtk_entry_new();
-       gtk_widget_show(entry_simplify_subject);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_simplify_subject, 1, 2, 
-                                 rowcount, rowcount + 1);
-       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));
-
-       rowcount++;
-
-       /* Folder chmod */
-       checkbtn_folder_chmod = gtk_check_button_new_with_label(_("Folder chmod: "));
-       gtk_widget_show(checkbtn_folder_chmod);
-       gtk_table_attach(GTK_TABLE(table), checkbtn_folder_chmod, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod), 
-                                    item->prefs->enable_folder_chmod);
-
-       entry_folder_chmod = gtk_entry_new();
-       gtk_widget_show(entry_folder_chmod);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_folder_chmod, 1, 2, 
-                                 rowcount, rowcount + 1);
-       SET_TOGGLE_SENSITIVITY(checkbtn_folder_chmod, entry_folder_chmod);
-       if (item->prefs->folder_chmod) {
-               gchar *buf;
-
-               buf = g_strdup_printf("%o", item->prefs->folder_chmod);
-               gtk_entry_set_text(GTK_ENTRY(entry_folder_chmod), buf);
-               g_free(buf);
-       }
+       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: "));
-       gtk_widget_show(checkbtn_enable_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 ();
-       gtk_widget_show (optmenu_default_account);
-       gtk_table_attach_defaults(GTK_TABLE(table), optmenu_default_account, 1, 2, 
-                                 rowcount, rowcount + 1);
+       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 ();
 
        account_list = account_get_list();
@@ -455,9 +541,7 @@ void prefs_folder_item_create(void *folderview, FolderItem *item)
                index++;                        
        }
 
-       dialog->item->prefs->default_account = item->prefs->default_account;
-
-       optmenu=GTK_OPTION_MENU(optmenu_default_account);
+       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);
@@ -468,155 +552,187 @@ void prefs_folder_item_create(void *folderview, FolderItem *item)
 
        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++;
 
-       /* Folder color */
-       folder_color = gtk_label_new(_("Folder color: "));
-       gtk_misc_set_alignment(GTK_MISC(folder_color), 0, 0.5);
-       gtk_widget_show(folder_color);
-       gtk_table_attach_defaults(GTK_TABLE(table), folder_color, 0, 1, 
-                        rowcount, rowcount + 1);
+#if USE_ASPELL
+       /* 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),
+                                    item->prefs->enable_default_dictionary);
 
-       folder_color_btn = gtk_button_new_with_label("");
-       gtk_widget_set_usize(folder_color_btn, 36, 26);
-       gtk_container_set_border_width(GTK_CONTAINER(folder_color_btn), 2);
-       gtk_widget_show(folder_color_btn);
-       gtk_table_attach(GTK_TABLE(table), folder_color_btn,
-                        1, 2, rowcount, rowcount + 1,
-                        GTK_SHRINK, 0, 0, 0);
+       optmenu_default_dictionary = gtk_option_menu_new();
+       gtk_table_attach(GTK_TABLE(table), optmenu_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));
 
-       dialog->item->prefs->color = item->prefs->color;
+       dictionary = item->prefs->default_dictionary;
 
-       gtk_signal_connect(GTK_OBJECT(folder_color_btn), "clicked",
-                          GTK_SIGNAL_FUNC(folder_color_set_dialog),
-                          dialog);
+       optmenu = GTK_OPTION_MENU(optmenu_default_dictionary);
+
+       menu = gtk_option_menu_get_menu(optmenu);
+       if (dictionary)
+               gtkaspell_set_dictionary_menu_active_item(optmenu_default_dictionary, dictionary);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
 
-       set_button_color(item->prefs->color, folder_color_btn);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, optmenu_default_dictionary);
 
+       default_dictionary_rec_checkbtn = gtk_check_button_new();
+       gtk_table_attach(GTK_TABLE(table), default_dictionary_rec_checkbtn, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+       
        rowcount++;
+#endif
 
-       /* Ok and Cancle Buttons */
-       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
-       gtk_widget_show(confirm_area);
-       gtk_table_attach_defaults(GTK_TABLE(table), confirm_area, 0, 2, 
-                                 rowcount, rowcount + 1);
-       gtk_widget_grab_default(ok_btn);
-       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_folder_item_ok_cb), dialog);
-       gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_folder_item_cancel_cb), dialog);
-
-       dialog->window = window;
-       dialog->checkbtn_request_return_receipt = checkbtn_request_return_receipt;
-       dialog->checkbtn_save_copy_to_folder = checkbtn_save_copy_to_folder;
-       dialog->checkbtn_default_to = checkbtn_default_to;
-       dialog->entry_default_to = entry_default_to;
-       dialog->checkbtn_default_reply_to = checkbtn_default_reply_to;
-       dialog->entry_default_reply_to = entry_default_reply_to;
-       dialog->checkbtn_simplify_subject = checkbtn_simplify_subject;
-       dialog->entry_simplify_subject = entry_simplify_subject;
-       dialog->checkbtn_folder_chmod = checkbtn_folder_chmod;
-       dialog->entry_folder_chmod = entry_folder_chmod;
-       dialog->checkbtn_enable_default_account = checkbtn_enable_default_account;
-       dialog->optmenu_default_account = optmenu_default_account;
-       dialog->folder_color = folder_color;
-       dialog->folder_color_btn = folder_color_btn;
-
-       g_free(infotext);
-
-       address_completion_start(window);
-
-       gtk_widget_show(window);
-}
+       gtk_widget_show_all(table);
+
+       page->window = GTK_WIDGET(window);
+       page->table = table;
+       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;
+       page->entry_default_to = entry_default_to;
+       page->checkbtn_default_reply_to = checkbtn_default_reply_to;
+       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
+       page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
+       page->optmenu_default_dictionary = optmenu_default_dictionary;
+#endif
 
-void prefs_folder_item_destroy(struct PrefsFolderItemDialog *dialog) 
-{
-       address_completion_unregister_entry(GTK_ENTRY(dialog->entry_default_to));
-       address_completion_unregister_entry(GTK_ENTRY(dialog->entry_default_reply_to));
-       address_completion_end(dialog->window);
-       gtk_widget_destroy(dialog->window);
-       g_free(dialog);
-}
+       page->request_return_receipt_rec_checkbtn = request_return_receipt_rec_checkbtn;
+       page->save_copy_to_folder_rec_checkbtn    = save_copy_to_folder_rec_checkbtn;
+       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
+       page->default_dictionary_rec_checkbtn = default_dictionary_rec_checkbtn;
+#endif
 
-void prefs_folder_item_cancel_cb(GtkWidget *widget, 
-                                struct PrefsFolderItemDialog *dialog) 
-{
-       prefs_folder_item_destroy(dialog);
+       address_completion_start(page->window);
+
+       page->page.widget = table;
 }
 
-void prefs_folder_item_delete_cb(GtkWidget *widget, GdkEventAny *event, 
-                                struct PrefsFolderItemDialog *dialog) 
+void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_) 
 {
-       prefs_folder_item_destroy(dialog);
+       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));
+       address_completion_end(page->window);
 }
 
-void prefs_folder_item_ok_cb(GtkWidget *widget, 
-                            struct PrefsFolderItemDialog *dialog) 
+/** \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
+ */
+static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
 {
-       gchar *buf;
-       PrefsFolderItem *prefs = dialog->item->prefs;
+       FolderItemPrefs *prefs = folder->prefs;
        GtkWidget *menu;
        GtkWidget *menuitem;
-       gboolean   old_simplify_val;
-       gchar     *old_simplify_str;
+       gboolean all = FALSE;
+
+       if (page->item == folder) 
+               all = TRUE;
 
        g_return_if_fail(prefs != NULL);
 
-       old_simplify_val = prefs->enable_simplify_subject;
-       old_simplify_str = prefs->simplify_subject_regexp;
-
-       prefs->request_return_receipt = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_request_return_receipt));
-       /* MIGRATION */    
-       dialog->item->ret_rcpt = prefs->request_return_receipt;
-
-       prefs->save_copy_to_folder = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_save_copy_to_folder));
-
-       prefs->enable_default_to = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_default_to));
-       g_free(prefs->default_to);
-       prefs->default_to = 
-           gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_default_to), 0, -1);
-
-       prefs->enable_default_reply_to = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_default_reply_to));
-       g_free(prefs->default_reply_to);
-       prefs->default_reply_to = 
-           gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_default_reply_to), 0, -1);
-
-       prefs->enable_simplify_subject =
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_simplify_subject));
-       prefs->simplify_subject_regexp = 
-           gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_simplify_subject), 0, -1);
-       
-       if (dialog->item == dialog->folderview->summaryview->folder_item &&
-           (prefs->enable_simplify_subject != old_simplify_val ||  
-           0 != strcmp2(prefs->simplify_subject_regexp, old_simplify_str))) 
-               summary_show(dialog->folderview->summaryview, dialog->item);
-               
-       if (old_simplify_str) g_free(old_simplify_str);
-
-       prefs->enable_folder_chmod = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_folder_chmod));
-       buf = gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_folder_chmod), 0, -1);
-       prefs->folder_chmod = prefs_folder_item_chmod_mode(buf);
-       g_free(buf);
-
-       prefs->enable_default_account = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_enable_default_account));
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->optmenu_default_account));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       prefs->default_account = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
-
-       prefs->color = dialog->item->prefs->color;
-       /* update folder view */
-       if (prefs->color > 0)
-               folderview_update_item(dialog->item, FALSE);
-
-       prefs_folder_item_save_config(dialog->item);
-       prefs_folder_item_destroy(dialog);
+       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));
+       }
+
+       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));
+       }
+
+#if USE_ASPELL
+       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));
+       }
+#endif
+
+       folder_item_prefs_save_config(folder);
+}      
+
+static gboolean compose_save_recurse_func(GNode *node, gpointer data)
+{
+       FolderItem *item = (FolderItem *) node->data;
+       FolderItemComposePage *page = (FolderItemComposePage *) data;
+
+       g_return_val_if_fail(item != NULL, TRUE);
+       g_return_val_if_fail(page != NULL, TRUE);
+
+       compose_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->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)) 
+#if USE_ASPELL
+             || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))
+#endif
+                   ))
+               return TRUE;
+       else 
+               return FALSE;
+}
+
+void prefs_folder_item_compose_save_func(PrefsPage *page_) 
+{
+       FolderItemComposePage *page = (FolderItemComposePage *) page_;
+
+       g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+                       -1, compose_save_recurse_func, page);
+
 }
 
 gint prefs_folder_item_chmod_mode(gchar *folder_chmod) 
@@ -633,127 +749,76 @@ gint prefs_folder_item_chmod_mode(gchar *folder_chmod)
        return newmode;
 }
 
-static void set_button_color(guint rgbvalue, GtkWidget *button)
-{
-       GtkStyle *newstyle;
-       GdkColor gdk_color;
-
-       gtkut_convert_int_to_gdk_color(rgbvalue, &gdk_color);
-       newstyle = gtk_style_copy(gtk_widget_get_default_style());
-       newstyle->bg[GTK_STATE_NORMAL]   = gdk_color;
-       newstyle->bg[GTK_STATE_PRELIGHT] = gdk_color;
-       newstyle->bg[GTK_STATE_ACTIVE]   = gdk_color;
-       gtk_widget_set_style(GTK_WIDGET(button), newstyle);
-}
-
 static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
 {
-       struct PrefsFolderItemDialog *folder_dialog = data;
-       GtkColorSelectionDialog *dialog;
-       gdouble color[4] = {0.0, 0.0, 0.0, 0.0};
-       guint rgbcolor;
-
-       color_dialog = gtk_color_selection_dialog_new(_("Pick color for folder"));
-       gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(color_dialog), FALSE, FALSE, FALSE);
-       manage_window_set_transient(GTK_WINDOW(color_dialog));
-
-       gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
-                          "clicked", GTK_SIGNAL_FUNC(folder_color_set_dialog_ok), data);
-       gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
-                          "clicked", GTK_SIGNAL_FUNC(folder_color_set_dialog_cancel), data);
-       gtk_signal_connect(GTK_OBJECT(color_dialog), "key_press_event",
-                          GTK_SIGNAL_FUNC(folder_color_set_dialog_key_pressed),
-                          data);
-
-       rgbcolor = folder_dialog->item->prefs->color;
-       color[0] = (gdouble) ((rgbcolor & 0xff0000) >> 16) / 255.0;
-       color[1] = (gdouble) ((rgbcolor & 0x00ff00) >>  8) / 255.0;
-       color[2] = (gdouble)  (rgbcolor & 0x0000ff)        / 255.0;
-
-       dialog = GTK_COLOR_SELECTION_DIALOG(color_dialog);
-       gtk_color_selection_set_color(GTK_COLOR_SELECTION(dialog->colorsel), color);
-
-       gtk_widget_show(color_dialog);
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *) data;
+       gint rgbcolor;
+
+       rgbcolor = colorsel_select_color_rgb(_("Pick color for folder"), 
+                                            page->folder_color);
+       gtkut_set_widget_bgcolor_rgb(page->folder_color_btn, rgbcolor);
+       page->folder_color = rgbcolor;
 }
 
-static void folder_color_set_dialog_ok(GtkWidget *widget, gpointer data)
+
+FolderItemGeneralPage folder_item_general_page;
+
+static void register_general_page()
 {
-       struct PrefsFolderItemDialog *folder_dialog = data;
-       GtkColorSelection *colorsel = (GtkColorSelection *)
-                               ((GtkColorSelectionDialog *) color_dialog)->colorsel;
-       gdouble color[4];
-       guint red, green, blue, rgbvalue;
+       static gchar *pfi_general_path[2];
+
+       pfi_general_path[0] = _("General");
+       pfi_general_path[1] = NULL;
 
-       gtk_color_selection_get_color(colorsel, color);
+        folder_item_general_page.page.path = pfi_general_path;
+        folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func;
+        folder_item_general_page.page.destroy_widget = prefs_folder_item_general_destroy_widget_func;
+        folder_item_general_page.page.save_page = prefs_folder_item_general_save_func;
+        
+       prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page);
+}
 
-       red      = (guint) (color[0] * 255.0);
-       green    = (guint) (color[1] * 255.0);
-       blue     = (guint) (color[2] * 255.0);
-       rgbvalue = (guint) ((red * 0x10000) | (green * 0x100) | blue);
+FolderItemComposePage folder_item_compose_page;
 
-       folder_dialog->item->prefs->color = rgbvalue;
-       set_button_color(rgbvalue, folder_dialog->folder_color_btn);
+static void register_compose_page(void)
+{
+       static gchar *pfi_compose_path[2];
 
-       gtk_widget_destroy(color_dialog);
+       pfi_compose_path[0] = _("Compose");
+       pfi_compose_path[1] = NULL;
+
+        folder_item_compose_page.page.path = pfi_compose_path;
+        folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func;
+        folder_item_compose_page.page.destroy_widget = prefs_folder_item_compose_destroy_widget_func;
+        folder_item_compose_page.page.save_page = prefs_folder_item_compose_save_func;
+        
+       prefs_folder_item_register_page((PrefsPage *) &folder_item_compose_page);
 }
 
-static void folder_color_set_dialog_cancel(GtkWidget *widget, gpointer data)
+static GSList *prefs_pages = NULL;
+
+void prefs_folder_item_open(FolderItem *item)
 {
-       gtk_widget_destroy(color_dialog);
+       gchar *id, *title;
+
+       if (prefs_pages == NULL) {
+               register_general_page();
+               register_compose_page();
+       }
+
+       id = folder_item_get_identifier (item);
+       title = g_strdup_printf (_("%s - Settings for folder"), id);
+       g_free (id);
+       prefswindow_open(title, prefs_pages, item);
+       g_free (title);
 }
 
-static void folder_color_set_dialog_key_pressed(GtkWidget *widget,
-                                               GdkEventKey *event,
-                                               gpointer data)
+void prefs_folder_item_register_page(PrefsPage *page)
 {
-       gtk_widget_destroy(color_dialog);
+       prefs_pages = g_slist_append(prefs_pages, page);
 }
 
-void prefs_folder_item_copy_prefs(FolderItem * src, FolderItem * dest)
+void prefs_folder_item_unregister_page(PrefsPage *page)
 {
-       GSList *tmp_prop_list = NULL, *tmp;
-       prefs_folder_item_read_config(src);
-
-       tmp_prefs.directory                     = g_strdup(src->prefs->directory);
-       tmp_prefs.sort_by_number                = src->prefs->sort_by_number;
-       tmp_prefs.sort_by_size                  = src->prefs->sort_by_size;
-       tmp_prefs.sort_by_date                  = src->prefs->sort_by_date;
-       tmp_prefs.sort_by_from                  = src->prefs->sort_by_from;
-       tmp_prefs.sort_by_subject               = src->prefs->sort_by_subject;
-       tmp_prefs.sort_by_score                 = src->prefs->sort_by_score;
-       tmp_prefs.sort_descending               = src->prefs->sort_descending;
-       tmp_prefs.enable_thread                 = src->prefs->enable_thread;
-       tmp_prefs.kill_score                    = src->prefs->kill_score;
-       tmp_prefs.important_score               = src->prefs->important_score;
-       /* FIXME!
-       tmp_prefs.scoring                       = g_slist_copy(src->prefs->scoring); 
-       */
-
-       for (tmp = src->prefs->processing; tmp != NULL && tmp->data != NULL;) {
-               FilteringProp *prop = (FilteringProp *)tmp->data;
-               
-               tmp_prop_list = g_slist_append(tmp_prop_list,
-                                          filteringprop_copy(prop));
-               tmp = tmp->next;
-       }
-       tmp_prefs.processing                    = tmp_prop_list;
-       
-       tmp_prefs.request_return_receipt        = src->prefs->request_return_receipt;
-       tmp_prefs.enable_default_to             = src->prefs->enable_default_to;
-       tmp_prefs.default_to                    = g_strdup(src->prefs->default_to);
-       tmp_prefs.enable_default_reply_to       = src->prefs->enable_default_reply_to;
-       tmp_prefs.default_reply_to              = src->prefs->default_reply_to;
-       tmp_prefs.enable_simplify_subject       = src->prefs->enable_simplify_subject;
-       tmp_prefs.simplify_subject_regexp       = g_strdup(src->prefs->simplify_subject_regexp);
-       tmp_prefs.enable_folder_chmod           = src->prefs->enable_folder_chmod;
-       tmp_prefs.folder_chmod                  = src->prefs->folder_chmod;
-       tmp_prefs.enable_default_account        = src->prefs->enable_default_account;
-       tmp_prefs.default_account               = src->prefs->default_account;
-       tmp_prefs.save_copy_to_folder           = src->prefs->save_copy_to_folder;
-       tmp_prefs.color                         = src->prefs->color;
-
-       *dest->prefs = tmp_prefs;
-       prefs_folder_item_save_config(dest);
+       prefs_pages = g_slist_remove(prefs_pages, page);
 }