2007-03-12 [colin] 2.8.1cvs8
[claws.git] / src / wizard.c
index 4fd9a022c2685454872c63019f3e93d3c46d4ce9..7a74bb5d06e97740971c17a1362380e78c65906a 100644 (file)
@@ -1,7 +1,7 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
- * This file (C) 2004 Colin Leroy
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> 
+ * and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,6 +49,7 @@
 
 #include "utils.h"
 #include "gtk/menu.h"
+#include "plugin.h"
 #include "account.h"
 #include "prefs_account.h"
 #include "mainwindow.h"
@@ -74,7 +75,6 @@ int USER_PAGE = -1;
 int SMTP_PAGE = -1;
 int RECV_PAGE = -1;
 int MAILBOX_PAGE = -1;
-int SSL_PAGE = -1;
 int DONE_PAGE = -1;
 
 typedef struct
@@ -107,10 +107,13 @@ typedef struct
        GtkWidget *recv_password_label;
        GtkWidget *recv_imap_label;
        GtkWidget *recv_imap_subdir;
-
+       GtkWidget *subsonly_checkbtn;
+       GtkWidget *no_imap_warning;
 #ifdef USE_OPENSSL
        GtkWidget *smtp_use_ssl;
        GtkWidget *recv_use_ssl;
+       GtkWidget *smtp_use_tls;
+       GtkWidget *recv_use_tls;
 #endif
        
        gboolean create_mailbox;
@@ -133,6 +136,7 @@ typedef struct _AccountTemplate {
        gchar *recvuser;
        gchar *recvpass;
        gchar *imapdir;
+       gboolean subsonly;
        gchar *mboxfile;
        gchar *mailbox;
        gboolean smtpssl;
@@ -168,14 +172,16 @@ static PrefParam template_params[] = {
         &tmpl.recvpass, P_STRING, NULL, NULL, NULL},
        {"imapdir", "",
         &tmpl.imapdir, P_STRING, NULL, NULL, NULL},
+       {"subsonly", "TRUE",
+        &tmpl.subsonly, P_BOOL, NULL, NULL, NULL},
        {"mboxfile", "/var/mail/$LOGIN",
         &tmpl.mboxfile, P_STRING, NULL, NULL, NULL},
        {"mailbox", "Mail",
         &tmpl.mailbox, P_STRING, NULL, NULL, NULL},
-       {"smtpssl", "FALSE",
-        &tmpl.smtpssl, P_BOOL, NULL, NULL, NULL},
-       {"recvssl", "FALSE",
-        &tmpl.recvssl, P_BOOL, NULL, NULL, NULL},
+       {"smtpssl", "0",
+        &tmpl.smtpssl, P_INT, NULL, NULL, NULL},
+       {"recvssl", "0",
+        &tmpl.recvssl, P_INT, NULL, NULL, NULL},
        {NULL, NULL, NULL, P_INT, NULL, NULL, NULL}
 };
 
@@ -234,10 +240,14 @@ static gchar *accountrc_tmpl =
        "#default is empty\n"
        "#recvpass=\n"
        "\n"
-       "#imap dir if imap (relative to the home on the server\n"
+       "#imap dir if imap (relative to the home on the server)\n"
        "#default is empty\n"
        "#imapdir=\n"
        "\n"
+       "#show subscribed folders only, if imap\n"
+       "#default is TRUE\n"
+       "#subsonly=\n"
+       "\n"
        "#mbox file if local\n"
        "#you can use $LOGIN here\n"
        "#default is /var/mail/$LOGIN\n"
@@ -249,11 +259,11 @@ static gchar *accountrc_tmpl =
        "#mailbox=\n"
        "\n"
        "#whether to use ssl on STMP connections\n"
-       "#default is 0\n"
+       "#default is 0, 1 is ssl, 2 is starttls\n"
        "#smtpssl=\n"
        "\n"
        "#whether to use ssl on pop or imap connections\n"
-       "#default is 0\n"
+       "#default is 0, 1 is ssl, 2 is starttls\n"
        "#recvssl=\n";
 
 static gchar *wizard_get_default_domain_name(void)
@@ -390,7 +400,6 @@ static void wizard_read_defaults(void)
        g_free(rcpath);
 }
 
-
 static void initialize_fonts(WizardWindow *wizard)
 {
        GtkWidget *widget = wizard->email;
@@ -448,15 +457,23 @@ static void write_welcome_email(WizardWindow *wizard)
        gchar *head=NULL;
        gchar *body=NULL;
        gchar *msg=NULL;
-       gchar *subj=NULL;
        const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name));
        Folder *folder = folder_find_from_path(mailbox);
        FolderItem *inbox = folder ? folder->inbox:NULL;
        gchar *file = get_tmp_file();
+       gchar enc_from_name[BUFFSIZE], enc_to_name[BUFFSIZE], enc_subject[BUFFSIZE];
        
        get_rfc822_date(buf_date, sizeof(buf_date));
 
-       subj = g_strdup_printf(_("Welcome to Sylpheed-Claws "));
+       conv_encode_header_full(enc_subject, sizeof(enc_subject), 
+                       Q_("Welcome Mail Subject|Welcome to Claws Mail"),
+                       strlen("Subject: "), FALSE, CS_INTERNAL);
+       conv_encode_header_full(enc_to_name, sizeof(enc_to_name), 
+                       gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
+                       strlen("To: "), TRUE, CS_INTERNAL);
+       conv_encode_header_full(enc_from_name, sizeof(enc_from_name), 
+                       _("The Claws Mail Team"),
+                       strlen("From: "), TRUE, CS_INTERNAL);
 
        head = g_strdup_printf(
                "From: %s <%s>\n"
@@ -466,26 +483,32 @@ static void write_welcome_email(WizardWindow *wizard)
                "X-Face: %s\n"
                "Face: %s\n"
                "Content-Type: text/plain; charset=UTF-8\n",
-               _("Sylpheed-Claws Team"),
+               enc_from_name,
                USERS_ML_ADDR,
-               gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
+               enc_to_name,
                gtk_entry_get_text(GTK_ENTRY(wizard->email)),
-               buf_date, subj, XFACE, FACE);
+               buf_date, enc_subject, XFACE, FACE);
        body = g_strdup_printf(
                _("\n"
-               "Welcome to Sylpheed-Claws\n"
-               "-------------------------\n"
+               "Welcome to Claws Mail\n"
+               "---------------------\n"
                "\n"
                "Now that you have set up your account you can fetch your\n"
                "mail by clicking the 'Get Mail' button at the left of the\n"
                "toolbar.\n"
                "\n"
+               "Claws Mail has lots of extra features accessible via plugins,\n"
+               "like anti-spam filtering and learning (via the Bogofilter or\n"
+               "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
+               "aggregator, a calendar, and much more. You can load them from\n"
+               "the menu entry '/Configuration/Plugins'.\n"
+               "\n"
                "You can change your Account Preferences by using the menu\n"
                "entry '/Configuration/Preferences for current account'\n"
                "and change the general Preferences by using\n"
                "'/Configuration/Preferences'.\n"
                "\n"
-               "You can find further information in the Sylpheed-Claws manual,\n"
+               "You can find further information in the Claws Mail manual,\n"
                "which can be accessed by using the menu entry '/Help/Manual'\n"
                "or online at the URL given below.\n"
                "\n"
@@ -499,7 +522,7 @@ static void write_welcome_email(WizardWindow *wizard)
                "\n"
                "LICENSE\n"
                "-------\n"
-               "Sylpheed-Claws is free software, released under the terms\n"
+               "Claws Mail is free software, released under the terms\n"
                "of the GNU General Public License, version 2 or later, as\n"
                "published by the Free Software Foundation, 51 Franklin Street,\n"
                "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
@@ -507,7 +530,7 @@ static void write_welcome_email(WizardWindow *wizard)
                "\n"
                "DONATIONS\n"
                "---------\n"
-               "If you wish to donate to the Sylpheed-Claws project you can do\n"
+               "If you wish to donate to the Claws Mail project you can do\n"
                "so at <%s>.\n\n"),
                HOMEPAGE_URI, MANUAL_URI, FAQ_URI, THEMES_URI, MAILING_LIST_URI,
                GPL_URI, DONATE_URI);
@@ -519,7 +542,6 @@ static void write_welcome_email(WizardWindow *wizard)
                MsgFlags flags = { MSG_UNREAD|MSG_NEW, 0};
                folder_item_add_msg(inbox, file, &flags, FALSE);
        }
-       g_free(subj);
        g_free(head);
        g_free(body);
        g_free(msg);
@@ -533,7 +555,12 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        PrefsAccount *prefs_account = prefs_account_new();
        GList *account_list = NULL;
        GtkWidget *menu, *menuitem;
-       
+       gchar *smtp_server, *recv_server;
+       gint smtp_port, recv_port;
+#ifdef USE_OPENSSL                     
+       SSLType smtp_ssl_type, recv_ssl_type;
+#endif
+
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        prefs_account->protocol = GPOINTER_TO_INT
@@ -629,21 +656,46 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                prefs_account->account_name = g_strdup_printf("%s",
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
 
+       recv_server = g_strdup(gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+       smtp_server = g_strdup(gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server)));
+
+       if (prefs_account->protocol != A_LOCAL && strstr(recv_server, ":")) {
+               recv_port = atoi(strstr(recv_server, ":")+1);
+               *(strstr(recv_server, ":")) = '\0';
+               if (prefs_account->protocol == A_IMAP4) {
+                       prefs_account->set_imapport = TRUE;
+                       prefs_account->imapport = recv_port;
+               } else if (prefs_account->protocol == A_POP3) {
+                       prefs_account->set_popport = TRUE;
+                       prefs_account->popport = recv_port;
+               }
+       }
+       if (strstr(smtp_server, ":")) {
+               smtp_port = atoi(strstr(smtp_server, ":")+1);
+               *(strstr(smtp_server, ":")) = '\0';
+               prefs_account->set_smtpport = TRUE;
+               prefs_account->smtpport = smtp_port;
+       }
+       
        prefs_account->name = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->full_name)));
        prefs_account->address = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->email)));
        prefs_account->organization = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->organization)));
-       prefs_account->smtp_server = g_strdup(
-                               gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server)));
+       prefs_account->smtp_server = g_strdup(smtp_server);
+
+       prefs_account->inbox = g_strdup_printf("#mh/%s/inbox",
+                       g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name))));
+       prefs_account->local_inbox = g_strdup(prefs_account->inbox);
 
        if (prefs_account->protocol != A_LOCAL)
-               prefs_account->recv_server = g_strdup(
-                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+               prefs_account->recv_server = g_strdup(recv_server);
        else
-               prefs_account->local_mbox = g_strdup(
-                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+               prefs_account->local_mbox = g_strdup(recv_server);
+
+       g_free(recv_server);
+       g_free(smtp_server);
 
        prefs_account->userid = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)));
@@ -658,15 +710,30 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                prefs_account->use_smtp_auth = TRUE;
        }
 
-#ifdef USE_OPENSSL                     
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl)))
-               prefs_account->ssl_smtp = SSL_TUNNEL;
+#ifdef USE_OPENSSL
+       smtp_ssl_type = SSL_NONE;
+       recv_ssl_type = SSL_NONE;       
+
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl))) {
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_tls)))
+                       smtp_ssl_type = SSL_STARTTLS;
+               else
+                       smtp_ssl_type = SSL_TUNNEL;
+       }
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->recv_use_ssl))) {
-               if (prefs_account->protocol == A_IMAP4)
-                       prefs_account->ssl_imap = SSL_TUNNEL;
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->recv_use_tls)))
+                       recv_ssl_type = SSL_STARTTLS;
                else
-                       prefs_account->ssl_pop = SSL_TUNNEL;
+                       recv_ssl_type = SSL_TUNNEL;
        }
+
+       prefs_account->ssl_smtp = smtp_ssl_type;
+
+       if (prefs_account->protocol == A_IMAP4)
+               prefs_account->ssl_imap = recv_ssl_type;
+       else
+               prefs_account->ssl_pop = recv_ssl_type;
+
 #endif
        if (prefs_account->protocol == A_IMAP4) {
                gchar *directory = gtk_editable_get_chars(
@@ -674,6 +741,9 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                if (directory && strlen(directory)) {
                        prefs_account->imap_dir = g_strdup(directory);
                }
+               prefs_account->imap_subsonly = 
+                       gtk_toggle_button_get_active(
+                               GTK_TOGGLE_BUTTON(wizard->subsonly_checkbtn));
                g_free(directory);
        }
 
@@ -686,6 +756,9 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4)
                write_welcome_email(wizard);
        
+#ifndef G_OS_WIN32 
+       plugin_load_standard_plugins();
+#endif
        return TRUE;
 }
 
@@ -703,7 +776,7 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
        /* create the titlebar */
        hbox = gtk_hbox_new (FALSE, 12);
        image = stock_pixmap_widget(wizard->window, 
-                               STOCK_PIXMAP_SYLPHEED_ICON);
+                               STOCK_PIXMAP_CLAWS_MAIL_ICON);
        gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 0);
        title_string = g_strconcat ("<span size=\"xx-large\" weight=\"ultrabold\">", title ? title : "", "</span>", NULL);
        w = gtk_label_new (title_string);
@@ -843,12 +916,19 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(1,2, FALSE);
        gint i = 0;
-       
+       GtkTooltips *tips = gtk_tooltips_new();
+
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        wizard->mailbox_name = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), tmpl.mailbox?tmpl.mailbox:"");
+
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->mailbox_name,
+                            _("You can also specify an absolute path, for example: "
+                              "\"/home/john/Documents/Mail\""),
+                            NULL);
+
        GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Mailbox name:</span>"), 
                             wizard->mailbox_name, i); i++;
        
@@ -868,7 +948,12 @@ static void smtp_auth_changed (GtkWidget *btn, gpointer data)
 
 static GtkWidget* smtp_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(1,4, FALSE);
+#ifdef USE_OPENSSL
+       GtkWidget *table = gtk_table_new(6, 2, FALSE);
+#else
+       GtkWidget *table = gtk_table_new(4, 2, FALSE);
+#endif
+       GtkTooltips *tips = gtk_tooltips_new();
        gchar *text;
        gint i = 0;
        
@@ -879,6 +964,12 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        text = get_default_server(wizard, "smtp");
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
        g_free(text);
+
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->smtp_server,
+                            _("You can specify the port number by appending it at the end: "
+                              "\"mail.example.com:25\""),
+                            NULL);
+
        GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">SMTP server address:</span>"), 
                             wizard->smtp_server, i); i++;
        wizard->smtp_auth = gtk_check_button_new_with_label(
@@ -919,6 +1010,23 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        gtk_table_attach(GTK_TABLE(table), wizard->smtp_password,             
                         1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
        i++;
+#ifdef USE_OPENSSL
+       wizard->smtp_use_ssl = gtk_check_button_new_with_label(
+                                       _("Use SSL to connect to SMTP server"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl),
+                       tmpl.smtpssl != 0);
+       gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_ssl,     
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); 
+       i++;
+       wizard->smtp_use_tls = gtk_check_button_new_with_label(
+                                       _("Use SSL via STARTTLS"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_tls),
+                       tmpl.smtpssl == 2);
+       gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_tls,      
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 16, 0); 
+       i++;
+       SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, wizard->smtp_use_tls);
+#endif
        smtp_auth_changed(NULL, wizard);
        return table;
 }
@@ -932,35 +1040,72 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
                gtk_widget_hide(wizard->recv_imap_label);
                gtk_widget_hide(wizard->recv_imap_subdir);
+               gtk_widget_hide(wizard->subsonly_checkbtn);
                gtk_widget_show(wizard->recv_username);
                gtk_widget_show(wizard->recv_password);
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
+               gtk_widget_hide(wizard->no_imap_warning);
+#ifdef USE_OPENSSL
+               gtk_widget_show(wizard->recv_use_ssl);
+               gtk_widget_show(wizard->recv_use_tls);
+#endif
                gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
                gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
+               gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
                g_free(text);
        } else if (protocol == A_IMAP4) {
+#ifdef HAVE_LIBETPAN
                text = get_default_server(wizard, "imap");
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
                gtk_widget_show(wizard->recv_imap_label);
                gtk_widget_show(wizard->recv_imap_subdir);
+               gtk_widget_show(wizard->subsonly_checkbtn);
                gtk_widget_show(wizard->recv_username);
                gtk_widget_show(wizard->recv_password);
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
+               gtk_widget_hide(wizard->no_imap_warning);
+#ifdef USE_OPENSSL
+               gtk_widget_show(wizard->recv_use_ssl);
+               gtk_widget_show(wizard->recv_use_tls);
+#endif
                gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
                gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
+               gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
                g_free(text);
+#else
+               gtk_widget_hide(wizard->recv_imap_label);
+               gtk_widget_hide(wizard->recv_imap_subdir);
+               gtk_widget_hide(wizard->subsonly_checkbtn);
+               gtk_widget_hide(wizard->recv_username);
+               gtk_widget_hide(wizard->recv_password);
+               gtk_widget_hide(wizard->recv_username_label);
+               gtk_widget_hide(wizard->recv_password_label);
+               gtk_widget_show(wizard->no_imap_warning);
+#ifdef USE_OPENSSL
+               gtk_widget_hide(wizard->recv_use_ssl);
+               gtk_widget_hide(wizard->recv_use_tls);
+#endif
+               gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, FALSE);
+#endif
        } else if (protocol == A_LOCAL) {
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), tmpl.mboxfile?tmpl.mboxfile:"");
                gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Local mailbox:</span>"));
                gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
+               gtk_widget_hide(wizard->no_imap_warning);
                gtk_widget_hide(wizard->recv_imap_label);
                gtk_widget_hide(wizard->recv_imap_subdir);
+               gtk_widget_hide(wizard->subsonly_checkbtn);
                gtk_widget_hide(wizard->recv_username);
                gtk_widget_hide(wizard->recv_password);
                gtk_widget_hide(wizard->recv_username_label);
                gtk_widget_hide(wizard->recv_password_label);
+#ifdef USE_OPENSSL
+               gtk_widget_hide(wizard->recv_use_ssl);
+               gtk_widget_hide(wizard->recv_use_tls);
+#endif
+               gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
        }
 }
 
@@ -976,9 +1121,14 @@ static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
 
 static GtkWidget* recv_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(5,2, FALSE);
+#ifdef USE_OPENSSL
+       GtkWidget *table = gtk_table_new(8,2, FALSE);
+#else
+       GtkWidget *table = gtk_table_new(6,2, FALSE);
+#endif
        GtkWidget *menu = gtk_menu_new();
        GtkWidget *menuitem;
+       GtkTooltips *tips = gtk_tooltips_new();
        gchar *text;
        gint i = 0;
        gint index = 0;
@@ -992,12 +1142,12 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(wizard_protocol_changed),
                         wizard);
-#ifdef HAVE_LIBETPAN
+
        MENUITEM_ADD (menu, menuitem, _("IMAP"), A_IMAP4);
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(wizard_protocol_changed),
                         wizard);
-#endif
+
        MENUITEM_ADD (menu, menuitem, _("Local mbox file"), A_LOCAL);
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(wizard_protocol_changed),
@@ -1008,18 +1158,12 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        case A_POP3: 
                index = 0;
                break;
-#ifdef HAVE_LIBETPAN
        case A_IMAP4:
                index = 1;
                break;
        case A_LOCAL:
                index = 2;
                break;
-#else
-       case A_LOCAL:
-               index = 1;
-               break;
-#endif
        default:
                index = 0;
        }
@@ -1032,6 +1176,11 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
        g_free(text);
        
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->recv_server,
+                            _("You can specify the port number by appending it at the end: "
+                              "\"mail.example.com:110\""),
+                            NULL);
+
        wizard->recv_label = gtk_label_new(_("<span weight=\"bold\">Server address:</span>"));
        gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_label,                        
@@ -1082,35 +1231,41 @@ static GtkWidget* recv_page (WizardWindow * wizard)
 
        i++;
        
-       return table;
-}
+       wizard->subsonly_checkbtn = gtk_check_button_new_with_label(
+                       _("Show only subscribed folders"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->subsonly_checkbtn),
+                       tmpl.subsonly);
+       gtk_table_attach(GTK_TABLE(table), wizard->subsonly_checkbtn,                         
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
 
-#ifdef USE_OPENSSL
-static GtkWidget* ssl_page (WizardWindow * wizard)
-{
-       GtkWidget *table = gtk_table_new(2,2, FALSE);
-       gint i = 0;
+       i++;
        
-       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-
-       wizard->smtp_use_ssl = gtk_check_button_new_with_label(
-                                       _("Use SSL to connect to SMTP server"));
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl),
-                       tmpl.smtpssl);
-       gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_ssl,      
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); i++;
        
+       wizard->no_imap_warning = gtk_label_new(_(
+                         "<span weight=\"bold\">Warning: this version of Claws Mail\n"
+                         "has been built without IMAP support.</span>"));
+       gtk_label_set_use_markup(GTK_LABEL(wizard->no_imap_warning), TRUE);
+       gtk_table_attach(GTK_TABLE(table), wizard->no_imap_warning,                           
+                        0,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+#ifdef USE_OPENSSL
        wizard->recv_use_ssl = gtk_check_button_new_with_label(
                                        _("Use SSL to connect to receiving server"));
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->recv_use_ssl),
-                       tmpl.recvssl);
+                       tmpl.recvssl != 0);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_use_ssl,      
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       
+       i++;
+       wizard->recv_use_tls = gtk_check_button_new_with_label(
+                                       _("Use SSL via STARTTLS"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->recv_use_tls),
+                       tmpl.recvssl == 2);
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_use_tls,      
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 16, 0); 
+       i++;
+       SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, wizard->recv_use_tls);
+#endif 
        return table;
 }
-#endif
 
 static void
 wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
@@ -1218,7 +1373,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
        wizard_read_defaults();
        
-       wizard->window = gtk_dialog_new_with_buttons (_("Sylpheed-Claws Setup Wizard"),
+       wizard->window = gtk_dialog_new_with_buttons (_("Claws Mail Setup Wizard"),
                        NULL, 0, 
                        GTK_STOCK_GO_BACK, GO_BACK,
                        GTK_STOCK_GO_FORWARD, GO_FORWARD,
@@ -1250,19 +1405,19 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
 /*welcome page: 0 */
        WELCOME_PAGE = i;
-       page = create_page(wizard, _("Welcome to Sylpheed-Claws"));
+       page = create_page(wizard, _("Welcome to Claws Mail"));
        
        wizard->pages = g_slist_append(wizard->pages, page);
        widget = stock_pixmap_widget(wizard->window, 
-                               STOCK_PIXMAP_SYLPHEED_LOGO);
+                               STOCK_PIXMAP_CLAWS_MAIL_LOGO);
 
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
        
-       text = g_strdup(_("Welcome to the Sylpheed-Claws setup wizard.\n\n"
+       text = g_strdup(_("Welcome to the Claws Mail setup wizard.\n\n"
                          "We will begin by defining some basic "
                          "information about you and your most common "
                          "mail options so that you can start to use "
-                         "Sylpheed-Claws in less than five minutes."));
+                         "Claws Mail in less than five minutes."));
        widget = gtk_label_new(text);
        gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE);
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
@@ -1305,16 +1460,6 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
                wizard->pages = g_slist_append(wizard->pages, widget);
        }
-/* ssl page: 5 */
-#ifdef USE_OPENSSL
-       i++;
-       SSL_PAGE = i;
-       widget = create_page (wizard, _("Security"));
-       gtk_box_pack_start (GTK_BOX(widget), ssl_page(wizard), FALSE, FALSE, 0);
-       PACK_WARNING(_("Bold fields must be completed"));
-       
-       wizard->pages = g_slist_append(wizard->pages, widget);
-#endif
 
 /* done page: 6 */
        i++;
@@ -1323,11 +1468,11 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
        wizard->pages = g_slist_append(wizard->pages, page);
        widget = stock_pixmap_widget(wizard->window, 
-                               STOCK_PIXMAP_SYLPHEED_LOGO);
+                               STOCK_PIXMAP_CLAWS_MAIL_LOGO);
 
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
        
-       text = g_strdup(_("Sylpheed-Claws is now ready.\n\n"
+       text = g_strdup(_("Claws Mail is now ready.\n\n"
                          "Click Save to start."));
        widget = gtk_label_new(text);
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
@@ -1345,6 +1490,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
 
        gtk_widget_hide(wizard->recv_imap_label);
        gtk_widget_hide(wizard->recv_imap_subdir);
+       gtk_widget_hide(wizard->subsonly_checkbtn);
 
        wizard_protocol_change(wizard, tmpl.recvtype);