diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6e488e1ee7..dbbd71dce4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #430369 
+
+	* mail-session.c: (mail_session_init): Init in the main gui thread.
+
 2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Non-intrusive errror reporting and basic logging support.
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 802eb386b4..c833b6a849 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -658,6 +658,7 @@ mail_session_init (const char *base_directory)
 
 	session = CAMEL_SESSION (camel_object_new (MAIL_SESSION_TYPE));
 	e_account_combo_box_set_session (session);  /* XXX Don't ask... */
+	e_account_writable(NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD); /* Init the EAccount Setup */
 
 	camel_dir = g_strdup_printf ("%s/mail", base_directory);
 	camel_session_construct (session, camel_dir);