fix popbeforesmtp checkbutton sensitivity
[claws.git] / src / prefs_account.c
index 221ef16613bf2a2d955574753ae0ca5bc67724ea..63481e470c70214443b29264c13ce8c1bb7c6c35 100644 (file)
@@ -88,6 +88,8 @@ static struct Receive {
        GtkWidget *rmmail_chkbtn;
        GtkWidget *leave_time_entry;
        GtkWidget *getall_chkbtn;
+       GtkWidget *sd_filter_on_recv_chkbtn;
+       GtkWidget *sd_rmmail_chkbtn;
        GtkWidget *size_limit_chkbtn;
        GtkWidget *size_limit_entry;
        GtkWidget *filter_on_recv_chkbtn;
@@ -105,10 +107,11 @@ static struct Send {
        GtkWidget *customhdr_chkbtn;
 
        GtkWidget *smtp_auth_chkbtn;
+       GtkWidget *smtp_auth_type_optmenu;
        GtkWidget *smtp_uid_entry;
        GtkWidget *smtp_pass_entry;
        GtkWidget *pop_bfr_smtp_chkbtn;
-} send;
+} p_send;
 
 static struct Compose {
        GtkWidget *sigpath_entry;
@@ -123,9 +126,10 @@ static struct Compose {
 
 #if USE_GPGME
 static struct Privacy {
-       GtkWidget *checkbtn_default_encrypt;
-       GtkWidget *checkbtn_ascii_armored;
-       GtkWidget *checkbtn_default_sign;
+       GtkWidget *default_encrypt_chkbtn;
+       GtkWidget *default_sign_chkbtn;
+       GtkWidget *ascii_armored_chkbtn;
+       GtkWidget *clearsign_chkbtn;
        GtkWidget *defaultkey_radiobtn;
        GtkWidget *emailkey_radiobtn;
        GtkWidget *customkey_radiobtn;
@@ -135,15 +139,24 @@ static struct Privacy {
 
 #if USE_SSL
 static struct SSLPrefs {
-       GtkWidget *receive_frame;
-       GtkWidget *pop_chkbtn;
-       GtkWidget *imap_chkbtn;
-       GtkWidget *nntp_chkbtn;
+       GtkWidget *pop_frame;
+       GtkWidget *pop_nossl_radiobtn;
+       GtkWidget *pop_ssltunnel_radiobtn;
+       GtkWidget *pop_starttls_radiobtn;
+
+       GtkWidget *imap_frame;
+       GtkWidget *imap_nossl_radiobtn;
+       GtkWidget *imap_ssltunnel_radiobtn;
+       GtkWidget *imap_starttls_radiobtn;
+
+       GtkWidget *nntp_frame;
+       GtkWidget *nntp_nossl_radiobtn;
+       GtkWidget *nntp_ssltunnel_radiobtn;
 
        GtkWidget *send_frame;
        GtkWidget *smtp_nossl_radiobtn;
        GtkWidget *smtp_ssltunnel_radiobtn;
-       GtkWidget *smtp_sslstarttls_radiobtn;
+       GtkWidget *smtp_starttls_radiobtn;
 } ssl;
 #endif /* USE_SSL */
 
@@ -182,12 +195,20 @@ static void prefs_account_fix_size                        (void);
 static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam);
 static void prefs_account_protocol_set_optmenu         (PrefParam *pparam);
 static void prefs_account_protocol_activated           (GtkMenuItem *menuitem);
+
+static void prefs_account_smtp_auth_type_set_data_from_optmenu
+                                                       (PrefParam *pparam);
+static void prefs_account_smtp_auth_type_set_optmenu   (PrefParam *pparam);
+
 #if USE_GPGME || USE_SSL
 static void prefs_account_enum_set_data_from_radiobtn  (PrefParam *pparam);
 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 */
+
+#if USE_GPGME
+static void prefs_account_ascii_armored_warning                (GtkWidget *widget);
+#endif /* USE_GPGME */
+
 static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
 static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
 
@@ -256,8 +277,8 @@ 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,
+
+       {"message_leave_time", "0", &tmp_ac_prefs.msg_leave_time, P_INT,
         &receive.leave_time_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
@@ -276,34 +297,47 @@ static PrefParam param[] = {
         &receive.filter_on_recv_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       /* selective download */        
+       {"sd_filter_on_receive", "TRUE", &tmp_ac_prefs.sd_filter_on_recv, P_BOOL,
+        &receive.sd_filter_on_recv_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"sd_remove_mail_on_download", "TRUE", &tmp_ac_prefs.sd_rmmail_on_download, P_BOOL,
+        &receive.sd_rmmail_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,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        /* Send */
        {"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
-        &send.date_chkbtn,
+        &p_send.date_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
-        &send.msgid_chkbtn,
+        &p_send.msgid_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
-        &send.customhdr_chkbtn,
+        &p_send.customhdr_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
-        &send.smtp_auth_chkbtn,
+        &p_send.smtp_auth_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"smtp_auth_method", "0", &tmp_ac_prefs.smtp_auth_type, P_ENUM,
+        &p_send.smtp_auth_type_optmenu,
+        prefs_account_smtp_auth_type_set_data_from_optmenu,
+        prefs_account_smtp_auth_type_set_optmenu},
+
        {"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
-        &send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &p_send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
        {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
-        &send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &p_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,
+        &p_send.pop_bfr_smtp_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        /* Compose */
@@ -333,19 +367,21 @@ static PrefParam param[] = {
 
        {"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING,
         &compose.autoreplyto_entry,
-
         prefs_set_data_from_entry, prefs_set_entry},
 
 #if USE_GPGME
        /* Privacy */
        {"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
-        &privacy.checkbtn_default_encrypt,
+        &privacy.default_encrypt_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
+        &privacy.default_sign_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"ascii_armored", "FALSE", &tmp_ac_prefs.ascii_armored, P_BOOL,
-        &privacy.checkbtn_ascii_armored,
+        &privacy.ascii_armored_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
-        &privacy.checkbtn_default_sign,
+       {"clearsign", "FALSE", &tmp_ac_prefs.clearsign, P_BOOL,
+        &privacy.clearsign_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
         &privacy.defaultkey_radiobtn,
@@ -358,16 +394,22 @@ static PrefParam param[] = {
 
 #if USE_SSL
        /* SSL */
+       {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
+        &ssl.pop_nossl_radiobtn,
+        prefs_account_enum_set_data_from_radiobtn,
+        prefs_account_enum_set_radiobtn},
+       {"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM,
+        &ssl.imap_nossl_radiobtn,
+        prefs_account_enum_set_data_from_radiobtn,
+        prefs_account_enum_set_radiobtn},
+       {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
+        &ssl.nntp_nossl_radiobtn,
+        prefs_account_enum_set_data_from_radiobtn,
+        prefs_account_enum_set_radiobtn},
        {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
         &ssl.smtp_nossl_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
-       {"ssl_pop", "FALSE", &tmp_ac_prefs.ssl_pop, P_BOOL,
-        &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 */
@@ -578,7 +620,7 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
        if (prefs_rc_is_readonly(ACCOUNT_RC))
                return ac_prefs;
 
-       debug_print(_("Opening account preferences window...\n"));
+       debug_print("Opening account preferences window...\n");
 
        inc_lock();
 
@@ -660,7 +702,7 @@ static void prefs_account_create(void)
 {
        gint page = 0;
 
-       debug_print(_("Creating account preferences window...\n"));
+       debug_print("Creating account preferences window...\n");
 
        /* create dialog */
        prefs_dialog_create(&dialog);
@@ -1016,19 +1058,20 @@ static void prefs_account_receive_create(void)
        GtkWidget *frame1;
        GtkWidget *vbox2;
        GtkWidget *rmmail_chkbtn;
+       GtkWidget *hbox_spc;
+       GtkWidget *leave_time_label;
+       GtkWidget *leave_time_entry;
        GtkWidget *getall_chkbtn;
        GtkWidget *hbox1;
        GtkWidget *size_limit_chkbtn;
        GtkWidget *size_limit_entry;
        GtkWidget *label;
        GtkWidget *filter_on_recv_chkbtn;
+       GtkWidget *sd_filter_on_recv_chkbtn;
+       GtkWidget *sd_rmmail_chkbtn;
        GtkWidget *vbox3;
-       GtkWidget *hbox2;
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
-       GtkWidget *leave_time_entry;
-       GtkWidget *leave_time_label;
-       GtkWidget *leave_time_hint;     
        GtkWidget *inbox_btn;
        GtkWidget *recvatgetall_chkbtn;
 
@@ -1044,28 +1087,56 @@ static void prefs_account_receive_create(void)
        gtk_container_add (GTK_CONTAINER (frame1), vbox2);
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
-       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 (vbox2, rmmail_chkbtn,
+                          _("Remove messages on server when received"));
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 12, -1);
+
+       leave_time_label = gtk_label_new (_("Remove after"));
+       gtk_widget_show (leave_time_label);
+       gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 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_set_usize (leave_time_entry, 64, -1);
+       gtk_box_pack_start (GTK_BOX (hbox1), leave_time_entry, FALSE, FALSE, 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);
-               
+       gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
+
+       SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
+
+       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 12, -1);
+
+       leave_time_label = gtk_label_new (_("(0 days: remove immediately)"));
+       gtk_widget_show (leave_time_label);
+       gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
+
+       SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
+
        PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
                           _("Download all messages on server"));
+       PACK_CHECK_BUTTON (vbox2, sd_filter_on_recv_chkbtn,
+                          _("Use filtering rules with Selective Download"));
+       PACK_CHECK_BUTTON (vbox2, sd_rmmail_chkbtn,
+                          _("Remove mail after downloading with Selective Download"));
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -1125,18 +1196,20 @@ static void prefs_account_receive_create(void)
                (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.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.recvatgetall_chkbtn   = recvatgetall_chkbtn;
+       receive.pop3_frame               = frame1;
+       receive.rmmail_chkbtn            = rmmail_chkbtn;
+       receive.leave_time_entry         = leave_time_entry;
+       receive.getall_chkbtn            = getall_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.sd_filter_on_recv_chkbtn = sd_filter_on_recv_chkbtn;
+       receive.sd_rmmail_chkbtn         = sd_rmmail_chkbtn;
+       receive.inbox_label              = inbox_label;
+       receive.inbox_entry              = inbox_entry;
+       receive.inbox_btn                = inbox_btn;
+
+       receive.recvatgetall_chkbtn      = recvatgetall_chkbtn;
 }
 
 static void prefs_account_send_create(void)
@@ -1151,6 +1224,9 @@ static void prefs_account_send_create(void)
        GtkWidget *customhdr_edit_btn;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_chkbtn;
+       GtkWidget *optmenu;
+       GtkWidget *optmenu_menu;
+       GtkWidget *menuitem;
        GtkWidget *vbox4;
        GtkWidget *hbox_spc;
        GtkWidget *label;
@@ -1212,7 +1288,36 @@ static void prefs_account_send_create(void)
        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);
+       gtk_widget_set_usize (hbox_spc, 12, -1);
+
+       label = gtk_label_new (_("Authentication method"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+       optmenu = gtk_option_menu_new ();
+       gtk_widget_show (optmenu);
+       gtk_box_pack_start (GTK_BOX (hbox), optmenu, FALSE, FALSE, 0);
+
+       optmenu_menu = gtk_menu_new ();
+
+       MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
+       MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", SMTPAUTH_LOGIN);
+       MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
+       MENUITEM_ADD (optmenu_menu, menuitem, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
+       gtk_widget_set_sensitive (menuitem, FALSE);
+
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+
+       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, 12, -1);
 
        label = gtk_label_new (_("User ID"));
        gtk_widget_show (label);
@@ -1242,7 +1347,7 @@ static void prefs_account_send_create(void)
        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);
+       gtk_widget_set_usize (hbox_spc, 12, -1);
 
        label = gtk_label_new
                (_("If you leave these entries empty, the same\n"
@@ -1255,16 +1360,16 @@ static void prefs_account_send_create(void)
 
        PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
                _("Authenticate with POP3 before sending"));
-       gtk_widget_set_sensitive(pop_bfr_smtp_chkbtn, FALSE);
 
-       send.date_chkbtn      = date_chkbtn;
-       send.msgid_chkbtn     = msgid_chkbtn;
-       send.customhdr_chkbtn = customhdr_chkbtn;
+       p_send.date_chkbtn      = date_chkbtn;
+       p_send.msgid_chkbtn     = msgid_chkbtn;
+       p_send.customhdr_chkbtn = customhdr_chkbtn;
 
-       send.smtp_auth_chkbtn    = smtp_auth_chkbtn;
-       send.smtp_uid_entry      = smtp_uid_entry;
-       send.smtp_pass_entry     = smtp_pass_entry;
-       send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
+       p_send.smtp_auth_chkbtn       = smtp_auth_chkbtn;
+       p_send.smtp_auth_type_optmenu = optmenu;
+       p_send.smtp_uid_entry         = smtp_uid_entry;
+       p_send.smtp_pass_entry        = smtp_pass_entry;
+       p_send.pop_bfr_smtp_chkbtn    = pop_bfr_smtp_chkbtn;
 }
 
 static void prefs_account_compose_create(void)
@@ -1363,13 +1468,12 @@ static void prefs_account_privacy_create(void)
        GtkWidget *vbox1;
        GtkWidget *frame1;
        GtkWidget *vbox2;
-       GtkWidget *frame2;
-       GtkWidget *vbox3;
        GtkWidget *hbox1;
        GtkWidget *label;
-       GtkWidget *checkbtn_default_encrypt;
-       GtkWidget *checkbtn_ascii_armored;
-       GtkWidget *checkbtn_default_sign;
+       GtkWidget *default_encrypt_chkbtn;
+       GtkWidget *default_sign_chkbtn;
+       GtkWidget *ascii_armored_chkbtn;
+       GtkWidget *clearsign_chkbtn;
        GtkWidget *defaultkey_radiobtn;
        GtkWidget *emailkey_radiobtn;
        GtkWidget *customkey_radiobtn;
@@ -1380,35 +1484,32 @@ static void prefs_account_privacy_create(void)
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       PACK_FRAME (vbox1, frame1, _("Default Actions"));
-
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
-       gtk_container_add (GTK_CONTAINER (frame1), vbox2);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON (vbox2, checkbtn_default_encrypt,
+       PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
                           _("Encrypt message by default"));
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
-                          _("Plain ASCII-armored"));
-       gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
-                               prefs_account_ascii_armored_warning, (gpointer)0);
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_default_sign,
+       PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
                           _("Sign message by default"));
+       PACK_CHECK_BUTTON (vbox2, ascii_armored_chkbtn,
+                          _("Use ASCII-armored format for encryption"));
+       PACK_CHECK_BUTTON (vbox2, clearsign_chkbtn,
+                          _("Use clear text signature"));
+       gtk_signal_connect (GTK_OBJECT (ascii_armored_chkbtn), "toggled",
+                           prefs_account_ascii_armored_warning, NULL);
 
-       PACK_FRAME (vbox1, frame2, _("Sign key"));
+       PACK_FRAME (vbox1, frame1, _("Sign key"));
 
-       vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox3);
-       gtk_container_add (GTK_CONTAINER (frame2), vbox3);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+       vbox2 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox2);
+       gtk_container_add (GTK_CONTAINER (frame1), vbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
        defaultkey_radiobtn = gtk_radio_button_new_with_label
                (NULL, _("Use default GnuPG key"));
        gtk_widget_show (defaultkey_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox3), defaultkey_radiobtn,
+       gtk_box_pack_start (GTK_BOX (vbox2), defaultkey_radiobtn,
                            FALSE, FALSE, 0);
        gtk_object_set_user_data (GTK_OBJECT (defaultkey_radiobtn),
                                  GINT_TO_POINTER (SIGN_KEY_DEFAULT));
@@ -1417,7 +1518,7 @@ static void prefs_account_privacy_create(void)
                (GTK_RADIO_BUTTON (defaultkey_radiobtn),
                 _("Select key by your email address"));
        gtk_widget_show (emailkey_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox3), emailkey_radiobtn,
+       gtk_box_pack_start (GTK_BOX (vbox2), emailkey_radiobtn,
                            FALSE, FALSE, 0);
        gtk_object_set_user_data (GTK_OBJECT (emailkey_radiobtn),
                                  GINT_TO_POINTER (SIGN_KEY_BY_FROM));
@@ -1426,14 +1527,14 @@ static void prefs_account_privacy_create(void)
                (GTK_RADIO_BUTTON (defaultkey_radiobtn),
                 _("Specify key manually"));
        gtk_widget_show (customkey_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox3), customkey_radiobtn,
+       gtk_box_pack_start (GTK_BOX (vbox2), customkey_radiobtn,
                            FALSE, FALSE, 0);
        gtk_object_set_user_data (GTK_OBJECT (customkey_radiobtn),
                                  GINT_TO_POINTER (SIGN_KEY_CUSTOM));
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
        label = gtk_label_new ("");
        gtk_widget_show (label);
@@ -1451,107 +1552,166 @@ static void prefs_account_privacy_create(void)
 
        SET_TOGGLE_SENSITIVITY (customkey_radiobtn, customkey_entry);
 
-       privacy.checkbtn_default_encrypt = checkbtn_default_encrypt;
-       privacy.checkbtn_ascii_armored   = checkbtn_ascii_armored;
-       privacy.checkbtn_default_sign    = checkbtn_default_sign;
-       privacy.defaultkey_radiobtn = defaultkey_radiobtn;
-       privacy.emailkey_radiobtn = emailkey_radiobtn;
-       privacy.customkey_radiobtn = customkey_radiobtn;
-       privacy.customkey_entry = customkey_entry;
-}
-
-static void prefs_account_ascii_armored_warning(GtkWidget* widget,
-                                              gpointer unused)
-{
-       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 encrypted messages. It doesn't comply\n"
-                       "with the RFC 3156 - MIME security with OpenPGP."));
-       }
+       privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
+       privacy.default_sign_chkbtn    = default_sign_chkbtn;
+       privacy.ascii_armored_chkbtn   = ascii_armored_chkbtn;
+       privacy.clearsign_chkbtn       = clearsign_chkbtn;
+       privacy.defaultkey_radiobtn    = defaultkey_radiobtn;
+       privacy.emailkey_radiobtn      = emailkey_radiobtn;
+       privacy.customkey_radiobtn     = customkey_radiobtn;
+       privacy.customkey_entry        = customkey_entry;
 }
 #endif /* USE_GPGME */
 
 #if USE_SSL
+
+#define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data)              \
+{                                                                      \
+       btn = gtk_radio_button_new_with_label_from_widget               \
+               (GTK_RADIO_BUTTON (btn_p), label);                      \
+       gtk_widget_show (btn);                                          \
+       gtk_box_pack_start (GTK_BOX (box), btn, FALSE, FALSE, 0);       \
+       gtk_object_set_user_data (GTK_OBJECT (btn),                     \
+                                 GINT_TO_POINTER (data));              \
+}
+
+#define CREATE_RADIO_BUTTONS(box,                                      \
+                            btn1, btn1_label, btn1_data,               \
+                            btn2, btn2_label, btn2_data,               \
+                            btn3, btn3_label, btn3_data)               \
+{                                                                      \
+       btn1 = gtk_radio_button_new_with_label(NULL, btn1_label);       \
+       gtk_widget_show (btn1);                                         \
+       gtk_box_pack_start (GTK_BOX (box), btn1, FALSE, FALSE, 0);      \
+       gtk_object_set_user_data (GTK_OBJECT (btn1),                    \
+                                 GINT_TO_POINTER (btn1_data));         \
+                                                                       \
+       CREATE_RADIO_BUTTON(box, btn2, btn1, btn2_label, btn2_data);    \
+       CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn3_data);    \
+}
+
 static void prefs_account_ssl_create(void)
 {
        GtkWidget *vbox1;
 
-       GtkWidget *receive_frame;
+       GtkWidget *pop_frame;
        GtkWidget *vbox2;
-       GtkWidget *pop_chkbtn;
-       GtkWidget *imap_chkbtn;
-       GtkWidget *nntp_chkbtn;
+       GtkWidget *pop_nossl_radiobtn;
+       GtkWidget *pop_ssltunnel_radiobtn;
+       GtkWidget *pop_starttls_radiobtn;
 
-       GtkWidget *send_frame;
+       GtkWidget *imap_frame;
        GtkWidget *vbox3;
+       GtkWidget *imap_nossl_radiobtn;
+       GtkWidget *imap_ssltunnel_radiobtn;
+       GtkWidget *imap_starttls_radiobtn;
+
+       GtkWidget *nntp_frame;
+       GtkWidget *vbox4;
+       GtkWidget *nntp_nossl_radiobtn;
+       GtkWidget *nntp_ssltunnel_radiobtn;
+
+       GtkWidget *send_frame;
+       GtkWidget *vbox5;
        GtkWidget *smtp_nossl_radiobtn;
        GtkWidget *smtp_ssltunnel_radiobtn;
-       GtkWidget *smtp_sslstarttls_radiobtn;
+       GtkWidget *smtp_starttls_radiobtn;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       PACK_FRAME (vbox1, receive_frame, _("Receive"));
-
+       PACK_FRAME (vbox1, pop_frame, _("POP3"));
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
-       gtk_container_add (GTK_CONTAINER (receive_frame), vbox2);
+       gtk_container_add (GTK_CONTAINER (pop_frame), vbox2);
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
-       PACK_CHECK_BUTTON (vbox2, pop_chkbtn,
-                          _("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)"));
+       CREATE_RADIO_BUTTONS(vbox2,
+                            pop_nossl_radiobtn,
+                            _("Don't use SSL"),
+                            SSL_NONE,
+                            pop_ssltunnel_radiobtn,
+                            _("Use SSL for POP3 connection"),
+                            SSL_TUNNEL,
+                            pop_starttls_radiobtn,
+                            _("Use STARTTLS command to start SSL session"),
+                            SSL_STARTTLS);
 
+       PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
        vbox3 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox3);
-       gtk_container_add (GTK_CONTAINER (send_frame), vbox3);
+       gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
        gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
 
-       smtp_nossl_radiobtn =
-               gtk_radio_button_new_with_label(NULL, _("Don't use SSL"));
-       gtk_widget_show (smtp_nossl_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox3), smtp_nossl_radiobtn,
-                           FALSE, FALSE, 0);
-       gtk_object_set_user_data (GTK_OBJECT (smtp_nossl_radiobtn),
-                                 GINT_TO_POINTER (SSL_SMTP_NONE));
-
-       smtp_ssltunnel_radiobtn = gtk_radio_button_new_with_label_from_widget
-               (GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
-                _("Use SSL for SMTP connection"));
-       gtk_widget_show (smtp_ssltunnel_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox3), smtp_ssltunnel_radiobtn,
-                           FALSE, FALSE, 0);
-       gtk_object_set_user_data (GTK_OBJECT (smtp_ssltunnel_radiobtn),
-                                 GINT_TO_POINTER (SSL_SMTP_TUNNEL));
-
-       smtp_sslstarttls_radiobtn = gtk_radio_button_new_with_label_from_widget
-               (GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
-                _("Use STARTTLS command to start SSL session"));
-       gtk_widget_show (smtp_sslstarttls_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox3), smtp_sslstarttls_radiobtn,
+       CREATE_RADIO_BUTTONS(vbox3,
+                            imap_nossl_radiobtn,
+                            _("Don't use SSL"),
+                            SSL_NONE,
+                            imap_ssltunnel_radiobtn,
+                            _("Use SSL for IMAP4 connection"),
+                            SSL_TUNNEL,
+                            imap_starttls_radiobtn,
+                            _("Use STARTTLS command to start SSL session"),
+                            SSL_STARTTLS);
+
+       PACK_FRAME (vbox1, nntp_frame, _("NNTP"));
+       vbox4 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox4);
+       gtk_container_add (GTK_CONTAINER (nntp_frame), vbox4);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8);
+
+       nntp_nossl_radiobtn =
+               gtk_radio_button_new_with_label (NULL, _("Don't use SSL"));
+       gtk_widget_show (nntp_nossl_radiobtn);
+       gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
                            FALSE, FALSE, 0);
-       gtk_object_set_user_data (GTK_OBJECT (smtp_sslstarttls_radiobtn),
-                                 GINT_TO_POINTER (SSL_SMTP_STARTTLS));
-
-       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;
-       ssl.smtp_ssltunnel_radiobtn   = smtp_ssltunnel_radiobtn;
-       ssl.smtp_sslstarttls_radiobtn = smtp_sslstarttls_radiobtn;
+       gtk_object_set_user_data (GTK_OBJECT (nntp_nossl_radiobtn),
+                                 GINT_TO_POINTER (SSL_NONE));
+
+       CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
+                           _("Use SSL for NNTP connection"), SSL_TUNNEL);
+
+       PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
+       vbox5 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox5);
+       gtk_container_add (GTK_CONTAINER (send_frame), vbox5);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox5), 8);
+
+       CREATE_RADIO_BUTTONS(vbox5,
+                            smtp_nossl_radiobtn,
+                            _("Don't use SSL"),
+                            SSL_NONE,
+                            smtp_ssltunnel_radiobtn,
+                            _("Use SSL for SMTP connection"),
+                            SSL_TUNNEL,
+                            smtp_starttls_radiobtn,
+                            _("Use STARTTLS command to start SSL session"),
+                            SSL_STARTTLS);
+
+       ssl.pop_frame               = pop_frame;
+       ssl.pop_nossl_radiobtn      = pop_nossl_radiobtn;
+       ssl.pop_ssltunnel_radiobtn  = pop_ssltunnel_radiobtn;
+       ssl.pop_starttls_radiobtn   = pop_starttls_radiobtn;
+
+       ssl.imap_frame              = imap_frame;
+       ssl.imap_nossl_radiobtn     = imap_nossl_radiobtn;
+       ssl.imap_ssltunnel_radiobtn = imap_ssltunnel_radiobtn;
+       ssl.imap_starttls_radiobtn  = imap_starttls_radiobtn;
+
+       ssl.nntp_frame              = nntp_frame;
+       ssl.nntp_nossl_radiobtn     = nntp_nossl_radiobtn;
+       ssl.nntp_ssltunnel_radiobtn = nntp_ssltunnel_radiobtn;
+
+       ssl.send_frame              = send_frame;
+       ssl.smtp_nossl_radiobtn     = smtp_nossl_radiobtn;
+       ssl.smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
+       ssl.smtp_starttls_radiobtn  = smtp_starttls_radiobtn;
 }
+
+#undef CREATE_RADIO_BUTTONS
+#undef CREATE_RADIO_BUTTON
 #endif /* USE_SSL */
 
 static void crosspost_color_toggled(void)
@@ -1611,9 +1771,6 @@ static void prefs_account_advanced_create(void)
        GtkWidget *checkbtn_crosspost;
        GtkWidget *colormenu_crosspost;
        GtkWidget *menu;
-       GtkWidget *menuitem;
-       GtkWidget *item;
-       gint i;
        GtkWidget *imap_frame;
        GtkWidget *imapdir_label;
        GtkWidget *imapdir_entry;
@@ -1771,11 +1928,11 @@ static void prefs_account_advanced_create(void)
        SET_TOGGLE_SENSITIVITY (chkbtn, button);                        \
 }
 
-       SET_CHECK_BTN_AND_ENTRY(_("Put sent messages to"),
+       SET_CHECK_BTN_AND_ENTRY(_("Put sent messages in"),
                                sent_folder_chkbtn, sent_folder_entry, 0);
-       SET_CHECK_BTN_AND_ENTRY(_("Put draft messages to"),
+       SET_CHECK_BTN_AND_ENTRY(_("Put draft messages in"),
                                draft_folder_chkbtn, draft_folder_entry, 1);
-       SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages to"),
+       SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages in"),
                                trash_folder_chkbtn, trash_folder_entry, 2);
 
        advanced.smtpport_chkbtn        = checkbtn_smtpport;
@@ -1953,6 +2110,18 @@ static void prefs_account_enum_set_radiobtn(PrefParam *pparam)
        }
 }
 
+#endif /* USE_GPGME || USE_SSL */
+
+#if USE_GPGME
+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)) > 0)
+               alertpanel_warning
+                       (_("It's not recommended to use the old style ASCII-armored\n"
+                          "mode for encrypted messages. It doesn't comply with the\n"
+                          "RFC 3156 - MIME Security with OpenPGP."));
+}
 #endif /* USE_GPGME */
 
 static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam)
@@ -2011,11 +2180,47 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
        gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
 }
 
+static void prefs_account_smtp_auth_type_set_data_from_optmenu(PrefParam *pparam)
+{
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       *((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
+               (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_account_smtp_auth_type_set_optmenu(PrefParam *pparam)
+{
+       SMTPAuthType type = *((SMTPAuthType *)pparam->data);
+       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       switch (type) {
+       case SMTPAUTH_LOGIN:
+               gtk_option_menu_set_history(optmenu, 1);
+               break;
+       case SMTPAUTH_CRAM_MD5:
+               gtk_option_menu_set_history(optmenu, 2);
+               break;
+       case SMTPAUTH_DIGEST_MD5:
+               gtk_option_menu_set_history(optmenu, 3);
+               break;
+       case 0:
+       default:
+               gtk_option_menu_set_history(optmenu, 0);
+       }
+
+       menu = gtk_option_menu_get_menu(optmenu);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
 static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
 {
        RecvProtocol protocol;
-       gboolean active;
-       gint auth;
 
        protocol = GPOINTER_TO_INT
                (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
@@ -2067,6 +2272,10 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_toggle_button_set_active(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
@@ -2074,18 +2283,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #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, FALSE);
-               gtk_widget_set_sensitive(ssl.nntp_chkbtn, TRUE);
-               gtk_widget_set_sensitive(ssl.send_frame, FALSE);
+               gtk_widget_hide(ssl.pop_frame);
+               gtk_widget_hide(ssl.imap_frame);
+               gtk_widget_show(ssl.nntp_frame);
+               gtk_widget_hide(ssl.send_frame);
 #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);
+               gtk_widget_hide(advanced.imap_frame);
                break;
        case A_LOCAL:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2131,6 +2339,10 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                prefs_account_mailcmd_toggled
                        (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_toggle_button_set_active(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
@@ -2138,18 +2350,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #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);
+               gtk_widget_hide(ssl.pop_frame);
+               gtk_widget_hide(ssl.imap_frame);
+               gtk_widget_hide(ssl.nntp_frame);
+               gtk_widget_show(ssl.send_frame);
 #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);
+               gtk_widget_hide(advanced.imap_frame);
                break;
        case A_IMAP4:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2197,6 +2408,10 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_toggle_button_set_active(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
@@ -2204,18 +2419,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #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);
+               gtk_widget_hide(ssl.pop_frame);
+               gtk_widget_show(ssl.imap_frame);
+               gtk_widget_hide(ssl.nntp_frame);
+               gtk_widget_show(ssl.send_frame);
 #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);
+               gtk_widget_show(advanced.imap_frame);
                break;
        case A_POP3:
        default:
@@ -2264,6 +2478,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, TRUE);
+               
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
@@ -2271,18 +2488,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #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);
+               gtk_widget_show(ssl.pop_frame);
+               gtk_widget_hide(ssl.imap_frame);
+               gtk_widget_hide(ssl.nntp_frame);
+               gtk_widget_show(ssl.send_frame);
 #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);
+               gtk_widget_hide(advanced.imap_frame);
                break;
        }
 
@@ -2317,19 +2533,3 @@ 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);
-}