Fixed bugs:
[claws.git] / src / prefs_folder_item.c
index f716c8e8c39384e11006c8cb9ac7aead05d0c6f0..8d1b24abc5aa3dcf4900b7eeda934ec3fbc12ec7 100644 (file)
 #include "defs.h"
 #include "folder.h"
 #include "prefs_folder_item.h"
+#include "folderview.h"
 #include "summaryview.h"
+#include "menu.h"
+#include "account.h"
 #include "prefs.h"
 #include "manage_window.h"
+#include "utils.h"
+#include "addr_compl.h"
 
 PrefsFolderItem tmp_prefs;
 
 struct PrefsFolderItemDialog
 {
+       FolderView *folderview;
        FolderItem *item;
        GtkWidget *window;
        GtkWidget *checkbtn_request_return_receipt;
+       GtkWidget *checkbtn_save_copy_to_folder;
        GtkWidget *checkbtn_default_to;
        GtkWidget *entry_default_to;
+       GtkWidget *checkbtn_simplify_subject;
+       GtkWidget *entry_simplify_subject;
        GtkWidget *checkbtn_folder_chmod;
        GtkWidget *entry_folder_chmod;
+       GtkWidget *checkbtn_enable_default_account;
+       GtkWidget *optmenu_default_account;
 };
 
 static PrefParam param[] = {
@@ -70,19 +81,39 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"default_to", "", &tmp_prefs.default_to, P_STRING,
         NULL, NULL, NULL},
+       {"enable_simplify_subject", "", &tmp_prefs.enable_simplify_subject, P_BOOL,
+        NULL, NULL, NULL},
+       {"simplify_subject_regexp", "", &tmp_prefs.simplify_subject_regexp, P_STRING,
+        NULL, NULL, NULL},
        {"enable_folder_chmod", "", &tmp_prefs.enable_folder_chmod, P_BOOL,
         NULL, NULL, NULL},
        {"folder_chmod", "", &tmp_prefs.folder_chmod, P_INT,
         NULL, NULL, NULL},
+       {"enable_default_account", "", &tmp_prefs.enable_default_account, P_BOOL,
+        NULL, NULL, NULL},
+       {"default_account", NULL, &tmp_prefs.default_account, P_INT,
+        NULL, NULL, NULL},
+       {"save_copy_to_folder", NULL, &tmp_prefs.save_copy_to_folder, P_BOOL,
+        NULL, NULL, NULL},
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
-void prefs_folder_item_delete_cb(GtkWidget *widget, GdkEventAny *event, struct PrefsFolderItemDialog *dialog);
-void prefs_folder_item_cancel_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
-void prefs_folder_item_ok_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
-void prefs_folder_item_default_to_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
-void prefs_folder_item_folder_chmod_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
-gint prefs_folder_item_chmod_mode(gchar *folder_chmod);
+void prefs_folder_item_delete_cb               (GtkWidget *widget, GdkEventAny *event, 
+                                                struct PrefsFolderItemDialog *dialog);
+void prefs_folder_item_cancel_cb               (GtkWidget *widget, 
+                                                struct PrefsFolderItemDialog *dialog);
+void prefs_folder_item_ok_cb                   (GtkWidget *widget, 
+                                                struct PrefsFolderItemDialog *dialog);
+void prefs_folder_item_default_to_cb           (GtkWidget *widget, 
+                                                struct PrefsFolderItemDialog *dialog);
+void prefs_folder_item_simplify_subject_cb     (GtkWidget *widget, 
+                                                struct PrefsFolderItemDialog *dialog);
+void prefs_folder_item_folder_chmod_cb         (GtkWidget *widget, 
+                                                struct PrefsFolderItemDialog *dialog);
+void prefs_folder_item_default_account_cb      (GtkWidget *widget, 
+                                                struct PrefsFolderItemDialog *dialog);
+gint prefs_folder_item_chmod_mode              (gchar *folder_chmod);
+
 
 void prefs_folder_item_read_config(FolderItem * item)
 {
@@ -170,8 +201,13 @@ PrefsFolderItem * prefs_folder_item_new(void)
        tmp_prefs.request_return_receipt = FALSE;
        tmp_prefs.enable_default_to = FALSE;
        tmp_prefs.default_to = NULL;
+       tmp_prefs.enable_simplify_subject = FALSE;
+       tmp_prefs.simplify_subject_regexp = NULL;
        tmp_prefs.enable_folder_chmod = FALSE;
        tmp_prefs.folder_chmod = 0;
+       tmp_prefs.enable_default_account = FALSE;
+       tmp_prefs.default_account = 0;
+       tmp_prefs.save_copy_to_folder = FALSE;
 
        * prefs = tmp_prefs;
        
@@ -180,7 +216,8 @@ PrefsFolderItem * prefs_folder_item_new(void)
 
 void prefs_folder_item_free(PrefsFolderItem * prefs)
 {
-       g_free(prefs->default_to);
+       if (prefs->default_to) 
+               g_free(prefs->default_to);
        if (prefs->scoring != NULL)
                prefs_scoring_free(prefs->scoring);
        g_free(prefs);
@@ -215,23 +252,45 @@ gint prefs_folder_item_get_sort_type(FolderItem * item)
                return GTK_SORT_ASCENDING;
 }
 
-void prefs_folder_item_create(FolderItem *item) {
+#define SAFE_STRING(str) \
+       (str) ? (str) : ""
+
+void prefs_folder_item_create(void *folderview, FolderItem *item) 
+{
        struct PrefsFolderItemDialog *dialog;
+       guint rowcount;
+       gchar *folder_identifier, *infotext;
+
        GtkWidget *window;
-       GtkWidget *vbox;
+       GtkWidget *table;
+       GtkWidget *infolabel;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
        GtkWidget *confirm_area;
-       GtkWidget *hbox;
        
        GtkWidget *checkbtn_request_return_receipt;
+       GtkWidget *checkbtn_save_copy_to_folder;
        GtkWidget *checkbtn_default_to;
        GtkWidget *entry_default_to;
+       GtkWidget *checkbtn_simplify_subject;
+       GtkWidget *entry_simplify_subject;
        GtkWidget *checkbtn_folder_chmod;
        GtkWidget *entry_folder_chmod;
+       GtkWidget *checkbtn_enable_default_account;
+       GtkWidget *optmenu_default_account;
+       GtkWidget *optmenu_default_account_menu;
+       GtkWidget *optmenu_default_account_menuitem;
+       GList *cur_ac;
+       GList *account_list;
+       PrefsAccount *ac_prefs;
+       GtkOptionMenu *optmenu;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+       gint account_index, index;
 
        dialog = g_new0(struct PrefsFolderItemDialog, 1);
-       dialog->item = item;
+       dialog->folderview = folderview;
+       dialog->item       = item;
 
        /* Window */
        window = gtk_window_new (GTK_WINDOW_DIALOG);
@@ -247,132 +306,285 @@ void prefs_folder_item_create(FolderItem *item) {
        gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
                            GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
 
-       vbox = gtk_vbox_new (FALSE, 6);
-       gtk_widget_show(vbox);
-       gtk_container_add(GTK_CONTAINER (window), vbox);
-
-       /* Ok and Cancle Buttons */
-       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
-       gtk_widget_show(confirm_area);
-       gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
-       gtk_widget_grab_default(ok_btn);
-       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_folder_item_ok_cb), dialog);
-       gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_folder_item_cancel_cb), dialog);
+       /* Table */
+       table = gtk_table_new(4, 2, FALSE);
+       gtk_widget_show(table);
+       gtk_table_set_row_spacings(GTK_TABLE(table), VSPACING_NARROW);
+       gtk_container_add(GTK_CONTAINER (window), table);
+       rowcount = 0;
+
+       /* Label */
+       folder_identifier = folder_item_get_identifier(item);
+       infotext = g_strconcat(_("Folder Property for "), folder_identifier, NULL);
+       infolabel = gtk_label_new(infotext);
+       gtk_table_attach(GTK_TABLE(table), infolabel, 0, 2, rowcount, 
+                        rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+       gtk_widget_show(infolabel);
+       rowcount++;
 
        /* Request Return Receipt */
-       PACK_CHECK_BUTTON(vbox, checkbtn_request_return_receipt,
-                          _("Request Return Receipt"));
+       checkbtn_request_return_receipt = gtk_check_button_new_with_label
+               (_("Request Return Receipt"));
+       gtk_widget_show(checkbtn_request_return_receipt);
+       gtk_table_attach(GTK_TABLE(table), checkbtn_request_return_receipt, 
+                        0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, 
+                        GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt),
-                                    item->ret_rcpt);
+                                    item->ret_rcpt ? TRUE : FALSE);
 
-       /* Default To */
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_widget_show(hbox);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       rowcount++;
 
-       PACK_CHECK_BUTTON(hbox, checkbtn_default_to,
-                          _("Default To: "));
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), item->prefs->enable_default_to);
+       /* 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 outbox"));
+       gtk_widget_show(checkbtn_save_copy_to_folder);
+       gtk_table_attach(GTK_TABLE(table), checkbtn_save_copy_to_folder, 0, 2, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_save_copy_to_folder),
+                                    item->prefs->save_copy_to_folder ? TRUE : FALSE);
+
+       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);
        gtk_signal_connect(GTK_OBJECT(checkbtn_default_to), "toggled",
                            GTK_SIGNAL_FUNC(prefs_folder_item_default_to_cb), dialog);
 
        entry_default_to = gtk_entry_new();
        gtk_widget_show(entry_default_to);
-       gtk_box_pack_start(GTK_BOX(hbox), entry_default_to, FALSE, FALSE, 0);
+       gtk_table_attach_defaults(GTK_TABLE(table), entry_default_to, 1, 2, rowcount, rowcount + 1);
        gtk_editable_set_editable(GTK_EDITABLE(entry_default_to), item->prefs->enable_default_to);
-       gtk_entry_set_text(GTK_ENTRY(entry_default_to), item->prefs->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));
+
+       rowcount++;
+
+       /* Simplify Subject */
+       checkbtn_simplify_subject = gtk_check_button_new_with_label(_("Simplify Subject RegExp: "));
+       gtk_widget_show(checkbtn_simplify_subject);
+       gtk_table_attach(GTK_TABLE(table), checkbtn_simplify_subject, 0, 1, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_simplify_subject), 
+                                    item->prefs->enable_simplify_subject);
+       gtk_signal_connect(GTK_OBJECT(checkbtn_simplify_subject), "toggled",
+                          GTK_SIGNAL_FUNC(prefs_folder_item_simplify_subject_cb), dialog);
+
+       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_editable_set_editable(GTK_EDITABLE(entry_simplify_subject), 
+                                 item->prefs->enable_simplify_subject);
+       gtk_entry_set_text(GTK_ENTRY(entry_simplify_subject), 
+                          SAFE_STRING(item->prefs->simplify_subject_regexp));
+
+       rowcount++;
 
        /* Folder chmod */
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_widget_show(hbox);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       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);
 
-       PACK_CHECK_BUTTON(hbox, checkbtn_folder_chmod,
-                          _("Folder chmod: "));
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod), item->prefs->enable_folder_chmod);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod), 
+                                    item->prefs->enable_folder_chmod);
        gtk_signal_connect(GTK_OBJECT(checkbtn_folder_chmod), "toggled",
                            GTK_SIGNAL_FUNC(prefs_folder_item_folder_chmod_cb), dialog);
 
        entry_folder_chmod = gtk_entry_new();
        gtk_widget_show(entry_folder_chmod);
-       gtk_box_pack_start(GTK_BOX(hbox), entry_folder_chmod, FALSE, FALSE, 0);
-       gtk_editable_set_editable(GTK_EDITABLE(entry_folder_chmod), item->prefs->enable_folder_chmod);
+       gtk_table_attach_defaults(GTK_TABLE(table), entry_folder_chmod, 1, 2, 
+                                 rowcount, rowcount + 1);
+       gtk_editable_set_editable(GTK_EDITABLE(entry_folder_chmod), 
+                                 item->prefs->enable_folder_chmod);
        if (item->prefs->folder_chmod) {
-               gint tmp;
-               gint mult;
-               gint count = 0;
-               char buf[64]; /* plenty enough for an integer */
-
-               tmp = item->prefs->folder_chmod;
-               while (tmp && (count < sizeof(buf) - 1)) {
-                       mult = tmp / 8;
-                       buf[count++] = '0' + (tmp - mult * 8);
-                       tmp /= 8;
-               }
-               buf[count] = '\0';
+               gchar *buf;
+
+               buf = g_strdup_printf("%o", item->prefs->folder_chmod);
                gtk_entry_set_text(GTK_ENTRY(entry_folder_chmod), buf);
+               g_free(buf);
        }
+       
+       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);
+       gtk_signal_connect(GTK_OBJECT(checkbtn_enable_default_account), "toggled",
+                           GTK_SIGNAL_FUNC(prefs_folder_item_default_account_cb), dialog);
+
+       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);
+       optmenu_default_account_menu = gtk_menu_new ();
+
+       account_list = account_get_list();
+       account_index = 0;
+       index = 0;
+       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+               ac_prefs = (PrefsAccount *)cur_ac->data;
+               MENUITEM_ADD (optmenu_default_account_menu, optmenu_default_account_menuitem,
+                                       ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
+                                       ac_prefs->account_id);
+               /* get the index for menu's set_history (sad method?) */
+               if (ac_prefs->account_id == item->prefs->default_account)
+                       account_index = index;
+               index++;                        
+       }
+
+       dialog->item->prefs->default_account = item->prefs->default_account;
+
+       optmenu=GTK_OPTION_MENU(optmenu_default_account);
+       gtk_option_menu_set_menu(optmenu, optmenu_default_account_menu);
+
+       gtk_option_menu_set_history(optmenu, account_index);
+
+       menu = gtk_option_menu_get_menu(optmenu);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+
+       gtk_widget_set_sensitive(optmenu_default_account, item->prefs->enable_default_account);
+
+       rowcount++;
+
+       /* Ok and Cancle Buttons */
+       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
+                               &cancel_btn, _("Cancel"), NULL, NULL);
+       gtk_widget_show(confirm_area);
+       gtk_table_attach_defaults(GTK_TABLE(table), confirm_area, 0, 2, 
+                                 rowcount, rowcount + 1);
+       gtk_widget_grab_default(ok_btn);
+       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
+                           GTK_SIGNAL_FUNC(prefs_folder_item_ok_cb), dialog);
+       gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
+                           GTK_SIGNAL_FUNC(prefs_folder_item_cancel_cb), dialog);
 
        dialog->window = window;
        dialog->checkbtn_request_return_receipt = checkbtn_request_return_receipt;
+       dialog->checkbtn_save_copy_to_folder = checkbtn_save_copy_to_folder;
        dialog->checkbtn_default_to = checkbtn_default_to;
        dialog->entry_default_to = entry_default_to;
+       dialog->checkbtn_simplify_subject = checkbtn_simplify_subject;
+       dialog->entry_simplify_subject = entry_simplify_subject;
        dialog->checkbtn_folder_chmod = checkbtn_folder_chmod;
        dialog->entry_folder_chmod = entry_folder_chmod;
+       dialog->checkbtn_enable_default_account = checkbtn_enable_default_account;
+       dialog->optmenu_default_account = optmenu_default_account;
+
+       g_free(infotext);
+
+       address_completion_start(window);
 
        gtk_widget_show(window);
 }
 
-void prefs_folder_item_destroy(struct PrefsFolderItemDialog *dialog) {
+void prefs_folder_item_destroy(struct PrefsFolderItemDialog *dialog) 
+{
+       address_completion_unregister_entry(GTK_ENTRY(dialog->entry_default_to));
+       address_completion_end(dialog->window);
        gtk_widget_destroy(dialog->window);
        g_free(dialog);
 }
 
-void prefs_folder_item_cancel_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) {
+void prefs_folder_item_cancel_cb(GtkWidget *widget, 
+                                struct PrefsFolderItemDialog *dialog) 
+{
        prefs_folder_item_destroy(dialog);
 }
 
-void prefs_folder_item_delete_cb(GtkWidget *widget, GdkEventAny *event, struct PrefsFolderItemDialog *dialog) {
+void prefs_folder_item_delete_cb(GtkWidget *widget, GdkEventAny *event, 
+                                struct PrefsFolderItemDialog *dialog) 
+{
        prefs_folder_item_destroy(dialog);
 }
 
-void prefs_folder_item_ok_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) {
+void prefs_folder_item_ok_cb(GtkWidget *widget, 
+                            struct PrefsFolderItemDialog *dialog) 
+{
+       gchar *buf;
        PrefsFolderItem *prefs = dialog->item->prefs;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+       gboolean   old_simplify_val;
+       gchar     *old_simplify_str;
+
+       g_return_if_fail(prefs != NULL);
+
+       old_simplify_val = prefs->enable_simplify_subject;
+       old_simplify_str = prefs->simplify_subject_regexp;
 
        prefs->request_return_receipt = 
            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_request_return_receipt));
        /* MIGRATION */    
        dialog->item->ret_rcpt = prefs->request_return_receipt;
-           
+
+       prefs->save_copy_to_folder = 
+           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_save_copy_to_folder));
+
        prefs->enable_default_to = 
            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_default_to));
        g_free(prefs->default_to);
        prefs->default_to = 
            gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_default_to), 0, -1);
+
+       prefs->enable_simplify_subject =
+           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_simplify_subject));
+       prefs->simplify_subject_regexp = 
+           gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_simplify_subject), 0, -1);
+       
+       if (dialog->item == dialog->folderview->summaryview->folder_item &&
+           (prefs->enable_simplify_subject != old_simplify_val ||  
+           0 != strcmp2(prefs->simplify_subject_regexp, old_simplify_str))) 
+               summary_show(dialog->folderview->summaryview, dialog->item, FALSE);
+               
+       if (old_simplify_str) g_free(old_simplify_str);
+
        prefs->enable_folder_chmod = 
            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_folder_chmod));
-       prefs->folder_chmod = prefs_folder_item_chmod_mode(
-               gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_folder_chmod),
-                                      0, -1));
+       buf = gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_folder_chmod), 0, -1);
+       prefs->folder_chmod = prefs_folder_item_chmod_mode(buf);
+       g_free(buf);
+
+       prefs->enable_default_account = 
+           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_enable_default_account));
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->optmenu_default_account));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       prefs->default_account = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+
 
        prefs_folder_item_save_config(dialog->item);
        prefs_folder_item_destroy(dialog);
 }
 
-void prefs_folder_item_default_to_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) {
+void prefs_folder_item_default_to_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) 
+{
        gtk_editable_set_editable(GTK_EDITABLE(dialog->entry_default_to),
            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_default_to)));
 }
 
+void prefs_folder_item_simplify_subject_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) 
+{
+       gtk_editable_set_editable(GTK_EDITABLE(dialog->entry_simplify_subject),
+           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_simplify_subject)));
+}
+
 void prefs_folder_item_folder_chmod_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) {
        gtk_editable_set_editable(GTK_EDITABLE(dialog->entry_folder_chmod),
            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_folder_chmod)));
 }
 
-gint prefs_folder_item_chmod_mode(gchar *folder_chmod) {
+gint prefs_folder_item_chmod_mode(gchar *folder_chmod) 
+{
        gint newmode = 0;
        gchar *tmp;
 
@@ -384,3 +596,9 @@ gint prefs_folder_item_chmod_mode(gchar *folder_chmod) {
 
        return newmode;
 }
+
+void prefs_folder_item_default_account_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) 
+{
+       gtk_widget_set_sensitive(dialog->optmenu_default_account,
+           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_enable_default_account)));
+}