2006-06-28 [wwp] 2.3.1cvs31
[claws.git] / src / prefs_folder_item.c
index 1df741518e0d0c9626370986cd1deb5427b087b6..a5904278b253bf3f8a1f9516dd1e6daece28eb7f 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /* alfons - all folder item specific settings should migrate into 
@@ -32,6 +32,7 @@
 #include "folder.h"
 #include "prefs_folder_item.h"
 #include "folderview.h"
+#include "folder.h"
 #include "summaryview.h"
 #include "menu.h"
 #include "account.h"
@@ -65,6 +66,7 @@ struct _FolderItemGeneralPage
        FolderItem *item;
 
        GtkWidget *table;
+       GtkWidget *folder_type;
        GtkWidget *checkbtn_simplify_subject;
        GtkWidget *entry_simplify_subject;
        GtkWidget *checkbtn_folder_chmod;
@@ -72,13 +74,15 @@ struct _FolderItemGeneralPage
        GtkWidget *folder_color_btn;
        GtkWidget *checkbtn_enable_processing;
        GtkWidget *checkbtn_newmailcheck;
+       GtkWidget *checkbtn_offlinesync;
 
-       /* appy to sub folders */
+       /* apply 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;
+       GtkWidget *offlinesync_rec_checkbtn;
 
        gint       folder_color;
 };
@@ -138,10 +142,17 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        FolderItem *item = (FolderItem *) data;
        guint rowcount;
 
+
        GtkWidget *table;
        GtkWidget *hbox;
        GtkWidget *label;
        
+       GtkWidget *folder_type_menu;
+       GtkWidget *folder_type;
+       GtkWidget *dummy_chkbtn;
+       GtkWidget *menuitem;
+       SpecialFolderItemType type;
+       
        GtkWidget *checkbtn_simplify_subject;
        GtkWidget *entry_simplify_subject;
        GtkWidget *checkbtn_folder_chmod;
@@ -150,17 +161,20 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *folder_color_btn;
        GtkWidget *checkbtn_enable_processing;
        GtkWidget *checkbtn_newmailcheck;
+       GtkWidget *checkbtn_offlinesync;
 
        GtkWidget *simplify_subject_rec_checkbtn;
        GtkWidget *folder_chmod_rec_checkbtn;
        GtkWidget *folder_color_rec_checkbtn;
        GtkWidget *enable_processing_rec_checkbtn;
        GtkWidget *newmailcheck_rec_checkbtn;
-       
+       GtkWidget *offlinesync_rec_checkbtn;
+       GtkTooltips *tooltips;
+
        page->item         = item;
 
        /* Table */
-       table = gtk_table_new(5, 2, FALSE);
+       table = gtk_table_new(6, 2, FALSE);
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 4);
        rowcount = 0;
@@ -172,6 +186,54 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        rowcount++;
 
+       /* folder_type */
+       folder_type = gtk_option_menu_new ();
+       gtk_widget_show (folder_type);
+
+       type = F_NORMAL;
+       if (item->stype == F_INBOX)
+               type = F_INBOX;
+       else if (folder_has_parent_of_type(item, F_OUTBOX))
+               type = F_OUTBOX;
+       else if (folder_has_parent_of_type(item, F_DRAFT))
+               type = F_DRAFT;
+       else if (folder_has_parent_of_type(item, F_QUEUE))
+               type = F_QUEUE;
+       else if (folder_has_parent_of_type(item, F_TRASH))
+               type = F_TRASH;
+
+       folder_type_menu = gtk_menu_new ();
+
+       MENUITEM_ADD (folder_type_menu, menuitem, _("Normal"),  F_NORMAL);
+       MENUITEM_ADD (folder_type_menu, menuitem, _("Inbox"),  F_INBOX);
+       MENUITEM_ADD (folder_type_menu, menuitem, _("Outbox"),  F_OUTBOX);
+       MENUITEM_ADD (folder_type_menu, menuitem, _("Drafts"),  F_DRAFT);
+       MENUITEM_ADD (folder_type_menu, menuitem, _("Queue"),  F_QUEUE);
+       MENUITEM_ADD (folder_type_menu, menuitem, _("Trash"),  F_TRASH);
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (folder_type), folder_type_menu);
+
+       gtk_option_menu_set_history(GTK_OPTION_MENU(folder_type), type);
+
+       dummy_chkbtn = gtk_check_button_new();
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dummy_chkbtn), type != F_INBOX);
+       gtk_widget_set_sensitive(dummy_chkbtn, FALSE);
+
+       if (type == item->stype && type == F_NORMAL)
+               gtk_widget_set_sensitive(folder_type, TRUE);
+       else
+               gtk_widget_set_sensitive(folder_type, FALSE);
+
+       label = gtk_label_new(_("Folder type:"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(table), label, 0, 1, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+       gtk_table_attach(GTK_TABLE(table), folder_type, 1, 2, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+       gtk_table_attach(GTK_TABLE(table), dummy_chkbtn, 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_table_attach(GTK_TABLE(table), checkbtn_simplify_subject, 0, 1, 
@@ -231,6 +293,9 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        folder_color_btn = gtk_button_new_with_label("");
        gtk_widget_set_size_request(folder_color_btn, 36, 26);
        gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
+       tooltips = gtk_tooltips_new();
+       gtk_tooltips_set_tip(tooltips, folder_color_btn,
+                            _("Pick color for folder"), NULL);
 
        page->folder_color = item->prefs->color;
 
@@ -273,9 +338,32 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 
        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, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+       if (item->folder && (item->folder->klass->type != F_IMAP && 
+           item->folder->klass->type != F_NEWS)) {
+                item->prefs->offlinesync = TRUE;
+               gtk_widget_set_sensitive(GTK_WIDGET(checkbtn_offlinesync),
+                                                                FALSE);
+               gtk_widget_set_sensitive(GTK_WIDGET(offlinesync_rec_checkbtn),
+                                                                FALSE);
+       
+       }
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_offlinesync),
+                                                                item->prefs->offlinesync);
+       rowcount++;
+
        gtk_widget_show_all(table);
 
        page->table = table;
+       page->folder_type = folder_type;
        page->checkbtn_simplify_subject = checkbtn_simplify_subject;
        page->entry_simplify_subject = entry_simplify_subject;
        page->checkbtn_folder_chmod = checkbtn_folder_chmod;
@@ -283,12 +371,14 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->folder_color_btn = folder_color_btn;
        page->checkbtn_enable_processing = checkbtn_enable_processing;
        page->checkbtn_newmailcheck = checkbtn_newmailcheck;
+       page->checkbtn_offlinesync = checkbtn_offlinesync;
 
        page->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->offlinesync_rec_checkbtn       = offlinesync_rec_checkbtn;
 
        page->page.widget = table;
 }
@@ -301,19 +391,33 @@ void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_)
 /** \brief  Save the prefs in page to folder.
  *
  *  If the folder is not the one  specified in page->item, then only those properties 
- *  that have the relevant 'appy to sub folders' button checked are saved
+ *  that have the relevant 'apply to sub folders' button checked are saved
  */
 static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
 {
        FolderItemPrefs *prefs = folder->prefs;
        gchar *buf;
        gboolean all = FALSE;
+       SpecialFolderItemType type = F_NORMAL;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       if (folder->path == NULL)
+               return;
 
        g_return_if_fail(prefs != NULL);
 
        if (page->item == folder) 
                all = TRUE;
 
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->folder_type));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       type = GPOINTER_TO_INT
+               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       if (all && folder->stype != type) {
+               folder_item_change_type(folder, type);
+       }
+
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn))) {
                prefs->enable_simplify_subject =
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_simplify_subject));
@@ -330,10 +434,11 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
        }
 
        if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_color_rec_checkbtn))) {
+               int old_color = prefs->color;
                prefs->color = page->folder_color;
        
                /* update folder view */
-               if (prefs->color > 0)
+               if (prefs->color != old_color)
                        folder_item_update(folder, F_ITEM_UPDATE_MSGCNT);
        }
 
@@ -347,6 +452,11 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
                        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_newmailcheck));
        }
 
+       if (all ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn))) {
+               prefs->offlinesync = 
+                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_offlinesync));
+       }
+
        folder_item_prefs_save_config(folder);
 }      
 
@@ -368,7 +478,8 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
              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))))
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->newmailcheck_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn))))
                return TRUE;
        else 
                return FALSE;
@@ -383,6 +494,16 @@ void prefs_folder_item_general_save_func(PrefsPage *page_)
 
 }
 
+static RecvProtocol item_protocol(FolderItem *item)
+{
+       if (!item)
+               return A_NONE;
+       if (!item->folder)
+               return A_NONE;
+       if (!item->folder->account)
+               return A_NONE;
+       return item->folder->account->protocol;
+}
 void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                                                   GtkWindow * window,
                                                   gpointer data)
@@ -394,27 +515,27 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkWidget *table;
        GtkWidget *label;
        
-       GtkWidget *checkbtn_request_return_receipt;
-       GtkWidget *checkbtn_save_copy_to_folder;
-       GtkWidget *checkbtn_default_to;
-       GtkWidget *entry_default_to;
-       GtkWidget *checkbtn_default_reply_to;
-       GtkWidget *entry_default_reply_to;
-       GtkWidget *checkbtn_enable_default_account;
-       GtkWidget *optmenu_default_account;
-       GtkWidget *optmenu_default_account_menu;
-       GtkWidget *optmenu_default_account_menuitem;
+       GtkWidget *checkbtn_request_return_receipt = NULL;
+       GtkWidget *checkbtn_save_copy_to_folder = NULL;
+       GtkWidget *checkbtn_default_to = NULL;
+       GtkWidget *entry_default_to = NULL;
+       GtkWidget *checkbtn_default_reply_to = NULL;
+       GtkWidget *entry_default_reply_to = NULL;
+       GtkWidget *checkbtn_enable_default_account = NULL;
+       GtkWidget *optmenu_default_account = NULL;
+       GtkWidget *optmenu_default_account_menu = NULL;
+       GtkWidget *optmenu_default_account_menuitem = NULL;
 #if USE_ASPELL
-       GtkWidget *checkbtn_enable_default_dictionary;
-       GtkWidget *optmenu_default_dictionary;
+       GtkWidget *checkbtn_enable_default_dictionary = NULL;
+       GtkWidget *optmenu_default_dictionary = NULL;
 #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;
+       GtkWidget *request_return_receipt_rec_checkbtn = NULL;
+       GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
+       GtkWidget *default_to_rec_checkbtn = NULL;
+       GtkWidget *default_reply_to_rec_checkbtn = NULL;
+       GtkWidget *default_account_rec_checkbtn = NULL;
 #if USE_ASPELL
-       GtkWidget *default_dictionary_rec_checkbtn;
+       GtkWidget *default_dictionary_rec_checkbtn = NULL;
 #endif
 
        GList *cur_ac;
@@ -448,75 +569,76 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        rowcount++;
 
-       /* Request Return Receipt */
-       checkbtn_request_return_receipt = gtk_check_button_new_with_label
-               (_("Request Return Receipt"));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_request_return_receipt, 
-                        0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, 
-                        GTK_FILL, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt),
-                                    item->ret_rcpt ? TRUE : FALSE);
-
-       request_return_receipt_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), request_return_receipt_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
-       /* Save Copy to Folder */
-       checkbtn_save_copy_to_folder = gtk_check_button_new_with_label
-               (_("Save copy of outgoing messages to this folder instead of Sent"));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_save_copy_to_folder, 0, 2, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_save_copy_to_folder),
-                                    item->prefs->save_copy_to_folder ? TRUE : FALSE);
-
-       save_copy_to_folder_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), save_copy_to_folder_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
-       /* Default To */
-       checkbtn_default_to = gtk_check_button_new_with_label(_("Default To: "));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), 
-                                    item->prefs->enable_default_to);
-
-       entry_default_to = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
-                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-       SET_TOGGLE_SENSITIVITY(checkbtn_default_to, entry_default_to);
-       gtk_entry_set_text(GTK_ENTRY(entry_default_to), SAFE_STRING(item->prefs->default_to));
-       address_completion_register_entry(GTK_ENTRY(entry_default_to));
-
-       default_to_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), default_to_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
-       /* Default address to reply to */
-       checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Send replies to: "));
-       gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to), 
-                                    item->prefs->enable_default_reply_to);
-
-       entry_default_reply_to = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
-                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-       SET_TOGGLE_SENSITIVITY(checkbtn_default_reply_to, entry_default_reply_to);
-       gtk_entry_set_text(GTK_ENTRY(entry_default_reply_to), SAFE_STRING(item->prefs->default_reply_to));
-       address_completion_register_entry(GTK_ENTRY(entry_default_reply_to));
-
-       default_reply_to_rec_checkbtn = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), default_reply_to_rec_checkbtn, 2, 3, 
-                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-       
-       rowcount++;
-
+       if (item_protocol(item) != A_NNTP) {
+               /* Request Return Receipt */
+               checkbtn_request_return_receipt = gtk_check_button_new_with_label
+                       (_("Request Return Receipt"));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_request_return_receipt, 
+                                0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, 
+                                GTK_FILL, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt),
+                                            item->ret_rcpt ? TRUE : FALSE);
+
+               request_return_receipt_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), request_return_receipt_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Save Copy to Folder */
+               checkbtn_save_copy_to_folder = gtk_check_button_new_with_label
+                       (_("Save copy of outgoing messages to this folder instead of Sent"));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_save_copy_to_folder, 0, 2, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_save_copy_to_folder),
+                                            item->prefs->save_copy_to_folder ? TRUE : FALSE);
+
+               save_copy_to_folder_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), save_copy_to_folder_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Default To */
+               checkbtn_default_to = gtk_check_button_new_with_label(_("Default To: "));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), 
+                                            item->prefs->enable_default_to);
+
+               entry_default_to = gtk_entry_new();
+               gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
+                                rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+               SET_TOGGLE_SENSITIVITY(checkbtn_default_to, entry_default_to);
+               gtk_entry_set_text(GTK_ENTRY(entry_default_to), SAFE_STRING(item->prefs->default_to));
+               address_completion_register_entry(GTK_ENTRY(entry_default_to));
+
+               default_to_rec_checkbtn = gtk_check_button_new();
+               gtk_table_attach(GTK_TABLE(table), default_to_rec_checkbtn, 2, 3, 
+                                rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+               rowcount++;
+
+               /* Default address to reply to */
+               checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To for replies: "));
+               gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
+                                rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to), 
+                                            item->prefs->enable_default_reply_to);
+
+               entry_default_reply_to = gtk_entry_new();
+               gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
+                                rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+               SET_TOGGLE_SENSITIVITY(checkbtn_default_reply_to, entry_default_reply_to);
+               gtk_entry_set_text(GTK_ENTRY(entry_default_reply_to), SAFE_STRING(item->prefs->default_reply_to));
+               address_completion_register_entry(GTK_ENTRY(entry_default_reply_to));
+
+               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_table_attach(GTK_TABLE(table), checkbtn_enable_default_account, 0, 1, 
@@ -534,6 +656,14 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        index = 0;
        for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
                ac_prefs = (PrefsAccount *)cur_ac->data;
+               if (item->folder->account &&
+                   ( (item_protocol(item) == A_NNTP && ac_prefs->protocol != A_NNTP)
+                   ||(item_protocol(item) != A_NNTP && ac_prefs->protocol == A_NNTP))) 
+                       continue;
+
+               if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
+                       continue;
+
                MENUITEM_ADD (optmenu_default_account_menu, optmenu_default_account_menuitem,
                                        ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
                                        ac_prefs->account_id);
@@ -557,7 +687,6 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        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
@@ -630,15 +759,17 @@ void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
 {
        FolderItemComposePage *page = (FolderItemComposePage *) page_;
 
-       address_completion_unregister_entry(GTK_ENTRY(page->entry_default_to));
-       address_completion_unregister_entry(GTK_ENTRY(page->entry_default_reply_to));
+       if (page->entry_default_to)
+               address_completion_unregister_entry(GTK_ENTRY(page->entry_default_to));
+       if (page->entry_default_reply_to)
+               address_completion_unregister_entry(GTK_ENTRY(page->entry_default_reply_to));
        address_completion_end(page->window);
 }
 
 /** \brief  Save the prefs in page to folder.
  *
  *  If the folder is not the one  specified in page->item, then only those properties 
- *  that have the relevant 'appy to sub folders' button checked are saved
+ *  that have the relevant 'apply to sub folders' button checked are saved
  */
 static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
 {
@@ -647,38 +778,47 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
        GtkWidget *menuitem;
        gboolean all = FALSE;
 
+       if (folder->path == NULL)
+               return;
+
        if (page->item == folder) 
                all = TRUE;
 
        g_return_if_fail(prefs != NULL);
 
-       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
-               prefs->request_return_receipt = 
-                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_request_return_receipt));
-               /* MIGRATION */    
-               folder->ret_rcpt = prefs->request_return_receipt;
-       }
-
-       if (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 (item_protocol(folder) != A_NNTP) {
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
+                       prefs->request_return_receipt = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_request_return_receipt));
+                       /* MIGRATION */    
+                       folder->ret_rcpt = prefs->request_return_receipt;
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn))) {
+                       prefs->save_copy_to_folder = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_save_copy_to_folder));
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn))) {
+
+                       prefs->enable_default_to = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_to));
+                       ASSIGN_STRING(prefs->default_to,
+                                     gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_to), 0, -1));
+               }
+
+               if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))) {
+                       prefs->enable_default_reply_to = 
+                               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_reply_to));
+                       ASSIGN_STRING(prefs->default_reply_to,
+                                     gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_reply_to), 0, -1));
+               }
+       } else {
+               prefs->request_return_receipt = FALSE;
+               prefs->save_copy_to_folder = FALSE;
+               prefs->enable_default_to = FALSE;
+               prefs->enable_default_reply_to = FALSE;
        }
-
-       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->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));
@@ -713,12 +853,19 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
        /* optimise by not continuing if none of the 'apply to sub folders'
           check boxes are selected - and optimise the checking by only doing
           it once */
-       if ((node == page->item->node) &&
+       if ((node == page->item->node) && item_protocol(item) != A_NNTP &&
            !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn)) ||
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn)) ||
-             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn)) ||
-             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) 
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) ||
+#if USE_ASPELL
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn)) ||
+#endif
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))))
+               return TRUE;
+
+       if ((node == page->item->node) &&
+           !(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
@@ -763,11 +910,10 @@ static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
 }
 
 
-FolderItemGeneralPage folder_item_general_page;
-
 static void register_general_page()
 {
        static gchar *pfi_general_path[2];
+       static FolderItemGeneralPage folder_item_general_page;
 
        pfi_general_path[0] = _("General");
        pfi_general_path[1] = NULL;
@@ -780,11 +926,11 @@ static void register_general_page()
        prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page);
 }
 
-FolderItemComposePage folder_item_compose_page;
 
 static void register_compose_page(void)
 {
        static gchar *pfi_compose_path[2];
+       static FolderItemComposePage folder_item_compose_page;
 
        pfi_compose_path[0] = _("Compose");
        pfi_compose_path[1] = NULL;
@@ -808,10 +954,14 @@ void prefs_folder_item_open(FolderItem *item)
                register_compose_page();
        }
 
-       id = folder_item_get_identifier (item);
-       title = g_strdup_printf (_("%s - Settings for folder"), id);
+       if (item->path)
+               id = folder_item_get_identifier (item);
+       else 
+               id = g_strdup(item->name);
+       title = g_strdup_printf (_("Properties for folder %s"), id);
        g_free (id);
-       prefswindow_open(title, prefs_pages, item);
+       prefswindow_open(title, prefs_pages, item,
+                       &prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height);
        g_free (title);
 }