2004-10-26 [colin] 0.9.12cvs132.2
[claws.git] / src / prefs_folder_item.c
index 7d21058e1a019f48fbf4bf8d3ce5867f9b6b3415..c45acb312921538a95b68f923da127e5da7853e6 100644 (file)
 #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"
 
+#if USE_ASPELL
+#include "gtkaspell.h"
+#endif
+
 #define ASSIGN_STRING(string, value) \
        { \
                g_free(string); \
                string = (value); \
        }
 
-struct FolderItemGeneralPage
+typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
+typedef struct _FolderItemComposePage FolderItemComposePage;
+
+struct _FolderItemGeneralPage
 {
        PrefsPage page;
 
@@ -61,11 +68,20 @@ struct FolderItemGeneralPage
        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
+struct _FolderItemComposePage
 {
        PrefsPage page;
 
@@ -81,9 +97,30 @@ struct FolderItemComposePage
        GtkWidget *entry_default_reply_to;
        GtkWidget *checkbtn_enable_default_account;
        GtkWidget *optmenu_default_account;
+#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 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 folder_color_set_dialog(GtkWidget *widget, gpointer data);
@@ -91,16 +128,17 @@ static void folder_color_set_dialog(GtkWidget *widget, gpointer data);
 #define SAFE_STRING(str) \
        (str) ? (str) : ""
 
-void prefs_folder_item_general_create_widget_func(PrefsPage * _page,
+void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                                                   GtkWindow * window,
                                                   gpointer data)
 {
-       struct FolderItemGeneralPage *page = (struct FolderItemGeneralPage *) _page;
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_;
        FolderItem *item = (FolderItem *) data;
        guint rowcount;
 
        GtkWidget *table;
        GtkWidget *hbox;
+       GtkWidget *label;
        
        GtkWidget *checkbtn_simplify_subject;
        GtkWidget *entry_simplify_subject;
@@ -108,46 +146,61 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * _page,
        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;
 
        /* Table */
-       table = gtk_table_new(3, 2, FALSE);
-       gtk_widget_show(table);
-       gtk_table_set_row_spacings(GTK_TABLE(table), -1);
+       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;
 
+       /* 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++;
+
        /* 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);
+                        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);
 
        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);
+       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_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);
+                        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_widget_show(entry_folder_chmod);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_folder_chmod, 1, 2, 
-                                 rowcount, rowcount + 1);
+       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;
@@ -157,97 +210,187 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * _page,
                g_free(buf);
        }
        
-       rowcount++;
+       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_widget_show(folder_color);
-       gtk_table_attach_defaults(GTK_TABLE(table), folder_color, 0, 1, 
-                        rowcount, rowcount + 1);
+       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_widget_show(hbox);
-       gtk_table_attach_defaults(GTK_TABLE(table), hbox, 1, 2, 
-                                 rowcount, rowcount + 1);
+       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_usize(folder_color_btn, 36, 26);
+       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;
 
-       gtk_signal_connect(GTK_OBJECT(folder_color_btn), "clicked",
-                          GTK_SIGNAL_FUNC(folder_color_set_dialog),
-                          page);
+       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_general_destroy_widget_func(PrefsPage *_page
+void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_
 {
-       /* struct FolderItemGeneralPage *page = (struct FolderItemGeneralPage *) _page; */
+       /* FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_; */
 }
 
-void prefs_folder_item_general_save_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
+ */
+static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
 {
+       FolderItemPrefs *prefs = folder->prefs;
        gchar *buf;
-       struct FolderItemGeneralPage *page = (struct FolderItemGeneralPage *) _page;
-       FolderItemPrefs *prefs = page->item->prefs;
-       gboolean   old_simplify_val;
-       gchar     *old_simplify_str;
+       gboolean all = FALSE;
 
        g_return_if_fail(prefs != NULL);
 
-       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));
+       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));
+       }
        
-/*
-       if (page->item == page->folderview->summaryview->folder_item &&
-           (prefs->enable_simplify_subject != old_simplify_val ||  
-           0 != strcmp2(prefs->simplify_subject_regexp, old_simplify_str))) {
-               summary_clear_all(page->folderview->summaryview);
-               page->folderview->opened = NULL;
-               page->folderview->selected = NULL;
-               folderview_select(page->folderview, page->item);
+       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);
+       }
+
+       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);
+       }
+
+       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));
        }
-*/
-       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);
-
-       prefs->color = page->folder_color;
-       /* update folder view */
-       if (prefs->color > 0)
-               folder_item_update(page->item, F_ITEM_UPDATE_MSGCNT);
-
-       folder_item_prefs_save_config(page->item);
+
+       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)
+{
+       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;
+}
+
+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);
+
 }
 
-void prefs_folder_item_compose_create_widget_func(PrefsPage * _page,
+void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                                                   GtkWindow * window,
                                                   gpointer data)
 {
-       struct FolderItemComposePage *page = (struct FolderItemComposePage *) _page;
+       FolderItemComposePage *page = (FolderItemComposePage *) page_;
        FolderItem *item = (FolderItem *) data;
        guint rowcount;
 
        GtkWidget *table;
+       GtkWidget *label;
        
        GtkWidget *checkbtn_request_return_receipt;
        GtkWidget *checkbtn_save_copy_to_folder;
@@ -259,8 +402,24 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * _page,
        GtkWidget *optmenu_default_account;
        GtkWidget *optmenu_default_account_menu;
        GtkWidget *optmenu_default_account_menuitem;
+#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;
@@ -270,80 +429,102 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * _page,
        page->item         = item;
 
        /* Table */
-       table = gtk_table_new(5, 2, FALSE);
-       gtk_widget_show(table);
-       gtk_table_set_row_spacings(GTK_TABLE(table), -1);
+#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;
 
+       /* 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_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_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 address to reply to */
        checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Send replies to: "));
-       gtk_widget_show(checkbtn_default_reply_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));
 
+       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();
@@ -371,8 +552,49 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * _page,
 
        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: "));
+       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);
+
+       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));
+
+       dictionary = item->prefs->default_dictionary;
+
+       optmenu = GTK_OPTION_MENU(optmenu_default_dictionary);
+
+       menu = gtk_option_menu_get_menu(optmenu);
+       if (dictionary)
+               gtkaspell_set_dictionary_menu_active_item(optmenu_default_dictionary, dictionary);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+
+       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
+
+       gtk_widget_show_all(table);
+
        page->window = GTK_WIDGET(window);
        page->table = table;
        page->checkbtn_request_return_receipt = checkbtn_request_return_receipt;
@@ -383,55 +605,134 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * _page,
        page->entry_default_reply_to = entry_default_reply_to;
        page->checkbtn_enable_default_account = checkbtn_enable_default_account;
        page->optmenu_default_account = optmenu_default_account;
+#ifdef USE_ASPELL
+       page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
+       page->optmenu_default_dictionary = optmenu_default_dictionary;
+#endif
+
+       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
 
        address_completion_start(page->window);
 
        page->page.widget = table;
 }
 
-void prefs_folder_item_compose_destroy_widget_func(PrefsPage *_page
+void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_
 {
-       struct FolderItemComposePage *page = (struct FolderItemComposePage *) _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));
        address_completion_end(page->window);
 }
 
-void prefs_folder_item_compose_save_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
+ */
+static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
 {
-       struct FolderItemComposePage *page = (struct FolderItemComposePage *) _page;
-       FolderItemPrefs *prefs = page->item->prefs;
+       FolderItemPrefs *prefs = folder->prefs;
        GtkWidget *menu;
        GtkWidget *menuitem;
+       gboolean all = FALSE;
+
+       if (page->item == folder) 
+               all = TRUE;
 
        g_return_if_fail(prefs != NULL);
 
-       prefs->request_return_receipt = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_request_return_receipt));
-       /* MIGRATION */    
-       page->item->ret_rcpt = prefs->request_return_receipt;
+       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
 
-       prefs->save_copy_to_folder = 
-           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_save_copy_to_folder));
+       folder_item_prefs_save_config(folder);
+}      
 
-       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));
+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;
+}
 
-       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));
+void prefs_folder_item_compose_save_func(PrefsPage *page_) 
+{
+       FolderItemComposePage *page = (FolderItemComposePage *) page_;
 
-       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(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+       g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+                       -1, compose_save_recurse_func, page);
 
-       folder_item_prefs_save_config(page->item);
 }
 
 gint prefs_folder_item_chmod_mode(gchar *folder_chmod) 
@@ -450,7 +751,7 @@ gint prefs_folder_item_chmod_mode(gchar *folder_chmod)
 
 static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
 {
-       struct FolderItemGeneralPage *page = (struct FolderItemGeneralPage *) data;
+       FolderItemGeneralPage *page = (FolderItemGeneralPage *) data;
        gint rgbcolor;
 
        rgbcolor = colorsel_select_color_rgb(_("Pick color for folder"), 
@@ -459,11 +760,17 @@ static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
        page->folder_color = rgbcolor;
 }
 
-struct FolderItemGeneralPage folder_item_general_page;
+
+FolderItemGeneralPage folder_item_general_page;
 
 static void register_general_page()
 {
-        folder_item_general_page.page.path = _("General");
+       static gchar *pfi_general_path[2];
+
+       pfi_general_path[0] = _("General");
+       pfi_general_path[1] = NULL;
+
+        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;
@@ -471,11 +778,16 @@ static void register_general_page()
        prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page);
 }
 
-struct FolderItemComposePage folder_item_compose_page;
+FolderItemComposePage folder_item_compose_page;
 
-static void register_compose_page()
+static void register_compose_page(void)
 {
-        folder_item_compose_page.page.path = _("Compose");
+       static gchar *pfi_compose_path[2];
+
+       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;
@@ -487,12 +799,18 @@ 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();
        }
 
-       prefswindow_open(_("Settings for folder"), prefs_pages, item);
+       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);
 }
 
 void prefs_folder_item_register_page(PrefsPage *page)