Set the text of the reply-to. (mail_account_gui_save): Get the reply-to

2002-04-12  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-account-gui.c (mail_account_gui_new): Set the text of the
	reply-to.
	(mail_account_gui_save): Get the reply-to text here.
	(mail_account_gui_identity_complete): If there is text in the
	reply-to widget make sure it's valid.

	* mail-config.c (identity_copy): Copy the reply-to.
	(config_read): Read in the reply-to for all the accounts.
	(mail_config_write): Save the reply-to.
	(impl_GNOME_Evolution_MailConfig_addAccount): Get the reply-to.
	(identity_destroy): Free the reply-to.

svn path=/trunk/; revision=16446

8 files changed, 380 insertions, 127 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index b4a69cf3bd..8c03c58e1c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,17 @@
+2002-04-12  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-account-gui.c (mail_account_gui_new): Set the text of the
+	reply-to.
+	(mail_account_gui_save): Get the reply-to text here.
+	(mail_account_gui_identity_complete): If there is text in the
+	reply-to widget make sure it's valid.
+
+	* mail-config.c (identity_copy): Copy the reply-to.
+	(config_read): Read in the reply-to for all the accounts.
+	(mail_config_write): Save the reply-to.
+	(impl_GNOME_Evolution_MailConfig_addAccount): Get the reply-to.
+	(identity_destroy): Free the reply-to.
+
 2002-04-11  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* message-list.etspec: s/Sent/Date. This fixes bug #11159.
diff --git a/mail/Mail.idl b/mail/Mail.idl
index eedf2bcce8..01f4bb2dfb 100644
--- a/mail/Mail.idl
+++ b/mail/Mail.idl
@@ -44,6 +44,7 @@ module Evolution {
 		struct Identity {
 			string name;
 			string address;
+			string reply_to;
 			string organization;
 		};
 
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index f5b1795453..cbe13958db 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -106,6 +106,7 @@ mail_account_gui_identity_complete (MailAccountGui *gui, GtkWidget **incomplete)
 		if (incomplete)
 			*incomplete = get_focused_widget (GTK_WIDGET (gui->full_name),
 							  GTK_WIDGET (gui->email_address),
+							  GTK_WIDGET (gui->reply_to),
 							  NULL);
 		return FALSE;
 	}
@@ -115,6 +116,18 @@ mail_account_gui_identity_complete (MailAccountGui *gui, GtkWidget **incomplete)
 		if (incomplete)
 			*incomplete = get_focused_widget (GTK_WIDGET (gui->email_address),
 							  GTK_WIDGET (gui->full_name),
+							  GTK_WIDGET (gui->reply_to),
+							  NULL);
+		return FALSE;
+	}
+	
+	/* make sure that if the reply-to field is filled in, that it is valid */
+	text = gtk_entry_get_text (gui->reply_to);
+	if (text && *text && !is_email (text)) {
+		if (incomplete)
+			*incomplete = get_focused_widget (GTK_WIDGET (gui->reply_to),
+							  GTK_WIDGET (gui->email_address),
+							  GTK_WIDGET (gui->full_name),
 							  NULL);
 		return FALSE;
 	}
@@ -1393,6 +1406,7 @@ mail_account_gui_new (MailConfigAccount *account, MailAccountsTab *dialog)
 	/* Identity */
 	gui->full_name = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_full_name"));
 	gui->email_address = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_address"));
+	gui->reply_to = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_reply_to"));
 	gui->organization = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_organization"));
 	
 	prepare_signatures (gui);
@@ -1402,6 +1416,8 @@ mail_account_gui_new (MailConfigAccount *account, MailAccountsTab *dialog)
 			e_utf8_gtk_entry_set_text (gui->full_name, account->id->name);
 		if (account->id->address)
 			gtk_entry_set_text (gui->email_address, account->id->address);
+		if (account->id->reply_to)
+			gtk_entry_set_text (gui->reply_to, account->id->reply_to);
 		if (account->id->organization)
 			e_utf8_gtk_entry_set_text (gui->organization, account->id->organization);
 		
@@ -1829,6 +1845,7 @@ mail_account_gui_save (MailAccountGui *gui)
 	account->id = g_new0 (MailConfigIdentity, 1);
 	account->id->name = e_utf8_gtk_entry_get_text (gui->full_name);
 	account->id->address = e_utf8_gtk_entry_get_text (gui->email_address);
+	account->id->reply_to = e_utf8_gtk_entry_get_text (gui->reply_to);
 	account->id->organization = e_utf8_gtk_entry_get_text (gui->organization);
 	
 	sig_set_and_write (gui);
diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h
index 6a6735bf48..121b5bb59c 100644
--- a/mail/mail-account-gui.h
+++ b/mail/mail-account-gui.h
@@ -66,6 +66,7 @@ typedef struct {
 	/* identity */
 	GtkEntry *full_name;
 	GtkEntry *email_address;
+	GtkEntry *reply_to;
 	GtkEntry *organization;
 
 	/* signatures */
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 39c3126f8a..a33237acf2 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -353,7 +353,7 @@ composer_sent_cb (char *uri, CamelMimeMessage *message, gboolean sent, void *dat
 		}
 		gtk_widget_destroy (GTK_WIDGET (send->composer));
 	} else {
-		e_msg_composer_set_enable_autosave(send->composer, TRUE);
+		e_msg_composer_set_enable_autosave (send->composer, TRUE);
 		gtk_widget_show (GTK_WIDGET (send->composer));
 		gtk_object_unref (GTK_OBJECT (send->composer));
 	}
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 498ebcf623..e607019636 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -181,6 +181,7 @@ identity_copy (const MailConfigIdentity *id)
 	new = g_new0 (MailConfigIdentity, 1);
 	new->name = g_strdup (id->name);
 	new->address = g_strdup (id->address);
+	new->reply_to = g_strdup (id->reply_to);
 	new->organization = g_strdup (id->organization);
 	new->text_signature = id->text_signature;
 	new->text_random = id->text_random;
@@ -198,6 +199,7 @@ identity_destroy (MailConfigIdentity *id)
 	
 	g_free (id->name);
 	g_free (id->address);
+	g_free (id->reply_to);
 	g_free (id->organization);
 	
 	g_free (id);
@@ -719,6 +721,10 @@ config_read (void)
 		id->address = bonobo_config_get_string (config->db, path, NULL);
 		g_free (path);
 		
+		path = g_strdup_printf ("/Mail/Accounts/identity_reply_to_%d", i);
+		id->reply_to = bonobo_config_get_string (config->db, path, NULL);
+		g_free (path);
+		
 		path = g_strdup_printf ("/Mail/Accounts/identity_organization_%d", i);
 		id->organization = bonobo_config_get_string (config->db, path, NULL);
 		g_free (path);
@@ -727,19 +733,19 @@ config_read (void)
 		path = g_strdup_printf ("/Mail/Accounts/identity_signature_text_%d", i);
 		id->text_signature = lookup_signature (bonobo_config_get_long_with_default (config->db, path, -1, NULL));
 		g_free (path);
-
+		
 		path = g_strdup_printf ("/Mail/Accounts/identity_signature_html_%d", i);
 		id->html_signature = lookup_signature (bonobo_config_get_long_with_default (config->db, path, -1, NULL));
 		g_free (path);
-
+		
 		path = g_strdup_printf ("/Mail/Accounts/identity_signature_text_random_%d", i);
 		id->text_random = bonobo_config_get_boolean_with_default (config->db, path, FALSE, NULL);
 		g_free (path);
-
+		
 		path = g_strdup_printf ("/Mail/Accounts/identity_signature_html_random_%d", i);
 		id->html_random = bonobo_config_get_boolean_with_default (config->db, path, FALSE, NULL);
 		g_free (path);
-
+		
 		/* get the source */
 		source = g_new0 (MailConfigService, 1);
 		
@@ -1121,12 +1127,16 @@ mail_config_write (void)
 		bonobo_config_set_string_wrapper (config->db, path, account->id->address, NULL);
 		g_free (path);
 		
+		path = g_strdup_printf ("/Mail/Accounts/identity_reply_to_%d", i);
+		bonobo_config_set_string_wrapper (config->db, path, account->id->reply_to, NULL);
+		g_free (path);
+		
 		path = g_strdup_printf ("/Mail/Accounts/identity_organization_%d", i);
 		bonobo_config_set_string_wrapper (config->db, path, account->id->organization, NULL);
 		g_free (path);
 		
 		mail_config_write_account_sig (account, i);
-
+		
 		/* source info */
 		path = g_strdup_printf ("/Mail/Accounts/source_url_%d", i);
 		bonobo_config_set_string_wrapper (config->db, path, account->source->url, NULL);
@@ -2845,6 +2855,7 @@ impl_GNOME_Evolution_MailConfig_addAccount (PortableServer_Servant servant,
 	mail_id = g_new0 (MailConfigIdentity, 1);
 	mail_id->name = g_strdup (id.name);
 	mail_id->address = g_strdup (id.address);
+	mail_id->reply_to = g_strdup (id.reply_to);
 	mail_id->organization = g_strdup (id.organization);
 	
 	mail_account->id = mail_id;
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 013f317691..102530307b 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -205,7 +205,7 @@ Click &quot;Finish&quot; to save your settings.</text>
   <class>GtkWindow</class>
   <name>account_editor</name>
   <visible>False</visible>
-  <title>window1</title>
+  <title>Account Editor</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
@@ -234,7 +234,7 @@ Click &quot;Finish&quot; to save your settings.</text>
 
       <widget>
 	<class>GtkFrame</class>
-	<name>management_frame</name>
+	<name>frameManagement</name>
 	<border_width>3</border_width>
 	<label>Account Information</label>
 	<label_xalign>0</label_xalign>
@@ -272,7 +272,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 
 	  <widget>
 	    <class>GtkHBox</class>
-	    <name>hbox24</name>
+	    <name>hboxIdentityName</name>
 	    <border_width>3</border_width>
 	    <homogeneous>False</homogeneous>
 	    <spacing>4</spacing>
@@ -347,7 +347,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 
 	<widget>
 	  <class>GtkTable</class>
-	  <name>table1</name>
+	  <name>identity_required_table</name>
 	  <border_width>3</border_width>
 	  <rows>2</rows>
 	  <columns>2</columns>
@@ -477,9 +477,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 
 	<widget>
 	  <class>GtkTable</class>
-	  <name>table2</name>
+	  <name>identity_optional_table</name>
 	  <border_width>3</border_width>
-	  <rows>3</rows>
+	  <rows>4</rows>
 	  <columns>4</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>3</row_spacing>
@@ -499,8 +499,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</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>False</xexpand>
@@ -526,8 +526,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -553,8 +553,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -577,8 +577,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>1</left_attach>
 	      <right_attach>4</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>
@@ -599,8 +599,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>3</left_attach>
 	      <right_attach>4</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -621,8 +621,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>3</left_attach>
 	      <right_attach>4</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -643,8 +643,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>2</left_attach>
 	      <right_attach>3</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -665,8 +665,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <child>
 	      <left_attach>2</left_attach>
 	      <right_attach>3</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -690,8 +690,8 @@ Random
 	    <child>
 	      <left_attach>1</left_attach>
 	      <right_attach>2</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -714,8 +714,59 @@ Random
 	    <child>
 	      <left_attach>1</left_attach>
 	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_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>GtkLabel</class>
+	    <name>reply_to_label</name>
+	    <label>_Reply-To:</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <default_focus_target>identity_reply_to</default_focus_target>
+	    <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>GtkEntry</class>
+	    <name>identity_reply_to</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>0</top_attach>
+	      <bottom_attach>1</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>True</xexpand>
@@ -4317,124 +4368,225 @@ Quoted
   <auto_shrink>False</auto_shrink>
 
   <widget>
-    <class>GtkHBox</class>
+    <class>GtkNotebook</class>
     <name>toplevel</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>Custom</class>
-      <name>etableMailAccounts</name>
-      <creation_function>mail_accounts_etable_new</creation_function>
-      <int1>0</int1>
-      <int2>0</int2>
-      <last_modification_time>Thu, 28 Mar 2002 21:15:54 GMT</last_modification_time>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
+    <can_focus>True</can_focus>
+    <show_tabs>True</show_tabs>
+    <show_border>True</show_border>
+    <tab_pos>GTK_POS_TOP</tab_pos>
+    <scrollable>False</scrollable>
+    <tab_hborder>2</tab_hborder>
+    <tab_vborder>2</tab_vborder>
+    <popup_enable>False</popup_enable>
 
     <widget>
-      <class>GtkVBox</class>
-      <name>vbox</name>
+      <class>GtkHBox</class>
+      <name>vboxMailAccounts</name>
       <homogeneous>False</homogeneous>
       <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
 
       <widget>
-	<class>GtkLabel</class>
-	<name>label420</name>
-	<label>
-</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
+	<class>Custom</class>
+	<name>etableMailAccounts</name>
+	<creation_function>mail_accounts_etable_new</creation_function>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 28 Mar 2002 21:15:54 GMT</last_modification_time>
 	<child>
 	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
+	  <expand>True</expand>
+	  <fill>True</fill>
 	</child>
       </widget>
 
       <widget>
-	<class>GtkVButtonBox</class>
-	<name>vbuttonbox1</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
+	<class>GtkVBox</class>
+	<name>vboxMailFunctions</name>
+	<homogeneous>False</homogeneous>
 	<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>
+	  <fill>True</fill>
 	</child>
 
 	<widget>
-	  <class>GtkButton</class>
-	  <name>cmdAccountAdd</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <class>GtkLabel</class>
+	  <name>lblMailSpacer</name>
+	  <label>
+</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>
 	</widget>
 
 	<widget>
-	  <class>GtkButton</class>
-	  <name>cmdAccountEdit</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>_Edit</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonboxMailAccounts</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>GtkButton</class>
+	    <name>cmdAccountAdd</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>_Add</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdAccountEdit</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>_Edit</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdAccountDelete</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>_Delete</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
 	</widget>
 
 	<widget>
-	  <class>GtkButton</class>
-	  <name>cmdAccountDelete</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <class>GtkLabel</class>
+	  <name>label421</name>
+	  <label>
+</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>
+	</widget>
+
+	<widget>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonboxMailExtras</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>True</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdAccountDefault</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>De_fault</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdAccountAble</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>E_nable</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
 	</widget>
       </widget>
+    </widget>
+
+    <widget>
+      <class>GtkLabel</class>
+      <child_name>Notebook:tab</child_name>
+      <name>lblMailAccounts</name>
+      <label>Mail Accounts</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>GtkHBox</class>
+      <name>hboxNews</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
 
       <widget>
-	<class>GtkLabel</class>
-	<name>label421</name>
-	<label>
-</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
+	<class>GtkScrolledWindow</class>
+	<name>scrolledNewsServers</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>GtkCList</class>
+	  <name>clistNewsServers</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>
+	    <child_name>CList:title</child_name>
+	    <name>lblNewsServers</name>
+	    <label>News Servers</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>
 
       <widget>
-	<class>GtkVButtonBox</class>
-	<name>vbuttonbox2</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
+	<class>GtkVBox</class>
+	<name>vboxNewsFunctions</name>
+	<homogeneous>False</homogeneous>
 	<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>True</expand>
@@ -4442,24 +4594,80 @@ Quoted
 	</child>
 
 	<widget>
-	  <class>GtkButton</class>
-	  <name>cmdAccountDefault</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>De_fault</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <class>GtkLabel</class>
+	  <name>labelNewsSpacer</name>
+	  <label>
+</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>
 	</widget>
 
 	<widget>
-	  <class>GtkButton</class>
-	  <name>cmdAccountAble</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>E_nable</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonboxNewsServers</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>True</fill>
+	  </child>
+
+	  <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>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>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>
       </widget>
     </widget>
+
+    <widget>
+      <class>GtkLabel</class>
+      <child_name>Notebook:tab</child_name>
+      <name>lblNewsServers</name>
+      <label>News Servers</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>
 
@@ -5497,7 +5705,7 @@ Baltic (ISO-8859-4)
 	      <class>GtkOptionMenu</class>
 	      <name>omenuCharset</name>
 	      <can_focus>True</can_focus>
-	      <items>Baltic (IS0-8859-13)
+	      <items>Baltic (ISO-8859-13)
 Baltic (ISO-8859-4)
 </items>
 	      <initial_choice>0</initial_choice>
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 4d34374d9a..6d70a3a120 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -43,8 +43,9 @@ typedef struct {
 typedef struct {
 	char *name;
 	char *address;
+	char *reply_to;
 	char *organization;
-
+	
 	MailConfigSignature *text_signature;
 	gboolean text_random;
 	MailConfigSignature *html_signature;