remove all gtk3 conditionals
[claws.git] / src / prefs_folder_item.c
index e61dbfad702f1466d3bc2cc7944ece993e17335e..ffa7c4223fbeb4cb4d53a80bebfee3dcf4d9f45f 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 /* alfons - all folder item specific settings should migrate into 
@@ -23,6 +22,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -49,8 +49,9 @@
 #include "string_match.h"
 #include "quote_fmt.h"
 #include "combobox.h"
+#include "stock_pixmap.h"
 
-#if USE_ASPELL
+#if USE_ENCHANT
 #include "gtkaspell.h"
 #endif
 
@@ -60,9 +61,6 @@
                string = (value); \
        }
 
-static void prefs_folder_item_register_page    (PrefsPage      *page);
-static void prefs_folder_item_unregister_page  (PrefsPage      *page);
-
 typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
 typedef struct _FolderItemComposePage FolderItemComposePage;
 typedef struct _FolderItemTemplatesPage FolderItemTemplatesPage;
@@ -92,6 +90,7 @@ struct _FolderItemGeneralPage
        GtkWidget *entry_offlinesync;
        GtkWidget *label_end_offlinesync;
        GtkWidget *checkbtn_remove_old_offlinesync;
+       GtkWidget *promote_html_part;
        
        /* apply to sub folders */
        GtkWidget *simplify_subject_rec_checkbtn;
@@ -101,6 +100,7 @@ struct _FolderItemGeneralPage
        GtkWidget *enable_processing_when_opening_rec_checkbtn;
        GtkWidget *newmailcheck_rec_checkbtn;
        GtkWidget *offlinesync_rec_checkbtn;
+       GtkWidget *promote_html_part_rec_checkbtn;
 
        gint       folder_color;
 };
@@ -120,25 +120,38 @@ struct _FolderItemComposePage
        GtkWidget *entry_default_to;
        GtkWidget *checkbtn_default_reply_to;
        GtkWidget *entry_default_reply_to;
+       GtkWidget *checkbtn_default_cc;
+       GtkWidget *entry_default_cc;
+       GtkWidget *checkbtn_default_bcc;
+       GtkWidget *entry_default_bcc;
+       GtkWidget *checkbtn_default_replyto;
+       GtkWidget *entry_default_replyto;
        GtkWidget *checkbtn_enable_default_account;
        GtkWidget *optmenu_default_account;
-#if USE_ASPELL
+#if USE_ENCHANT
        GtkWidget *checkbtn_enable_default_dictionary;
        GtkWidget *checkbtn_enable_default_alt_dictionary;
        GtkWidget *combo_default_dictionary;
        GtkWidget *combo_default_alt_dictionary;
 #endif
+       GtkWidget *always_sign;
+       GtkWidget *always_encrypt;
 
        /* 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_cc_rec_checkbtn;
+       GtkWidget *default_bcc_rec_checkbtn;
+       GtkWidget *default_replyto_rec_checkbtn;
        GtkWidget *default_account_rec_checkbtn;
-#if USE_ASPELL
+#if USE_ENCHANT
        GtkWidget *default_dictionary_rec_checkbtn;
        GtkWidget *default_alt_dictionary_rec_checkbtn;
 #endif
+       GtkWidget *always_sign_rec_checkbtn;
+       GtkWidget *always_encrypt_rec_checkbtn;
 };
 
 struct _FolderItemTemplatesPage
@@ -187,6 +200,28 @@ static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer dat
 #define SAFE_STRING(str) \
        (str) ? (str) : ""
 
+static GtkWidget *prefs_folder_no_save_warning_create_widget() {
+       GtkWidget *hbox;
+       GtkWidget *icon;
+       GtkWidget *label;
+
+       hbox = gtk_hbox_new(FALSE, 0);
+
+       icon = stock_pixmap_widget(STOCK_PIXMAP_NOTICE_WARN);
+       gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 8);
+
+       label = gtk_label_new(g_strconcat("<i>",
+               _("These preferences will not be saved as this folder "
+               "is a top-level folder.\nHowever, you can set them for the "
+               "whole mailbox tree by using \"Apply to subfolders\"."),
+               "</i>", NULL));
+       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+       gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+
+       return hbox;
+}
+
 static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                                                   GtkWindow * window,
                                                   gpointer data)
@@ -204,14 +239,13 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkTreeIter iter;
        GtkWidget *dummy_checkbtn, *clean_cache_btn;
        SpecialFolderItemType type;
-       
        GtkWidget *no_save_warning = NULL;
+
        GtkWidget *checkbtn_simplify_subject;
        GtkWidget *entry_simplify_subject;
-       GtkWidget *hbox_regexp;
        GtkWidget *label_regexp_test;
        GtkWidget *entry_regexp_test_string;
-       GtkWidget *left_arrow;
+       GtkWidget *label_regexp_result;
        GtkWidget *entry_regexp_test_result;
 
        GtkWidget *checkbtn_folder_chmod;
@@ -226,43 +260,39 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *entry_offlinesync;
        GtkWidget *label_end_offlinesync;
        GtkWidget *checkbtn_remove_old_offlinesync;
+       GtkWidget *promote_html_part;
+       GtkListStore *promote_html_part_menu;
 
        GtkWidget *simplify_subject_rec_checkbtn;
+
        GtkWidget *folder_chmod_rec_checkbtn;
        GtkWidget *folder_color_rec_checkbtn;
        GtkWidget *enable_processing_rec_checkbtn;
        GtkWidget *enable_processing_when_opening_rec_checkbtn;
        GtkWidget *newmailcheck_rec_checkbtn;
        GtkWidget *offlinesync_rec_checkbtn;
-       GtkTooltips *tooltips;
+       GtkWidget *promote_html_part_rec_checkbtn;
 
-       tooltips = gtk_tooltips_new();
        page->item         = item;
 
        /* Table */
-       table = gtk_table_new(11, 4, FALSE);
+       table = gtk_table_new(12, 3, FALSE);
        gtk_container_set_border_width (GTK_CONTAINER (table), VBOX_BORDER);
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 4);
        rowcount = 0;
 
        if (!can_save) {
-               no_save_warning = gtk_label_new(
-                       _("<i>These preferences will not be saved as this folder "
-                       "is a top-level one. However you can use them to set them "
-                       "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
-               gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
-               gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
-               gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
-               gtk_table_attach(GTK_TABLE(table), no_save_warning, 0, 4,
-                        rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
+               no_save_warning = prefs_folder_no_save_warning_create_widget();
+               gtk_table_attach(GTK_TABLE(table), no_save_warning, 0, 3,
+                       rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
                rowcount++;
        }
        
        /* Apply to subfolders */
        label = gtk_label_new(_("Apply to\nsubfolders"));
        gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
-       gtk_table_attach(GTK_TABLE(table), label, 3, 4,
+       gtk_table_attach(GTK_TABLE(table), label, 2, 3,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        rowcount++;
 
@@ -309,7 +339,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
        gtk_table_attach(GTK_TABLE(table), folder_type, 1, 2, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
-       gtk_table_attach(GTK_TABLE(table), dummy_checkbtn, 3, 4
+       gtk_table_attach(GTK_TABLE(table), dummy_checkbtn, 2, 3
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
@@ -325,7 +355,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                        G_CALLBACK(folder_regexp_set_subject_example_cb), page);
 
        entry_simplify_subject = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), entry_simplify_subject, 1, 3
+       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), 
@@ -335,14 +365,14 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                        G_CALLBACK(folder_regexp_test_cb), page);
 
        simplify_subject_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), simplify_subject_rec_checkbtn, 3, 4
+       gtk_table_attach(GTK_TABLE(table), simplify_subject_rec_checkbtn, 2, 3
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
 
-       /* Test RegExp */
-       label_regexp_test = gtk_label_new(_("Test RegExp"));
-       gtk_misc_set_alignment(GTK_MISC(label_regexp_test), 0, 0.5);
+       /* Test string */
+       label_regexp_test = gtk_label_new(_("Test string"));
+       gtk_misc_set_alignment(GTK_MISC(label_regexp_test), 1, 0.5);
        gtk_table_attach(GTK_TABLE(table), label_regexp_test, 0, 1, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, label_regexp_test);
@@ -355,20 +385,20 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        g_signal_connect(G_OBJECT(entry_regexp_test_string), "changed",
                        G_CALLBACK(folder_regexp_test_cb), page);
 
-       hbox_regexp = gtk_hbox_new (FALSE, 4);
-       gtk_widget_show (hbox_regexp);
-       gtk_table_attach(GTK_TABLE(table), hbox_regexp, 2, 3, 
-                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-
-       left_arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
-       gtk_widget_show(left_arrow);
-       gtk_box_pack_start (GTK_BOX(hbox_regexp), left_arrow, FALSE, FALSE, 0);
-       SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, left_arrow);
+       rowcount++;
+       
+       /* Test result */
+       label_regexp_result = gtk_label_new(_("Result"));
+       gtk_misc_set_alignment(GTK_MISC(label_regexp_result), 1, 0.5);
+       gtk_table_attach(GTK_TABLE(table), label_regexp_result, 0, 1, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, label_regexp_result);
 
        entry_regexp_test_result = gtk_entry_new();
-       gtk_box_pack_end (GTK_BOX(hbox_regexp), entry_regexp_test_result, TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(table), entry_regexp_test_result, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_regexp_test_result);
-       gtk_entry_set_editable(GTK_ENTRY(entry_regexp_test_result), FALSE);
+       gtk_editable_set_editable(GTK_EDITABLE(entry_regexp_test_result), FALSE);
 
        rowcount++;
 
@@ -393,7 +423,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        }
        
        folder_chmod_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), folder_chmod_rec_checkbtn, 3, 4
+       gtk_table_attach(GTK_TABLE(table), folder_chmod_rec_checkbtn, 2, 3
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
@@ -408,11 +438,10 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        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);
+       folder_color_btn = GTKUT_COLOR_BUTTON();
        gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
-       gtk_tooltips_set_tip(tooltips, folder_color_btn,
-                            _("Pick color for folder"), NULL);
+       CLAWS_SET_TIP(folder_color_btn,
+                            _("Pick color for folder"));
 
        page->folder_color = item->prefs->color;
 
@@ -423,7 +452,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        gtkut_set_widget_bgcolor_rgb(folder_color_btn, item->prefs->color);
 
        folder_color_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), folder_color_rec_checkbtn, 3, 4
+       gtk_table_attach(GTK_TABLE(table), folder_color_rec_checkbtn, 2, 3
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
@@ -438,7 +467,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                                     item->prefs->enable_processing);
 
        enable_processing_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), enable_processing_rec_checkbtn, 3, 4
+       gtk_table_attach(GTK_TABLE(table), enable_processing_rec_checkbtn, 2, 3
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        
        rowcount++;
@@ -453,42 +482,74 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                                     item->prefs->enable_processing_when_opening);
 
        enable_processing_when_opening_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), enable_processing_when_opening_rec_checkbtn, 3, 4
+       gtk_table_attach(GTK_TABLE(table), enable_processing_when_opening_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_tooltips_set_tip(tooltips, checkbtn_newmailcheck,
+       CLAWS_SET_TIP(checkbtn_newmailcheck,
                             _("Turn this option on if mail is delivered directly "
                               "to this folder by server side filtering on IMAP or "
-                              "by an external application"), NULL);
+                              "by an external application"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        
        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, 3, 4
+       gtk_table_attach(GTK_TABLE(table), newmailcheck_rec_checkbtn, 2, 3
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
 
+       /* Select HTML part by default? */
+       hbox = gtk_hbox_new (FALSE, 2);
+       gtk_widget_show (hbox);
+       gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
+                       rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
+
+       label = gtk_label_new(_("Select the HTML part of multipart messages"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+       promote_html_part = gtkut_sc_combobox_create (NULL, FALSE);
+       gtk_widget_show (promote_html_part);
+       gtk_box_pack_start (GTK_BOX(hbox), promote_html_part, FALSE, FALSE, 0);
+
+       promote_html_part_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(promote_html_part)));
+       COMBOBOX_ADD (promote_html_part_menu, _("Default"), HTML_PROMOTE_DEFAULT);
+       COMBOBOX_ADD (promote_html_part_menu, _("No"), HTML_PROMOTE_NEVER);
+       COMBOBOX_ADD (promote_html_part_menu, _("Yes"), HTML_PROMOTE_ALWAYS);
+
+       combobox_select_by_data(GTK_COMBO_BOX(promote_html_part),
+                       item->prefs->promote_html_part);
+
+       CLAWS_SET_TIP(hbox, _("\"Default\" will follow global preference (found in /Preferences/"
+                             "Message View/Text Options)"));
+
+       promote_html_part_rec_checkbtn = gtk_check_button_new();
+       gtk_widget_show (promote_html_part_rec_checkbtn);
+       gtk_table_attach(GTK_TABLE(table), promote_html_part_rec_checkbtn, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+       rowcount++;
+
        /* Synchronise folder for offline use */
        checkbtn_offlinesync = gtk_check_button_new_with_label(_("Synchronise for offline use"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_offlinesync, 0, 2,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        
        offlinesync_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), offlinesync_rec_checkbtn, 3, 4
+       gtk_table_attach(GTK_TABLE(table), offlinesync_rec_checkbtn, 2, 3
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
        rowcount++;
 
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
-       gtk_table_attach(GTK_TABLE(table), hbox, 0, 4,
+       gtk_table_attach(GTK_TABLE(table), hbox, 0, 3,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        rowcount++;
 
@@ -504,7 +565,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        entry_offlinesync = gtk_entry_new();
        gtk_widget_set_size_request (entry_offlinesync, 64, -1);
        gtk_widget_show (entry_offlinesync);
-       gtk_tooltips_set_tip(tooltips, entry_offlinesync, _("0: all bodies"), NULL);
+       CLAWS_SET_TIP(entry_offlinesync, _("0: all bodies"));
        gtk_box_pack_start (GTK_BOX (hbox), entry_offlinesync, FALSE, FALSE, 0);
 
        label_end_offlinesync = gtk_label_new(_("days"));
@@ -516,7 +577,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);
-       gtk_table_attach(GTK_TABLE(table), hbox2, 0, 4,
+       gtk_table_attach(GTK_TABLE(table), hbox2, 0, 3,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        rowcount++;
 
@@ -565,10 +626,12 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->table = table;
        page->folder_type = folder_type;
        page->no_save_warning = no_save_warning;
+
        page->checkbtn_simplify_subject = checkbtn_simplify_subject;
        page->entry_simplify_subject = entry_simplify_subject;
        page->entry_regexp_test_string = entry_regexp_test_string;
        page->entry_regexp_test_result = entry_regexp_test_result;
+
        page->checkbtn_folder_chmod = checkbtn_folder_chmod;
        page->entry_folder_chmod = entry_folder_chmod;
        page->folder_color_btn = folder_color_btn;
@@ -580,14 +643,18 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->entry_offlinesync = entry_offlinesync;
        page->label_end_offlinesync = label_end_offlinesync;
        page->checkbtn_remove_old_offlinesync = checkbtn_remove_old_offlinesync;
+       page->promote_html_part = promote_html_part;
+
 
        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->enable_processing_when_opening_rec_checkbtn = enable_processing_when_opening_rec_checkbtn;
        page->newmailcheck_rec_checkbtn      = newmailcheck_rec_checkbtn;
        page->offlinesync_rec_checkbtn       = offlinesync_rec_checkbtn;
+       page->promote_html_part_rec_checkbtn = promote_html_part_rec_checkbtn;
 
        page->page.widget = table;
 
@@ -601,36 +668,49 @@ static void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_)
 
 /** \brief  Save the prefs in page to folder.
  *
- *  If the folder is not the one  specified in page->item, then only those properties 
+ *  If the folder is not the one specified in page->item, then only those properties 
  *  that have the relevant 'apply to sub folders' button checked are saved
  */
 static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
 {
        FolderItemPrefs *prefs = folder->prefs;
        gchar *buf;
-       gboolean all = FALSE;
+       gboolean all = FALSE, summary_update_needed = FALSE;
        SpecialFolderItemType type = F_NORMAL;
+       FolderView *folderview = mainwindow_get_mainwindow()->folderview;
+       HTMLPromoteType promote_html_part = HTML_PROMOTE_DEFAULT;
 
        if (folder->path == NULL)
                return;
 
-       g_return_if_fail(prefs != NULL);
+       cm_return_if_fail(prefs != NULL);
 
        if (page->item == folder) 
                all = TRUE;
 
        type = combobox_get_active_data(GTK_COMBO_BOX(page->folder_type));
-       if (all && folder->stype != type) {
+       if (all && folder->stype != type && page->item->parent_stype == F_NORMAL) {
                folder_item_change_type(folder, type);
+               summary_update_needed = TRUE;
        }
 
+       promote_html_part =
+               combobox_get_active_data(GTK_COMBO_BOX(page->promote_html_part));
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn)))
+               prefs->promote_html_part = promote_html_part;
+
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn))) {
+               gboolean old_simplify_subject = prefs->enable_simplify_subject;
+               int regexp_diffs = strcmp2(prefs->simplify_subject_regexp, gtk_editable_get_chars(
+                                       GTK_EDITABLE(page->entry_simplify_subject), 0, -1));
                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 (old_simplify_subject != prefs->enable_simplify_subject || regexp_diffs != 0)
+                       summary_update_needed = TRUE;
        }
-       
+
        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));
@@ -673,6 +753,11 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
        }
 
        folder_item_prefs_save_config(folder);
+
+       if (folder->opened && summary_update_needed) {
+               summary_set_prefs_from_folderitem(folderview->summaryview, folder);
+               summary_show(folderview->summaryview, folder);
+       }       
 }      
 
 static gboolean general_save_recurse_func(GNode *node, gpointer data)
@@ -680,8 +765,8 @@ 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);
+       cm_return_val_if_fail(item != NULL, TRUE);
+       cm_return_val_if_fail(page != NULL, TRUE);
 
        general_save_folder_prefs(item, page);
 
@@ -689,13 +774,16 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
           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->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->enable_processing_when_opening_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->newmailcheck_rec_checkbtn)) ||
-             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn))))
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn)) ||
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn))
+                       ))
                return TRUE;
        else 
                return FALSE;
@@ -730,8 +818,11 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        FolderItemComposePage *page = (FolderItemComposePage *) page_;
        FolderItem *item = (FolderItem *) data;
        guint rowcount;
+       gchar *text = NULL;
+       gchar *tr = NULL;
 
        GtkWidget *table;
+       GtkWidget *hbox;
        GtkWidget *label;
        
        GtkWidget *no_save_warning = NULL;
@@ -741,11 +832,17 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkWidget *entry_default_to = NULL;
        GtkWidget *checkbtn_default_reply_to = NULL;
        GtkWidget *entry_default_reply_to = NULL;
+       GtkWidget *checkbtn_default_cc = NULL;
+       GtkWidget *entry_default_cc = NULL;
+       GtkWidget *checkbtn_default_bcc = NULL;
+       GtkWidget *entry_default_bcc = NULL;
+       GtkWidget *checkbtn_default_replyto = NULL;
+       GtkWidget *entry_default_replyto = NULL;
        GtkWidget *checkbtn_enable_default_account = NULL;
        GtkWidget *optmenu_default_account = NULL;
        GtkListStore *optmenu_default_account_menu = NULL;
        GtkTreeIter iter;
-#if USE_ASPELL
+#if USE_ENCHANT
        GtkWidget *checkbtn_enable_default_dictionary = NULL;
        GtkWidget *combo_default_dictionary = NULL;
        GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
@@ -754,11 +851,20 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
        gchar *dictionary;
 #endif
+       GtkWidget *always_sign;
+       GtkListStore *always_sign_menu;
+       GtkWidget *always_encrypt;
+       GtkListStore *always_encrypt_menu;
        GtkWidget *request_return_receipt_rec_checkbtn = NULL;
        GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
        GtkWidget *default_to_rec_checkbtn = NULL;
        GtkWidget *default_reply_to_rec_checkbtn = NULL;
+       GtkWidget *default_cc_rec_checkbtn = NULL;
+       GtkWidget *default_bcc_rec_checkbtn = NULL;
+       GtkWidget *default_replyto_rec_checkbtn = NULL;
        GtkWidget *default_account_rec_checkbtn = NULL;
+       GtkWidget *always_sign_rec_checkbtn = NULL;
+       GtkWidget *always_encrypt_rec_checkbtn = NULL;
 
        GList *cur_ac;
        GList *account_list;
@@ -768,7 +874,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->item         = item;
 
        /* Table */
-#if USE_ASPELL
+#if USE_ENCHANT
 # define TABLEHEIGHT 7
 #else
 # define TABLEHEIGHT 6
@@ -780,13 +886,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        rowcount = 0;
 
        if (!can_save) {
-               no_save_warning = gtk_label_new(
-                       _("<i>These preferences will not be saved as this folder "
-                       "is a top-level one. However you can use them to set them "
-                       "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
-               gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
-               gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
-               gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
+               no_save_warning = prefs_folder_no_save_warning_create_widget();
                gtk_table_attach(GTK_TABLE(table), no_save_warning, 0, 3,
                         rowcount, rowcount + 1, GTK_FILL, 0, 0, 0);
                rowcount++;
@@ -830,11 +930,16 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default To */
-               checkbtn_default_to = gtk_check_button_new_with_label(_("Default To:"));
+               tr = g_strdup(C_("folder properties: %s stands for a header name",
+                                         "Default %s"));
+               text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
+               checkbtn_default_to = gtk_check_button_new_with_label(text);
                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);
+               g_free(text);
+               g_free(tr);
 
                entry_default_to = gtk_entry_new();
                gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
@@ -851,11 +956,16 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default address to reply to */
-               checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To: for replies"));
+               tr = g_strdup(C_("folder properties: %s stands for a header name",
+                                         "Default %s for replies"));
+               text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
+               checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
                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);
+               g_free(text);
+               g_free(tr);
 
                entry_default_reply_to = gtk_entry_new();
                gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
@@ -870,6 +980,84 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                                 rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
                rowcount++;
+
+               /* Default Cc */
+               tr = g_strdup(C_("folder properties: %s stands for a header name",
+                                         "Default %s"));
+               text = g_strdup_printf(tr, prefs_common_translated_header_name("Cc:"));
+               checkbtn_default_cc = gtk_check_button_new_with_label(text);
+               gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_cc), 
+                                            item->prefs->enable_default_cc);
+               g_free(text);
+               g_free(tr);
+
+               entry_default_cc = gtk_entry_new();
+               gtk_table_attach(GTK_TABLE(table), entry_default_cc, 1, 2,
+                                rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+               SET_TOGGLE_SENSITIVITY(checkbtn_default_cc, entry_default_cc);
+               gtk_entry_set_text(GTK_ENTRY(entry_default_cc), SAFE_STRING(item->prefs->default_cc));
+               address_completion_register_entry(GTK_ENTRY(entry_default_cc),
+                               TRUE);
+
+               default_cc_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), default_cc_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Default Bcc */
+               tr = g_strdup(C_("folder properties: %s stands for a header name",
+                                         "Default %s"));
+               text = g_strdup_printf(tr, prefs_common_translated_header_name("Bcc:"));
+               checkbtn_default_bcc = gtk_check_button_new_with_label(text);
+               gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_bcc), 
+                                            item->prefs->enable_default_bcc);
+               g_free(text);
+               g_free(tr);
+
+               entry_default_bcc = gtk_entry_new();
+               gtk_table_attach(GTK_TABLE(table), entry_default_bcc, 1, 2,
+                                rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+               SET_TOGGLE_SENSITIVITY(checkbtn_default_bcc, entry_default_bcc);
+               gtk_entry_set_text(GTK_ENTRY(entry_default_bcc), SAFE_STRING(item->prefs->default_bcc));
+               address_completion_register_entry(GTK_ENTRY(entry_default_bcc),
+                               TRUE);
+
+               default_bcc_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), default_bcc_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Default Reply-to */
+               tr = g_strdup(C_("folder properties: %s stands for a header name",
+                                         "Default %s"));
+               text = g_strdup_printf(tr, prefs_common_translated_header_name("Reply-To:"));
+               checkbtn_default_replyto = gtk_check_button_new_with_label(text);
+               gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_replyto), 
+                                            item->prefs->enable_default_replyto);
+               g_free(text);
+               g_free(tr);
+
+               entry_default_replyto = gtk_entry_new();
+               gtk_table_attach(GTK_TABLE(table), entry_default_replyto, 1, 2,
+                                rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+               SET_TOGGLE_SENSITIVITY(checkbtn_default_replyto, entry_default_replyto);
+               gtk_entry_set_text(GTK_ENTRY(entry_default_replyto), SAFE_STRING(item->prefs->default_replyto));
+               address_completion_register_entry(GTK_ENTRY(entry_default_replyto),
+                               TRUE);
+
+               default_replyto_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), default_replyto_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"));
@@ -921,7 +1109,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        rowcount++;
 
-#if USE_ASPELL
+#if USE_ENCHANT
        /* Default dictionary */
        checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_dictionary, 0, 1,
@@ -929,12 +1117,21 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
                                     item->prefs->enable_default_dictionary);
 
-       combo_default_dictionary = gtkaspell_dictionary_combo_new(
-                                               prefs_common.aspell_path, TRUE);
+       combo_default_dictionary = gtkaspell_dictionary_combo_new(TRUE);
        gtk_table_attach(GTK_TABLE(table), combo_default_dictionary, 1, 2,
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
 
        dictionary = item->prefs->default_dictionary;
+       if (dictionary && strrchr(dictionary, '/')) {
+               gchar *tmp = g_strdup(strrchr(dictionary, '/')+1);
+               g_free(item->prefs->default_dictionary);
+               item->prefs->default_dictionary = tmp;
+               dictionary = item->prefs->default_dictionary;
+       }
+       if (item->prefs->default_dictionary &&
+           strchr(item->prefs->default_dictionary, '-')) {
+               *(strchr(item->prefs->default_dictionary, '-')) = '\0';
+       }
        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(
                        GTK_COMBO_BOX(combo_default_dictionary), dictionary);
@@ -947,19 +1144,28 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        
        rowcount++;
 
-       /* Default dictionary */
+       /* Default alternate dictionary */
        checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_alt_dictionary, 0, 1,
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
                                     item->prefs->enable_default_alt_dictionary);
 
-       combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(
-                                               prefs_common.aspell_path, FALSE);
+       combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(FALSE);
        gtk_table_attach(GTK_TABLE(table), combo_default_alt_dictionary, 1, 2,
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
 
        dictionary = item->prefs->default_alt_dictionary;
+       if (dictionary && strrchr(dictionary, '/')) {
+               gchar *tmp = g_strdup(strrchr(dictionary, '/')+1);
+               g_free(item->prefs->default_alt_dictionary);
+               item->prefs->default_alt_dictionary = tmp;
+               dictionary = item->prefs->default_alt_dictionary;
+       }
+       if (item->prefs->default_alt_dictionary &&
+           strchr(item->prefs->default_alt_dictionary, '-')) {
+               *(strchr(item->prefs->default_alt_dictionary, '-')) = '\0';
+       }
        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(
                        GTK_COMBO_BOX(combo_default_alt_dictionary), dictionary);
@@ -973,6 +1179,70 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        rowcount++;
 #endif
 
+       /* PGP sign? */
+       hbox = gtk_hbox_new (FALSE, 2);
+       gtk_widget_show (hbox);
+       gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
+                       rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
+
+       label = gtk_label_new(_("Always sign messages"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+       always_sign = gtkut_sc_combobox_create (NULL, FALSE);
+       gtk_widget_show (always_sign);
+       gtk_box_pack_start (GTK_BOX(hbox), always_sign, FALSE, FALSE, 0);
+
+       always_sign_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(always_sign)));
+       COMBOBOX_ADD (always_sign_menu, _("Default"), SIGN_OR_ENCRYPT_DEFAULT);
+       COMBOBOX_ADD (always_sign_menu, _("No"), SIGN_OR_ENCRYPT_NEVER);
+       COMBOBOX_ADD (always_sign_menu, _("Yes"), SIGN_OR_ENCRYPT_ALWAYS);
+
+       combobox_select_by_data(GTK_COMBO_BOX(always_sign),
+                       item->prefs->always_sign);
+
+       CLAWS_SET_TIP(hbox, _("\"Default\" will follow the applicable account preference"));
+
+       always_sign_rec_checkbtn = gtk_check_button_new();
+       gtk_widget_show (always_sign_rec_checkbtn);
+       gtk_table_attach(GTK_TABLE(table), always_sign_rec_checkbtn, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+       rowcount++;
+
+       /* PGP encrypt? */
+       hbox = gtk_hbox_new (FALSE, 2);
+       gtk_widget_show (hbox);
+       gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
+                       rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
+
+       label = gtk_label_new(_("Always encrypt messages"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+       always_encrypt = gtkut_sc_combobox_create (NULL, FALSE);
+       gtk_widget_show (always_encrypt);
+       gtk_box_pack_start (GTK_BOX(hbox), always_encrypt, FALSE, FALSE, 0);
+
+       always_encrypt_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(always_encrypt)));
+       COMBOBOX_ADD (always_encrypt_menu, _("Default"), SIGN_OR_ENCRYPT_DEFAULT);
+       COMBOBOX_ADD (always_encrypt_menu, _("No"), SIGN_OR_ENCRYPT_NEVER);
+       COMBOBOX_ADD (always_encrypt_menu, _("Yes"), SIGN_OR_ENCRYPT_ALWAYS);
+
+       combobox_select_by_data(GTK_COMBO_BOX(always_encrypt),
+                       item->prefs->always_encrypt);
+
+       CLAWS_SET_TIP(hbox, _("\"Default\" will follow the applicable account preference"));
+
+       always_encrypt_rec_checkbtn = gtk_check_button_new();
+       gtk_widget_show (always_encrypt_rec_checkbtn);
+       gtk_table_attach(GTK_TABLE(table), always_encrypt_rec_checkbtn, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+       rowcount++;
+
        gtk_widget_show_all(table);
 
        page->window = GTK_WIDGET(window);
@@ -984,24 +1254,37 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        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_default_cc = checkbtn_default_cc;
+       page->entry_default_cc = entry_default_cc;
+       page->checkbtn_default_bcc = checkbtn_default_bcc;
+       page->entry_default_bcc = entry_default_bcc;
+       page->checkbtn_default_replyto = checkbtn_default_replyto;
+       page->entry_default_replyto = entry_default_replyto;
        page->checkbtn_enable_default_account = checkbtn_enable_default_account;
        page->optmenu_default_account = optmenu_default_account;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
        page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
        page->combo_default_dictionary = combo_default_dictionary;
        page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
        page->combo_default_alt_dictionary = combo_default_alt_dictionary;
 #endif
+       page->always_sign = always_sign;
+       page->always_encrypt = always_encrypt;
 
        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_cc_rec_checkbtn             = default_cc_rec_checkbtn;
+       page->default_bcc_rec_checkbtn            = default_bcc_rec_checkbtn;
+       page->default_replyto_rec_checkbtn                = default_replyto_rec_checkbtn;
        page->default_account_rec_checkbtn        = default_account_rec_checkbtn;
-#if USE_ASPELL
+#if USE_ENCHANT
        page->default_dictionary_rec_checkbtn = default_dictionary_rec_checkbtn;
        page->default_alt_dictionary_rec_checkbtn = default_alt_dictionary_rec_checkbtn;
 #endif
+       page->always_sign_rec_checkbtn = always_sign_rec_checkbtn;
+       page->always_encrypt_rec_checkbtn = always_encrypt_rec_checkbtn;
 
        page->page.widget = table;
 }
@@ -1014,6 +1297,12 @@ static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
                address_completion_unregister_entry(GTK_ENTRY(page->entry_default_to));
        if (page->entry_default_reply_to)
                address_completion_unregister_entry(GTK_ENTRY(page->entry_default_reply_to));
+       if (page->entry_default_cc)
+               address_completion_unregister_entry(GTK_ENTRY(page->entry_default_cc));
+       if (page->entry_default_bcc)
+               address_completion_unregister_entry(GTK_ENTRY(page->entry_default_bcc));
+       if (page->entry_default_replyto)
+               address_completion_unregister_entry(GTK_ENTRY(page->entry_default_replyto));
 }
 
 /** \brief  Save the prefs in page to folder.
@@ -1033,7 +1322,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
        if (page->item == folder) 
                all = TRUE;
 
-       g_return_if_fail(prefs != NULL);
+       cm_return_if_fail(prefs != NULL);
 
        if (item_protocol(folder) != A_NNTP) {
                if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
@@ -1062,11 +1351,39 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
                        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_cc_rec_checkbtn))) {
+
+                       prefs->enable_default_cc = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_cc));
+                       ASSIGN_STRING(prefs->default_cc,
+                                     gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_cc), 0, -1));
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_bcc_rec_checkbtn))) {
+
+                       prefs->enable_default_bcc = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_bcc));
+                       ASSIGN_STRING(prefs->default_bcc,
+                                     gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_bcc), 0, -1));
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_replyto_rec_checkbtn))) {
+
+                       prefs->enable_default_replyto = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_replyto));
+                       ASSIGN_STRING(prefs->default_replyto,
+                                     gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_replyto), 0, -1));
+               }
+
        } else {
                prefs->request_return_receipt = FALSE;
                prefs->save_copy_to_folder = FALSE;
                prefs->enable_default_to = FALSE;
                prefs->enable_default_reply_to = FALSE;
+               prefs->enable_default_cc = FALSE;
+               prefs->enable_default_bcc = FALSE;
+               prefs->enable_default_replyto = FALSE;
        }
 
        if (all || gtk_toggle_button_get_active(
@@ -1078,7 +1395,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
                                GTK_COMBO_BOX(page->optmenu_default_account));
        }
 
-#if USE_ASPELL
+#if USE_ENCHANT
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))) {
                prefs->enable_default_dictionary =
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_dictionary));
@@ -1094,6 +1411,14 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
                                      GTK_COMBO_BOX(page->combo_default_alt_dictionary)));
        }
 #endif
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn))) {
+               prefs->always_sign = 
+                               combobox_get_active_data(GTK_COMBO_BOX(page->always_sign));
+       }
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn))) {
+               prefs->always_encrypt = 
+                               combobox_get_active_data(GTK_COMBO_BOX(page->always_encrypt));
+       }
 
        folder_item_prefs_save_config(folder);
 }      
@@ -1103,8 +1428,8 @@ 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);
+       cm_return_val_if_fail(item != NULL, TRUE);
+       cm_return_val_if_fail(page != NULL, TRUE);
 
        compose_save_folder_prefs(item, page);
 
@@ -1116,18 +1441,26 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) ||
-#if USE_ASPELL
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_cc_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_bcc_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_replyto_rec_checkbtn)) ||
+#if USE_ENCHANT
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn)) ||
 #endif
-             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))))
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))
+                       ))
                return TRUE;
        else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
            !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) 
-#if USE_ASPELL
+#if USE_ENCHANT
              || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))
              || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))
 #endif
+             || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn))
+             || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn))
                    ))
                return TRUE;
        else 
@@ -1153,20 +1486,29 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
        GtkWidget *notebook;
        GtkWidget *vbox;
        GtkWidget *page_vbox;
+       GtkWidget *no_save_warning;
        GtkWidget *new_msg_format_rec_checkbtn;
        GtkWidget *reply_format_rec_checkbtn;
        GtkWidget *forward_format_rec_checkbtn;
-
+       GtkWidget *hbox;
+       GtkWidget *vbox_format;
+       
        page->item = item;
 
        page_vbox = gtk_vbox_new (FALSE, 0);
+       gtk_container_set_border_width (GTK_CONTAINER (page_vbox), VBOX_BORDER);
        gtk_widget_show (page_vbox);
        
+       if (!can_save) {
+               no_save_warning = prefs_folder_no_save_warning_create_widget();
+               gtk_box_pack_start(GTK_BOX(page_vbox),
+                                  no_save_warning, FALSE, FALSE, 0);
+       }
+
        /* Notebook */
        notebook = gtk_notebook_new();
        gtk_widget_show(notebook);
-       gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
-       gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 4);
 
        /* compose format */
        vbox = gtk_vbox_new (FALSE, VSPACING);
@@ -1183,10 +1525,17 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
                                FALSE, FALSE);
        address_completion_register_entry(GTK_ENTRY(page->compose_override_from_format),
                        TRUE);
+       
+       vbox_format = gtk_widget_get_parent(
+                       gtk_widget_get_parent(page->compose_body_format));
 
+       hbox = gtk_hbox_new (FALSE, 0);
+       gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
+       quotefmt_add_info_button(window, hbox);
+       
        new_msg_format_rec_checkbtn = gtk_check_button_new_with_label(
                        _("Apply to subfolders"));
-       gtk_box_pack_end (GTK_BOX(vbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
+       gtk_box_pack_end (GTK_BOX(hbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Compose")));
 
        /* reply format */
@@ -1205,9 +1554,16 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
        address_completion_register_entry(GTK_ENTRY(page->reply_override_from_format),
                        TRUE);
 
+       vbox_format = gtk_widget_get_parent(
+                       gtk_widget_get_parent(page->reply_body_format));
+
+       hbox = gtk_hbox_new (FALSE, 0);
+       gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
+       quotefmt_add_info_button(window, hbox);
+
        reply_format_rec_checkbtn = gtk_check_button_new_with_label(
                        _("Apply to subfolders"));
-       gtk_box_pack_end (GTK_BOX(vbox), reply_format_rec_checkbtn, FALSE, FALSE, 0);
+       gtk_box_pack_end (GTK_BOX(hbox), reply_format_rec_checkbtn, FALSE, FALSE, 0);
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Reply")));
 
        /* forward format */
@@ -1226,14 +1582,18 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
        address_completion_register_entry(GTK_ENTRY(page->forward_override_from_format),
                        TRUE);
 
+       vbox_format = gtk_widget_get_parent(
+                       gtk_widget_get_parent(page->forward_body_format));
+
+       hbox = gtk_hbox_new (FALSE, 0);
+       gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
+       quotefmt_add_info_button(window, hbox);
+
        forward_format_rec_checkbtn = gtk_check_button_new_with_label(
                        _("Apply to subfolders"));
-       gtk_box_pack_end (GTK_BOX(vbox), forward_format_rec_checkbtn, FALSE, FALSE, 0);
+       gtk_box_pack_end (GTK_BOX(hbox), forward_format_rec_checkbtn, FALSE, FALSE, 0);
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Forward")));
 
-       /* information button */
-       quotefmt_add_info_button(window, page_vbox);
-
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format),
                        item->prefs->compose_with_format);
        pref_set_entry_from_pref(GTK_ENTRY(page->compose_override_from_format),
@@ -1300,7 +1660,7 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
        if (page->item == folder) 
                all = TRUE;
 
-       g_return_if_fail(prefs != NULL);
+       cm_return_if_fail(prefs != NULL);
 
        /* save and check formats */
 
@@ -1358,8 +1718,8 @@ static gboolean templates_save_recurse_func(GNode *node, gpointer data)
        FolderItem *item = (FolderItem *) node->data;
        FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) data;
 
-       g_return_val_if_fail(item != NULL, TRUE);
-       g_return_val_if_fail(page != NULL, TRUE);
+       cm_return_val_if_fail(item != NULL, TRUE);
+       cm_return_val_if_fail(page != NULL, TRUE);
 
        templates_save_folder_prefs(item, page);
 
@@ -1421,8 +1781,8 @@ static void clean_cache_cb(GtkWidget *widget, gpointer data)
        if (alertpanel_full(_("Discard cache"), 
                            _("Do you really want to discard the local cached "
                              "data for this folder?"),
-                                GTK_STOCK_CANCEL, _("+Discard"), NULL, FALSE,
-                                NULL, ALERT_WARNING, G_ALERTDEFAULT)
+                                GTK_STOCK_CANCEL, _("Discard"), NULL, ALERTFOCUS_SECOND,
+                                FALSE, NULL, ALERT_WARNING)
                != G_ALERTALTERNATE)
                return;
        
@@ -1430,7 +1790,7 @@ static void clean_cache_cb(GtkWidget *widget, gpointer data)
                folderview = mainwindow_get_mainwindow()->folderview;
 
        if (folderview && item->opened) {
-               folderview_close_opened(folderview);
+               folderview_close_opened(folderview, FALSE);
                was_open = TRUE;
        }
        folder_item_discard_cache(item);
@@ -1472,29 +1832,33 @@ static void folder_regexp_test_cb(GtkWidget *widget, gpointer data)
        if (!regexp || !regexp[0]) {
                gtk_widget_modify_base(page->entry_simplify_subject,
                                GTK_STATE_NORMAL, NULL);
-               if (test_string) {
+               if (test_string)
                        gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_result), test_string);
-                       g_free(test_string);
-               }
+                       
+               g_free(test_string);
+               g_free(regexp);
                return;
        }
 
        if (!test_string || !test_string[0]) {
+               g_free(test_string);
                g_free(regexp);
                return;
        }
 
        if (!colors_initialised) {
-               gdk_color_parse("#ff7070", &red);
+               if (!gdk_color_parse("#ff7070", &red)) {
+               g_warning("color parse failed: red");
+                                       return;
+               }
                colors_initialised = gdk_colormap_alloc_color(
-                       gdk_colormap_get_system(), &red, FALSE, TRUE);
+                               gdk_colormap_get_system(), &red, FALSE, TRUE);
        }
 
        preg = summary_compile_simplify_regexp(regexp);
-       if (colors_initialised) {
+       if (colors_initialised)
                gtk_widget_modify_base(page->entry_simplify_subject,
                                GTK_STATE_NORMAL, preg ? NULL : &red);
-       }
 
        if (preg != NULL) {
                string_remove_match(buf, BUFFSIZE, test_string, preg);
@@ -1537,71 +1901,70 @@ static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer dat
 
 static void register_general_page()
 {
-       static gchar *pfi_general_path[3];
+       static gchar *pfi_general_path[2];
        static FolderItemGeneralPage folder_item_general_page;
 
-       pfi_general_path[0] = _("Folder");
-       pfi_general_path[1] = _("General");
-       pfi_general_path[2] = NULL;
+       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;
         
-       prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page);
+       prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page, NULL);
 }
 
 
 static void register_compose_page(void)
 {
-       static gchar *pfi_compose_path[3];
+       static gchar *pfi_compose_path[2];
        static FolderItemComposePage folder_item_compose_page;
 
-       pfi_compose_path[0] = _("Folder");
-       pfi_compose_path[1] = _("Compose");
-       pfi_compose_path[2] = NULL;
+       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);
+       prefs_folder_item_register_page((PrefsPage *) &folder_item_compose_page, NULL);
 }
 
 static void register_templates_page(void)
 {
-       static gchar *pfi_templates_path[3];
+       static gchar *pfi_templates_path[2];
        static FolderItemTemplatesPage folder_item_templates_page;
 
-       pfi_templates_path[0] = _("Folder");
-       pfi_templates_path[1] = _("Templates");
-       pfi_templates_path[2] = NULL;
+       pfi_templates_path[0] = _("Templates");
+       pfi_templates_path[1] = NULL;
 
         folder_item_templates_page.page.path = pfi_templates_path;
         folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func;
         folder_item_templates_page.page.destroy_widget = prefs_folder_item_templates_destroy_widget_func;
         folder_item_templates_page.page.save_page = prefs_folder_item_templates_save_func;
         
-       prefs_folder_item_register_page((PrefsPage *) &folder_item_templates_page);
+       prefs_folder_item_register_page((PrefsPage *) &folder_item_templates_page, NULL);
 }
 
 static GSList *prefs_pages = NULL;
 
-static void prefs_folder_item_address_completion_start(GtkWindow * window)
+static void prefs_folder_item_address_completion_start(PrefsWindow *window)
 {
-       address_completion_start(GTK_WIDGET(window));
+       address_completion_start(window->window);
 }
 
-static void prefs_folder_item_address_completion_end(GtkWindow * window)
+static void prefs_folder_item_address_completion_end(PrefsWindow *window)
 {
-       address_completion_end(GTK_WIDGET(window));
+       address_completion_end(window->window);
 }
 
 void prefs_folder_item_open(FolderItem *item)
 {
        gchar *id, *title;
+       GSList *pages;
+
        if (prefs_pages == NULL) {
                register_general_page();
                register_compose_page();
@@ -1615,22 +1978,35 @@ void prefs_folder_item_open(FolderItem *item)
                id = g_strdup(item->name);
                can_save = FALSE;
        }
+       
+       pages = g_slist_concat(
+                       g_slist_copy(prefs_pages),
+                       g_slist_copy(item->folder->klass->prefs_pages));
+
        title = g_strdup_printf (_("Properties for folder %s"), id);
        g_free (id);
-       prefswindow_open(title, prefs_pages, item,
+       prefswindow_open(title, pages, item,
                        &prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height,
                        prefs_folder_item_address_completion_start,
+                       NULL,
                        prefs_folder_item_address_completion_end);
 
+       g_slist_free(pages);
        g_free (title);
 }
 
-static void prefs_folder_item_register_page(PrefsPage *page)
+void prefs_folder_item_register_page(PrefsPage *page, FolderClass *klass)
 {
-       prefs_pages = g_slist_append(prefs_pages, page);
+       if (klass != NULL)
+               klass->prefs_pages = g_slist_append(klass->prefs_pages, page);
+       else
+               prefs_pages = g_slist_append(prefs_pages, page);
 }
 
-static void prefs_folder_item_unregister_page(PrefsPage *page)
+void prefs_folder_item_unregister_page(PrefsPage *page, FolderClass *klass)
 {
-       prefs_pages = g_slist_remove(prefs_pages, page);
+       if (klass != NULL)
+               klass->prefs_pages = g_slist_remove(klass->prefs_pages, page);
+       else
+               prefs_pages = g_slist_remove(prefs_pages, page);
 }