Remove (obsolete) FSF address from welcome mail
[claws.git] / src / wizard.c
index 3e26f1deafadab96e55094c7ed8037a916b4431d..777b8bfeebdc6c62cc9058202b4b8c80b94f6cd9 100644 (file)
@@ -1,11 +1,11 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2004 Colin Leroy
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
 #include <gtk/gtk.h>
 
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "utils.h"
 #include "gtk/menu.h"
+#include "plugin.h"
 #include "account.h"
 #include "prefs_account.h"
 #include "mainwindow.h"
 #include "setup.h"
 #include "folder.h"
 #include "alertpanel.h"
-#ifdef USE_OPENSSL                     
+#include "filesel.h"
+#ifdef USE_GNUTLS
 #include "ssl.h"
 #endif
 #include "prefs_common.h"
+#include "combobox.h"
+#include "passwordstore.h"
 
 typedef enum
 {
@@ -74,7 +65,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
@@ -90,8 +80,14 @@ typedef struct
        GtkWidget *organization;
 
        GtkWidget *mailbox_name;
+       GtkWidget *mailbox_label;
        
        GtkWidget *smtp_server;
+       GtkWidget *smtp_auth;
+       GtkWidget *smtp_username;
+       GtkWidget *smtp_password;
+       GtkWidget *smtp_username_label;
+       GtkWidget *smtp_password_label;
 
        GtkWidget *recv_type;
        GtkWidget *recv_label;
@@ -102,26 +98,359 @@ typedef struct
        GtkWidget *recv_password_label;
        GtkWidget *recv_imap_label;
        GtkWidget *recv_imap_subdir;
-
-#ifdef USE_OPENSSL
+       GtkWidget *subsonly_checkbtn;
+       GtkWidget *no_imap_warning;
+#ifdef USE_GNUTLS
        GtkWidget *smtp_use_ssl;
        GtkWidget *recv_use_ssl;
+       GtkWidget *smtp_use_tls;
+       GtkWidget *recv_use_tls;
+       GtkWidget *smtp_ssl_cert_file;
+       GtkWidget *recv_ssl_cert_file;
+       GtkWidget *smtp_ssl_cert_pass;
+       GtkWidget *recv_ssl_cert_pass;
+       GtkWidget *smtp_cert_table;
+       GtkWidget *recv_cert_table;
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+       GtkWidget *auto_configure_lbl;
+       GtkWidget *auto_configure_btn;
+       GtkWidget *auto_configure_cancel_btn;
 #endif
-       
        gboolean create_mailbox;
        gboolean finished;
        gboolean result;
 
 } WizardWindow;
 
+typedef struct _AccountTemplate {
+       gchar *name;
+       gchar *domain;
+       gchar *email;
+       gchar *organization;
+       gchar *smtpserver;
+       gboolean smtpauth;
+       gchar *smtpuser;
+       gchar *smtppass;
+       RecvProtocol recvtype;
+       gchar *recvserver;
+       gchar *recvuser;
+       gchar *recvpass;
+       gchar *imapdir;
+       gboolean subsonly;
+       gchar *mboxfile;
+       gchar *mailbox;
+       gboolean smtpssl;
+       gboolean recvssl;
+       gchar *smtpssl_cert;
+       gchar *recvssl_cert;
+       gchar *smtpssl_cert_pass;
+       gchar *recvssl_cert_pass;
+} AccountTemplate;
+
+static AccountTemplate tmpl;
+
+static PrefParam template_params[] = {
+       {"name", "$USERNAME",
+        &tmpl.name, P_STRING, NULL, NULL, NULL},
+       {"domain", "$DEFAULTDOMAIN",
+        &tmpl.domain, P_STRING, NULL, NULL, NULL},
+       {"email", "$NAME_MAIL@$DOMAIN",
+        &tmpl.email, P_STRING, NULL, NULL, NULL},
+       {"organization", "",
+        &tmpl.organization, P_STRING, NULL, NULL, NULL},
+       {"smtpserver", "smtp.$DOMAIN",
+        &tmpl.smtpserver, P_STRING, NULL, NULL, NULL},
+       {"smtpauth", "FALSE",
+        &tmpl.smtpauth, P_BOOL, NULL, NULL, NULL},
+       {"smtpuser", "",
+        &tmpl.smtpuser, P_STRING, NULL, NULL, NULL},
+       {"smtppass", "",
+        &tmpl.smtppass, P_STRING, NULL, NULL, NULL},
+       {"recvtype", A_POP3,
+        &tmpl.recvtype, P_INT, NULL, NULL, NULL},
+       {"recvserver", "pop.$DOMAIN",
+        &tmpl.recvserver, P_STRING, NULL, NULL, NULL},
+       {"recvuser", "$LOGIN",
+        &tmpl.recvuser, P_STRING, NULL, NULL, NULL},
+       {"recvpass", "",
+        &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", "0",
+        &tmpl.smtpssl, P_INT, NULL, NULL, NULL},
+       {"recvssl", "0",
+        &tmpl.recvssl, P_INT, NULL, NULL, NULL},
+       {"smtpssl_cert", "",
+        &tmpl.smtpssl_cert, P_STRING, NULL, NULL, NULL},
+       {"recvssl_cert", "",
+        &tmpl.recvssl_cert, P_STRING, NULL, NULL, NULL},
+       {"smtpssl_cert_pass", "",
+        &tmpl.smtpssl_cert, P_STRING, NULL, NULL, NULL},
+       {"recvssl_cert_pass", "",
+        &tmpl.recvssl_cert, P_STRING, NULL, NULL, NULL},
+       {NULL, NULL, NULL, P_INT, NULL, NULL, NULL}
+};
+
+
+static gchar *accountrc_tmpl =
+       "[AccountTemplate]\n"
+       "#you can use $DEFAULTDOMAIN here\n"
+       "#domain must be defined before the variables that use it\n"
+       "#by default, domain is extracted from the hostname\n"
+       "#domain=\n"
+       "\n"
+       "#you can use $USERNAME for name (this is the default)\n"
+       "#name=\n"
+       "\n"
+       "#you can use $LOGIN, $NAME_MAIL and $DOMAIN here \n"
+       "#$NAME_MAIL is the name without uppercase and with dots instead\n"
+       "#of spaces\n"
+       "#the default is $NAME_MAIL@$DOMAIN\n"
+       "#email=\n"
+       "\n"
+       "#you can use $DOMAIN here\n"
+       "#the default organization is empty\n"
+       "#organization=\n"
+       "\n"
+       "#you can use $DOMAIN here \n"
+       "#the default is smtp.$DOMAIN\n"
+       "#smtpserver=\n"
+       "\n"
+       "#Whether to use smtp authentication\n"
+       "#the default is 0 (no)\n"
+       "#smtpauth=\n"
+       "\n"
+       "#SMTP username\n"
+       "#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here\n"
+       "#the default is empty (same as reception username)\n"
+       "#smtpuser=\n"
+       "\n"
+       "#SMTP password\n"
+       "#the default is empty (same as reception password)\n"
+       "#smtppass=\n"
+       "\n"
+       "#recvtype can be:\n"
+       "#0 for pop3\n"
+       "#3  for imap\n"
+       "#5  for a local mbox file\n"
+       "#recvtype=\n"
+       "\n"
+       "#you can use $DOMAIN here \n"
+       "#the default is {pop,imap}.$DOMAIN\n"
+       "#recvserver=\n"
+       "\n"
+       "#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here\n"
+       "#default is $LOGIN\n"
+       "#recvuser=\n"
+       "\n"
+       "#default is empty\n"
+       "#recvpass=\n"
+       "\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"
+       "#mboxfile=\n"
+       "\n"
+       "#mailbox name if pop3 or local\n"
+       "#relative path from the user's home\n"
+       "#default is \"Mail\"\n"
+       "#mailbox=\n"
+       "\n"
+       "#whether to use ssl on smtp connections\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, 1 is ssl, 2 is starttls\n"
+       "#recvssl=\n"
+       "\n"
+       "#SSL client certificate path for SMTP\n"
+       "#default is empty (no certificate)\n"
+       "#smtpssl_cert=\n"
+       "\n"
+       "#SSL client certificate path for POP/IMAP\n"
+       "#default is empty (no certificate)\n"
+       "#recvssl_cert=\n"
+       "\n"
+       "#SSL client certificate password for SMTP\n"
+       "#default is empty (no password)\n"
+       "#smtpssl_cert_pass=\n"
+       "\n"
+       "#SSL client certificate password for POP/IMAP\n"
+       "#default is empty (no password)\n"
+       "#recvssl_cert_pass=\n"
+       ;
+
+static gchar *wizard_get_default_domain_name(void)
+{
+       static gchar *domain_name = NULL;
+       
+       if (domain_name == NULL) {
+               domain_name = g_strdup(get_domain_name());
+               if (strchr(domain_name, '.') != NULL 
+               && strchr(domain_name, '.') != strrchr(domain_name, '.')
+               && strlen(strchr(domain_name, '.')) > 6) {
+                       gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
+                       g_free(domain_name);
+                       domain_name = tmp;
+               }
+       }
+       return domain_name;
+}
+
+static gchar *get_name_for_mail(void)
+{
+       gchar *name = NULL;
+       if (tmpl.name == NULL)
+               return NULL;
+       name = g_utf8_strdown(tmpl.name, -1);
+       while(strstr(name, " "))
+               *strstr(name, " ")='.';
+       
+       return name;
+}
+
+#define PARSE_DEFAULT(str) {   \
+       gchar *tmp = NULL, *new = NULL; \
+       if (str != NULL) {      \
+               if (strstr(str, "$USERNAME")) { \
+                       tmp = g_strdup(str); \
+                       *strstr(tmp, "$USERNAME") = '\0';       \
+                       new = g_strconcat(tmp, g_get_real_name(),       \
+                               strstr(str, "$USERNAME")+strlen("$USERNAME"),   \
+                               NULL);  \
+                       g_free(tmp);    \
+                       g_free(str);    \
+                       str = new;      \
+                       new = NULL;     \
+               }       \
+               if (strstr(str, "$LOGIN")) {    \
+                       tmp = g_strdup(str); \
+                       *strstr(tmp, "$LOGIN") = '\0';  \
+                       new = g_strconcat(tmp, g_get_user_name(),       \
+                               strstr(str, "$LOGIN")+strlen("$LOGIN"),         \
+                               NULL);  \
+                       g_free(tmp);    \
+                       g_free(str);    \
+                       str = new;      \
+                       new = NULL;     \
+               }       \
+               if (strstr(str, "$EMAIL")) {    \
+                       tmp = g_strdup(str); \
+                       *strstr(tmp, "$EMAIL") = '\0';  \
+                       new = g_strconcat(tmp, tmpl.email,      \
+                               strstr(str, "$EMAIL")+strlen("$EMAIL"),         \
+                               NULL);  \
+                       g_free(tmp);    \
+                       g_free(str);    \
+                       str = new;      \
+                       new = NULL;     \
+               }       \
+               if (strstr(str, "$NAME_MAIL")) {        \
+                       tmp = g_strdup(str); \
+                       *strstr(tmp, "$NAME_MAIL") = '\0';      \
+                       new = g_strconcat(tmp, get_name_for_mail(),     \
+                               strstr(str, "$NAME_MAIL")+strlen("$NAME_MAIL"),         \
+                               NULL);  \
+                       g_free(tmp);    \
+                       g_free(str);    \
+                       str = new;      \
+                       new = NULL;     \
+               }       \
+               if (strstr(str, "$DEFAULTDOMAIN")) {    \
+                       tmp = g_strdup(str); \
+                       *strstr(tmp, "$DEFAULTDOMAIN") = '\0';  \
+                       new = g_strconcat(tmp, wizard_get_default_domain_name(),        \
+                               strstr(str, "$DEFAULTDOMAIN")+strlen("$DEFAULTDOMAIN"),         \
+                               NULL);  \
+                       g_free(tmp);    \
+                       g_free(str);    \
+                       str = new;      \
+                       new = NULL;     \
+               }       \
+               if (strstr(str, "$DOMAIN")) {   \
+                       tmp = g_strdup(str); \
+                       *strstr(tmp, "$DOMAIN") = '\0'; \
+                       new = g_strconcat(tmp, tmpl.domain,     \
+                               strstr(str, "$DOMAIN")+strlen("$DOMAIN"),       \
+                               NULL);  \
+                       g_free(tmp);    \
+                       g_free(str);    \
+                       str = new;      \
+                       new = NULL;     \
+               }       \
+       }       \
+}
+static void wizard_read_defaults(void)
+{
+       gchar *rcpath;
+
+       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "accountrc.tmpl", NULL);
+       if (!is_file_exist(rcpath)) {
+               str_write_to_file(accountrc_tmpl, rcpath);
+       }
+
+       prefs_read_config(template_params, "AccountTemplate", rcpath, NULL);
+
+       PARSE_DEFAULT(tmpl.domain);
+       PARSE_DEFAULT(tmpl.name);
+       PARSE_DEFAULT(tmpl.email);
+       PARSE_DEFAULT(tmpl.organization);
+       PARSE_DEFAULT(tmpl.smtpserver);
+       PARSE_DEFAULT(tmpl.smtpuser);
+       PARSE_DEFAULT(tmpl.smtppass);
+       PARSE_DEFAULT(tmpl.recvserver);
+       PARSE_DEFAULT(tmpl.recvuser);
+       PARSE_DEFAULT(tmpl.recvpass);
+       PARSE_DEFAULT(tmpl.imapdir);
+       PARSE_DEFAULT(tmpl.mboxfile);
+       PARSE_DEFAULT(tmpl.mailbox);
+/*
+       g_print("defaults:"
+       "%s, %s, %s, %s, %s, %d, %s, %s, %s, %s, %s, %s, %d, %d\n",
+       tmpl.name,tmpl.domain,tmpl.email,tmpl.organization,tmpl.smtpserver,
+       tmpl.recvtype,tmpl.recvserver,tmpl.recvuser,tmpl.recvpass,
+       tmpl.imapdir,tmpl.mboxfile,tmpl.mailbox,tmpl.smtpssl,tmpl.recvssl);
+*/
+       g_free(rcpath);
+}
+
 static void initialize_fonts(WizardWindow *wizard)
 {
        GtkWidget *widget = wizard->email;
        gint size = pango_font_description_get_size(
-                       widget->style->font_desc)
+                       gtk_widget_get_style(widget)->font_desc)
                      /PANGO_SCALE;
        gchar *tmp, *new;
-       
+#ifdef G_OS_WIN32
+       PangoFontDescription *bold_desc;
+       gchar *curfont = pango_font_description_to_string(widget->style->font_desc);
+       g_free(prefs_common.smallfont);
+       g_free(prefs_common.normalfont);
+       g_free(prefs_common.boldfont);
+       prefs_common.smallfont = g_strdup(curfont);
+       prefs_common.normalfont = g_strdup(curfont);
+       bold_desc = pango_font_description_from_string(curfont);
+       pango_font_description_set_weight(bold_desc, PANGO_WEIGHT_BOLD);
+       prefs_common.boldfont = pango_font_description_to_string(bold_desc);
+       pango_font_description_free(bold_desc);
+       g_free(curfont);
+#endif 
        tmp = g_strdup(prefs_common.textfont);
        if (strrchr(tmp, ' ')) {
                *(strrchr(tmp, ' ')) = '\0';
@@ -148,9 +477,31 @@ static void initialize_fonts(WizardWindow *wizard)
                prefs_common.normalfont = new;
        }
        g_free(tmp);
+
+       tmp = g_strdup(prefs_common.boldfont);
+       if (strrchr(tmp, ' ')) {
+               *(strrchr(tmp, ' ')) = '\0';
+               new = g_strdup_printf("%s %d", tmp, size);
+               g_free(prefs_common.boldfont);
+               prefs_common.boldfont = new;
+       }
+       g_free(tmp);
 }
 
 #define XFACE "+}Axz@~a,-Yx?0Ysa|q}CLRH=89Y]\"')DSX^<6p\"d)'81yx5%G#u^o*7JG&[aPU0h1Ux.vb2yIjH83{5`/bVo|~nn/i83vE^E)qk-4W)_E.4Y=D*qvf/,Ci_=P<iY<M6"
+#define FACE "iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAM1BMVEUAAAAcJCI\n\
+ ONl1JUi0+Z4daY2NZciPabV9ykS5kj6Wsl2ybmZOBsMjZxK2wzN3Pzczs7OsCAGN0AAAAAXRSTlM\n\
+ AQObYZgAAAAFiS0dEAIgFHUgAAAIVSURBVEjH1ZbtlqMgDIaFECoGhPu/2s0b0Lais/NzN6d1OJ7\n\
+ 3yReQzrL8B5Zy3rvl9At52Pf2tv1vSMjtYj8jaa8XUyI/yn3YD6sigj/2Tf5Bn069MIsTPHvx/t5\n\
+ /3rU/6JCIY3YwGe26r/cwUfE3cFe5T28L0K5rJAUHEeYAQxs8DHojjk3M9wECU4xxjXisI8RA0gy\n\
+ oczJZJOjxiTFZVTchAnIRJrgdmEGDyFfAI3UuG5FmYTkR9RDrIC4H0SqV4pzpEcUp0HNLjwBv+jA\n\
+ dikUE5g9iBvzmu3sH2oDk4lnHd829+2Q9gj6kDqDPg7hsGwBzH02fE3ZCt6ZHmlNKIMjMeRwra5I\n\
+ ecgNoBnLGPmzaHPJIwLY8Sq2M/tLUJfj0QcqmfVXAdLSStIYF8dzWjBBb2VgvDa4mO9oc651OiUo\n\
+ BEKbZokdPATF9E9oKAjQJcJOniaPXrVZRAnVWaqIyqRoNC8ZJvgCcW8XN39RqxVP1rS8Yd4WnCdN\n\
+ aRTo2jJRDbg3vtCpEUGffgDPhqKDaSuVqYtOplFIvIcx3HUI5/MuIWl6vKyBjNlqEru8hbFXqBPA\n\
+ 5TpHGIUZOePeaIyzfQ/g9Xg0opU1AvdfXM9floYhv92pPAE96OZtkPV8eivgQi9RTfwPUU36I26n\n\
+ Hy+WuCJzAT7efMSeA1TNf2/VugDz+dN139xfA5ffxGZDD+MvcP/uvyB80wzZ76wbz8gAAAABJRU5\n\
+ ErkJggg=="
 
 static void write_welcome_email(WizardWindow *wizard)
 {
@@ -158,42 +509,58 @@ 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), 
+                       C_("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 <sylpheed-claws-users@lists.sf.net>\n"
+               "From: %s <%s>\n"
                "To: %s <%s>\n"
                "Date: %s\n"
                "Subject: %s\n"
                "X-Face: %s\n"
+               "Face: %s\n"
                "Content-Type: text/plain; charset=UTF-8\n",
-               _("Sylpheed-Claws Team"),
-               gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
+               enc_from_name,
+               USERS_ML_ADDR,
+               enc_to_name,
                gtk_entry_get_text(GTK_ENTRY(wizard->email)),
-               buf_date, subj, XFACE);
+               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"
@@ -207,15 +574,14 @@ static void write_welcome_email(WizardWindow *wizard)
                "\n"
                "LICENSE\n"
                "-------\n"
-               "Sylpheed-Claws 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"
-               "found at <%s>.\n"
+               "Claws Mail is free software, released under the terms\n"
+               "of the GNU General Public License, version 3 or later, as\n"
+               "published by the Free Software Foundation. The license can\n"
+               "be found at <%s>.\n"
                "\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);
@@ -227,11 +593,10 @@ 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);
-       g_unlink(file);
+       claws_unlink(file);
 }
 #undef XFACE
 
@@ -240,13 +605,14 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        static gboolean mailbox_ok = FALSE;
        PrefsAccount *prefs_account = prefs_account_new();
        GList *account_list = NULL;
-       GtkWidget *menu, *menuitem;
-       
-       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
-                       (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-       
+       gchar *smtp_server, *recv_server;
+       gint smtp_port, recv_port;
+#ifdef USE_GNUTLS
+       SSLType smtp_ssl_type, recv_ssl_type;
+#endif
+
+       prefs_account->protocol = combobox_get_active_data(
+                                       GTK_COMBO_BOX(wizard->recv_type));
        
        if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4 && 
            !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)))) {
@@ -307,7 +673,7 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                        return FALSE;
                }
        }
-
+       
        if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server)))) {
                alertpanel_error(_("Please enter your SMTP server."));
                g_free(prefs_account);
@@ -315,7 +681,18 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                        GTK_NOTEBOOK(wizard->notebook), 
                        SMTP_PAGE);
                return FALSE;
+       }
 
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_auth))) {
+               if (prefs_account->protocol == A_LOCAL
+               &&  !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->smtp_username)))) {
+                       alertpanel_error(_("Please enter your SMTP username."));
+                       g_free(prefs_account);
+                       gtk_notebook_set_current_page (
+                               GTK_NOTEBOOK(wizard->notebook), 
+                               SMTP_PAGE);
+                       return FALSE;           
+               } /* if it's not local we'll use the reception server */
        }
 
        if (prefs_account->protocol != A_LOCAL)
@@ -326,43 +703,119 @@ 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);
+
+       if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) {
+               gchar *tmp;
+               tmp = g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
+               prefs_account->inbox = g_strdup_printf("#mh/%s/inbox",
+                       (!strcmp("Mail", gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name))))
+                               ?_("Mailbox"):tmp);
+               g_free(tmp);
+               prefs_account->local_inbox = g_strdup(prefs_account->inbox);
+       } else if (prefs_account->protocol != A_IMAP4) {
+               if (folder_get_default_inbox())
+                       prefs_account->local_inbox = 
+                               folder_item_get_identifier(folder_get_default_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)));
-       prefs_account->passwd = g_strdup(
-                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_password)));
+       prefs_account->smtp_userid = g_strdup(
+                               gtk_entry_get_text(GTK_ENTRY(wizard->smtp_username)));
+
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_RECV,
+                       gtk_entry_get_text(GTK_ENTRY(wizard->recv_password)),
+                       FALSE);
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_SEND,
+                       gtk_entry_get_text(GTK_ENTRY(wizard->smtp_password)),
+                       FALSE);
+
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_auth))) {
+               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_GNUTLS
+       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;
+
+       prefs_account->out_ssl_client_cert_file = g_strdup(
+                               gtk_entry_get_text(GTK_ENTRY(wizard->smtp_ssl_cert_file)));
+       prefs_account->in_ssl_client_cert_file = g_strdup(
+                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_ssl_cert_file)));
+
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_SEND_CERT,
+                       gtk_entry_get_text(GTK_ENTRY(wizard->smtp_ssl_cert_pass)),
+                       FALSE);
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_RECV_CERT,
+                       gtk_entry_get_text(GTK_ENTRY(wizard->recv_ssl_cert_pass)),
+                       FALSE);
 #endif
+
        if (prefs_account->protocol == A_IMAP4) {
                gchar *directory = gtk_editable_get_chars(
                        GTK_EDITABLE(wizard->recv_imap_subdir), 0, -1);
                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);
        }
 
@@ -374,7 +827,10 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        initialize_fonts(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;
 }
 
@@ -391,8 +847,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);
+       image = stock_pixmap_widget(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);
@@ -414,64 +869,56 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
        return vbox;
 }
 
-#define GTK_TABLE_ADD_ROW_AT(table,text,entry,i) {                           \
-       GtkWidget *label = gtk_label_new(text);                               \
-       gtk_table_attach(GTK_TABLE(table), label,                             \
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            \
-       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);                     \
-       if (GTK_IS_MISC(label))                                               \
-               gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);              \
-       gtk_table_attach(GTK_TABLE(table), entry,                             \
-                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            \
+#define PACK_BOX(hbox,text,entry) {                                    \
+       GtkWidget *label = gtk_label_new(text);                         \
+       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);               \
+       if (GTK_IS_MISC(label))                                         \
+               gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);        \
+       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);      \
+       gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);        \
 }
 
-static gchar *get_default_email_addr(void)
+static gchar *get_default_server(WizardWindow * wizard, const gchar *type)
 {
-       gchar *domain_name = g_strdup(get_domain_name());
-       gchar *result;
-       if (strchr(domain_name, '.') != strrchr(domain_name, '.')
-       && strlen(strchr(domain_name, '.')) > 6) {
-               gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
-               g_free(domain_name);
-               domain_name = tmp;
-       }
-       result = g_strdup_printf("%s@%s",
-                               g_get_user_name(),
-                               domain_name);
-       g_free(domain_name);
-       return result;
+       if (!strcmp(type, "smtp")) {
+               if (!tmpl.smtpserver || !strlen(tmpl.smtpserver))
+                       return g_strconcat(type, ".", tmpl.domain, NULL);
+               else 
+                       return g_strdup(tmpl.smtpserver);
+       } else {
+               if (!tmpl.recvserver || !strlen(tmpl.recvserver))
+                       return g_strconcat(type, ".", tmpl.domain, NULL);
+               else 
+                       return g_strdup(tmpl.recvserver);
+       }
 }
 
-static gchar *get_default_server(WizardWindow * wizard, const gchar *type)
+static gchar *get_default_account(WizardWindow * wizard)
 {
-       gchar *domain_name = NULL;
-       gchar *tmp = gtk_editable_get_chars(
-                       GTK_EDITABLE(wizard->email), 0, -1);
-       gchar *result;
+       gchar *result = NULL;
        
-       if (strstr(tmp, "@")) {
-               domain_name = g_strdup(strstr(tmp,"@")+1);
+       if (!tmpl.recvuser || !strlen(tmpl.recvuser)) {
+               result = gtk_editable_get_chars(
+                               GTK_EDITABLE(wizard->email), 0, -1);
+
+               if (strstr(result, "@")) {
+                       *(strstr(result,"@")) = '\0';
+               } 
        } else {
-               domain_name = g_strdup(get_domain_name());
+               result = g_strdup(tmpl.recvuser);
        }
-       
-       g_free(tmp);
-
-       result = g_strdup_printf("%s.%s",
-                               type, domain_name);
-       g_free(domain_name);
        return result;
 }
 
-static gchar *get_default_account(WizardWindow * wizard)
+static gchar *get_default_smtp_account(WizardWindow * wizard)
 {
-       gchar *result = gtk_editable_get_chars(
-                       GTK_EDITABLE(wizard->email), 0, -1);
+       gchar *result = NULL;
        
-       if (strstr(result, "@")) {
-               *(strstr(result,"@")) = '\0';
-       } 
-
+       if (!tmpl.smtpuser || !strlen(tmpl.smtpuser)) {
+               return g_strdup("");
+       } else {
+               result = g_strdup(tmpl.smtpuser);
+       }
        return result;
 }
 
@@ -480,8 +927,7 @@ static void wizard_email_changed(GtkWidget *widget, gpointer data)
        WizardWindow *wizard = (WizardWindow *)data;
        RecvProtocol protocol;
        gchar *text;
-       protocol = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(wizard->recv_type), MENU_VAL_ID));
+       protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type));
        
        text = get_default_server(wizard, "smtp");
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
@@ -500,37 +946,61 @@ static void wizard_email_changed(GtkWidget *widget, gpointer data)
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
                g_free(text);
        } else if (protocol == A_LOCAL) {
-               gchar *mbox = g_strdup_printf("/var/mail/%s", g_get_user_name());
-               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), mbox);
-               g_free(mbox);
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), tmpl.mboxfile?tmpl.mboxfile:"");
        }
        
 }
 
 static GtkWidget* user_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(3,2, FALSE);
-       gchar *text;
-       gint i = 0;
+       GtkWidget *table = gtk_table_new(1,1, FALSE);
+       GtkWidget *vbox;
+       GtkWidget *label;
+       GtkWidget *user_table;
        
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
+       vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
+
+       gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+       user_table = gtk_table_new(3, 2, FALSE);
+       gtk_table_set_row_spacings(GTK_TABLE(user_table), VSPACING_NARROW);
+       gtk_box_pack_start(GTK_BOX(vbox), user_table, FALSE, FALSE, 0);
+
+       label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Your name:"),
+                                         "</span>", NULL));
+       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_table_attach(GTK_TABLE(user_table), label, 0,1,0,1, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
        wizard->full_name = gtk_entry_new();
-       gtk_entry_set_text(GTK_ENTRY(wizard->full_name), g_get_real_name());
-       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Your name:</span>"), 
-                            wizard->full_name, i); i++;
-       
+       gtk_entry_set_text(GTK_ENTRY(wizard->full_name), tmpl.name?tmpl.name:"");
+       gtk_table_attach(GTK_TABLE(user_table), wizard->full_name, 1,2,0,1, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+       label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Your email address:"),
+                                         "</span>", NULL));
+       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_table_attach(GTK_TABLE(user_table), label, 0,1,1,2, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
        wizard->email = gtk_entry_new();
-       text = get_default_email_addr();
-       gtk_entry_set_text(GTK_ENTRY(wizard->email), text);
-       g_free(text);
-       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Your email address:</span>"), 
-                            wizard->email, i); i++;
-       
+       gtk_entry_set_text(GTK_ENTRY(wizard->email), tmpl.email?tmpl.email:"");
+       gtk_table_attach(GTK_TABLE(user_table), wizard->email, 1,2,1,2, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+       label = gtk_label_new(_("Your organization:"));
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_table_attach(GTK_TABLE(user_table), label, 0,1,2,3, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
        wizard->organization = gtk_entry_new();
-       GTK_TABLE_ADD_ROW_AT(table, _("Your organization:"),
-                            wizard->organization, i); i++;
+       gtk_entry_set_text(GTK_ENTRY(wizard->organization), tmpl.organization?tmpl.organization:"");
+       gtk_table_attach(GTK_TABLE(user_table), wizard->organization, 1,2,2,3, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
        
        g_signal_connect(G_OBJECT(wizard->email), "changed",
                         G_CALLBACK(wizard_email_changed),
@@ -540,211 +1010,682 @@ static GtkWidget* user_page (WizardWindow * wizard)
 
 static GtkWidget* mailbox_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(1,2, FALSE);
-       gint i = 0;
-       
+       GtkWidget *table = gtk_table_new(1,1, FALSE);
+       GtkWidget *vbox;
+       GtkWidget *hbox;
+
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
+       vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
+
+       gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+       wizard->mailbox_label = gtk_label_new(g_strconcat("<span weight=\"bold\">",
+                                                         _("Mailbox name:"), "</span>", NULL));
+       gtk_label_set_use_markup(GTK_LABEL(wizard->mailbox_label), TRUE);
+       if (GTK_IS_MISC(wizard->mailbox_label))                                               
+               gtk_misc_set_alignment(GTK_MISC(wizard->mailbox_label), 1, 0.5);              
        wizard->mailbox_name = gtk_entry_new();
-       gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), "Mail");
-       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Mailbox name:</span>"), 
-                            wizard->mailbox_name, i); i++;
-       
+
+       gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), tmpl.mailbox?tmpl.mailbox:"");
+
+       CLAWS_SET_TIP(wizard->mailbox_name, _("You can also specify an absolute path, for example: "
+                              "\"/home/john/Documents/Mail\""));
+
+       gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_label, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_name, TRUE, TRUE, 0);
+
        return table;
 }
 
+static void smtp_auth_changed (GtkWidget *btn, gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       gboolean do_auth = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(wizard->smtp_auth));
+       gtk_widget_set_sensitive(wizard->smtp_username, do_auth);
+       gtk_widget_set_sensitive(wizard->smtp_username_label, do_auth);
+       gtk_widget_set_sensitive(wizard->smtp_password, do_auth);
+       gtk_widget_set_sensitive(wizard->smtp_password_label, do_auth);
+}
+
+#ifdef USE_GNUTLS
+static void cert_browse_cb(GtkWidget *widget, gpointer data)
+{
+       GtkEntry *dest = GTK_ENTRY(data);
+       gchar *filename;
+       gchar *utf8_filename;
+
+       filename = filesel_select_file_open(_("Select certificate file"), NULL);
+       if (!filename) return;
+
+       utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+       if (!utf8_filename) {
+               g_warning("cert_browse_cb(): failed to convert character set.");
+               utf8_filename = g_strdup(filename);
+       }
+       gtk_entry_set_text(dest, utf8_filename);
+       g_free(utf8_filename);
+}
+#endif
+
 static GtkWidget* smtp_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(1,2, FALSE);
+       GtkWidget *table = gtk_table_new(1, 1, FALSE);
+       GtkWidget *vbox;
+       GtkWidget *hbox;
+       GtkWidget *hbox_spc;
+       GtkWidget *smtp_auth_table;
+       GtkWidget *label;
+#ifdef USE_GNUTLS
+       GtkWidget *button;
+       GtkWidget *smtp_cert_table;
+#endif
        gchar *text;
-       gint i = 0;
        
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
+       vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
+
+       gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        wizard->smtp_server = gtk_entry_new();
        text = get_default_server(wizard, "smtp");
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
        g_free(text);
-       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">SMTP server address:</span>"), 
-                            wizard->smtp_server, i); i++;
+
+       CLAWS_SET_TIP(wizard->smtp_server,
+                            _("You can specify the port number by appending it at the end: "
+                              "\"mail.example.com:25\""));
+
+       PACK_BOX(hbox, g_strconcat("<span weight=\"bold\">", _("SMTP server address:"),
+                                  "</span>", NULL), wizard->smtp_server);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       wizard->smtp_auth = gtk_check_button_new_with_label(
+                                       _("Use authentication"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_auth),
+                       tmpl.smtpauth);
+       g_signal_connect(G_OBJECT(wizard->smtp_auth), "toggled",
+                        G_CALLBACK(smtp_auth_changed),
+                        wizard);
+       gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_auth, FALSE, FALSE, 0);
+
+       label = gtk_label_new(g_strconcat("<span size=\"small\">",
+                                         _("(empty to use the same as receive)"), "</span>", NULL));
+       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+       SET_TOGGLE_SENSITIVITY (wizard->smtp_auth, label);      
+       gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       smtp_auth_table = gtk_table_new(2, 2, FALSE);
+       SET_TOGGLE_SENSITIVITY (wizard->smtp_auth, smtp_auth_table);
+       gtk_box_pack_start(GTK_BOX(hbox), smtp_auth_table, TRUE, TRUE, 0);
+
+       wizard->smtp_username_label = gtk_label_new(_("SMTP username:"));
+       gtk_misc_set_alignment(GTK_MISC(wizard->smtp_username_label), 1, 0.5);        
+       gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_username_label, 0,1,0,1, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       text = get_default_smtp_account(wizard);
+       wizard->smtp_username = gtk_entry_new();
+       gtk_entry_set_text(GTK_ENTRY(wizard->smtp_username), text);
+       g_free(text);
+       gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_username, 1,2,0,1, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+       wizard->smtp_password_label = gtk_label_new(_("SMTP password:"));
+       gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);        
+       gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password_label, 0,1,1,2, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->smtp_password = gtk_entry_new();
+       gtk_entry_set_text(GTK_ENTRY(wizard->smtp_password), tmpl.smtppass?tmpl.smtppass:""); 
+       gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_password), FALSE);
+       gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password, 1,2,1,2, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+#ifdef USE_GNUTLS
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       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_box_pack_start(GTK_BOX(hbox), wizard->smtp_use_ssl, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       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_box_pack_start(GTK_BOX(hbox), wizard->smtp_use_tls, FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, wizard->smtp_use_tls);
+       
+       smtp_cert_table = gtk_table_new(3,3, FALSE);
+       gtk_box_pack_start (GTK_BOX(vbox), smtp_cert_table, FALSE, FALSE, 4);
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       label = gtk_label_new(_("Client SSL certificate (optional)"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+       gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       label = gtk_label_new(_("File"));
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 1, 2, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->smtp_ssl_cert_file = gtk_entry_new();
+       gtk_entry_set_text(GTK_ENTRY(wizard->smtp_ssl_cert_file), tmpl.smtpssl_cert?tmpl.smtpssl_cert:"");
+       gtk_table_attach(GTK_TABLE(smtp_cert_table), wizard->smtp_ssl_cert_file, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+       button = gtkut_get_browse_file_btn(_("Browse"));
+       gtk_table_attach(GTK_TABLE(smtp_cert_table), button, 2, 3, 1, 2, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       g_signal_connect(G_OBJECT(button), "clicked",
+                        G_CALLBACK(cert_browse_cb), wizard->smtp_ssl_cert_file);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); 
+       label = gtk_label_new(_("Password"));
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 2, 3, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->smtp_ssl_cert_pass = gtk_entry_new();
+       gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_ssl_cert_pass), FALSE);
+       gtk_entry_set_text(GTK_ENTRY(wizard->smtp_ssl_cert_pass), tmpl.smtpssl_cert_pass?tmpl.smtpssl_cert_pass:"");
+       gtk_table_attach(GTK_TABLE(smtp_cert_table), wizard->smtp_ssl_cert_pass, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+       SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, smtp_cert_table);
+       wizard->smtp_cert_table = smtp_cert_table;
+#endif
+       smtp_auth_changed(NULL, wizard);
        return table;
 }
 
-static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
+static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
 {
-       WizardWindow *wizard = (WizardWindow *)data;
-       RecvProtocol protocol;
        gchar *text;
-       protocol = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
        
        if (protocol == A_POP3) {
                text = get_default_server(wizard, "pop");
                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_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
+               gtk_widget_hide(wizard->no_imap_warning);
+#ifdef USE_GNUTLS
+               gtk_widget_show(wizard->recv_use_ssl);
+               gtk_widget_show(wizard->recv_use_tls);
+               gtk_widget_show(wizard->recv_cert_table);
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+               gtk_widget_show(wizard->auto_configure_btn);
+               gtk_widget_hide(wizard->auto_configure_cancel_btn);
+               gtk_widget_show(wizard->auto_configure_lbl);
+#endif
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label),
+                                  g_strconcat("<span weight=\"bold\">", _("Server address:"),
+                                               "</span>", NULL));
                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);
+               if (wizard->create_mailbox) {
+                       gtk_widget_show(wizard->mailbox_label);
+                       gtk_widget_show(wizard->mailbox_name);
+               }
        } 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_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
+               gtk_widget_hide(wizard->no_imap_warning);
+#ifdef USE_GNUTLS
+               gtk_widget_show(wizard->recv_use_ssl);
+               gtk_widget_show(wizard->recv_use_tls);
+               gtk_widget_show(wizard->recv_cert_table);
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+               gtk_widget_show(wizard->auto_configure_btn);
+               gtk_widget_hide(wizard->auto_configure_cancel_btn);
+               gtk_widget_show(wizard->auto_configure_lbl);
+#endif
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label),
+                                  g_strconcat("<span weight=\"bold\">", _("Server address:"),
+                                               "</span>", NULL));
                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);
+               if (wizard->create_mailbox) {
+                       gtk_widget_hide(wizard->mailbox_label);
+                       gtk_widget_hide(wizard->mailbox_name);
+               }
+#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);
+               if (wizard->create_mailbox) {
+                       gtk_widget_hide(wizard->mailbox_label);
+                       gtk_widget_hide(wizard->mailbox_name);
+               }
+#ifdef USE_GNUTLS
+               gtk_widget_hide(wizard->recv_use_ssl);
+               gtk_widget_hide(wizard->recv_use_tls);
+               gtk_widget_hide(wizard->recv_cert_table);
+#endif
+               gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, FALSE);
+#endif
        } else if (protocol == A_LOCAL) {
-               gchar *mbox = g_strdup_printf("/var/mail/%s", g_get_user_name());
-               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), mbox);
-               g_free(mbox);
-               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Local mailbox:</span>"));
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), tmpl.mboxfile?tmpl.mboxfile:"");
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label), 
+                                  g_strconcat("<span weight=\"bold\">", _("Local mailbox:"),
+                                              "</span>", NULL));
                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);
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+               gtk_widget_hide(wizard->auto_configure_btn);
+               gtk_widget_hide(wizard->auto_configure_cancel_btn);
+               gtk_widget_hide(wizard->auto_configure_lbl);
+#endif
+#ifdef USE_GNUTLS
+               gtk_widget_hide(wizard->recv_use_ssl);
+               gtk_widget_hide(wizard->recv_use_tls);
+               gtk_widget_hide(wizard->recv_cert_table);
+#endif
+               if (wizard->create_mailbox) {
+                       gtk_widget_show(wizard->mailbox_label);
+                       gtk_widget_show(wizard->mailbox_name);
+               }
+               gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
+       }
+}
+
+static void wizard_protocol_changed(GtkComboBox *combo, gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       RecvProtocol protocol = combobox_get_active_data(combo);
+
+       wizard_protocol_change(wizard, protocol);       
+}
+
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+static void auto_configure_cb (GtkWidget *widget, gpointer data)
+{
+       gchar *address = NULL;
+       AutoConfigureData *recv_data;
+       AutoConfigureData *send_data;
+       static GCancellable *recv_cancel = NULL;
+       static GCancellable *send_cancel = NULL;
+       WizardWindow *wizard = (WizardWindow *)data;
+       RecvProtocol protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type));
+
+       if (!recv_cancel) {
+               recv_cancel = g_cancellable_new();
+               send_cancel = g_cancellable_new();
+       }
+
+       if (widget == wizard->auto_configure_cancel_btn) {
+               g_cancellable_cancel(recv_cancel);
+               g_cancellable_cancel(send_cancel);
+               g_object_unref(recv_cancel);
+               g_object_unref(send_cancel);
+               recv_cancel = NULL;
+               send_cancel = NULL;
+               return;
+       }
+
+       address = gtk_editable_get_chars(GTK_EDITABLE(wizard->email), 0, -1);
+
+       if (strchr(address, '@') == NULL) {
+               g_free(address);
+               gtk_label_set_text(GTK_LABEL(wizard->auto_configure_lbl),
+                          _("Failed (wrong address)"));
+               return;
+       }
+
+       if (protocol == A_POP3 || protocol == A_IMAP4) {
+               recv_data = g_new0(AutoConfigureData, 1);
+               recv_data->configure_button = GTK_BUTTON(wizard->auto_configure_btn);
+               recv_data->cancel_button = GTK_BUTTON(wizard->auto_configure_cancel_btn);
+               recv_data->info_label = GTK_LABEL(wizard->auto_configure_lbl);
+               recv_data->uid_entry = GTK_ENTRY(wizard->recv_username);
+               recv_data->cancel = recv_cancel;
+               switch(protocol) {
+               case A_POP3:
+                       recv_data->ssl_service = "pop3s";
+                       recv_data->tls_service = "pop3";
+                       recv_data->address = g_strdup(address);
+                       recv_data->hostname_entry = GTK_ENTRY(wizard->recv_server);
+                       recv_data->set_port = NULL;
+                       recv_data->port = NULL;
+                       recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_tls);
+                       recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_ssl);
+                       recv_data->default_port = 110;
+                       recv_data->default_ssl_port = 995;
+                       break;
+               case A_IMAP4:
+                       recv_data->ssl_service = "imaps";
+                       recv_data->tls_service = "imap";
+                       recv_data->address = g_strdup(address);
+                       recv_data->hostname_entry = GTK_ENTRY(wizard->recv_server);
+                       recv_data->set_port = NULL;
+                       recv_data->port = NULL;
+                       recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_tls);
+                       recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(wizard->recv_use_ssl);
+                       recv_data->default_port = 143;
+                       recv_data->default_ssl_port = 993;
+                       break;
+               default:
+                       cm_return_if_fail(FALSE);
+               }
+               auto_configure_service(recv_data);
        }
+
+       send_data = g_new0(AutoConfigureData, 1);
+       send_data->configure_button = GTK_BUTTON(wizard->auto_configure_btn);
+       send_data->cancel_button = GTK_BUTTON(wizard->auto_configure_cancel_btn);
+       send_data->info_label = GTK_LABEL(wizard->auto_configure_lbl);
+       send_data->cancel = send_cancel;
+
+       send_data->ssl_service = NULL;
+       send_data->tls_service = "submission";
+       send_data->address = g_strdup(address);
+       send_data->hostname_entry = GTK_ENTRY(wizard->smtp_server);
+       send_data->set_port = NULL;
+       send_data->port = NULL;
+       send_data->tls_checkbtn = GTK_TOGGLE_BUTTON(wizard->smtp_use_tls);
+       send_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl);
+       send_data->default_port = 25;
+       send_data->default_ssl_port = -1;
+       send_data->auth_checkbtn = GTK_TOGGLE_BUTTON(wizard->smtp_auth);
+
+       auto_configure_service(send_data);
+
+       g_free(address);
 }
+#endif
 
 static GtkWidget* recv_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(5,2, FALSE);
-       GtkWidget *menu = gtk_menu_new();
-       GtkWidget *menuitem;
+       GtkWidget *table = gtk_table_new(1,1, FALSE);
+       GtkWidget *vbox;
+       GtkWidget *hbox;
+       GtkWidget *hbox_spc;    
+       GtkWidget *recv_table;
+       GtkWidget *label;
+#ifdef USE_GNUTLS
+       GtkWidget *button;
+       GtkWidget *recv_cert_table;
+#endif
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+       GtkWidget *auto_configure_btn;
+       GtkWidget *auto_configure_cancel_btn;
+       GtkWidget *auto_configure_lbl;
+#endif
+       GtkListStore *store;
+       GtkTreeIter iter;
        gchar *text;
-       gint i = 0;
-       
+       gint index = 0;
+
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
-       wizard->recv_type = gtk_option_menu_new();
-       
-       MENUITEM_ADD (menu, menuitem, _("POP3"), A_POP3);
-       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",
+       vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
+
+       gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+       recv_table = gtk_table_new(4, 2, FALSE); 
+
+       gtk_box_pack_start(GTK_BOX(vbox), recv_table, FALSE, FALSE, 0);
+
+       label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Server type:"), "</span>", NULL));
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+       gtk_table_attach(GTK_TABLE(recv_table), label, 0,1,0,1, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->recv_type = gtkut_sc_combobox_create(NULL, FALSE);
+       store = GTK_LIST_STORE(gtk_combo_box_get_model(
+                       GTK_COMBO_BOX(wizard->recv_type)));
+
+       COMBOBOX_ADD(store, _("POP3"), A_POP3);
+       COMBOBOX_ADD(store, _("IMAP"), A_IMAP4);
+       COMBOBOX_ADD(store, _("Local mbox file"), A_LOCAL);
+
+       switch(tmpl.recvtype) {
+       case A_POP3: 
+               index = 0;
+               break;
+       case A_IMAP4:
+               index = 1;
+               break;
+       case A_LOCAL:
+               index = 2;
+               break;
+       default:
+               index = 0;
+       }
+       gtk_combo_box_set_active(GTK_COMBO_BOX (wizard->recv_type), index);
+       g_signal_connect(G_OBJECT(wizard->recv_type), "changed",
                         G_CALLBACK(wizard_protocol_changed),
                         wizard);
+       gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_type, 1,2,0,1, 
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+       auto_configure_btn = gtk_button_new_with_label(_("Auto-configure"));
+       auto_configure_cancel_btn = gtk_button_new_with_label(_("Cancel"));
+       gtk_table_attach(GTK_TABLE(recv_table), auto_configure_btn, 0,1,1,2,
+                       GTK_FILL, 0, VSPACING_NARROW, 0);
+       auto_configure_lbl = gtk_label_new("");
+       gtk_misc_set_alignment(GTK_MISC(auto_configure_lbl), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(recv_table), auto_configure_lbl, 1,2,1,2,
+                       GTK_FILL, 0, VSPACING_NARROW, 0);
+       gtk_widget_show(auto_configure_btn);
+       gtk_widget_show(auto_configure_lbl);
+       wizard->auto_configure_lbl = auto_configure_lbl;
+       wizard->auto_configure_btn = auto_configure_btn;
+       wizard->auto_configure_cancel_btn = auto_configure_cancel_btn;
+       g_signal_connect (G_OBJECT (auto_configure_btn), "clicked",
+                         G_CALLBACK (auto_configure_cb), wizard);
+       g_signal_connect (G_OBJECT (auto_configure_cancel_btn), "clicked",
+                         G_CALLBACK (auto_configure_cb), wizard);
 #endif
-       MENUITEM_ADD (menu, menuitem, _("Local mbox file"), A_LOCAL);
-       g_signal_connect(G_OBJECT(menuitem), "activate",
-                        G_CALLBACK(wizard_protocol_changed),
-                        wizard);
-
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (wizard->recv_type), menu);
-       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Server type:</span>"), 
-                            wizard->recv_type, i); i++;
 
+       wizard->recv_label = gtk_label_new(g_strconcat("<span weight=\"bold\">",
+                                               _("Server address:"), "</span>", NULL));
+       gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5);
+       gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
+       gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_label, 0,1,2,3,
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
        wizard->recv_server = gtk_entry_new();
        text = get_default_server(wizard, "pop");
        gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
        g_free(text);
        
-       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,                        
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-       if (GTK_IS_MISC(wizard->recv_label))                                                  
-               gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5);         
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_server,       
-                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-       i++;
+       CLAWS_SET_TIP(wizard->recv_server,
+                            _("You can specify the port number by appending it at the end: "
+                              "\"mail.example.com:110\""));
+       gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_server, 1,2,2,3,
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
        
-       wizard->recv_username = gtk_entry_new();
-       wizard->recv_username_label = gtk_label_new(_("<span weight=\"bold\">Username:</span>"));
+       wizard->recv_username_label = gtk_label_new(g_strconcat("<span weight=\"bold\">",
+                                                               _("Username:"),"</span>", NULL));
+       gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5);
        gtk_label_set_use_markup(GTK_LABEL(wizard->recv_username_label), TRUE);
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_username_label,                               
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-       if (GTK_IS_MISC(wizard->recv_username_label))                                                 
-               gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5);        
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_username,             
-                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-       i++;
-       
+       gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_username_label, 0,1,3,4,
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->recv_username = gtk_entry_new();
        text = get_default_account(wizard);
        gtk_entry_set_text(GTK_ENTRY(wizard->recv_username), text);
        g_free(text);
-
-       wizard->recv_password = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_username, 1,2,3,4,
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0);
+                        
        wizard->recv_password_label = gtk_label_new(_("Password:"));
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_password_label,                               
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-       if (GTK_IS_MISC(wizard->recv_password_label))                                                 
-               gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);        
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_password,             
-                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);
+       gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password_label, 0,1,4,5,
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->recv_password = gtk_entry_new();
+       gtk_entry_set_text(GTK_ENTRY(wizard->recv_password), tmpl.recvpass?tmpl.recvpass:"");
        gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_password), FALSE);
-       i++;
-       
+       gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password, 1,2,4,5,
+                        GTK_EXPAND|GTK_FILL, 0, 0, 0); 
+#ifdef USE_GNUTLS
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       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 != 0);
+       gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_use_ssl, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); 
+       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_box_pack_start(GTK_BOX(hbox), wizard->recv_use_tls, FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, wizard->recv_use_tls);
+
+       recv_cert_table = gtk_table_new(3,3, FALSE);
+       gtk_box_pack_start (GTK_BOX(vbox), recv_cert_table, FALSE, FALSE, 4);
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       label = gtk_label_new(_("Client SSL certificate (optional)"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);    
+       gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       label = gtk_label_new(_("File"));
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);      
+       gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 1, 2, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->recv_ssl_cert_file = gtk_entry_new();
+       gtk_entry_set_text(GTK_ENTRY(wizard->recv_ssl_cert_file), tmpl.recvssl_cert?tmpl.recvssl_cert:"");
+       gtk_table_attach(GTK_TABLE(recv_cert_table), wizard->recv_ssl_cert_file, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+       button = gtkut_get_browse_file_btn(_("Browse"));
+       gtk_table_attach(GTK_TABLE(recv_cert_table), button, 2, 3, 1, 2, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       g_signal_connect(G_OBJECT(button), "clicked",
+                        G_CALLBACK(cert_browse_cb), wizard->recv_ssl_cert_file);
+
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       label = gtk_label_new(_("Password"));
+       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 2, 3, 
+                        GTK_FILL, 0, VSPACING_NARROW, 0);
+       wizard->recv_ssl_cert_pass = gtk_entry_new();
+       gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_ssl_cert_pass), FALSE);
+       gtk_entry_set_text(GTK_ENTRY(wizard->recv_ssl_cert_pass), tmpl.recvssl_cert_pass?tmpl.recvssl_cert_pass:"");
+       gtk_table_attach(GTK_TABLE(recv_cert_table), wizard->recv_ssl_cert_pass, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+       SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, recv_cert_table); 
+       wizard->recv_cert_table = recv_cert_table;
+#endif 
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        wizard->recv_imap_subdir = gtk_entry_new();
+       gtk_entry_set_text(GTK_ENTRY(wizard->recv_imap_subdir), tmpl.imapdir?tmpl.imapdir:"");
        wizard->recv_imap_label = gtk_label_new(_("IMAP server directory:"));
+       gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5);            
+       gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_label, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_subdir, TRUE, TRUE, 0);
        
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_imap_label,                           
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-       if (GTK_IS_MISC(wizard->recv_imap_label))                                                     
-               gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5);            
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_imap_subdir,          
-                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-
-       i++;
-       
-       return table;
-}
-
-#ifdef USE_OPENSSL
-static GtkWidget* ssl_page (WizardWindow * wizard)
-{
-       GtkWidget *table = gtk_table_new(2,2, FALSE);
-       gint i = 0;
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_set_size_request (hbox_spc, 12, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       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_box_pack_start(GTK_BOX(hbox), wizard->subsonly_checkbtn, FALSE, FALSE, 0);
        
-       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+       hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+       gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       wizard->no_imap_warning = gtk_label_new(g_strconcat("<span weight=\"bold\">",
+                       _("Warning: this version of Claws Mail\n"
+                         "has been built without IMAP support."), "</span>", NULL));
+       gtk_label_set_use_markup(GTK_LABEL(wizard->no_imap_warning), TRUE);
+       gtk_box_pack_start(GTK_BOX(hbox), wizard->no_imap_warning, FALSE, FALSE, 0);
 
-       wizard->smtp_use_ssl = gtk_check_button_new_with_label(
-                                       _("Use SSL to connect to SMTP server"));
-       gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_ssl,      
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); i++;
-       
-       wizard->recv_use_ssl = gtk_check_button_new_with_label(
-                                       _("Use SSL to connect to receiving server"));
-       gtk_table_attach(GTK_TABLE(table), wizard->recv_use_ssl,      
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       
        return table;
 }
-#endif
 
 static void
 wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
 {
        WizardWindow * wizard = (WizardWindow *)data;
        int current_page, num_pages;
-       GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
-       GtkWidget *menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       gint protocol = GPOINTER_TO_INT
-                       (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
        gboolean skip_mailbox_page = FALSE;
-       
+       gint protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type));
+
        if (protocol == A_IMAP4) {
                skip_mailbox_page = TRUE;
        }
-       
+
        num_pages = g_slist_length(wizard->pages);
 
        current_page = gtk_notebook_get_current_page (
@@ -799,8 +1740,14 @@ set_sens:
                                current_page > 0);
                gtk_dialog_set_response_sensitive (dialog, GO_FORWARD, 
                                current_page < (num_pages - 1));
-               gtk_dialog_set_response_sensitive (dialog, FINISHED, 
-                               current_page == (num_pages - 1));
+               if (current_page == (num_pages -1)) {
+                       gtk_dialog_set_response_sensitive (dialog, FINISHED, TRUE);
+                       gtk_dialog_set_default_response(GTK_DIALOG(wizard->window), FINISHED);
+               } else {
+                       gtk_dialog_set_response_sensitive (dialog, FINISHED, FALSE);
+                       gtk_dialog_set_default_response(GTK_DIALOG(wizard->window), GO_FORWARD);
+               }
+
        }
 }
 
@@ -825,6 +1772,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        GtkWidget *page;
        GtkWidget *widget;
        GtkWidget *label;
+       GtkWidget *scrolled_window;
        gchar     *text;
        GSList    *cur;
        gboolean   result;
@@ -834,13 +1782,17 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
        gtk_widget_hide(mainwin->window);
        
-       wizard->window = gtk_dialog_new_with_buttons (_("Sylpheed-Claws Setup Wizard"),
+       wizard_read_defaults();
+       
+       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,
                        GTK_STOCK_SAVE, FINISHED,
                        GTK_STOCK_CANCEL, CANCEL,
                        NULL);
+       gtk_widget_set_size_request(wizard->window, -1, 480);
+       gtk_window_set_position(GTK_WINDOW(wizard->window), GTK_WIN_POS_CENTER);
 
        g_signal_connect(wizard->window, "response", 
                          G_CALLBACK(wizard_response_cb), wizard);
@@ -859,26 +1811,25 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        wizard->notebook = gtk_notebook_new();
        gtk_notebook_set_show_tabs(GTK_NOTEBOOK(wizard->notebook), FALSE);
        gtk_notebook_set_show_border(GTK_NOTEBOOK(wizard->notebook), FALSE);
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(wizard->window)->vbox), 
+       gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(wizard->window))), 
                            wizard->notebook, TRUE, TRUE, 0);
        
        wizard->pages = NULL;
        
 /*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);
+       widget = stock_pixmap_widget(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);
@@ -888,25 +1839,43 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        i++;
        USER_PAGE = i;
        widget = create_page (wizard, _("About You"));
-       gtk_box_pack_start (GTK_BOX(widget), user_page(wizard), FALSE, FALSE, 0);
+       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_box_pack_start(GTK_BOX(widget), scrolled_window, TRUE, TRUE, 0);
+
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
+                                             user_page(wizard));
        PACK_WARNING(_("Bold fields must be completed"));
        
        wizard->pages = g_slist_append(wizard->pages, widget);
 
-/*smtp page: 2 */
+/* recv+auth page: 2 */
        i++;
-       SMTP_PAGE = i;
-       widget = create_page (wizard, _("Sending mail"));
-       gtk_box_pack_start (GTK_BOX(widget), smtp_page(wizard), FALSE, FALSE, 0);
+       RECV_PAGE = i;
+       widget = create_page (wizard, _("Receiving mail"));
+       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_box_pack_start(GTK_BOX(widget), scrolled_window, TRUE, TRUE, 0);
+
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
+                                             recv_page(wizard));
        PACK_WARNING(_("Bold fields must be completed"));
        
        wizard->pages = g_slist_append(wizard->pages, widget);
 
-/* recv+auth page: 3 */
+/*smtp page: 3 */
        i++;
-       RECV_PAGE = i;
-       widget = create_page (wizard, _("Receiving mail"));
-       gtk_box_pack_start (GTK_BOX(widget), recv_page(wizard), FALSE, FALSE, 0);
+       SMTP_PAGE = i;
+       widget = create_page (wizard, _("Sending mail"));
+       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_box_pack_start(GTK_BOX(widget), scrolled_window, TRUE, TRUE, 0);
+
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
+                                             smtp_page(wizard));
        PACK_WARNING(_("Bold fields must be completed"));
        
        wizard->pages = g_slist_append(wizard->pages, widget);
@@ -916,21 +1885,17 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
                i++;
                MAILBOX_PAGE = i;
                widget = create_page (wizard, _("Saving mail on disk"));
-               gtk_box_pack_start (GTK_BOX(widget), mailbox_page(wizard), FALSE, FALSE, 0);
+               scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+               gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+               gtk_box_pack_start(GTK_BOX(widget), scrolled_window, TRUE, TRUE, 0);
+
+               gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
+                                             mailbox_page(wizard));
                PACK_WARNING(_("Bold fields must be completed"));
        
                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++;
@@ -938,12 +1903,11 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        page = create_page(wizard, _("Configuration finished"));
        
        wizard->pages = g_slist_append(wizard->pages, page);
-       widget = stock_pixmap_widget(wizard->window, 
-                               STOCK_PIXMAP_SYLPHEED_LOGO);
+       widget = stock_pixmap_widget(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"
                          "Click Save to start."));
        widget = gtk_label_new(text);
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
@@ -961,6 +1925,11 @@ 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);
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+       gtk_widget_hide(wizard->auto_configure_cancel_btn);
+#endif
+       wizard_protocol_change(wizard, tmpl.recvtype);
 
        while (!wizard->finished)
                gtk_main_iteration();