From 3b1cd946dfefa0b86331583076936ce7f89c4e26 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@helixcode.com>
Date: Fri, 5 Jan 2001 18:36:18 +0000
Subject: Renamed from _delete_mail

2001-01-05  Jeffrey Stedfast  <fejj@helixcode.com>

	* mail-config-druid.c (mail_config_druid_get_incoming_keep_mail):
	Renamed from _delete_mail

	* mail-config-druid.glade: Changed "Delete mail from server" to
	"Keep mail on server" as this has a more positive ring to it. Both
	I and Aaron agree this is the better phrase.

svn path=/trunk/; revision=7269
---
 mail/ChangeLog                 |   9 +
 mail/mail-config-druid.c       |   8 +-
 mail/mail-config-druid.glade   | 759 +++++++++++++++++++++--------------------
 mail/mail-config-druid.glade.h |  17 +-
 mail/mail-config-druid.h       |   4 +-
 5 files changed, 415 insertions(+), 382 deletions(-)

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4e1edd59be..84cbebf16b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-05  Jeffrey Stedfast  <fejj@helixcode.com>
+
+	* mail-config-druid.c (mail_config_druid_get_incoming_keep_mail):
+	Renamed from _delete_mail
+
+	* mail-config-druid.glade: Changed "Delete mail from server" to
+	"Keep mail on server" as this has a more positive ring to it. Both
+	I and Aaron agree this is the better phrase.
+
 2001-01-04  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* mail-config-druid.c: Fixed a few 'Oops'es.
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index 38917fffb5..7bf7ccc4da 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -672,7 +672,7 @@ construct (MailConfigDruid *druid)
 	gtk_signal_connect (GTK_OBJECT (druid->incoming_username), "changed", incoming_changed, druid);
 	druid->incoming_path = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingPath"));
 	gtk_signal_connect (GTK_OBJECT (druid->incoming_path), "changed", incoming_changed, druid);
-	druid->incoming_delete_mail = GTK_CHECK_BOX (glade_xml_get_widget (gui, "chkIncomingDeleteMail"));
+	druid->incoming_keep_mail = GTK_CHECK_BOX (glade_xml_get_widget (gui, "chkIncomingKeepMail"));
 	
 	druid->auth_text = glade_xml_get_widget (gui, "htmlAuthentication");
 	druid->auth_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuAuthType"));
@@ -716,7 +716,7 @@ do_check_service (gpointer in_data, gpointer op_data, CamelException *ex)
 {
 	check_service_input_t *input = in_data;
 	CamelService *service;
-
+	
 	if (input->authtypes) {
 		service = camel_session_get_service (
 			session, input->url, input->type, ex);
@@ -866,11 +866,11 @@ mail_config_druid_get_incoming_path (MailConfigDruid *druid)
 
 
 gboolean
-mail_config_druid_get_incoming_delete_mail (MailConfigDruid *druid)
+mail_config_druid_get_incoming_keep_mail (MailConfigDruid *druid)
 {
 	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
 	
-	return GTK_TOGGLE_BUTTON (druid->incoming_delete_mail)->active;
+	return GTK_TOGGLE_BUTTON (druid->incoming_keep_mail)->active;
 }
 
 
diff --git a/mail/mail-config-druid.glade b/mail/mail-config-druid.glade
index ad7f605143..89cbb7eced 100644
--- a/mail/mail-config-druid.glade
+++ b/mail/mail-config-druid.glade
@@ -552,11 +552,11 @@ Click &quot;Next&quot; to begin. </text>
 		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<xexpand>False</xexpand>
+		<xexpand>True</xexpand>
 		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
-		<xfill>False</xfill>
+		<xfill>True</xfill>
 		<yfill>False</yfill>
 	      </child>
 	    </widget>
@@ -759,11 +759,11 @@ Click &quot;Next&quot; to begin. </text>
 
 		<widget>
 		  <class>GtkCheckButton</class>
-		  <name>chkIncomingDeleteMail</name>
+		  <name>chkIncomingKeepMail</name>
 		  <border_width>3</border_width>
 		  <can_focus>True</can_focus>
-		  <label>Delete mail from server</label>
-		  <active>False</active>
+		  <label>Keep mail on server</label>
+		  <active>True</active>
 		  <draw_indicator>True</draw_indicator>
 		  <child>
 		    <padding>2</padding>
@@ -1650,151 +1650,153 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </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>
+	    <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>4</right_attach>
+	      <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>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</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>
+	    <class>GtkEntry</class>
+	    <name>txtEMail</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>4</right_attach>
+	      <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>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</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>
+	    <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>4</right_attach>
+	      <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>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</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>
+	    <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>4</right_attach>
+	      <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>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </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>
+	    <class>GnomeFileEntry</class>
+	    <name>fileSignature</name>
+	    <max_saved>10</max_saved>
+	    <title>Select signature file</title>
+	    <directory>True</directory>
+	    <modal>True</modal>
 	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
+	      <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>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <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>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>
+	    <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>4</left_attach>
-	      <right_attach>10</right_attach>
+	      <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>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -1804,21 +1806,23 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtEMail</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>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>4</left_attach>
-	      <right_attach>10</right_attach>
+	      <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>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -1828,21 +1832,23 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </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>
+	    <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>4</left_attach>
-	      <right_attach>10</right_attach>
+	      <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>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -1852,21 +1858,23 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </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>
+	    <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>4</left_attach>
-	      <right_attach>10</right_attach>
+	      <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>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -1876,37 +1884,29 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </widget>
 
 	  <widget>
-	    <class>GnomeFileEntry</class>
-	    <name>fileSignature</name>
-	    <max_saved>10</max_saved>
-	    <title>Select signature file</title>
-	    <directory>True</directory>
-	    <modal>True</modal>
+	    <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>4</left_attach>
-	      <right_attach>10</right_attach>
+	      <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>True</xexpand>
+	      <xexpand>False</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>
@@ -1994,47 +1994,44 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </widget>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblUsername</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>
+	    <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>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
+	      <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>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtUsername</name>
+	    <class>GtkCheckButton</class>
+	    <name>chkIncomingSSL</name>
+	    <sensitive>False</sensitive>
 	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
+	    <label>This server requires a secure connection (SSL)</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
 	    <child>
-	      <left_attach>4</left_attach>
+	      <left_attach>1</left_attach>
 	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
+	      <top_attach>7</top_attach>
+	      <bottom_attach>8</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -2044,21 +2041,23 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtPassword</name>
+	    <class>GtkOptionMenu</class>
+	    <name>omenuIncomingAuth</name>
 	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
+	    <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>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
+	      <top_attach>6</top_attach>
+	      <bottom_attach>7</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -2069,8 +2068,8 @@ Click &quot;Finish&quot; to save your settings.</text>
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>lblPassword</name>
-	    <label>Password:</label>
+	    <name>lblIncomingServerType</name>
+	    <label>Type:</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
@@ -2079,24 +2078,24 @@ Click &quot;Finish&quot; to save your settings.</text>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_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>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>lblIncomingAuth</name>
-	    <label>Authentication:</label>
+	    <name>lblIncomingServer</name>
+	    <label>Hostname:</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
@@ -2105,32 +2104,35 @@ Click &quot;Finish&quot; to save your settings.</text>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>6</top_attach>
-	      <bottom_attach>7</bottom_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>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </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>
+	    <class>GtkLabel</class>
+	    <name>lblUsername</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>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>5</top_attach>
-	      <bottom_attach>6</bottom_attach>
+	      <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>
@@ -2143,18 +2145,20 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </widget>
 
 	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkIncomingSSL</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>
+	    <class>GtkLabel</class>
+	    <name>lblPassword</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>10</right_attach>
-	      <top_attach>7</top_attach>
-	      <bottom_attach>8</bottom_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>
@@ -2167,23 +2171,21 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuIncomingAuth</name>
+	    <class>GtkEntry</class>
+	    <name>txtServerType</name>
 	    <can_focus>True</can_focus>
-	    <items>Plain Text
-Kerberos
-CRAM-MD5
-DIGEST-MD5
-</items>
-	    <initial_choice>0</initial_choice>
+	    <editable>False</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text>IMAP</text>
 	    <child>
-	      <left_attach>4</left_attach>
+	      <left_attach>3</left_attach>
 	      <right_attach>10</right_attach>
-	      <top_attach>6</top_attach>
-	      <bottom_attach>7</bottom_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -2193,44 +2195,42 @@ DIGEST-MD5
 	  </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>
+	    <class>GtkEntry</class>
+	    <name>txtIncomingServer</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>4</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <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>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
 
 	  <widget>
 	    <class>GtkEntry</class>
-	    <name>txtServerType</name>
+	    <name>txtUsername</name>
 	    <can_focus>True</can_focus>
-	    <editable>False</editable>
+	    <editable>True</editable>
 	    <text_visible>True</text_visible>
 	    <text_max_length>0</text_max_length>
-	    <text>IMAP</text>
+	    <text></text>
 	    <child>
-	      <left_attach>4</left_attach>
+	      <left_attach>3</left_attach>
 	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>True</xexpand>
@@ -2243,47 +2243,47 @@ DIGEST-MD5
 	  </widget>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblIncomingServer</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>
+	    <class>GtkEntry</class>
+	    <name>txtPassword</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>4</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <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>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtIncomingServer</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>lblIncomingAuth</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>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <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>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -2355,32 +2355,6 @@ DIGEST-MD5
 	    </widget>
 	  </widget>
 
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblOutgoingAuth</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>
-	  </widget>
-
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>chkOutgoingSSL</name>
@@ -2441,7 +2415,7 @@ CRAM-MD5
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
+	      <right_attach>3</right_attach>
 	      <top_attach>1</top_attach>
 	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
@@ -2450,7 +2424,7 @@ CRAM-MD5
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
@@ -2467,7 +2441,7 @@ CRAM-MD5
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
+	      <right_attach>3</right_attach>
 	      <top_attach>2</top_attach>
 	      <bottom_attach>3</bottom_attach>
 	      <xpad>0</xpad>
@@ -2476,24 +2450,26 @@ CRAM-MD5
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <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>
+	    <class>GtkLabel</class>
+	    <name>lblOutgoingAuth</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>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <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>
@@ -2514,7 +2490,7 @@ SMTP
 	    <text_max_length>0</text_max_length>
 	    <text></text>
 	    <child>
-	      <left_attach>4</left_attach>
+	      <left_attach>3</left_attach>
 	      <right_attach>10</right_attach>
 	      <top_attach>2</top_attach>
 	      <bottom_attach>3</bottom_attach>
@@ -2528,6 +2504,30 @@ SMTP
 	      <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>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>
+	  </widget>
 	</widget>
       </widget>
 
@@ -2554,38 +2554,27 @@ SMTP
 	<widget>
 	  <class>GtkTable</class>
 	  <name>tableServerTimeouts</name>
-	  <rows>2</rows>
+	  <rows>3</rows>
 	  <columns>10</columns>
 	  <homogeneous>True</homogeneous>
 	  <row_spacing>0</row_spacing>
 	  <column_spacing>0</column_spacing>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
 	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>spinAutoCheckMinutes</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>0</value>
-	    <lower>0</lower>
-	    <upper>100</upper>
-	    <step>1</step>
-	    <page>10</page>
-	    <page_size>10</page_size>
+	    <class>GtkHBox</class>
+	    <name>hbox34</name>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
 	    <child>
-	      <left_attach>7</left_attach>
-	      <right_attach>8</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <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>
@@ -2593,6 +2582,56 @@ SMTP
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
 	      <xfill>True</xfill>
+	      <yfill>True</yfill>
+	    </child>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>lblServerTimeouts</name>
+	      <label>Server Timeouts</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>GtkCheckButton</class>
+	    <name>chkKeepMailOnServer</name>
+	    <can_focus>True</can_focus>
+	    <label>Keep mail on server</label>
+	    <active>True</active>
+	    <draw_indicator>True</draw_indicator>
+	    <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>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
@@ -2609,7 +2648,7 @@ SMTP
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>1</left_attach>
-	      <right_attach>7</right_attach>
+	      <right_attach>6</right_attach>
 	      <top_attach>1</top_attach>
 	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
@@ -2618,83 +2657,67 @@ SMTP
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblMinutes</name>
-	    <label>minute(s)</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
+	    <class>GtkSpinButton</class>
+	    <name>spinAutoCheckMinutes</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>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
+	    <value>0</value>
+	    <lower>0</lower>
+	    <upper>100</upper>
+	    <step>1</step>
+	    <page>10</page>
+	    <page_size>10</page_size>
 	    <child>
-	      <left_attach>8</left_attach>
-	      <right_attach>10</right_attach>
+	      <left_attach>6</left_attach>
+	      <right_attach>7</right_attach>
 	      <top_attach>1</top_attach>
 	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox34</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <class>GtkLabel</class>
+	    <name>lblMinutes</name>
+	    <label>minute(s)</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>0</left_attach>
+	      <left_attach>7</left_attach>
 	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
 	      <xfill>True</xfill>
-	      <yfill>True</yfill>
+	      <yfill>False</yfill>
 	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblServerTimeouts</name>
-	      <label>Server Timeouts</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>
       </widget>
diff --git a/mail/mail-config-druid.glade.h b/mail/mail-config-druid.glade.h
index 2173da685e..a0908a12c5 100644
--- a/mail/mail-config-druid.glade.h
+++ b/mail/mail-config-druid.glade.h
@@ -23,7 +23,7 @@ gchar *s = N_("Server Configuration");
 gchar *s = N_("Host:");
 gchar *s = N_("Username:");
 gchar *s = N_("Path:");
-gchar *s = N_("Delete mail from server");
+gchar *s = N_("Keep mail on server");
 gchar *s = N_("Authentication");
 gchar *s = N_("Authentication");
 gchar *s = N_("Authentication Type:");
@@ -49,17 +49,14 @@ gchar *s = N_("Account Properties");
 gchar *s = N_("Mail Account");
 gchar *s = N_("Type the name by which you would like to refer to these servers. For example: \"Work\" or \"Home\".");
 gchar *s = N_("User Information");
+gchar *s = N_("Select signature file");
 gchar *s = N_("Name:");
 gchar *s = N_("E-Mail Address:");
 gchar *s = N_("Reply-To:");
 gchar *s = N_("Organization:");
 gchar *s = N_("Signature:");
-gchar *s = N_("Select signature file");
 gchar *s = N_("General");
 gchar *s = N_("Incoming Mail Server");
-gchar *s = N_("Username:");
-gchar *s = N_("Password:");
-gchar *s = N_("Authentication:");
 gchar *s = N_("Save password");
 gchar *s = N_("This server requires a secure connection (SSL)");
 gchar *s = N_("Plain Text\n"
@@ -68,23 +65,27 @@ gchar *s = N_("Plain Text\n"
               "DIGEST-MD5\n"
               "");
 gchar *s = N_("Type:");
-gchar *s = N_("IMAP");
 gchar *s = N_("Hostname:");
-gchar *s = N_("Outgoing Mail Server");
+gchar *s = N_("Username:");
+gchar *s = N_("Password:");
+gchar *s = N_("IMAP");
 gchar *s = N_("Authentication:");
+gchar *s = N_("Outgoing Mail Server");
 gchar *s = N_("This server requires a secure connection (SSL)");
 gchar *s = N_("None\n"
               "CRAM-MD5\n"
               "");
 gchar *s = N_("Type:");
 gchar *s = N_("Hostname:");
+gchar *s = N_("Authentication:");
 gchar *s = N_("Sendmail\n"
               "SMTP\n"
               "");
 gchar *s = N_("Servers");
+gchar *s = N_("Server Timeouts");
+gchar *s = N_("Keep mail on server");
 gchar *s = N_("Automatically check mail every ");
 gchar *s = N_("minute(s)");
-gchar *s = N_("Server Timeouts");
 gchar *s = N_("Advanced");
 gchar *s = N_("Evolution Mail Configuration");
 gchar *s = N_("Account");
diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h
index 661eda3383..7672636db8 100644
--- a/mail/mail-config-druid.h
+++ b/mail/mail-config-druid.h
@@ -66,7 +66,7 @@ struct _MailConfigDruid {
 	GtkEntry *incoming_hostname;
 	GtkEntry *incoming_username;
 	GtkEntry *incoming_path;
-	GtkCheckBox *incoming_delete_mail;
+	GtkCheckBox *incoming_keep_mail;
 	
 	/* authentication */
 	GtkWidget *auth_text;
@@ -120,7 +120,7 @@ char *mail_config_druid_get_incoming_username (MailConfigDruid *druid);
 
 char *mail_config_druid_get_incoming_path (MailConfigDruid *druid);
 
-gboolean mail_config_druid_get_incoming_delete_mail (MailConfigDruid *druid);
+gboolean mail_config_druid_get_incoming_keep_mail (MailConfigDruid *druid);
 
 int mail_config_druid_get_auth_type (MailConfigDruid *druid);
 
-- 
cgit v1.2.3