sync with 0.7.5cvs20
[claws.git] / src / prefs_account.c
index da15a4ca251f4c3303ac782b9e4f6961d222cd22..221ef16613bf2a2d955574753ae0ca5bc67724ea 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-2002 Hiroyuki Yamamoto
  *
  * 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
@@ -46,6 +46,7 @@
 #include "gtkutils.h"
 #include "utils.h"
 #include "alertpanel.h"
+#include "colorlabel.h"
 
 static gboolean cancelled;
 
@@ -85,15 +86,16 @@ static struct Basic {
 static struct Receive {
        GtkWidget *pop3_frame;
        GtkWidget *rmmail_chkbtn;
+       GtkWidget *leave_time_entry;
        GtkWidget *getall_chkbtn;
-       GtkWidget *recvatgetall_chkbtn;
+       GtkWidget *size_limit_chkbtn;
+       GtkWidget *size_limit_entry;
        GtkWidget *filter_on_recv_chkbtn;
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
        GtkWidget *inbox_btn;
 
-       GtkWidget *imap_frame;
-       GtkWidget *imapdir_entry;
+       GtkWidget *recvatgetall_chkbtn;
 } receive;
 
 static struct Send {
@@ -103,14 +105,14 @@ static struct Send {
        GtkWidget *customhdr_chkbtn;
 
        GtkWidget *smtp_auth_chkbtn;
-       GtkWidget *smtp_userid_entry;
-       GtkWidget *smtp_passwd_entry;
+       GtkWidget *smtp_uid_entry;
+       GtkWidget *smtp_pass_entry;
        GtkWidget *pop_bfr_smtp_chkbtn;
 } send;
 
 static struct Compose {
        GtkWidget *sigpath_entry;
-        
+
        GtkWidget *autocc_chkbtn;
        GtkWidget *autocc_entry;
        GtkWidget *autobcc_chkbtn;
@@ -136,6 +138,7 @@ static struct SSLPrefs {
        GtkWidget *receive_frame;
        GtkWidget *pop_chkbtn;
        GtkWidget *imap_chkbtn;
+       GtkWidget *nntp_chkbtn;
 
        GtkWidget *send_frame;
        GtkWidget *smtp_nossl_radiobtn;
@@ -160,6 +163,18 @@ static struct Advanced {
        GtkWidget *domain_entry;
        GtkWidget *tunnelcmd_chkbtn;
        GtkWidget *tunnelcmd_entry;
+       GtkWidget *crosspost_chkbtn;
+       GtkWidget *crosspost_colormenu;
+
+       GtkWidget *imap_frame;
+       GtkWidget *imapdir_entry;
+
+       GtkWidget *sent_folder_chkbtn;
+       GtkWidget *sent_folder_entry;
+       GtkWidget *draft_folder_chkbtn;
+       GtkWidget *draft_folder_entry;
+       GtkWidget *trash_folder_chkbtn;
+       GtkWidget *trash_folder_entry;
 } advanced;
 
 static void prefs_account_fix_size                     (void);
@@ -173,11 +188,15 @@ static void prefs_account_enum_set_radiobtn               (PrefParam *pparam);
 static void prefs_account_ascii_armored_warning(GtkWidget* widget, 
                                               gpointer unused);
 #endif /* USE_GPGME || USE_SSL */
+static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
+static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
 
 static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
                                           gpointer user_data);
 static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
                                          gpointer user_data);
+static void prefs_account_smtp_userid_cb(GtkEditable *editable,
+                                        gpointer smtp_passwd);
 
 static PrefParam param[] = {
        /* Basic */
@@ -217,7 +236,7 @@ static PrefParam param[] = {
        {"use_mail_command", "FALSE", &tmp_ac_prefs.use_mail_command, P_BOOL,
         &basic.mailcmd_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"mail_command", "/usr/sbin/sendmail", &tmp_ac_prefs.mail_command, P_STRING,
+       {"mail_command", "/usr/sbin/sendmail -t", &tmp_ac_prefs.mail_command, P_STRING,
         &basic.mailcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
 
        {"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
@@ -237,21 +256,29 @@ static PrefParam param[] = {
        {"remove_mail", "TRUE", &tmp_ac_prefs.rmmail, P_BOOL,
         &receive.rmmail_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       
+       {"leave_mail_time", "0", &tmp_ac_prefs.leave_time, P_STRING,
+        &receive.leave_time_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
 
        {"get_all_mail", "FALSE", &tmp_ac_prefs.getall, P_BOOL,
         &receive.getall_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
-        &receive.recvatgetall_chkbtn,
+       {"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
+        &receive.size_limit_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"size_limit", "1024", &tmp_ac_prefs.size_limit, P_INT,
+        &receive.size_limit_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
 
        {"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL,
         &receive.filter_on_recv_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
-        &receive.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+       {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
+        &receive.recvatgetall_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
 
        /* Send */
        {"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
@@ -270,11 +297,10 @@ static PrefParam param[] = {
         &send.smtp_auth_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"smtp_user_id", "ENV_USER", &tmp_ac_prefs.smtp_userid, P_STRING,
-        &send.smtp_userid_entry, prefs_set_data_from_entry, prefs_set_entry},
-
+       {"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
+        &send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
        {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
-        &send.smtp_passwd_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
 
        {"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
         &send.pop_bfr_smtp_chkbtn,
@@ -340,6 +366,8 @@ static PrefParam param[] = {
         &ssl.pop_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
        {"ssl_imap", "FALSE", &tmp_ac_prefs.ssl_imap, P_BOOL,
         &ssl.imap_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
+       {"ssl_nntp", "FALSE", &tmp_ac_prefs.ssl_nntp, P_BOOL,
+        &ssl.nntp_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
 #endif /* USE_SSL */
 
        /* Advanced */
@@ -391,6 +419,39 @@ static PrefParam param[] = {
         &advanced.tunnelcmd_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
+       {"mark_crosspost_read", "FALSE", &tmp_ac_prefs.mark_crosspost_read, P_BOOL,
+        &advanced.crosspost_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+       {"crosspost_color", NULL, &tmp_ac_prefs.crosspost_col, P_ENUM,
+        &advanced.crosspost_colormenu,
+        prefs_account_crosspost_set_data_from_colormenu,
+        prefs_account_crosspost_set_colormenu},
+
+       {"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
+        &advanced.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
+        &advanced.sent_folder_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"sent_folder", NULL, &tmp_ac_prefs.sent_folder, P_STRING,
+        &advanced.sent_folder_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_draft_folder", "FALSE", &tmp_ac_prefs.set_draft_folder, P_BOOL,
+        &advanced.draft_folder_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"draft_folder", NULL, &tmp_ac_prefs.draft_folder, P_STRING,
+        &advanced.draft_folder_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_trash_folder", "FALSE", &tmp_ac_prefs.set_trash_folder, P_BOOL,
+        &advanced.trash_folder_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING,
+        &advanced.trash_folder_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -407,7 +468,8 @@ static void prefs_account_ssl_create                (void);
 #endif /* USE_SSL */
 static void prefs_account_advanced_create      (void);
 
-static void prefs_account_select_inbox_cb      (void);
+static void prefs_account_select_folder_cb     (GtkWidget      *widget,
+                                                gpointer        data);
 static void prefs_account_edit_custom_header   (void);
 
 static gint prefs_account_deleted              (GtkWidget      *widget,
@@ -524,6 +586,9 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
 
        if (!ac_prefs) {
                ac_prefs = g_new0(PrefsAccount, 1);
+               memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
+               prefs_set_default(param);
+               *ac_prefs = tmp_ac_prefs;
                ac_prefs->account_id = prefs_account_get_new_id();
                new_account = TRUE;
        }
@@ -555,6 +620,12 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
                        gtk_entry_set_text(GTK_ENTRY(basic.org_entry),
                                           def_ac->organization ? def_ac->organization : "");
                }
+               menu_set_sensitive_all
+                       (GTK_MENU_SHELL
+                               (gtk_option_menu_get_menu
+                                       (GTK_OPTION_MENU
+                                               (basic.protocol_optmenu))),
+                        TRUE);
                gtk_window_set_title(GTK_WINDOW(dialog.window),
                                     _("Preferences for new account"));
                gtk_widget_hide(dialog.apply_btn);
@@ -597,10 +668,8 @@ static void prefs_account_create(void)
                           GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
        gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
                           GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_in_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_out_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
+
        gtk_signal_connect(GTK_OBJECT(dialog.ok_btn), "clicked",
                           GTK_SIGNAL_FUNC(prefs_account_ok), NULL);
        gtk_signal_connect(GTK_OBJECT(dialog.apply_btn), "clicked",
@@ -948,17 +1017,20 @@ static void prefs_account_receive_create(void)
        GtkWidget *vbox2;
        GtkWidget *rmmail_chkbtn;
        GtkWidget *getall_chkbtn;
-       GtkWidget *recvatgetall_chkbtn;
+       GtkWidget *hbox1;
+       GtkWidget *size_limit_chkbtn;
+       GtkWidget *size_limit_entry;
+       GtkWidget *label;
        GtkWidget *filter_on_recv_chkbtn;
        GtkWidget *vbox3;
-       GtkWidget *hbox1;
+       GtkWidget *hbox2;
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
+       GtkWidget *leave_time_entry;
+       GtkWidget *leave_time_label;
+       GtkWidget *leave_time_hint;     
        GtkWidget *inbox_btn;
-       GtkWidget *label;
-       GtkWidget *frame2;
-       GtkWidget *imapdir_label;
-       GtkWidget *imapdir_entry;
+       GtkWidget *recvatgetall_chkbtn;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -972,13 +1044,46 @@ static void prefs_account_receive_create(void)
        gtk_container_add (GTK_CONTAINER (frame1), vbox2);
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
-       PACK_CHECK_BUTTON (vbox2, rmmail_chkbtn,
-                          _("Remove messages on server when received"));
+       hbox2 = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox2);
+       gtk_container_add (GTK_CONTAINER (vbox2), hbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox2), 0);
+
+       PACK_CHECK_BUTTON (hbox2, rmmail_chkbtn,
+                          _("Remove messages on server when received for "));
+       leave_time_entry = gtk_entry_new ();
+       gtk_widget_show (leave_time_entry);
+       gtk_widget_set_usize (leave_time_entry, DEFAULT_ENTRY_WIDTH, -1);
+       gtk_box_pack_start (GTK_BOX (hbox2), leave_time_entry, TRUE, TRUE, 0);
+       
+       leave_time_label = gtk_label_new (_(" days"));
+       gtk_widget_show (leave_time_label);
+       gtk_box_pack_start (GTK_BOX (hbox2), leave_time_label, FALSE, FALSE, 0);
+       
+       leave_time_hint=gtk_label_new (_("(Setting to 0 days will delete messages immediately)"));
+       gtk_widget_show(leave_time_hint);
+       gtk_box_pack_start (GTK_BOX (vbox2), leave_time_hint, FALSE, FALSE, 0);
+               
        PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
                           _("Download all messages on server"));
-       PACK_CHECK_BUTTON
-               (vbox2, recvatgetall_chkbtn,
-                _("`Get all' checks for new mail on this account"));
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON (hbox1, size_limit_chkbtn, _("Receive size limit"));
+
+       size_limit_entry = gtk_entry_new ();
+       gtk_widget_show (size_limit_entry);
+       gtk_widget_set_usize (size_limit_entry, 64, -1);
+       gtk_box_pack_start (GTK_BOX (hbox1), size_limit_entry, FALSE, FALSE, 0);
+
+       label = gtk_label_new ("KB");
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+
+       SET_TOGGLE_SENSITIVITY (size_limit_chkbtn, size_limit_entry);
+
        PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
                           _("Filter messages on receiving"));
 
@@ -1001,8 +1106,8 @@ static void prefs_account_receive_create(void)
        gtk_widget_show (inbox_btn);
        gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
        gtk_signal_connect (GTK_OBJECT (inbox_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_account_select_inbox_cb),
-                           NULL);
+                           GTK_SIGNAL_FUNC (prefs_account_select_folder_cb),
+                           inbox_entry);
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
@@ -1016,36 +1121,22 @@ static void prefs_account_receive_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-       PACK_FRAME (vbox1, frame2, _("IMAP4"));
-
-       vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox2);
-       gtk_container_add (GTK_CONTAINER (frame2), vbox2);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-       imapdir_label = gtk_label_new (_("IMAP server directory"));
-       gtk_widget_show (imapdir_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
-
-       imapdir_entry = gtk_entry_new();
-       gtk_widget_show (imapdir_entry);
-       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
+       PACK_CHECK_BUTTON
+               (vbox1, recvatgetall_chkbtn,
+                _("`Get all' checks for new messages on this account"));
 
        receive.pop3_frame            = frame1;
        receive.rmmail_chkbtn         = rmmail_chkbtn;
+       receive.leave_time_entry      = leave_time_entry;
        receive.getall_chkbtn         = getall_chkbtn;
-       receive.recvatgetall_chkbtn   = recvatgetall_chkbtn;
+       receive.size_limit_chkbtn     = size_limit_chkbtn;
+       receive.size_limit_entry      = size_limit_entry;
        receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
        receive.inbox_label           = inbox_label;
        receive.inbox_entry           = inbox_entry;
        receive.inbox_btn             = inbox_btn;
 
-       receive.imap_frame    = frame2;
-       receive.imapdir_entry = imapdir_entry;
+       receive.recvatgetall_chkbtn   = recvatgetall_chkbtn;
 }
 
 static void prefs_account_send_create(void)
@@ -1058,15 +1149,14 @@ static void prefs_account_send_create(void)
        GtkWidget *hbox;
        GtkWidget *customhdr_chkbtn;
        GtkWidget *customhdr_edit_btn;
-       GtkWidget *frame3;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_chkbtn;
-       GtkWidget *smtp_auth_hbox;
+       GtkWidget *vbox4;
+       GtkWidget *hbox_spc;
        GtkWidget *label;
-       GtkWidget *uid_label;
-       GtkWidget *smtp_userid_entry;
-       GtkWidget *pass_label;
-       GtkWidget *smtp_passwd_entry;
+       GtkWidget *smtp_uid_entry;
+       GtkWidget *smtp_pass_entry;
+       GtkWidget *vbox_spc;
        GtkWidget *pop_bfr_smtp_chkbtn;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1101,52 +1191,67 @@ static void prefs_account_send_create(void)
 
        SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
 
-       PACK_FRAME (vbox1, frame3, _("Authentication"));
+       PACK_FRAME (vbox1, frame, _("Authentication"));
 
        vbox3 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox3);
-       gtk_container_add (GTK_CONTAINER (frame3), vbox3);
+       gtk_container_add (GTK_CONTAINER (frame), vbox3);
        gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
 
        PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
                _("SMTP Authentication (SMTP AUTH)"));
 
-       smtp_auth_hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (smtp_auth_hbox);
-       gtk_box_pack_start (GTK_BOX (vbox3), smtp_auth_hbox, FALSE, FALSE, 0);
+       vbox4 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox4);
+       gtk_box_pack_start (GTK_BOX (vbox3), vbox4, FALSE, FALSE, 0);
 
-       label = gtk_label_new ("");
+       hbox = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 16, -1);
+
+       label = gtk_label_new (_("User ID"));
        gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), label, FALSE, FALSE, 0);
-       gtk_widget_set_usize (label, 16, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-       uid_label = gtk_label_new (_("User ID"));
-       gtk_widget_show (uid_label);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), uid_label,
-                           FALSE, FALSE, 0);
-       gtk_misc_set_alignment (GTK_MISC (uid_label), 1, 0.5);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, uid_label);
+       smtp_uid_entry = gtk_entry_new ();
+       gtk_widget_show (smtp_uid_entry);
+       gtk_widget_set_usize (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0);
 
-       smtp_userid_entry = gtk_entry_new ();
-       gtk_widget_show (smtp_userid_entry);
-       gtk_widget_set_usize (smtp_userid_entry, DEFAULT_ENTRY_WIDTH, -1);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), smtp_userid_entry,
-                           TRUE, TRUE, 0);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, smtp_userid_entry);
+       label = gtk_label_new (_("Password"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-       pass_label = gtk_label_new (_("Password"));
-       gtk_widget_show (pass_label);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), pass_label,
-                           FALSE, FALSE, 0);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, pass_label);
+       smtp_pass_entry = gtk_entry_new ();
+       gtk_widget_show (smtp_pass_entry);
+       gtk_widget_set_usize (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
+       gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
 
-       smtp_passwd_entry = gtk_entry_new ();
-       gtk_widget_show (smtp_passwd_entry);
-       gtk_widget_set_usize (smtp_passwd_entry, DEFAULT_ENTRY_WIDTH, -1);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), smtp_passwd_entry,
-                           TRUE, TRUE, 0);
-       gtk_entry_set_visibility (GTK_ENTRY (smtp_passwd_entry), FALSE);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, smtp_passwd_entry);
+       PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
+
+       hbox = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 16, -1);
+
+       label = gtk_label_new
+               (_("If you leave these entries empty, the same\n"
+                  "user ID and password as receiving will be used."));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4);
 
        PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
                _("Authenticate with POP3 before sending"));
@@ -1157,8 +1262,8 @@ static void prefs_account_send_create(void)
        send.customhdr_chkbtn = customhdr_chkbtn;
 
        send.smtp_auth_chkbtn    = smtp_auth_chkbtn;
-       send.smtp_userid_entry   = smtp_userid_entry;
-       send.smtp_passwd_entry   = smtp_passwd_entry;
+       send.smtp_uid_entry      = smtp_uid_entry;
+       send.smtp_pass_entry     = smtp_pass_entry;
        send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
 }
 
@@ -1286,7 +1391,7 @@ static void prefs_account_privacy_create(void)
                           _("Encrypt message by default"));
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
-                          _("Plain ASCII armored"));
+                          _("Plain ASCII-armored"));
        gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
                                prefs_account_ascii_armored_warning, (gpointer)0);
 
@@ -1360,9 +1465,9 @@ static void prefs_account_ascii_armored_warning(GtkWidget* widget,
 {
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))
                && gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook))) {
-               alertpanel_message(_("Warning - Privacy/Plain ASCII armored"),
-                       _("Its not recommend to use the old style plain ASCII\n"
-                       "armored mode for encypted messages. It doesn't comply\n"
+               alertpanel_message(_("Warning - Privacy/Plain ASCII-armored"),
+                       _("Its not recommend to use the old style plain ASCII-\n"
+                       "armored mode for encrypted messages. It doesn't comply\n"
                        "with the RFC 3156 - MIME security with OpenPGP."));
        }
 }
@@ -1377,6 +1482,7 @@ static void prefs_account_ssl_create(void)
        GtkWidget *vbox2;
        GtkWidget *pop_chkbtn;
        GtkWidget *imap_chkbtn;
+       GtkWidget *nntp_chkbtn;
 
        GtkWidget *send_frame;
        GtkWidget *vbox3;
@@ -1400,6 +1506,8 @@ static void prefs_account_ssl_create(void)
                           _("Use SSL for POP3 connection"));
        PACK_CHECK_BUTTON (vbox2, imap_chkbtn,
                           _("Use SSL for IMAP4 connection"));
+       PACK_CHECK_BUTTON (vbox2, nntp_chkbtn,
+                          _("Use SSL for NNTP connection"));
 
        PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
 
@@ -1437,6 +1545,7 @@ static void prefs_account_ssl_create(void)
        ssl.receive_frame = receive_frame;
        ssl.pop_chkbtn    = pop_chkbtn;
        ssl.imap_chkbtn   = imap_chkbtn;
+       ssl.nntp_chkbtn   = nntp_chkbtn;
 
        ssl.send_frame                = send_frame;
        ssl.smtp_nossl_radiobtn       = smtp_nossl_radiobtn;
@@ -1445,6 +1554,40 @@ static void prefs_account_ssl_create(void)
 }
 #endif /* USE_SSL */
 
+static void crosspost_color_toggled(void)
+{
+       gboolean is_active;
+
+       is_active = gtk_toggle_button_get_active
+               (GTK_TOGGLE_BUTTON(advanced.crosspost_chkbtn));
+       gtk_widget_set_sensitive(advanced.crosspost_colormenu, is_active);
+}
+
+static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam)
+{
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(advanced.crosspost_colormenu));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       *((gint *)pparam->data) = GPOINTER_TO_INT
+               (gtk_object_get_data(GTK_OBJECT(menuitem), "color"));
+}
+
+static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
+{
+       gint colorlabel = *((gint *)pparam->data);
+       GtkOptionMenu *colormenu = GTK_OPTION_MENU(*pparam->widget);
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       gtk_option_menu_set_history(colormenu, colorlabel);
+       menu = gtk_option_menu_get_menu(colormenu);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
+
 static void prefs_account_advanced_create(void)
 {
        GtkWidget *vbox1;
@@ -1465,6 +1608,24 @@ static void prefs_account_advanced_create(void)
        GtkWidget *entry_domain;
        GtkWidget *checkbtn_tunnelcmd;
        GtkWidget *entry_tunnelcmd;
+       GtkWidget *checkbtn_crosspost;
+       GtkWidget *colormenu_crosspost;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+       GtkWidget *item;
+       gint i;
+       GtkWidget *imap_frame;
+       GtkWidget *imapdir_label;
+       GtkWidget *imapdir_entry;
+       GtkWidget *folder_frame;
+       GtkWidget *vbox3;
+       GtkWidget *table;
+       GtkWidget *sent_folder_chkbtn;
+       GtkWidget *sent_folder_entry;
+       GtkWidget *draft_folder_chkbtn;
+       GtkWidget *draft_folder_entry;
+       GtkWidget *trash_folder_chkbtn;
+       GtkWidget *trash_folder_entry;
 
 #define PACK_HBOX(hbox) \
        { \
@@ -1530,9 +1691,93 @@ static void prefs_account_advanced_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), entry_tunnelcmd, TRUE, TRUE, 0);
        SET_TOGGLE_SENSITIVITY (checkbtn_tunnelcmd, entry_tunnelcmd);
 
+       PACK_HBOX (hbox1);
+       PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost, 
+                          _("Mark cross-posted messages as read and color:"));
+       gtk_signal_connect (GTK_OBJECT (checkbtn_crosspost), "toggled",
+                                       GTK_SIGNAL_FUNC (crosspost_color_toggled),
+                                       NULL);
+
+       colormenu_crosspost = gtk_option_menu_new();
+       gtk_widget_show (colormenu_crosspost);
+       gtk_box_pack_start (GTK_BOX (hbox1), colormenu_crosspost, FALSE, FALSE, 0);
+
+       menu = colorlabel_create_color_menu();
+       gtk_option_menu_set_menu (GTK_OPTION_MENU(colormenu_crosspost), menu);
+       SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
+
+       PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
+
+       vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox3);
+       gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
+
+       imapdir_label = gtk_label_new (_("IMAP server directory"));
+       gtk_widget_show (imapdir_label);
+       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
+
+       imapdir_entry = gtk_entry_new();
+       gtk_widget_show (imapdir_entry);
+       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
+
 #undef PACK_HBOX
 #undef PACK_PORT_ENTRY
 
+       /* special folder setting (maybe these options are redundant) */
+
+       PACK_FRAME (vbox1, folder_frame, _("Folder"));
+
+       vbox3 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox3);
+       gtk_container_add (GTK_CONTAINER (folder_frame), vbox3);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
+       table = gtk_table_new (3, 3, FALSE);
+       gtk_widget_show (table);
+       gtk_container_add (GTK_CONTAINER (vbox3), table);
+       gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+       gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+
+#define SET_CHECK_BTN_AND_ENTRY(label, chkbtn, entry, n)               \
+{                                                                      \
+       GtkWidget *button;                                              \
+                                                                       \
+       chkbtn = gtk_check_button_new_with_label (label);               \
+       gtk_widget_show (chkbtn);                                       \
+       gtk_table_attach (GTK_TABLE (table), chkbtn,                    \
+                         0, 1, n, n + 1, GTK_FILL, 0, 0, 0);           \
+                                                                       \
+       entry = gtk_entry_new ();                                       \
+       gtk_widget_show (entry);                                        \
+       gtk_table_attach (GTK_TABLE (table), entry, 1, 2, n, n + 1,     \
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,           \
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);    \
+                                                                       \
+       button = gtk_button_new_with_label (_(" ... "));                \
+       gtk_widget_show (button);                                       \
+       gtk_table_attach (GTK_TABLE (table), button,                    \
+                         2, 3, n, n + 1, GTK_FILL, 0, 0, 0);           \
+       gtk_signal_connect                                              \
+               (GTK_OBJECT (button), "clicked",                        \
+                GTK_SIGNAL_FUNC (prefs_account_select_folder_cb),      \
+                entry);                                                \
+                                                                       \
+       SET_TOGGLE_SENSITIVITY (chkbtn, entry);                         \
+       SET_TOGGLE_SENSITIVITY (chkbtn, button);                        \
+}
+
+       SET_CHECK_BTN_AND_ENTRY(_("Put sent messages to"),
+                               sent_folder_chkbtn, sent_folder_entry, 0);
+       SET_CHECK_BTN_AND_ENTRY(_("Put draft messages to"),
+                               draft_folder_chkbtn, draft_folder_entry, 1);
+       SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages to"),
+                               trash_folder_chkbtn, trash_folder_entry, 2);
+
        advanced.smtpport_chkbtn        = checkbtn_smtpport;
        advanced.smtpport_entry         = entry_smtpport;
        advanced.popport_hbox           = hbox_popport;
@@ -1548,6 +1793,18 @@ static void prefs_account_advanced_create(void)
        advanced.domain_entry           = entry_domain;
        advanced.tunnelcmd_chkbtn       = checkbtn_tunnelcmd;
        advanced.tunnelcmd_entry        = entry_tunnelcmd;
+       advanced.crosspost_chkbtn       = checkbtn_crosspost;
+       advanced.crosspost_colormenu    = colormenu_crosspost;
+
+       advanced.imap_frame             = imap_frame;
+       advanced.imapdir_entry          = imapdir_entry;
+
+       advanced.sent_folder_chkbtn  = sent_folder_chkbtn;
+       advanced.sent_folder_entry   = sent_folder_entry;
+       advanced.draft_folder_chkbtn = draft_folder_chkbtn;
+       advanced.draft_folder_entry  = draft_folder_entry;
+       advanced.trash_folder_chkbtn = trash_folder_chkbtn;
+       advanced.trash_folder_entry  = trash_folder_entry;
 }
 
 static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
@@ -1581,6 +1838,10 @@ static gint prefs_account_apply(void)
        protocol = GPOINTER_TO_INT
                (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
 
+       if (*gtk_entry_get_text(GTK_ENTRY(basic.acname_entry)) == '\0') {
+               alertpanel_error(_("Account name is not entered."));
+               return -1;
+       }
        if (*gtk_entry_get_text(GTK_ENTRY(basic.addr_entry)) == '\0') {
                alertpanel_error(_("Mail address is not entered."));
                return -1;
@@ -1633,17 +1894,19 @@ static void prefs_account_cancel(void)
        gtk_main_quit();
 }
 
-static void prefs_account_select_inbox_cb(void)
+static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
 {
        FolderItem *item;
-       gchar      *path;
-
-       item = foldersel_folder_sel(NULL, NULL);
-       if (item) {
-               path = folder_item_get_identifier(item);
-               gtk_entry_set_text(GTK_ENTRY(receive.inbox_entry), path);
-               g_free(path);
-       }       
+       gchar *id;
+
+       item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
+       if (item && item->path) {
+               id = folder_item_get_identifier(item);
+               if (id) {
+                       gtk_entry_set_text(GTK_ENTRY(data), id);
+                       g_free(id);
+               }
+       }
 }
 
 static void prefs_account_edit_custom_header(void)
@@ -1709,35 +1972,41 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
        GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
        GtkWidget *menu;
        GtkWidget *menuitem;
+       GList *children;
+       gint list_order[] = {
+               0,  /* A_POP3  */
+               1,  /* A_APOP  */
+               -1, /* A_RPOP  */
+               2,  /* A_IMAP4 */
+               3,  /* A_NNTP  */
+               4   /* A_LOCAL */
+       };
 
        protocol = *((RecvProtocol *)pparam->data);
+       if (protocol < 0 || protocol > A_LOCAL) return;
+       if (list_order[protocol] < 0) return;
+       gtk_option_menu_set_history(optmenu, list_order[protocol]);
 
-       switch (protocol) {
-       case A_POP3:
-               gtk_option_menu_set_history(optmenu, 0);
-               break;
-       case A_APOP:
-               gtk_option_menu_set_history(optmenu, 1);
-               break;
-       case A_IMAP4:
-               gtk_option_menu_set_history(optmenu, 2);
-               break;
-       case A_NNTP:
-               gtk_option_menu_set_history(optmenu, 3);
-               break;
-       case A_LOCAL:
-               gtk_option_menu_set_history(optmenu, 4);
-               break;
-               /*
-       case A_LOCAL_CMD:
-               gtk_option_menu_set_history(optmenu, 5);
-               break;
-               */
-       default:
-               break;
+       menu = gtk_option_menu_get_menu(optmenu);
+       menu_set_insensitive_all(GTK_MENU_SHELL(menu));
+
+#define SET_NTH_SENSITIVE(proto) \
+{ \
+       menuitem = g_list_nth_data(children, list_order[proto]); \
+       if (menuitem) \
+               gtk_widget_set_sensitive(menuitem, TRUE); \
+}
+
+       children = GTK_MENU_SHELL(menu)->children;
+       SET_NTH_SENSITIVE(protocol);
+       if (protocol == A_POP3) {
+               SET_NTH_SENSITIVE(A_APOP);
+       } else if (protocol == A_APOP) {
+               SET_NTH_SENSITIVE(A_POP3);
        }
 
-       menu = gtk_option_menu_get_menu(optmenu);
+#undef SET_NTH_SENSITIVE
+
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
 }
@@ -1796,16 +2065,27 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                prefs_account_nntpauth_toggled
                        (GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
-               gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
+
+               if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                FALSE);
+               }
+
 #if USE_SSL
-               gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
+               gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, TRUE);
                gtk_widget_set_sensitive(ssl.send_frame, FALSE);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_show(advanced.nntpport_hbox);
+               gtk_widget_show(advanced.crosspost_chkbtn);
+               gtk_widget_show(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
                break;
        case A_LOCAL:
                gtk_widget_hide(basic.nntpserv_label);
@@ -1847,19 +2127,29 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
                gtk_widget_set_sensitive(basic.pass_entry, TRUE);
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
-               gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
                prefs_account_mailcmd_toggled
                        (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
 
+               if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                TRUE);
+               }
+
 #if USE_SSL
                gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.send_frame, TRUE);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
+               gtk_widget_hide(advanced.crosspost_chkbtn);
+               gtk_widget_hide(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
                break;
        case A_IMAP4:
                gtk_widget_hide(basic.nntpserv_label);
@@ -1903,19 +2193,29 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
                gtk_widget_set_sensitive(basic.pass_entry, TRUE);
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
-               gtk_widget_set_sensitive(receive.imap_frame, TRUE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+               if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                FALSE);
+               }
+
 #if USE_SSL
                gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, TRUE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.send_frame, TRUE);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_show(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
+               gtk_widget_hide(advanced.crosspost_chkbtn);
+               gtk_widget_hide(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, TRUE);
                break;
        case A_POP3:
        default:
@@ -1960,19 +2260,29 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
                gtk_widget_set_sensitive(basic.pass_entry, TRUE);
                gtk_widget_set_sensitive(receive.pop3_frame, TRUE);
-               gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+               if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                TRUE);
+               }
+
 #if USE_SSL
                gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, TRUE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.send_frame, TRUE);
 #endif
                gtk_widget_show(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
+               gtk_widget_hide(advanced.crosspost_chkbtn);
+               gtk_widget_hide(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
                break;
        }
 
@@ -2007,3 +2317,19 @@ static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
        gtk_widget_set_sensitive(basic.uid_entry,  !use_mailcmd);
        gtk_widget_set_sensitive(basic.pass_entry, !use_mailcmd);
 }
+
+static void prefs_account_smtp_userid_cb(GtkEditable *editable,
+                                        gpointer smtp_passwd)
+{
+       gchar *buf;
+       gboolean use_smtp_userid;
+       
+       buf = gtk_editable_get_chars(editable, 0, -1);
+       if(buf[0] == '\0') {
+               use_smtp_userid = FALSE;
+       } else {
+               use_smtp_userid = TRUE;
+       }
+       gtk_widget_set_sensitive(GTK_WIDGET(smtp_passwd), use_smtp_userid);
+       g_free(buf);
+}