2006-04-05 [colin] 2.1.0cvs4
[claws.git] / src / wizard.c
index bf30db6e914c3f02d4ebf9e90e1ce7b18b1f2e8c..7052d1a4bf73affcd42c876bf81d98f5dcab59ec 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  * This file (C) 2004 Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "defs.h"
 
 #include <glib.h>
 #include "stock_pixmap.h"
 #include "setup.h"
 #include "folder.h"
+#include "alertpanel.h"
 #ifdef USE_OPENSSL                     
 #include "ssl.h"
 #endif
+#include "prefs_common.h"
+
 typedef enum
 {
        GO_BACK,
@@ -61,6 +69,14 @@ typedef enum
        FINISHED
 } PageNavigation;
 
+int WELCOME_PAGE = -1;
+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
 {
        GtkWidget *window;
@@ -76,11 +92,21 @@ typedef struct
        GtkWidget *mailbox_name;
        
        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;
        GtkWidget *recv_server;
        GtkWidget *recv_username;
        GtkWidget *recv_password;
+       GtkWidget *recv_username_label;
+       GtkWidget *recv_password_label;
+       GtkWidget *recv_imap_label;
+       GtkWidget *recv_imap_subdir;
 
 #ifdef USE_OPENSSL
        GtkWidget *smtp_use_ssl;
@@ -93,21 +119,501 @@ typedef struct
 
 } WizardWindow;
 
-static void wizard_write_config(WizardWindow *wizard)
+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;
+       gchar *mboxfile;
+       gchar *mailbox;
+       gboolean smtpssl;
+       gboolean recvssl;
+} 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},
+       {"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},
+       {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 stmp.$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"
+       "#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 STMP connections\n"
+       "#default is 0\n"
+       "#smtpssl=\n"
+       "\n"
+       "#whether to use ssl on pop or imap connections\n"
+       "#default is 0\n"
+       "#recvssl=\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, '.') != 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)
 {
-       gboolean mailbox_ok = FALSE;
+       gchar *name = g_strdup(tmpl.name);
+       if (name == NULL)
+               return NULL;
+       g_strdown(name);
+       while(strstr(name, " "))
+               *strstr(name, " ")='.';
+       
+       return name;
+}
+
+#define PARSE_DEFAULT(str) {   \
+       gchar *tmp = NULL, *new = NULL; \
+       if (str != NULL) {      \
+               tmp = g_strdup(str);    \
+               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);
+/*
+       printf("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)
+                     /PANGO_SCALE;
+       gchar *tmp, *new;
+       
+       tmp = g_strdup(prefs_common.textfont);
+       if (strrchr(tmp, ' ')) {
+               *(strrchr(tmp, ' ')) = '\0';
+               new = g_strdup_printf("%s %d", tmp, size);
+               g_free(prefs_common.textfont);
+               prefs_common.textfont = new;
+       }
+       g_free(tmp);
+       
+       tmp = g_strdup(prefs_common.smallfont);
+       if (strrchr(tmp, ' ')) {
+               *(strrchr(tmp, ' ')) = '\0';
+               new = g_strdup_printf("%s %d", tmp, size);
+               g_free(prefs_common.smallfont);
+               prefs_common.smallfont = new;
+       }
+       g_free(tmp);
+       
+       tmp = g_strdup(prefs_common.normalfont);
+       if (strrchr(tmp, ' ')) {
+               *(strrchr(tmp, ' ')) = '\0';
+               new = g_strdup_printf("%s %d", tmp, size);
+               g_free(prefs_common.normalfont);
+               prefs_common.normalfont = 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"
+
+static void write_welcome_email(WizardWindow *wizard)
+{
+       gchar buf_date[64];
+       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();
+       
+       get_rfc822_date(buf_date, sizeof(buf_date));
+
+       subj = g_strdup_printf(_("Welcome to Sylpheed-Claws"));
+
+       head = g_strdup_printf(
+               "From: %s <sylpheed-claws-users@lists.sf.net>\n"
+               "To: %s <%s>\n"
+               "Date: %s\n"
+               "Subject: %s\n"
+               "X-Face: %s\n"
+               "Content-Type: text/plain; charset=UTF-8\n",
+               _("Sylpheed-Claws Team"),
+               gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
+               gtk_entry_get_text(GTK_ENTRY(wizard->email)),
+               buf_date, subj, XFACE);
+       body = g_strdup_printf(
+               _("\n"
+               "Welcome to Sylpheed-Claws\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"
+               "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"
+               "which can be accessed by using the menu entry '/Help/Manual'\n"
+               "or online at the URL given below.\n"
+               "\n"
+               "Useful URLs\n"
+               "-----------\n"
+               "Homepage:      <%s>\n"
+               "Manual:        <%s>\n"
+               "FAQ:          <%s>\n"
+               "Themes:        <%s>\n"
+               "Mailing Lists: <%s>\n"
+               "\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"
+               "\n"
+               "DONATIONS\n"
+               "---------\n"
+               "If you wish to donate to the Sylpheed-Claws 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);
+       
+       msg = g_strconcat(head, body, NULL);
+
+       if (inbox && inbox->total_msgs == 0
+        && str_write_to_file(msg, file) >= 0) {
+               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);
+}
+#undef XFACE
+
+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;
        
-       if (wizard->create_mailbox) {
-               mailbox_ok = setup_write_mailbox_path(wizard->mainwin, 
-                               gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
+       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));
+       
+       
+       if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4 && 
+           !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)))) {
+               alertpanel_error(_("Please enter the mailbox name."));
+               g_free(prefs_account);
+               gtk_notebook_set_current_page (
+                       GTK_NOTEBOOK(wizard->notebook), 
+                       MAILBOX_PAGE);
+               return FALSE;
        }
 
-       prefs_account->account_name = g_strdup_printf("%s@%s",
+       if (!mailbox_ok) {
+               if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) {
+                       mailbox_ok = setup_write_mailbox_path(wizard->mainwin, 
+                                       gtk_entry_get_text(
+                                               GTK_ENTRY(wizard->mailbox_name)));
+               } else
+                       mailbox_ok = TRUE;
+       }
+
+       if (!mailbox_ok) {
+               /* alertpanel done by setup_write_mailbox_path */
+               g_free(prefs_account);
+               gtk_notebook_set_current_page (
+                       GTK_NOTEBOOK(wizard->notebook), 
+                       MAILBOX_PAGE);
+               return FALSE;
+       }
+       
+       if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->full_name)))
+       ||  !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->email)))) {
+               alertpanel_error(_("Please enter your name and email address."));
+               g_free(prefs_account);
+               gtk_notebook_set_current_page (
+                       GTK_NOTEBOOK(wizard->notebook), 
+                       USER_PAGE);
+               return FALSE;
+       }
+       
+       if (prefs_account->protocol != A_LOCAL) {
+               if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)))
+               ||  !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)))) {
+                       alertpanel_error(_("Please enter your receiving server "
+                                          "and username."));
+                       g_free(prefs_account);
+                       gtk_notebook_set_current_page (
+                               GTK_NOTEBOOK(wizard->notebook), 
+                               RECV_PAGE);
+                       return FALSE;
+               }
+       } else {
+               if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)))) {
+                       alertpanel_error(_("Please enter your username."));
+                       g_free(prefs_account);
+                       gtk_notebook_set_current_page (
+                               GTK_NOTEBOOK(wizard->notebook), 
+                               RECV_PAGE);
+                       return FALSE;
+               }
+       }
+       
+       if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server)))) {
+               alertpanel_error(_("Please enter your SMTP server."));
+               g_free(prefs_account);
+               gtk_notebook_set_current_page (
+                       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)
+               prefs_account->account_name = g_strdup_printf("%s@%s",
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)),
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+       else
+               prefs_account->account_name = g_strdup_printf("%s",
+                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+
        prefs_account->name = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->full_name)));
        prefs_account->address = g_strdup(
@@ -116,17 +622,26 @@ static void wizard_write_config(WizardWindow *wizard)
                                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->recv_server = g_strdup(
+
+       if (prefs_account->protocol != A_LOCAL)
+               prefs_account->recv_server = g_strdup(
+                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+       else
+               prefs_account->local_mbox = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_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)));
 
-       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));
+       prefs_account->smtp_userid = g_strdup(
+                               gtk_entry_get_text(GTK_ENTRY(wizard->smtp_username)));
+       prefs_account->smtp_passwd = g_strdup(
+                               gtk_entry_get_text(GTK_ENTRY(wizard->smtp_password)));
+       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)))
@@ -138,11 +653,25 @@ static void wizard_write_config(WizardWindow *wizard)
                        prefs_account->ssl_pop = SSL_TUNNEL;
        }
 #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);
+               }
+               g_free(directory);
+       }
 
        account_list = g_list_append(account_list, prefs_account);
        prefs_account_write_config_all(account_list);
        prefs_account_free(prefs_account);
        account_read_config_all();
+
+       initialize_fonts(wizard);
+       if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4)
+               write_welcome_email(wizard);
+       
+       return TRUE;
 }
 
 static GtkWidget* create_page (WizardWindow *wizard, const char * title)
@@ -181,57 +710,58 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
        return vbox;
 }
 
-#define GTK_TABLE_ADD_ROW_AT(table,text,entry,i) {                           \
+#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);            \
 }
 
-static gchar *get_default_email_addr(void)
+static gchar *get_default_server(WizardWindow * wizard, const gchar *type)
+{
+       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_account(WizardWindow * wizard)
 {
-       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;
+       gchar *result = NULL;
+       
+       if (!tmpl.recvuser || !strlen(tmpl.recvuser)) {
+               result = gtk_editable_get_chars(
+                               GTK_EDITABLE(wizard->email), 0, -1);
+
+               if (strstr(result, "@")) {
+                       *(strstr(result,"@")) = '\0';
+               } 
+       } else {
+               result = g_strdup(tmpl.recvuser);
        }
-       result = g_strdup_printf("%s@%s",
-                               g_get_user_name(),
-                               domain_name);
-       g_free(domain_name);
        return result;
 }
 
-static gchar *get_default_server(WizardWindow * wizard, const gchar *type)
+static gchar *get_default_smtp_account(WizardWindow * wizard)
 {
-       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;
-       } else if (strchr(domain_name, '.') == NULL) {
-               /* only hostname found, use email suffix */
-               gchar *mail;
-               mail = gtk_editable_get_chars(GTK_EDITABLE(wizard->email), 0, -1);
-
-               if (strlen (mail) && strstr(mail, "@")) {
-                       g_free(domain_name);
-                       domain_name = g_strdup(strstr(mail, "@")+1);
-               }
-               g_free(mail);
+       gchar *result = NULL;
+       
+       if (!tmpl.smtpuser || !strlen(tmpl.smtpuser)) {
+               return g_strdup("");
+       } else {
+               result = g_strdup(tmpl.smtpuser);
        }
-       result = g_strdup_printf("%s.%s",
-                               type, domain_name);
-       g_free(domain_name);
        return result;
 }
 
@@ -247,41 +777,46 @@ static void wizard_email_changed(GtkWidget *widget, gpointer data)
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
        g_free(text);
 
+       text = get_default_account(wizard);
+       gtk_entry_set_text(GTK_ENTRY(wizard->recv_username), text);
+       g_free(text);
+
        if (protocol == A_POP3) {
                text = get_default_server(wizard, "pop");
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
                g_free(text);
-       } else {
+       } else if (protocol == A_IMAP4) {
                text = get_default_server(wizard, "imap");
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
                g_free(text);
+       } else if (protocol == A_LOCAL) {
+               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;
        
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        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, _("Your name:"), 
+       gtk_entry_set_text(GTK_ENTRY(wizard->full_name), tmpl.name?tmpl.name:"");
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Your name:</span>"), 
                             wizard->full_name, i); i++;
        
        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, _("Your email address:"), 
+       gtk_entry_set_text(GTK_ENTRY(wizard->email), tmpl.email?tmpl.email:"");
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Your email address:</span>"), 
                             wizard->email, i); i++;
        
        wizard->organization = gtk_entry_new();
-       GTK_TABLE_ADD_ROW_AT(table, _("Your organization:"), 
+       GTK_TABLE_ADD_ROW_AT(table, _("Your organization:"),
                             wizard->organization, i); i++;
+       gtk_entry_set_text(GTK_ENTRY(wizard->organization), tmpl.organization?tmpl.organization:"");
        
        g_signal_connect(G_OBJECT(wizard->email), "changed",
                         G_CALLBACK(wizard_email_changed),
@@ -298,16 +833,27 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        wizard->mailbox_name = gtk_entry_new();
-       gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), "Mail");
-       GTK_TABLE_ADD_ROW_AT(table, _("Mailbox name:"), 
+       gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), tmpl.mailbox?tmpl.mailbox:"");
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Mailbox name:</span>"), 
                             wizard->mailbox_name, i); i++;
        
        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);
+}
+
 static GtkWidget* smtp_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(1,2, FALSE);
+       GtkWidget *table = gtk_table_new(1,4, FALSE);
        gchar *text;
        gint i = 0;
        
@@ -318,30 +864,101 @@ 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_TABLE_ADD_ROW_AT(table, _("SMTP server address:"), 
+       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(
+                                       _("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_table_attach(GTK_TABLE(table), wizard->smtp_auth,      
+                        0,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); i++;
+
+       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);
+       wizard->smtp_username_label = gtk_label_new(_("SMTP username:\n"
+                                       "<span size=\"small\">(empty to use the same as reception)</span>"));
+       gtk_label_set_use_markup(GTK_LABEL(wizard->smtp_username_label), TRUE);
+       gtk_table_attach(GTK_TABLE(table), wizard->smtp_username_label,                               
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       if (GTK_IS_MISC(wizard->smtp_username_label))                                                 
+               gtk_misc_set_alignment(GTK_MISC(wizard->smtp_username_label), 1, 0.5);        
+       gtk_table_attach(GTK_TABLE(table), wizard->smtp_username,             
+                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       i++;
+       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);
+       wizard->smtp_password_label = gtk_label_new(_("SMTP password:\n"
+                                       "<span size=\"small\">(empty to use the same as reception)</span>"));
+       gtk_label_set_use_markup(GTK_LABEL(wizard->smtp_password_label), TRUE);
+       gtk_table_attach(GTK_TABLE(table), wizard->smtp_password_label,                               
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       if (GTK_IS_MISC(wizard->smtp_password_label))                                                 
+               gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);        
+       gtk_table_attach(GTK_TABLE(table), wizard->smtp_password,             
+                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       i++;
+       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_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_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
                g_free(text);
-       } else {
+       } else if (protocol == A_IMAP4) {
                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->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_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
                g_free(text);
+       } 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->recv_imap_label);
+               gtk_widget_hide(wizard->recv_imap_subdir);
+               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);
        }
 }
 
+static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       RecvProtocol protocol;
+       protocol = GPOINTER_TO_INT
+               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+
+       wizard_protocol_change(wizard, protocol);       
+}
+
 static GtkWidget* recv_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(5,2, FALSE);
@@ -349,7 +966,8 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        GtkWidget *menuitem;
        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);
 
@@ -359,30 +977,95 @@ 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),
+                        wizard);
+
        gtk_option_menu_set_menu (GTK_OPTION_MENU (wizard->recv_type), menu);
-       GTK_TABLE_ADD_ROW_AT(table, _("Server type:"), 
+       switch(tmpl.recvtype) {
+       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;
+       }
+       gtk_option_menu_set_history(GTK_OPTION_MENU (wizard->recv_type), index);
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Server type:</span>"), 
                             wizard->recv_type, i); i++;
 
        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);
-       GTK_TABLE_ADD_ROW_AT(table, _("Server address:"), 
-                            wizard->recv_server, i); i++;
+       
+       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++;
        
        wizard->recv_username = gtk_entry_new();
-       gtk_entry_set_text(GTK_ENTRY(wizard->recv_username), g_get_user_name());
-       GTK_TABLE_ADD_ROW_AT(table, _("Username:"), 
-                            wizard->recv_username, i); i++;
+       wizard->recv_username_label = gtk_label_new(_("<span weight=\"bold\">Username:</span>"));
+       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++;
        
+       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_entry_set_text(GTK_ENTRY(wizard->recv_password), tmpl.recvpass?tmpl.recvpass:"");
+       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_entry_set_visibility(GTK_ENTRY(wizard->recv_password), FALSE);
-       GTK_TABLE_ADD_ROW_AT(table, _("Password:"), 
-                            wizard->recv_password, i); i++;
+       i++;
+       
+       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_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;
 }
@@ -398,11 +1081,15 @@ static GtkWidget* ssl_page (WizardWindow * wizard)
 
        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->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);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_use_ssl,      
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
        
@@ -415,40 +1102,66 @@ 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;
+       
+       if (protocol == A_IMAP4) {
+               skip_mailbox_page = TRUE;
+       }
        
        num_pages = g_slist_length(wizard->pages);
+
        current_page = gtk_notebook_get_current_page (
                                GTK_NOTEBOOK(wizard->notebook));
        if (response == CANCEL)
        {
-               wizard->finished = TRUE;
                wizard->result = FALSE;
+               wizard->finished = TRUE;
                gtk_widget_destroy (GTK_WIDGET(dialog));
        }
        else if (response == FINISHED)
        {
-               wizard_write_config(wizard);
-               wizard->finished = TRUE;
+               if (!wizard_write_config(wizard)) {
+                       current_page = gtk_notebook_get_current_page (
+                                       GTK_NOTEBOOK(wizard->notebook));
+                       goto set_sens;
+               }
                wizard->result = TRUE;
+               wizard->finished = TRUE;
                gtk_widget_destroy (GTK_WIDGET(dialog));
        }
        else
        {
                if (response == GO_BACK)
                {
-                       if (current_page > 0)
+                       if (current_page > 0) {
+                               current_page--;
+                               if (current_page == MAILBOX_PAGE && skip_mailbox_page) {
+                                       /* mailbox */
+                                       current_page--;
+                               }
                                gtk_notebook_set_current_page (
                                        GTK_NOTEBOOK(wizard->notebook), 
-                                       --current_page);
+                                       current_page);
+                       }
                }
                else if (response == GO_FORWARD)
                {
-                       if (current_page < (num_pages-1))
+                       if (current_page < (num_pages-1)) {
+                               current_page++;
+                               if (current_page == MAILBOX_PAGE && skip_mailbox_page) {
+                                       /* mailbox */
+                                       current_page++;
+                               }
                                gtk_notebook_set_current_page (
                                        GTK_NOTEBOOK(wizard->notebook), 
-                                       ++current_page);
+                                       current_page);
+                       }
                }
-
+set_sens:
                gtk_dialog_set_response_sensitive (dialog, GO_BACK, 
                                current_page > 0);
                gtk_dialog_set_response_sensitive (dialog, GO_FORWARD, 
@@ -458,26 +1171,44 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
        }
 }
 
+static gint wizard_close_cb(GtkWidget *widget, GdkEventAny *event,
+                                gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       wizard->result = FALSE;
+       wizard->finished = TRUE;
+       
+       return FALSE;
+}
+
+#define PACK_WARNING(text) {                                           \
+       label = gtk_label_new(text);                                    \
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0);                  \
+       gtk_box_pack_end(GTK_BOX(widget), label, FALSE, FALSE, 0);      \
+}
 
 gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        WizardWindow *wizard = g_new0(WizardWindow, 1);
        GtkWidget *page;
        GtkWidget *widget;
+       GtkWidget *label;
        gchar     *text;
        GSList    *cur;
        gboolean   result;
-       
+       gint i = 0;
        wizard->mainwin = mainwin;
        wizard->create_mailbox = create_mailbox;
        
        gtk_widget_hide(mainwin->window);
        
-       wizard->window = gtk_dialog_new_with_buttons (_("New User"),
+       wizard_read_defaults();
+       
+       wizard->window = gtk_dialog_new_with_buttons (_("Sylpheed-Claws Setup Wizard"),
                        NULL, 0, 
                        GTK_STOCK_GO_BACK, GO_BACK,
                        GTK_STOCK_GO_FORWARD, GO_FORWARD,
                        GTK_STOCK_SAVE, FINISHED,
-                       GTK_STOCK_QUIT, CANCEL,
+                       GTK_STOCK_CANCEL, CANCEL,
                        NULL);
 
        g_signal_connect(wizard->window, "response", 
@@ -502,8 +1233,9 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
        wizard->pages = NULL;
        
-/*welcome page */
-       page = create_page(wizard, _("Welcome to Sylpheed-Claws."));
+/*welcome page: 0 */
+       WELCOME_PAGE = i;
+       page = create_page(wizard, _("Welcome to Sylpheed-Claws"));
        
        wizard->pages = g_slist_append(wizard->pages, page);
        widget = stock_pixmap_widget(wizard->window, 
@@ -511,51 +1243,96 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
 
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
        
-       text = g_strdup(_("Welcome to Sylpheed-Claws.\n\n"
-                         "It looks like it's the first time you use \n"
-                         "Sylpheed-Claws. So, we'll now define some basic\n"
-                         "information about yourself and your most common\n"
-                         "mail parameters; so that you can begin to use\n"
+       text = g_strdup(_("Welcome to the Sylpheed-Claws 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."));
        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);
        g_free(text);
 
-/* user page */
+/* user page: 1 */
+       i++;
+       USER_PAGE = i;
        widget = create_page (wizard, _("About You"));
        gtk_box_pack_start (GTK_BOX(widget), user_page(wizard), FALSE, FALSE, 0);
+       PACK_WARNING(_("Bold fields must be completed"));
+       
+       wizard->pages = g_slist_append(wizard->pages, widget);
+
+/* recv+auth page: 2 */
+       i++;
+       RECV_PAGE = i;
+       widget = create_page (wizard, _("Receiving mail"));
+       gtk_box_pack_start (GTK_BOX(widget), recv_page(wizard), FALSE, FALSE, 0);
+       PACK_WARNING(_("Bold fields must be completed"));
+       
+       wizard->pages = g_slist_append(wizard->pages, widget);
+
+/*smtp page: 3 */
+       i++;
+       SMTP_PAGE = i;
+       widget = create_page (wizard, _("Sending mail"));
+       gtk_box_pack_start (GTK_BOX(widget), smtp_page(wizard), FALSE, FALSE, 0);
+       PACK_WARNING(_("Bold fields must be completed"));
+       
        wizard->pages = g_slist_append(wizard->pages, widget);
 
-/* mailbox page */
+/* mailbox page: 4 */
        if (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);
+               PACK_WARNING(_("Bold fields must be completed"));
+       
                wizard->pages = g_slist_append(wizard->pages, widget);
        }
-/*smtp page */
-       widget = create_page (wizard, _("Sending mail"));
-       gtk_box_pack_start (GTK_BOX(widget), smtp_page(wizard), FALSE, FALSE, 0);
-       wizard->pages = g_slist_append(wizard->pages, widget);
-
-/* recv+auth page */
-       widget = create_page (wizard, _("Receiving mail"));
-       gtk_box_pack_start (GTK_BOX(widget), recv_page(wizard), FALSE, FALSE, 0);
-       wizard->pages = g_slist_append(wizard->pages, widget);
-
-/* ssl page */
+/* 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++;
+       DONE_PAGE = i;
+       page = create_page(wizard, _("Configuration finished"));
        
+       wizard->pages = g_slist_append(wizard->pages, page);
+       widget = stock_pixmap_widget(wizard->window, 
+                               STOCK_PIXMAP_SYLPHEED_LOGO);
+
+       gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
+       
+       text = g_strdup(_("Sylpheed-Claws 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);
+       g_free(text);
+
+
        for (cur = wizard->pages; cur && cur->data; cur = cur->next) {
                gtk_notebook_append_page (GTK_NOTEBOOK(wizard->notebook), 
                                          GTK_WIDGET(cur->data), NULL);
        }
        
+       g_signal_connect(G_OBJECT(wizard->window), "delete_event",
+                        G_CALLBACK(wizard_close_cb), wizard);
        gtk_widget_show_all (wizard->window);
 
+       gtk_widget_hide(wizard->recv_imap_label);
+       gtk_widget_hide(wizard->recv_imap_subdir);
+
+       wizard_protocol_change(wizard, tmpl.recvtype);
+
        while (!wizard->finished)
                gtk_main_iteration();