Move the signal emittion to after the set_menu call so that it actually

2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-account-editor.c (source_auth_init): Move the signal
	emittion to after the set_menu call so that it actually works.
	(transport_type_changed): Updated to manipulate the user/passwd
	fields for the transport.
	(construct): Updated to init the user/passwd fields for the
	transport.
	(transport_auth_init): Renamed. Also fill in the user/passwd
	fields if available.

svn path=/trunk/; revision=8577

4 files changed, 1332 insertions, 1399 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index b6a5886277..757cf4fa44 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-account-editor.c (source_auth_init): Move the signal
+	emittion to after the set_menu call so that it actually works.
+	(transport_type_changed): Updated to manipulate the user/passwd
+	fields for the transport.
+	(construct): Updated to init the user/passwd fields for the
+	transport.
+	(transport_auth_init): Renamed. Also fill in the user/passwd
+	fields if available.
+
 2001-03-06  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-accounts.c (construct): Disable the NNTP code if NNTP is
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index 89f6057949..0f7b605435 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -194,7 +194,7 @@ apply_changes (MailAccountEditor *editor)
 		str = gtk_entry_get_text (editor->source_path);
 		source_url->path = str && *str ? g_strdup (str) : NULL;
 		
-		account->source->save_passwd = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->save_passwd));
+		account->source->save_passwd = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->source_save_passwd));
 		account->source->keep_on_server = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->keep_on_server));
 		
 		account->source->enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->source_enabled));
@@ -226,6 +226,14 @@ apply_changes (MailAccountEditor *editor)
 	str = gtk_object_get_data (GTK_OBJECT (editor), "transport_authmech");
 	transport_url->authmech = str && *str ? g_strdup (str) : NULL;
 	
+	if (transport_url->authmech) {
+		str = gtk_entry_get_text (editor->transport_user);
+		transport_url->user = str && *str ? g_strdup (str) : NULL;
+		
+		str = gtk_entry_get_text (editor->transport_passwd);
+		transport_url->passwd = str && *str ? g_strdup (str) : NULL;
+	}
+	
 	host = g_strdup (gtk_entry_get_text (editor->transport_host));
 	if (host && (pport = strchr (host, ':'))) {
 		*pport = '\0';
@@ -243,6 +251,8 @@ apply_changes (MailAccountEditor *editor)
 	g_free (account->transport->url);
 	account->transport->url = camel_url_to_string (transport_url, FALSE);
 	
+	account->transport->save_passwd = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->transport_save_passwd));
+	
 	/* check to make sure the source works */
 	if (source_url) {
 		if (mail_config_check_service (source_url, CAMEL_PROVIDER_STORE, FALSE, NULL)) {
@@ -258,8 +268,15 @@ apply_changes (MailAccountEditor *editor)
 	}
 	
 	/* check to make sure the transport works */
-	if (!mail_config_check_service (transport_url, CAMEL_PROVIDER_TRANSPORT, FALSE, NULL))
+	if (mail_config_check_service (transport_url, CAMEL_PROVIDER_TRANSPORT, FALSE, NULL)) {
+		/* save the password if we were requested to do so */
+		if (account->transport->save_passwd && transport_url->passwd) {
+			mail_session_set_password (account->transport->url, transport_url->passwd);
+			mail_session_remember_password (account->transport->url);
+		}
+	} else {
 		retval = FALSE;
+	}
 	
 	camel_url_free (transport_url);
 	
@@ -331,7 +348,7 @@ source_auth_type_changed (GtkWidget *widget, gpointer user_data)
 	label = glade_xml_get_widget (editor->gui, "lblSourcePasswd");
 	gtk_widget_set_sensitive (label, sensitive);
 	gtk_widget_set_sensitive (GTK_WIDGET (editor->source_passwd), sensitive);
-	gtk_widget_set_sensitive (GTK_WIDGET (editor->save_passwd), sensitive);
+	gtk_widget_set_sensitive (GTK_WIDGET (editor->source_save_passwd), sensitive);
 }
 
 static void
@@ -376,14 +393,14 @@ source_auth_init (MailAccountEditor *editor, CamelURL *url)
 			l = l->next;
 			i++;
 		}
-		
-		if (authmech) {
-			gtk_signal_emit_by_name (GTK_OBJECT (authmech), "activate", editor);
-			gtk_option_menu_set_history (editor->source_auth, history);
-		}
 	}
 	
 	gtk_option_menu_set_menu (editor->source_auth, menu);
+	
+	if (authmech) {
+		gtk_signal_emit_by_name (GTK_OBJECT (authmech), "activate", editor);
+		gtk_option_menu_set_history (editor->source_auth, history);
+	}
 }
 
 static void
@@ -398,7 +415,7 @@ transport_auth_type_changed (GtkWidget *widget, gpointer user_data)
 }
 
 static void
-transport_construct_authmenu (MailAccountEditor *editor, CamelURL *url)
+transport_auth_init (MailAccountEditor *editor, CamelURL *url)
 {
 	GtkWidget *authmech = NULL;
 	GtkWidget *menu, *item;
@@ -449,6 +466,13 @@ transport_construct_authmenu (MailAccountEditor *editor, CamelURL *url)
 	if (authmech) {
 		gtk_signal_emit_by_name (GTK_OBJECT (authmech), "activate", editor);
 		gtk_option_menu_set_history (editor->transport_auth, history);
+		if (url->authmech) {
+			gtk_entry_set_text (editor->transport_user, url->user ? url->user : "");
+			gtk_entry_set_text (editor->transport_passwd, url->passwd ? url->passwd : "");
+		} else {
+			gtk_entry_set_text (editor->transport_user, "");
+			gtk_entry_set_text (editor->transport_passwd, "");
+		}
 	}
 }
 
@@ -473,6 +497,30 @@ transport_type_changed (GtkWidget *widget, gpointer user_data)
 		gtk_widget_set_sensitive (label, FALSE);
 	}
 	
+	/* username */
+	label = glade_xml_get_widget (editor->gui, "lblTransportUser");
+	if (provider->url_flags & CAMEL_URL_ALLOW_AUTH) {
+		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_user), TRUE);
+		gtk_widget_set_sensitive (label, TRUE);
+	} else {
+		gtk_entry_set_text (editor->transport_user, "");
+		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_user), FALSE);
+		gtk_widget_set_sensitive (label, FALSE);
+	}
+	
+	/* password */
+	label = glade_xml_get_widget (editor->gui, "lblTransportPasswd");
+	if (provider->url_flags & CAMEL_URL_ALLOW_AUTH) {
+		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_passwd), TRUE);
+		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_save_passwd), TRUE);
+		gtk_widget_set_sensitive (label, TRUE);
+	} else {
+		gtk_entry_set_text (editor->transport_passwd, "");
+		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_passwd), FALSE);
+		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_save_passwd), FALSE);
+		gtk_widget_set_sensitive (label, FALSE);
+	}
+	
 	/* auth */
 	label = glade_xml_get_widget (editor->gui, "lblTransportAuth");
 	if (provider->url_flags & CAMEL_URL_ALLOW_AUTH) {
@@ -485,7 +533,7 @@ transport_type_changed (GtkWidget *widget, gpointer user_data)
 		url = g_new0 (CamelURL, 1);
 		url->protocol = g_strdup (provider->protocol);
 		url->host = g_strdup (gtk_entry_get_text (editor->transport_host));
-		transport_construct_authmenu (editor, url);
+		transport_auth_init (editor, url);
 		camel_url_free (url);
 	} else {
 		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_auth), FALSE);
@@ -622,11 +670,11 @@ source_check (MailAccountEditor *editor, CamelURL *url)
 				label = glade_xml_get_widget (editor->gui, "lblSourcePasswd");
 				if (url && provider->url_flags & CAMEL_URL_ALLOW_PASSWORD) {
 					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_passwd), TRUE);
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->save_passwd), TRUE);
+					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_save_passwd), TRUE);
 					gtk_widget_set_sensitive (label, TRUE);
 				} else {
 					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_passwd), FALSE);
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->save_passwd), FALSE);
+					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_save_passwd), FALSE);
 					gtk_widget_set_sensitive (label, FALSE);
 				}
 				
@@ -676,24 +724,25 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account)
 	
 	/* General */
 	editor->account_name = GTK_ENTRY (glade_xml_get_widget (gui, "txtAccountName"));
-	e_utf8_gtk_entry_set_text (editor->account_name, account->name);
+	e_utf8_gtk_entry_set_text (editor->account_name, account->name ? account->name : _("Unspecified"));
 	gtk_signal_connect (GTK_OBJECT (editor->account_name), "changed", entry_changed, editor);
 	editor->name = GTK_ENTRY (glade_xml_get_widget (gui, "txtName"));
-	e_utf8_gtk_entry_set_text (editor->name, account->id->name);
+	e_utf8_gtk_entry_set_text (editor->name, account->id->name ? account->id->name : "");
 	gtk_signal_connect (GTK_OBJECT (editor->name), "changed", entry_changed, editor);
 	editor->email = GTK_ENTRY (glade_xml_get_widget (gui, "txtAddress"));
-	e_utf8_gtk_entry_set_text (editor->email, account->id->address);
+	e_utf8_gtk_entry_set_text (editor->email, account->id->address ? account->id->address : "");
 	gtk_signal_connect (GTK_OBJECT (editor->email), "changed", entry_changed, editor);
 	editor->reply_to = GTK_ENTRY (glade_xml_get_widget (gui, "txtReplyTo"));
 	if (editor->reply_to)
 		e_utf8_gtk_entry_set_text (editor->reply_to, account->id->reply_to ? account->id->reply_to : "");
 	editor->organization = GTK_ENTRY (glade_xml_get_widget (gui, "txtOrganization"));
 	if (editor->organization)
-		e_utf8_gtk_entry_set_text (editor->organization, account->id->organization);
+		e_utf8_gtk_entry_set_text (editor->organization, account->id->organization ?
+					   account->id->organization : "");
 	editor->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileSignature"));
 	if (editor->signature) {
 		entry = gnome_file_entry_gtk_entry (editor->signature);
-		gtk_entry_set_text (GTK_ENTRY (entry), account->id->signature);
+		gtk_entry_set_text (GTK_ENTRY (entry), account->id->signature ? account->id->signature : "");
 	}
 	
 	/* Servers */
@@ -744,16 +793,16 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account)
 		
 		if (provider) {
 			if (provider->url_flags & CAMEL_URL_PATH_IS_ABSOLUTE)
-				gtk_entry_set_text (editor->source_path, url->path);
+				gtk_entry_set_text (editor->source_path, url->path ? url->path : "");
 			else
-				gtk_entry_set_text (editor->source_path, url->path + 1);
+				gtk_entry_set_text (editor->source_path, url->path + 1 ? url->path + 1 : "");
 		} else {
 			/* we've got a serious problem if we ever get to here */
 			g_assert_not_reached ();
 		}
 	}
-	editor->save_passwd = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSavePasswd"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->save_passwd), account->source->save_passwd);
+	editor->source_save_passwd = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSourceSavePasswd"));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_save_passwd), account->source->save_passwd);
 	editor->source_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuSourceAuth"));
 	editor->source_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSourceSSL"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_ssl), account->source->use_ssl);
@@ -789,6 +838,12 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account)
 		gtk_entry_append_text (editor->transport_host, port);
 	}
 	editor->transport_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportAuth"));
+	editor->transport_user = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportUser"));
+	gtk_entry_set_text (editor->transport_user, url && url->user ? url->user : "");
+	editor->transport_passwd = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportPasswd"));
+	gtk_entry_set_text (editor->transport_passwd, url && url->passwd ? url->passwd : "");
+	editor->transport_save_passwd = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportSavePasswd"));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_save_passwd), account->transport->save_passwd);
 	editor->transport_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportSSL"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_ssl), account->transport->use_ssl);
 	if (GTK_IS_OPTION_MENU (editor->transport_type))
@@ -797,6 +852,8 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account)
 		gtk_label_set_text (GTK_LABEL (editor->transport_type),
 				    url && url->protocol ? url->protocol : _("None"));
 	
+	transport_auth_init (editor, url);
+	
 	if (url)
 		camel_url_free (url);
 	
diff --git a/mail/mail-account-editor.h b/mail/mail-account-editor.h
index a750bdedb6..5bbdaa64b0 100644
--- a/mail/mail-account-editor.h
+++ b/mail/mail-account-editor.h
@@ -60,7 +60,7 @@ struct _MailAccountEditor {
 	GtkEntry *source_user;
 	GtkEntry *source_passwd;
 	GtkEntry *source_path;
-	GtkCheckButton *save_passwd;
+	GtkCheckButton *source_save_passwd;
 	GtkOptionMenu *source_auth;
 	GtkCheckButton *source_ssl;
 	
@@ -75,6 +75,9 @@ struct _MailAccountEditor {
 	GtkWidget *transport_type;    /* Same here... */
 	GtkEntry *transport_host;
 	GtkOptionMenu *transport_auth;
+	GtkEntry *transport_user;
+	GtkEntry *transport_passwd;
+	GtkCheckButton *transport_save_passwd;
 	GtkCheckButton *transport_ssl;
 	
 	const CamelProvider *transport;
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 6fcd24a197..5f5d6d0540 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -736,7 +736,6 @@ Click &quot;Next&quot; to begin. </text>
 		<widget>
 		  <class>GtkSpinButton</class>
 		  <name>spinAutoCheckMinutes</name>
-		  <sensitive>False</sensitive>
 		  <can_focus>True</can_focus>
 		  <climb_rate>1</climb_rate>
 		  <digits>0</digits>
@@ -1682,12 +1681,14 @@ Click &quot;Finish&quot; to save your settings.</text>
 
 <widget>
   <class>GnomeDialog</class>
-  <name>mail-account-editor</name>
+  <name>mail-accounts-dialog</name>
   <visible>False</visible>
-  <title>Account Properties</title>
+  <title>Evolution Mail Configuration</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_CENTER</position>
-  <modal>True</modal>
+  <modal>False</modal>
+  <default_width>350</default_width>
+  <default_height>240</default_height>
   <allow_shrink>False</allow_shrink>
   <allow_grow>True</allow_grow>
   <auto_shrink>True</auto_shrink>
@@ -1697,7 +1698,7 @@ Click &quot;Finish&quot; to save your settings.</text>
   <widget>
     <class>GtkVBox</class>
     <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
+    <name>vbox37</name>
     <homogeneous>False</homogeneous>
     <spacing>8</spacing>
     <child>
@@ -1709,7 +1710,7 @@ Click &quot;Finish&quot; to save your settings.</text>
     <widget>
       <class>GtkHButtonBox</class>
       <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
+      <name>hbuttonbox2</name>
       <layout_style>GTK_BUTTONBOX_END</layout_style>
       <spacing>8</spacing>
       <child_min_width>85</child_min_width>
@@ -1733,14 +1734,6 @@ Click &quot;Finish&quot; to save your settings.</text>
 
       <widget>
 	<class>GtkButton</class>
-	<name>cmdApply</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
 	<name>cmdCancel</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
@@ -1750,7 +1743,7 @@ Click &quot;Finish&quot; to save your settings.</text>
 
     <widget>
       <class>GtkNotebook</class>
-      <name>toplevel</name>
+      <name>notebook</name>
       <can_focus>True</can_focus>
       <show_tabs>True</show_tabs>
       <show_border>True</show_border>
@@ -1766,415 +1759,111 @@ Click &quot;Finish&quot; to save your settings.</text>
       </child>
 
       <widget>
-	<class>GtkVBox</class>
-	<name>vbox32</name>
-	<border_width>5</border_width>
+	<class>GtkHBox</class>
+	<name>hbox36</name>
 	<homogeneous>False</homogeneous>
 	<spacing>0</spacing>
 
 	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox33</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
+	  <class>GtkScrolledWindow</class>
+	  <name>scrolledwindow1</name>
+	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
 	  <child>
 	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
+	    <expand>True</expand>
+	    <fill>True</fill>
 	  </child>
 
 	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox26</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>5</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
+	    <class>GtkCList</class>
+	    <name>clistAccounts</name>
+	    <can_focus>True</can_focus>
+	    <columns>2</columns>
+	    <column_widths>150,80</column_widths>
+	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+	    <show_titles>True</show_titles>
+	    <shadow_type>GTK_SHADOW_IN</shadow_type>
 
 	    <widget>
 	      <class>GtkLabel</class>
-	      <name>lblMailAccount</name>
-	      <label>Mail Account</label>
+	      <child_name>CList:title</child_name>
+	      <name>lblAccount</name>
+	      <label>Account</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
 	      <yalign>0.5</yalign>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
 	    </widget>
 
 	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblDirections</name>
-	    <label>Type the name by which you would like to refer to these servers. For example: &quot;Work&quot; or &quot;Home&quot;.</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtAccountName</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>5</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>tableUserInfo</name>
-	  <rows>6</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>0</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox35</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
 	      <class>GtkLabel</class>
-	      <name>lblUserInfo</name>
-	      <label>User Information</label>
+	      <child_name>CList:title</child_name>
+	      <name>lblType</name>
+	      <label>Type</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
 	      <yalign>0.5</yalign>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator8</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
 	    </widget>
 	  </widget>
+	</widget>
 
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtName</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
+	<widget>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonbox1</name>
+	  <layout_style>GTK_BUTTONBOX_START</layout_style>
+	  <spacing>0</spacing>
+	  <child_min_width>85</child_min_width>
+	  <child_min_height>27</child_min_height>
+	  <child_ipad_x>7</child_ipad_x>
+	  <child_ipad_y>0</child_ipad_y>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtAddress</name>
+	    <class>GtkButton</class>
+	    <name>cmdMailAdd</name>
+	    <can_default>True</can_default>
 	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <label>_Add</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtReplyTo</name>
+	    <class>GtkButton</class>
+	    <name>cmdMailEdit</name>
+	    <can_default>True</can_default>
 	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <label>_Edit</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtOrganization</name>
+	    <class>GtkButton</class>
+	    <name>cmdMailDelete</name>
+	    <can_default>True</can_default>
 	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GnomeFileEntry</class>
-	    <name>fileSignature</name>
-	    <max_saved>10</max_saved>
-	    <title>Select signature file</title>
-	    <directory>False</directory>
-	    <modal>True</modal>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>5</top_attach>
-	      <bottom_attach>6</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GnomeEntry:entry</child_name>
-	      <name>txtSignature</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblName</name>
-	    <label>Name:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblEMail</name>
-	    <label>E-Mail Address:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblReplyTo</name>
-	    <label>Reply-To:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblOrganization</name>
-	    <label>Organization:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <label>_Delete</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSignature</name>
-	    <label>Signature:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>5</top_attach>
-	      <bottom_attach>6</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <class>GtkButton</class>
+	    <name>cmdMailDefault</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>De_fault</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
       </widget>
@@ -2182,8 +1871,8 @@ Click &quot;Finish&quot; to save your settings.</text>
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>lblGeneral</name>
-	<label>General</label>
+	<name>lblMail</name>
+	<label>Mail</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -2193,383 +1882,58 @@ Click &quot;Finish&quot; to save your settings.</text>
       </widget>
 
       <widget>
-	<class>GtkVBox</class>
-	<name>vbox34</name>
-	<border_width>5</border_width>
+	<class>GtkHBox</class>
+	<name>hbox37</name>
 	<homogeneous>False</homogeneous>
 	<spacing>0</spacing>
 
 	<widget>
-	  <class>GtkTable</class>
-	  <name>tableIncomingServer</name>
-	  <rows>8</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
+	  <class>GtkScrolledWindow</class>
+	  <name>scrolledwindow2</name>
+	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
 	  <child>
 	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
+	    <expand>True</expand>
+	    <fill>True</fill>
 	  </child>
 
 	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox31</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
+	    <class>GtkCList</class>
+	    <name>clistNews</name>
+	    <can_focus>True</can_focus>
+	    <columns>1</columns>
+	    <column_widths>80</column_widths>
+	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+	    <show_titles>True</show_titles>
+	    <shadow_type>GTK_SHADOW_IN</shadow_type>
 
 	    <widget>
 	      <class>GtkLabel</class>
-	      <name>lblIncomingMailServer</name>
-	      <label>Incoming Mail Server</label>
+	      <child_name>CList:title</child_name>
+	      <name>lblSources</name>
+	      <label>Sources</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
 	      <yalign>0.5</yalign>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
 	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator4</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkSavePasswd</name>
-	    <can_focus>True</can_focus>
-	    <label>Save password</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>5</top_attach>
-	      <bottom_attach>6</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourceHost</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourceUser</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourcePasswd</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>False</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkSourceSSL</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <label>This server requires a secure connection (SSL)</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>7</top_attach>
-	      <bottom_attach>8</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourceUser</name>
-	    <label>Username:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourcePasswd</name>
-	    <label>Password:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourceAuth</name>
-	    <label>Authentication:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>6</top_attach>
-	      <bottom_attach>7</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourceHost</name>
-	    <label>Hostname:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblIncomingServerType</name>
-	    <label>Type:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourceType</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>False</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuSourceAuth</name>
-	    <can_focus>True</can_focus>
-	    <items>Plain Text
-Kerberos
-CRAM-MD5
-DIGEST-MD5
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>6</top_attach>
-	      <bottom_attach>7</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
 	  </widget>
 	</widget>
 
 	<widget>
-	  <class>GtkTable</class>
-	  <name>tableOutgoingServer</name>
-	  <rows>5</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonbox2</name>
+	  <layout_style>GTK_BUTTONBOX_START</layout_style>
+	  <spacing>0</spacing>
+	  <child_min_width>85</child_min_width>
+	  <child_min_height>27</child_min_height>
+	  <child_ipad_x>7</child_ipad_x>
+	  <child_ipad_y>0</child_ipad_y>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -2577,225 +1941,30 @@ DIGEST-MD5
 	  </child>
 
 	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox32</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblOutgoingMailServer</name>
-	      <label>Outgoing Mail Server</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator5</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtTransportHost</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkTransportSSL</name>
-	    <sensitive>False</sensitive>
+	    <class>GtkButton</class>
+	    <name>cmdNewsAdd</name>
+	    <can_default>True</can_default>
 	    <can_focus>True</can_focus>
-	    <label>This server requires a secure connection (SSL)</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblOutgoingServerType</name>
-	    <label>Type:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblTransportHost</name>
-	    <label>Hostname:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblTransportAuth</name>
-	    <label>Authentication:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <label>Add</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuTransportAuth</name>
+	    <class>GtkButton</class>
+	    <name>cmdNewsEdit</name>
+	    <can_default>True</can_default>
 	    <can_focus>True</can_focus>
-	    <items>None
-CRAM-MD5
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <label>Edit</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuTransportType</name>
+	    <class>GtkButton</class>
+	    <name>cmdNewsDelete</name>
+	    <can_default>True</can_default>
 	    <can_focus>True</can_focus>
-	    <items>Sendmail
-SMTP
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <label>Delete</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
       </widget>
@@ -2803,8 +1972,8 @@ SMTP
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>lblServers</name>
-	<label>Servers</label>
+	<name>lblNews</name>
+	<label>News</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -2815,241 +1984,143 @@ SMTP
 
       <widget>
 	<class>GtkVBox</class>
-	<name>vbox36</name>
-	<border_width>5</border_width>
+	<name>vbox38</name>
 	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
+	<spacing>4</spacing>
 
 	<widget>
-	  <class>GtkTable</class>
-	  <name>tableServerTimeouts</name>
-	  <rows>5</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
+	  <class>GtkCheckButton</class>
+	  <name>chkSendHTML</name>
+	  <can_focus>True</can_focus>
+	  <label>Send mail in HTML format by default.</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
-	    <fill>True</fill>
+	    <fill>False</fill>
 	  </child>
+	</widget>
 
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox34</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblMisc</name>
-	      <label>Miscellaneous</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator7</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
+	<widget>
+	  <class>GtkHBox</class>
+	  <name>hbox38</name>
+	  <homogeneous>False</homogeneous>
+	  <spacing>0</spacing>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>True</fill>
+	  </child>
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>lblSourcePath</name>
-	    <label>Path:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
+	    <name>lblMarkAsRead</name>
+	    <label>Mark messages as &quot;Read&quot; after:</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
+	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>4</xpad>
 	    <ypad>0</ypad>
 	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkKeepMailOnServer</name>
+	    <class>GtkSpinButton</class>
+	    <name>spinMarkTimeout</name>
 	    <can_focus>True</can_focus>
-	    <label>Keep mail on server</label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
+	    <climb_rate>1</climb_rate>
+	    <digits>1</digits>
+	    <numeric>True</numeric>
+	    <update_policy>GTK_UPDATE_IF_VALID</update_policy>
+	    <snap>False</snap>
+	    <wrap>False</wrap>
+	    <value>1.5</value>
+	    <lower>0</lower>
+	    <upper>10</upper>
+	    <step>0.1</step>
+	    <page>1</page>
+	    <page_size>1</page_size>
 	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>True</fill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourcePath</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
+	    <class>GtkLabel</class>
+	    <name>lblSeconds</name>
+	    <label>seconds.</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>4</xpad>
+	    <ypad>0</ypad>
 	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
 	    </child>
 	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkHBox</class>
+	  <name>hbox41</name>
+	  <homogeneous>False</homogeneous>
+	  <spacing>0</spacing>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>True</fill>
+	  </child>
 
 	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkEnabled</name>
-	    <can_focus>True</can_focus>
-	    <label>Include in &quot;Get Mail&quot; operations.</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
+	    <class>GtkLabel</class>
+	    <name>lblPgpPath</name>
+	    <label>PGP binary path:</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>4</xpad>
+	    <ypad>0</ypad>
 	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox40</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <class>GnomeFileEntry</class>
+	    <name>filePgpPath</name>
+	    <max_saved>10</max_saved>
+	    <title>Select PGP binary</title>
+	    <directory>False</directory>
+	    <modal>True</modal>
 	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
+	      <padding>4</padding>
+	      <expand>True</expand>
+	      <fill>True</fill>
 	    </child>
 
 	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>chkAutoCheckMail</name>
-	      <can_focus>True</can_focus>
-	      <label>Automatically check mail every</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>spinAutoCheckTimeout</name>
+	      <class>GtkEntry</class>
+	      <child_name>GnomeEntry:entry</child_name>
+	      <name>combo-entry1</name>
 	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>True</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>10</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblMinutes</name>
-	      <label>minutes.</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
+	      <editable>True</editable>
+	      <text_visible>True</text_visible>
+	      <text_max_length>0</text_max_length>
+	      <text></text>
 	    </widget>
 	  </widget>
 	</widget>
@@ -3058,8 +2129,8 @@ SMTP
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>lblAdvanced</name>
-	<label>Advanced</label>
+	<name>lblOther</name>
+	<label>Other</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -3073,15 +2144,12 @@ SMTP
 
 <widget>
   <class>GnomeDialog</class>
-  <name>mail-accounts-dialog</name>
+  <name>mail-account-editor</name>
   <visible>False</visible>
-  <title>Evolution Mail Configuration</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <default_width>350</default_width>
-  <default_height>240</default_height>
-  <allow_shrink>False</allow_shrink>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>True</modal>
+  <allow_shrink>True</allow_shrink>
   <allow_grow>True</allow_grow>
   <auto_shrink>True</auto_shrink>
   <auto_close>False</auto_close>
@@ -3090,7 +2158,7 @@ SMTP
   <widget>
     <class>GtkVBox</class>
     <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox37</name>
+    <name>dialog-vbox4</name>
     <homogeneous>False</homogeneous>
     <spacing>8</spacing>
     <child>
@@ -3102,7 +2170,7 @@ SMTP
     <widget>
       <class>GtkHButtonBox</class>
       <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox2</name>
+      <name>dialog-action_area4</name>
       <layout_style>GTK_BUTTONBOX_END</layout_style>
       <spacing>8</spacing>
       <child_min_width>85</child_min_width>
@@ -3118,7 +2186,7 @@ SMTP
 
       <widget>
 	<class>GtkButton</class>
-	<name>cmdOK</name>
+	<name>button1</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
@@ -3126,7 +2194,15 @@ SMTP
 
       <widget>
 	<class>GtkButton</class>
-	<name>cmdCancel</name>
+	<name>button2</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button3</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
@@ -3135,7 +2211,7 @@ SMTP
 
     <widget>
       <class>GtkNotebook</class>
-      <name>notebook</name>
+      <name>toplevel</name>
       <can_focus>True</can_focus>
       <show_tabs>True</show_tabs>
       <show_border>True</show_border>
@@ -3151,18 +2227,18 @@ SMTP
       </child>
 
       <widget>
-	<class>GtkHBox</class>
-	<name>hbox36</name>
+	<class>GtkVBox</class>
+	<name>vboxGeneral</name>
 	<homogeneous>False</homogeneous>
 	<spacing>0</spacing>
 
 	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+	  <class>GtkFrame</class>
+	  <name>frameMailAccount</name>
+	  <border_width>4</border_width>
+	  <label>Mail Account</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
 	    <expand>True</expand>
@@ -3170,92 +2246,327 @@ SMTP
 	  </child>
 
 	  <widget>
-	    <class>GtkCList</class>
-	    <name>clistAccounts</name>
-	    <can_focus>True</can_focus>
+	    <class>GtkVBox</class>
+	    <name>vboxMailAccount</name>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>labelDirections</name>
+	      <label>Type the name by which you would like to refer to these servers. For example: &quot;Work&quot; or &quot;Home&quot;.</label>
+	      <justify>GTK_JUSTIFY_LEFT</justify>
+	      <wrap>True</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>4</ypad>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkEntry</class>
+	      <name>txtAccountName</name>
+	      <can_focus>True</can_focus>
+	      <editable>True</editable>
+	      <text_visible>True</text_visible>
+	      <text_max_length>0</text_max_length>
+	      <text></text>
+	      <child>
+		<padding>2</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frameIdentity</name>
+	  <border_width>4</border_width>
+	  <label>User Information</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkTable</class>
+	    <name>tableIdentity</name>
+	    <border_width>4</border_width>
+	    <rows>5</rows>
 	    <columns>2</columns>
-	    <column_widths>150,80</column_widths>
-	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    <show_titles>True</show_titles>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
+	    <homogeneous>False</homogeneous>
+	    <row_spacing>4</row_spacing>
+	    <column_spacing>4</column_spacing>
 
 	    <widget>
 	      <class>GtkLabel</class>
-	      <child_name>CList:title</child_name>
-	      <name>lblAccount</name>
-	      <label>Account</label>
+	      <name>lblName</name>
+	      <label>Full Name:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
+	      <xalign>0</xalign>
 	      <yalign>0.5</yalign>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
 	    </widget>
 
 	    <widget>
 	      <class>GtkLabel</class>
-	      <child_name>CList:title</child_name>
-	      <name>lblType</name>
-	      <label>Type</label>
+	      <name>lblEmailAddress</name>
+	      <label>Email address:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
+	      <xalign>0</xalign>
 	      <yalign>0.5</yalign>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
 	    </widget>
-	  </widget>
-	</widget>
 
-	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonbox1</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>lblReplyTo</name>
+	      <label>Reply address:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>2</top_attach>
+		<bottom_attach>3</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailAdd</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>lblOrganization</name>
+	      <label>Organization:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>3</top_attach>
+		<bottom_attach>4</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailEdit</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Edit</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>lblSignature</name>
+	      <label>Signature:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>4</top_attach>
+		<bottom_attach>5</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailDelete</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Delete</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	    <widget>
+	      <class>GtkEntry</class>
+	      <name>txtName</name>
+	      <can_focus>True</can_focus>
+	      <editable>True</editable>
+	      <text_visible>True</text_visible>
+	      <text_max_length>0</text_max_length>
+	      <text></text>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailDefault</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>De_fault</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
+	    <widget>
+	      <class>GtkEntry</class>
+	      <name>txtAddress</name>
+	      <can_focus>True</can_focus>
+	      <editable>True</editable>
+	      <text_visible>True</text_visible>
+	      <text_max_length>0</text_max_length>
+	      <text></text>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkEntry</class>
+	      <name>txtReplyTo</name>
+	      <can_focus>True</can_focus>
+	      <editable>True</editable>
+	      <text_visible>True</text_visible>
+	      <text_max_length>0</text_max_length>
+	      <text></text>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>2</top_attach>
+		<bottom_attach>3</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkEntry</class>
+	      <name>txtOrganization</name>
+	      <can_focus>True</can_focus>
+	      <editable>True</editable>
+	      <text_visible>True</text_visible>
+	      <text_max_length>0</text_max_length>
+	      <text></text>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>3</top_attach>
+		<bottom_attach>4</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GnomeFileEntry</class>
+	      <name>fileSignature</name>
+	      <max_saved>10</max_saved>
+	      <title>Select signature file</title>
+	      <directory>False</directory>
+	      <modal>True</modal>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>4</top_attach>
+		<bottom_attach>5</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+
+	      <widget>
+		<class>GtkEntry</class>
+		<child_name>GnomeEntry:entry</child_name>
+		<name>txtSignature</name>
+		<can_focus>True</can_focus>
+		<editable>True</editable>
+		<text_visible>True</text_visible>
+		<text_max_length>0</text_max_length>
+		<text></text>
+	      </widget>
+	    </widget>
 	  </widget>
 	</widget>
       </widget>
@@ -3263,8 +2574,8 @@ SMTP
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>lblMail</name>
-	<label>Mail</label>
+	<name>lblGeneral</name>
+	<label>General</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -3274,98 +2585,371 @@ SMTP
       </widget>
 
       <widget>
-	<class>GtkHBox</class>
-	<name>hbox37</name>
+	<class>GtkTable</class>
+	<name>tableSource</name>
+	<border_width>4</border_width>
+	<rows>8</rows>
+	<columns>2</columns>
 	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
+	<row_spacing>4</row_spacing>
+	<column_spacing>4</column_spacing>
 
 	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+	  <class>GtkLabel</class>
+	  <name>lblIncomingServerType</name>
+	  <label>Server type:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
 	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
 	  </child>
+	</widget>
 
-	  <widget>
-	    <class>GtkCList</class>
-	    <name>clistNews</name>
-	    <can_focus>True</can_focus>
-	    <columns>1</columns>
-	    <column_widths>80</column_widths>
-	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    <show_titles>True</show_titles>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblSourceHost</name>
+	  <label>Hostname:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>CList:title</child_name>
-	      <name>lblSources</name>
-	      <label>Sources</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>txtSourceHost</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonbox2</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
+	  <class>GtkLabel</class>
+	  <name>lblSourceUser</name>
+	  <label>Username:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
 	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
 	  </child>
+	</widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsAdd</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Add</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>txtSourceUser</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsEdit</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Edit</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblSourcePasswd</name>
+	  <label>Password:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>4</top_attach>
+	    <bottom_attach>5</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsDelete</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Delete</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>txtSourcePasswd</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>False</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>4</top_attach>
+	    <bottom_attach>5</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkCheckButton</class>
+	  <name>chkSourceSavePasswd</name>
+	  <can_focus>True</can_focus>
+	  <label>Save password</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>5</top_attach>
+	    <bottom_attach>6</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkCheckButton</class>
+	  <name>chkSourceSSL</name>
+	  <can_focus>True</can_focus>
+	  <label>This server requires a secure connection (SSL)</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>7</top_attach>
+	    <bottom_attach>8</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblSourcePath</name>
+	  <label>Path:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>6</top_attach>
+	    <bottom_attach>7</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>txtSourcePath</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>6</top_attach>
+	    <bottom_attach>7</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblSourceAuth</name>
+	  <label>Authentication:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkOptionMenu</class>
+	  <name>omenuSourceAuth</name>
+	  <can_focus>True</can_focus>
+	  <items>Plain Text
+Kerberos
+CRAM-MD5
+DIGEST-MD5
+</items>
+	  <initial_choice>0</initial_choice>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>txtSourceType</name>
+	  <label>IMAP</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
 	</widget>
       </widget>
 
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>lblNews</name>
-	<label>News</label>
+	<name>lblSource</name>
+	<label>Source</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -3375,30 +2959,336 @@ SMTP
       </widget>
 
       <widget>
-	<class>GtkVBox</class>
-	<name>vbox38</name>
+	<class>GtkTable</class>
+	<name>tableTransport</name>
+	<border_width>4</border_width>
+	<rows>7</rows>
+	<columns>2</columns>
 	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
+	<row_spacing>4</row_spacing>
+	<column_spacing>4</column_spacing>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblOutgoingServerType</name>
+	  <label>Server type:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkOptionMenu</class>
+	  <name>omenuTransportType</name>
+	  <can_focus>True</can_focus>
+	  <items>Sendmail
+SMTP
+</items>
+	  <initial_choice>0</initial_choice>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblTransportHost</name>
+	  <label>Hostname:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>txtTransportHost</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblTransportUser</name>
+	  <label>Username:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>txtTransportUser</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblTransportPasswd</name>
+	  <label>Password:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>4</top_attach>
+	    <bottom_attach>5</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>txtTransportPasswd</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>False</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>4</top_attach>
+	    <bottom_attach>5</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>lblTransportAuth</name>
+	  <label>Authentication:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkOptionMenu</class>
+	  <name>omenuTransportAuth</name>
+	  <can_focus>True</can_focus>
+	  <items>None
+CRAM-MD5
+</items>
+	  <initial_choice>0</initial_choice>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
 	<widget>
 	  <class>GtkCheckButton</class>
-	  <name>chkSendHTML</name>
+	  <name>chkTransportSSL</name>
 	  <can_focus>True</can_focus>
-	  <label>Send mail in HTML format by default.</label>
+	  <label>This server requires a secure connection (SSL)</label>
 	  <active>False</active>
 	  <draw_indicator>True</draw_indicator>
 	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
+	    <left_attach>0</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>6</top_attach>
+	    <bottom_attach>7</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
+	  <class>GtkCheckButton</class>
+	  <name>chkTransportSavePasswd</name>
+	  <can_focus>True</can_focus>
+	  <label>Save password</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>5</top_attach>
+	    <bottom_attach>6</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>lblTransport</name>
+	<label>Transport</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
+	<class>GtkVBox</class>
+	<name>vboxAdvanced</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+
+	<widget>
 	  <class>GtkHBox</class>
-	  <name>hbox38</name>
+	  <name>hboxAutoCheckMail</name>
 	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
+	  <spacing>4</spacing>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -3406,15 +3296,12 @@ SMTP
 	  </child>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblMarkAsRead</name>
-	    <label>Mark messages as &quot;Read&quot; after:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
+	    <class>GtkCheckButton</class>
+	    <name>chkAutoCheckMail</name>
+	    <can_focus>True</can_focus>
+	    <label>Automatically check mail every</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -3424,20 +3311,21 @@ SMTP
 
 	  <widget>
 	    <class>GtkSpinButton</class>
-	    <name>spinMarkTimeout</name>
+	    <name>spinAutoCheckTimeout</name>
+	    <sensitive>False</sensitive>
 	    <can_focus>True</can_focus>
 	    <climb_rate>1</climb_rate>
-	    <digits>1</digits>
+	    <digits>0</digits>
 	    <numeric>True</numeric>
-	    <update_policy>GTK_UPDATE_IF_VALID</update_policy>
+	    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
 	    <snap>False</snap>
 	    <wrap>False</wrap>
-	    <value>1.5</value>
+	    <value>10</value>
 	    <lower>0</lower>
-	    <upper>10</upper>
-	    <step>0.1</step>
-	    <page>1</page>
-	    <page_size>1</page_size>
+	    <upper>100</upper>
+	    <step>1</step>
+	    <page>10</page>
+	    <page_size>10</page_size>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -3447,13 +3335,13 @@ SMTP
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>lblSeconds</name>
-	    <label>seconds.</label>
+	    <name>lblMinutes</name>
+	    <label>minutes.</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
+	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <padding>0</padding>
@@ -3464,65 +3352,39 @@ SMTP
 	</widget>
 
 	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox41</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
+	  <class>GtkCheckButton</class>
+	  <name>chkKeepMailOnServer</name>
+	  <can_focus>True</can_focus>
+	  <label>Keep mail on server</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
-	    <fill>True</fill>
+	    <fill>False</fill>
 	  </child>
+	</widget>
 
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblPgpPath</name>
-	    <label>PGP binary path:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GnomeFileEntry</class>
-	    <name>filePgpPath</name>
-	    <max_saved>10</max_saved>
-	    <title>Select PGP binary</title>
-	    <directory>False</directory>
-	    <modal>True</modal>
-	    <child>
-	      <padding>4</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GnomeEntry:entry</child_name>
-	      <name>combo-entry1</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	    </widget>
-	  </widget>
+	<widget>
+	  <class>GtkCheckButton</class>
+	  <name>chkEnabled</name>
+	  <can_focus>True</can_focus>
+	  <label>Include this account when receiving mail</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
 	</widget>
       </widget>
 
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>lblOther</name>
-	<label>Other</label>
+	<name>lblAdvanced</name>
+	<label>Advanced</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>