Re: [evolution-patches] Patch for mail-config glade higification



On Sun, 2004-01-11 at 15:33, JP Rosevear wrote:
> On Mon, 2003-12-08 at 19:31, Martyn Russell wrote:
> > I have revitalised this patch to work with the current CVS repository as
> > of tonight.  Let me know if there are any further changes needed.
> 
> Could you do a quick revitalisation again for me?
> 

Here is that quick patch revitalisation you requested - AGAIN,
(the first send doesn't seem to have appeared on the mailing list).

I have also done some screenshots here:
http://gnome-jabber.sourceforge.net/e1.5/screenshot-comp-prefs-general.png
http://gnome-jabber.sourceforge.net/e1.5/screenshot-mail-acc-identity.png
http://gnome-jabber.sourceforge.net/e1.5/screenshot-mail-acc-receiving.png
http://gnome-jabber.sourceforge.net/e1.5/screenshot-mail-acc-security.png
http://gnome-jabber.sourceforge.net/e1.5/screenshot-mail-acc-sending.png
http://gnome-jabber.sourceforge.net/e1.5/screenshot-mail-prefs-general.png
http://gnome-jabber.sourceforge.net/e1.5/screenshot-mail-prefs-headers.png

Let me know if you need anymore on this patch!

-- 
Regards,
Martyn
? .README.swp
? 1
? a.diff
? mail-config.patch4
? addressbook/gui/component/apps_evolution_addressbook-1.5.schemas
? calendar/common/Makefile
? calendar/common/Makefile.in
? calendar/gui/apps_evolution_calendar-1.5.schemas
? mail/evolution-mail-1.5.schemas
? mail/local-config.gladep
? mail/mail-search.gladep
? mail/mail-security.gladep
? mail/message-tags.gladep
? shell/apps_evolution_shell-1.5.schemas
Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1955
diff -r1.1955 ChangeLog
0a1,5
> 2004-01-17  Martyn Russell  <ginxd btopenworld com>
> 
> 	* providers/smtp/camel-smtp-provider.c: 
> 	- Removed \n from the "using SMTP" message.
> 
Index: camel/providers/smtp/camel-smtp-provider.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/smtp/camel-smtp-provider.c,v
retrieving revision 1.28
diff -r1.28 camel-smtp-provider.c
40c40
< 	   "using SMTP.\n"),
---
> 	   "using SMTP."),
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2981
diff -r1.2981 ChangeLog
0a1,5
> 2004-01-17  Martyn Russell  <ginxd btopenworld com>
> 
> 	* mail-account-gui.c (source_type_changed): 
> 	- Added fix to show SSL or message when SSL is unavailable.
> 	
Index: mail/local-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/local-config.glade,v
retrieving revision 1.10
diff -r1.10 local-config.glade
4a5
> <requires lib="gnome"/>
13c14
<   <property name="resizable">True</property>
---
>   <property name="resizable">False</property>
15c16
<   <property name="has_separator">True</property>
---
>   <property name="has_separator">False</property>
21c22
<       <property name="spacing">6</property>
---
>       <property name="spacing">12</property>
62d62
< 	  <property name="border_width">3</property>
80c80
< 		  <property name="yalign">0.5</property>
---
> 		  <property name="yalign">0</property>
88,89c88,89
< 	      <property name="expand">True</property>
< 	      <property name="fill">True</property>
---
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
96c96
< 	      <property name="label" translatable="yes">Note: When converting between mailbox formats, a failure
---
> 	      <property name="label" translatable="yes">When converting between mailbox formats, a failure
129c129
< 	  <property name="expand">True</property>
---
> 	  <property name="expand">False</property>
136d135
< 	  <property name="border_width">2</property>
142c141
< 	  <property name="column_spacing">6</property>
---
> 	  <property name="column_spacing">12</property>
147c146
< 	      <property name="label" translatable="yes">New store format:</property>
---
> 	      <property name="label" translatable="yes">New Format:</property>
153c152
< 	      <property name="xalign">1</property>
---
> 	      <property name="xalign">0</property>
171c170
< 	      <property name="label" translatable="yes">Current store format:</property>
---
> 	      <property name="label" translatable="yes">Current Format:</property>
177c176
< 	      <property name="xalign">1</property>
---
> 	      <property name="xalign">0</property>
203c202
< 	      <property name="xpad">8</property>
---
> 	      <property name="xpad">0</property>
243c242
< 	      <property name="label" translatable="yes">Index body contents</property>
---
> 	      <property name="label" translatable="yes">Index Body Contents</property>
317c316
< 	  <property name="expand">True</property>
---
> 	  <property name="expand">False</property>
Index: mail/mail-account-gui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-account-gui.c,v
retrieving revision 1.142
diff -r1.142 mail-account-gui.c
502a503
> 
549c550
< 		if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL)
---
> 		if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) 
552a554
> 
565a568,576
> 			
> 		/* security */
> 		frame = glade_xml_get_widget (gui->xml, "source_security_frame");
> 		if (provider && CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH)) {
> 			build_auth_menu (&gui->source, provider->authtypes, NULL, FALSE);
> 			gtk_widget_show (frame);
> 		} else
> 			gtk_widget_hide (frame);
> 
569a581,582
> 		frame = glade_xml_get_widget (gui->xml, "source_security_frame");
> 		gtk_widget_hide (frame);
592a606,609
> 
> 	widget = glade_xml_get_widget (gui->xml, "transport_security_frame");
> 	gtk_widget_set_sensitive (widget, need);
> 
629c646
< 		if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL)
---
> 		if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) {
631c648,649
< 		else
---
> 			gtk_widget_hide (gui->transport.no_ssl);
> 		} else {
633c651,652
< 		gtk_widget_hide (gui->transport.no_ssl);
---
> 			gtk_widget_show (gui->transport.no_ssl);
> 		}
645c664,673
< 	} else
---
> 
> 		/* security */
> 		frame = glade_xml_get_widget (gui->xml, "transport_security_frame");
> 		if (CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH) &&
> 		    !CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_AUTH))
> 			gtk_widget_show (frame);
> 		else 
> 			gtk_widget_hide (frame);
> 
> 	} else {
646a675,679
> 
> 		/* security */
> 		frame = glade_xml_get_widget (gui->xml, "transport_security_frame");
> 		gtk_widget_hide (frame);
> 	}
Index: mail/mail-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.glade,v
retrieving revision 1.127
diff -r1.127 mail-config.glade
175c175
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
178c178
< 	  <property name="spacing">3</property>
---
> 	  <property name="spacing">18</property>
181c181
< 	    <widget class="GtkVBox" id="identity_vbox">
---
> 	    <widget class="GtkVBox" id="management_frame">
184c184
< 	      <property name="spacing">3</property>
---
> 	      <property name="spacing">6</property>
187c187
< 		<widget class="GtkFrame" id="management_frame">
---
> 		<widget class="GtkLabel" id="label470">
189,191c189,211
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Account Information&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox172">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
194,195c214
< 		    <widget class="GtkVBox" id="account_vbox">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkLabel" id="label471">
197,198c216,232
< 		      <property name="homogeneous">False</property>
< 		      <property name="spacing">3</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
200,220c234,241
< 		      <child>
< 			<widget class="GtkLabel" id="management_description_label">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
< For example: &quot;Work&quot; or &quot;Personal&quot;</property>
< 			  <property name="use_underline">False</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">3</property>
< 			  <property name="ypad">3</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">True</property>
< 			</packing>
< 		      </child>
---
> 		  <child>
> 		    <widget class="GtkTable" id="table12">
> 		      <property name="visible">True</property>
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
223,224c244
< 			<widget class="GtkHBox" id="hboxIdentityName">
< 			  <property name="border_width">3</property>
---
> 			<widget class="GtkVBox" id="account_vbox">
227c247
< 			  <property name="spacing">4</property>
---
> 			  <property name="spacing">6</property>
230c250
< 			    <widget class="GtkLabel" id="management_name_label">
---
> 			    <widget class="GtkLabel" id="management_description_label">
232,235c252,256
< 			      <property name="label" translatable="yes">_Name:</property>
< 			      <property name="use_underline">True</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
---
> 			      <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
> For example: &quot;Work&quot; or &quot;Personal&quot;</property>
> 			      <property name="use_underline">False</property>
> 			      <property name="use_markup">True</property>
> 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
238c259
< 			      <property name="xalign">0.5</property>
---
> 			      <property name="xalign">0</property>
242d262
< 			      <property name="mnemonic_widget">management_name</property>
247c267
< 			      <property name="fill">False</property>
---
> 			      <property name="fill">True</property>
252c272
< 			    <widget class="GtkEntry" id="management_name">
---
> 			    <widget class="GtkHBox" id="hboxIdentityName">
254,261c274,317
< 			      <property name="can_focus">True</property>
< 			      <property name="editable">True</property>
< 			      <property name="visibility">True</property>
< 			      <property name="max_length">0</property>
< 			      <property name="text" translatable="yes"></property>
< 			      <property name="has_frame">True</property>
< 			      <property name="invisible_char" translatable="yes">*</property>
< 			      <property name="activates_default">False</property>
---
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">12</property>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="management_name_label">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">_Name:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_RIGHT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">management_name</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkEntry" id="management_name">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="has_focus">True</property>
> 				  <property name="editable">True</property>
> 				  <property name="visibility">True</property>
> 				  <property name="max_length">0</property>
> 				  <property name="text" translatable="yes"></property>
> 				  <property name="has_frame">True</property>
> 				  <property name="invisible_char" translatable="yes">*</property>
> 				  <property name="activates_default">False</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">True</property>
> 				  <property name="fill">True</property>
> 				</packing>
> 			      </child>
265c321
< 			      <property name="expand">True</property>
---
> 			      <property name="expand">False</property>
271,291c327,330
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">True</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="management_default">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">_Make this my default account</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
294a334,338
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
295a340,386
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="identity_required_frame">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label464">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Required Information&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox170">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
298c389
< 		    <widget class="GtkLabel" id="label1">
---
> 		    <widget class="GtkLabel" id="label465">
300c391
< 		      <property name="label" translatable="yes">Account Information</property>
---
> 		      <property name="label" translatable="yes"></property>
308c399
< 		      <property name="xpad">0</property>
---
> 		      <property name="xpad">12</property>
312c403,405
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
315,328d407
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">False</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="identity_required_frame">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
331,332c410
< 		    <widget class="GtkTable" id="identity_required_table">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkTable" id="table10">
334,335c412,413
< 		      <property name="n_rows">2</property>
< 		      <property name="n_columns">2</property>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
337c415
< 		      <property name="row_spacing">6</property>
---
> 		      <property name="row_spacing">2</property>
341,362c419
< 			<widget class="GtkEntry" id="identity_address">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="identity_address_label">
---
> 			<widget class="GtkTable" id="identity_required_table">
364,384c421,425
< 			  <property name="label" translatable="yes">Email _address:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">identity_address</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
---
> 			  <property name="n_rows">2</property>
> 			  <property name="n_columns">2</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">6</property>
> 			  <property name="column_spacing">12</property>
386,409c427,446
< 		      <child>
< 			<widget class="GtkLabel" id="identity_full_name_label">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">_Full name:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">identity_full_name</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
---
> 			  <child>
> 			    <widget class="GtkEntry" id="identity_address">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes"></property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
411,421c448,517
< 		      <child>
< 			<widget class="GtkEntry" id="identity_full_name">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
---
> 			  <child>
> 			    <widget class="GtkLabel" id="identity_address_label">
> 			      <property name="visible">True</property>
> 			      <property name="label" translatable="yes">Email _Address:</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="use_markup">False</property>
> 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			      <property name="wrap">False</property>
> 			      <property name="selectable">False</property>
> 			      <property name="xalign">0</property>
> 			      <property name="yalign">0.5</property>
> 			      <property name="xpad">0</property>
> 			      <property name="ypad">0</property>
> 			      <property name="mnemonic_widget">identity_address</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkLabel" id="identity_full_name_label">
> 			      <property name="visible">True</property>
> 			      <property name="label" translatable="yes">_Full Name:</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="use_markup">False</property>
> 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			      <property name="wrap">False</property>
> 			      <property name="selectable">False</property>
> 			      <property name="xalign">0</property>
> 			      <property name="yalign">0.5</property>
> 			      <property name="xpad">0</property>
> 			      <property name="ypad">0</property>
> 			      <property name="mnemonic_widget">identity_full_name</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="identity_full_name">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes"></property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
424,425c520,521
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
428d523
< 			  <property name="y_options"></property>
431a527,531
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
432a533,579
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="identity_optional_frame">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label466">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Optional Information&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox171">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
435c582
< 		    <widget class="GtkLabel" id="label2">
---
> 		    <widget class="GtkLabel" id="label467">
437c584
< 		      <property name="label" translatable="yes">Required Information</property>
---
> 		      <property name="label" translatable="yes"></property>
445c592
< 		      <property name="xpad">0</property>
---
> 		      <property name="xpad">12</property>
449c596,598
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
452,465d600
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">True</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="identity_optional_frame">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
468,469c603
< 		    <widget class="GtkTable" id="identity_optional_table">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkTable" id="table11">
471,472c605,606
< 		      <property name="n_rows">3</property>
< 		      <property name="n_columns">2</property>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
474c608
< 		      <property name="row_spacing">6</property>
---
> 		      <property name="row_spacing">2</property>
478,503c612
< 			<widget class="GtkLabel" id="identity_organization_label">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Or_ganization:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">identity_organization</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="sigLabel">
---
> 			<widget class="GtkTable" id="identity_optional_table">
505,524c614,618
< 			  <property name="label" translatable="yes">_Default signature:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
---
> 			  <property name="n_rows">4</property>
> 			  <property name="n_columns">2</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">6</property>
> 			  <property name="column_spacing">12</property>
526,545c620,639
< 		      <child>
< 			<widget class="GtkEntry" id="identity_organization">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
---
> 			  <child>
> 			    <widget class="GtkCheckButton" id="management_default">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">_Make this my default account</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
547,597c641,664
< 		      <child>
< 			<widget class="GtkLabel" id="reply_to_label">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Re_ply-To:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">identity_reply_to</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkEntry" id="identity_reply_to">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkHBox" id="hbox169">
< 			  <property name="visible">True</property>
< 			  <property name="homogeneous">False</property>
< 			  <property name="spacing">5</property>
---
> 			  <child>
> 			    <widget class="GtkLabel" id="sigLabel">
> 			      <property name="visible">True</property>
> 			      <property name="label" translatable="yes">Signat_ure:</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="use_markup">False</property>
> 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			      <property name="wrap">False</property>
> 			      <property name="selectable">False</property>
> 			      <property name="xalign">0</property>
> 			      <property name="yalign">0.5</property>
> 			      <property name="xpad">0</property>
> 			      <property name="ypad">0</property>
> 			      <property name="mnemonic_widget">sigOption</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">3</property>
> 			      <property name="bottom_attach">4</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
600c667
< 			    <widget class="GtkOptionMenu" id="sigOption">
---
> 			    <widget class="GtkHBox" id="hbox169">
602,603c669,670
< 			      <property name="can_focus">True</property>
< 			      <property name="history">0</property>
---
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
605,606c672,673
< 			      <child internal-child="menu">
< 				<widget class="GtkMenu" id="convertwidget1">
---
> 			      <child>
> 				<widget class="GtkOptionMenu" id="sigOption">
607a675,676
> 				  <property name="can_focus">True</property>
> 				  <property name="history">0</property>
609,610c678,679
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget2">
---
> 				  <child internal-child="menu">
> 				    <widget class="GtkMenu" id="convertwidget1">
612,613c681,688
< 				      <property name="label" translatable="yes">Default</property>
< 				      <property name="use_underline">True</property>
---
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget2">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Default</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
616a692,713
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkButton" id="sigAddNew">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="label" translatable="yes">Add Ne_w Signature...</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="relief">GTK_RELIEF_NORMAL</property>
> 				  <signal name="clicked" handler="sigAddNewClicked"/>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				  <property name="pack_type">GTK_PACK_END</property>
> 				</packing>
620,622c717,722
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
---
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">3</property>
> 			      <property name="bottom_attach">4</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options">fill</property>
627c727
< 			    <widget class="GtkButton" id="sigAddNew">
---
> 			    <widget class="GtkEntry" id="identity_organization">
630c730,750
< 			      <property name="label" translatable="yes">Add new signature...</property>
---
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes"></property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">2</property>
> 			      <property name="bottom_attach">3</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkLabel" id="identity_organization_label">
> 			      <property name="visible">True</property>
> 			      <property name="label" translatable="yes">Or_ganization:</property>
632,633c752,760
< 			      <property name="relief">GTK_RELIEF_NORMAL</property>
< 			      <signal name="clicked" handler="sigAddNewClicked"/>
---
> 			      <property name="use_markup">False</property>
> 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			      <property name="wrap">False</property>
> 			      <property name="selectable">False</property>
> 			      <property name="xalign">0</property>
> 			      <property name="yalign">0.5</property>
> 			      <property name="xpad">0</property>
> 			      <property name="ypad">0</property>
> 			      <property name="mnemonic_widget">identity_organization</property>
636,639c763,814
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			      <property name="pack_type">GTK_PACK_END</property>
---
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">2</property>
> 			      <property name="bottom_attach">3</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="identity_reply_to">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes"></property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkLabel" id="reply_to_label">
> 			      <property name="visible">True</property>
> 			      <property name="label" translatable="yes">Re_ply-To:</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="use_markup">False</property>
> 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
> 			      <property name="wrap">False</property>
> 			      <property name="selectable">False</property>
> 			      <property name="xalign">0</property>
> 			      <property name="yalign">0.5</property>
> 			      <property name="xpad">0</property>
> 			      <property name="ypad">0</property>
> 			      <property name="mnemonic_widget">identity_reply_to</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
644,649c819,822
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options">fill</property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
653,668d825
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label3">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Optional Information</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
670c827,829
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
676c835
< 		  <property name="expand">False</property>
---
> 		  <property name="expand">True</property>
683,684c842,843
< 	      <property name="expand">True</property>
< 	      <property name="fill">True</property>
---
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
697c856
< 	  <property name="label" translatable="yes">_Identity</property>
---
> 	  <property name="label" translatable="yes">Identity</property>
715c874
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
718c877
< 	  <property name="spacing">3</property>
---
> 	  <property name="spacing">18</property>
724c883
< 	      <property name="spacing">3</property>
---
> 	      <property name="spacing">18</property>
729,730c888,889
< 		  <property name="n_rows">1</property>
< 		  <property name="n_columns">2</property>
---
> 		  <property name="n_rows">2</property>
> 		  <property name="n_columns">3</property>
732,733c891,892
< 		  <property name="row_spacing">0</property>
< 		  <property name="column_spacing">3</property>
---
> 		  <property name="row_spacing">6</property>
> 		  <property name="column_spacing">12</property>
744c903
< 		      <property name="xalign">1</property>
---
> 		      <property name="xalign">0</property>
821,833d979
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">False</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkHBox" id="hboxSourceDescription">
< 		  <property name="visible">True</property>
< 		  <property name="homogeneous">False</property>
< 		  <property name="spacing">3</property>
836c982
< 		    <widget class="GtkLabel" id="label442">
---
> 		    <widget class="GtkLabel" id="source_description">
838c984
< 		      <property name="label" translatable="yes">Description:</property>
---
> 		      <property name="label" translatable="yes">description</property>
841,842c987,988
< 		      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 		      <property name="wrap">False</property>
---
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">True</property>
844,845c990,991
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
---
> 		      <property name="xalign">0</property>
> 		      <property name="yalign">0</property>
850,852c996,1000
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">True</property>
---
> 		      <property name="left_attach">1</property>
> 		      <property name="right_attach">3</property>
> 		      <property name="top_attach">1</property>
> 		      <property name="bottom_attach">2</property>
> 		      <property name="y_options"></property>
857c1005
< 		    <widget class="GtkLabel" id="source_description">
---
> 		    <widget class="GtkFixed" id="fixed1">
859c1007,1020
< 		      <property name="label" translatable="yes">description</property>
---
> 		    </widget>
> 		    <packing>
> 		      <property name="left_attach">2</property>
> 		      <property name="right_attach">3</property>
> 		      <property name="top_attach">0</property>
> 		      <property name="bottom_attach">1</property>
> 		      <property name="y_options">fill</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label442">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes">Description:</property>
862c1023
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
---
> 		      <property name="justify">GTK_JUSTIFY_CENTER</property>
871,873c1032,1036
< 		      <property name="padding">0</property>
< 		      <property name="expand">True</property>
< 		      <property name="fill">True</property>
---
> 		      <property name="left_attach">0</property>
> 		      <property name="right_attach">1</property>
> 		      <property name="top_attach">1</property>
> 		      <property name="bottom_attach">2</property>
> 		      <property name="x_options">fill</property>
880c1043
< 		  <property name="fill">True</property>
---
> 		  <property name="fill">False</property>
885c1048
< 		<widget class="GtkFrame" id="source_frame">
---
> 		<widget class="GtkHSeparator" id="hseparator2">
887,889c1050,1083
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkVBox" id="source_frame">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">6</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label472">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Configuration&lt;/span&gt;</property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">True</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">0</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
892,893c1086
< 		    <widget class="GtkTable" id="table4">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkHBox" id="hbox173">
895,896d1087
< 		      <property name="n_rows">5</property>
< 		      <property name="n_columns">2</property>
898,899c1089
< 		      <property name="row_spacing">6</property>
< 		      <property name="column_spacing">6</property>
---
> 		      <property name="spacing">0</property>
902c1092
< 			<widget class="GtkLabel" id="source_host_label">
---
> 			<widget class="GtkLabel" id="label473">
904,905c1094,1095
< 			  <property name="label" translatable="yes">_Host:</property>
< 			  <property name="use_underline">True</property>
---
> 			  <property name="label" translatable="yes"></property>
> 			  <property name="use_underline">False</property>
910c1100
< 			  <property name="xalign">0</property>
---
> 			  <property name="xalign">0.5</property>
912c1102
< 			  <property name="xpad">0</property>
---
> 			  <property name="xpad">12</property>
914d1103
< 			  <property name="mnemonic_widget">source_host</property>
917,922c1106,1108
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
---
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
927c1113
< 			<widget class="GtkLabel" id="source_user_label">
---
> 			<widget class="GtkTable" id="table13">
929,939c1115,1284
< 			  <property name="label" translatable="yes">User_name:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">source_user</property>
---
> 			  <property name="n_rows">1</property>
> 			  <property name="n_columns">1</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">2</property>
> 			  <property name="column_spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkTable" id="table4">
> 			      <property name="visible">True</property>
> 			      <property name="n_rows">3</property>
> 			      <property name="n_columns">2</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="row_spacing">6</property>
> 			      <property name="column_spacing">12</property>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="source_host_label">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">_Host:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">source_host</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="source_user_label">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">User_name:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">source_user</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkEntry" id="source_host">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="editable">True</property>
> 				  <property name="visibility">True</property>
> 				  <property name="max_length">0</property>
> 				  <property name="text" translatable="yes"></property>
> 				  <property name="has_frame">True</property>
> 				  <property name="invisible_char" translatable="yes">*</property>
> 				  <property name="activates_default">False</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkEntry" id="source_user">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="editable">True</property>
> 				  <property name="visibility">True</property>
> 				  <property name="max_length">0</property>
> 				  <property name="text" translatable="yes"></property>
> 				  <property name="has_frame">True</property>
> 				  <property name="invisible_char" translatable="yes">*</property>
> 				  <property name="activates_default">False</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="source_path_label">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">_Path:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">source_path</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">2</property>
> 				  <property name="bottom_attach">3</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GnomeFileEntry" id="source_path_entry">
> 				  <property name="visible">True</property>
> 				  <property name="max_saved">10</property>
> 				  <property name="browse_dialog_title" translatable="yes">Mailbox location</property>
> 				  <property name="directory_entry">False</property>
> 				  <property name="modal">False</property>
> 
> 				  <child internal-child="entry">
> 				    <widget class="GtkEntry" id="source_path">
> 				      <property name="visible">True</property>
> 				      <property name="can_focus">True</property>
> 				      <property name="editable">True</property>
> 				      <property name="visibility">True</property>
> 				      <property name="max_length">0</property>
> 				      <property name="text" translatable="yes"></property>
> 				      <property name="has_frame">True</property>
> 				      <property name="invisible_char" translatable="yes">*</property>
> 				      <property name="activates_default">False</property>
> 				    </widget>
> 				  </child>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">2</property>
> 				  <property name="bottom_attach">3</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			    </packing>
> 			  </child>
942,947c1287,1289
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
---
> 			  <property name="padding">0</property>
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
949a1292,1338
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkVBox" id="source_auth_frame">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">6</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label474">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Authentication Type&lt;/span&gt;</property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">True</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">0</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkHBox" id="hbox174">
> 		      <property name="visible">True</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="spacing">0</property>
952c1341
< 			<widget class="GtkEntry" id="source_host">
---
> 			<widget class="GtkLabel" id="label475">
954,961c1343,1352
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
---
> 			  <property name="label" translatable="yes"></property>
> 			  <property name="use_underline">False</property>
> 			  <property name="use_markup">False</property>
> 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			  <property name="wrap">False</property>
> 			  <property name="selectable">False</property>
> 			  <property name="xalign">0.5</property>
> 			  <property name="yalign">0.5</property>
> 			  <property name="xpad">12</property>
> 			  <property name="ypad">0</property>
964,968c1355,1357
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="y_options"></property>
---
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
973,1075c1362
< 			<widget class="GtkEntry" id="source_user">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="source_path_label">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">_Path:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">source_path</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GnomeFileEntry" id="source_path_entry">
< 			  <property name="visible">True</property>
< 			  <property name="max_saved">10</property>
< 			  <property name="browse_dialog_title" translatable="yes">Mailbox location</property>
< 			  <property name="directory_entry">False</property>
< 			  <property name="modal">False</property>
< 
< 			  <child internal-child="entry">
< 			    <widget class="GtkEntry" id="source_path">
< 			      <property name="visible">True</property>
< 			      <property name="can_focus">True</property>
< 			      <property name="editable">True</property>
< 			      <property name="visibility">True</property>
< 			      <property name="max_length">0</property>
< 			      <property name="text" translatable="yes"></property>
< 			      <property name="has_frame">True</property>
< 			      <property name="invisible_char" translatable="yes">*</property>
< 			      <property name="activates_default">False</property>
< 			    </widget>
< 			  </child>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="source_ssl_disabled">
< 			  <property name="visible">True</property>
< 			  <property name="sensitive">False</property>
< 			  <property name="label" translatable="yes">(SSL is not supported in this build of Evolution)</property>
< 			  <property name="use_underline">False</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">4</property>
< 			  <property name="bottom_attach">5</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkHBox" id="source_ssl_hbox">
---
> 			<widget class="GtkVBox" id="vbox179">
1081,1103c1368
< 			    <widget class="GtkLabel" id="lblSourceUseSSL">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">_Use secure connection (SSL):</property>
< 			      <property name="use_underline">True</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">0.5</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xpad">0</property>
< 			      <property name="ypad">0</property>
< 			      <property name="mnemonic_widget">source_use_ssl</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
< 
< 			  <child>
< 			    <widget class="GtkOptionMenu" id="source_use_ssl">
---
> 			    <widget class="GtkHBox" id="hbox199">
1105,1106c1370,1371
< 			      <property name="can_focus">True</property>
< 			      <property name="history">0</property>
---
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
1108,1109c1373,1374
< 			      <child internal-child="menu">
< 				<widget class="GtkMenu" id="convertwidget9">
---
> 			      <child>
> 				<widget class="GtkOptionMenu" id="source_auth_omenu">
1110a1376,1377
> 				  <property name="can_focus">True</property>
> 				  <property name="history">0</property>
1112,1113c1379,1380
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget10">
---
> 				  <child internal-child="menu">
> 				    <widget class="GtkMenu" id="convertwidget13">
1115,1118d1381
< 				      <property name="label" translatable="yes">Always</property>
< 				      <property name="use_underline">True</property>
< 				    </widget>
< 				  </child>
1120,1126c1383,1389
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget11">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">Whenever Possible</property>
< 				      <property name="use_underline">True</property>
< 				    </widget>
< 				  </child>
---
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget14">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Password</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
1128,1132c1391,1397
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget12">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">Never</property>
< 				      <property name="use_underline">True</property>
---
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget15">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Kerberos </property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
1135a1401,1420
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkButton" id="source_check_supported">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="label" translatable="yes"> Ch_eck for Supported Types </property>
> 				  <property name="use_underline">True</property>
> 				  <property name="relief">GTK_RELIEF_NORMAL</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
1139a1425,1443
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="source_remember_password">
> 			      <property name="visible">True</property>
> 			      <property name="tooltip" translatable="yes">Note: you will not be prompted for a password until you connect for the first time</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Re_member password</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
1146,1150c1450,1452
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">3</property>
< 			  <property name="bottom_attach">4</property>
< 			  <property name="x_options">fill</property>
---
> 			  <property name="padding">0</property>
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
1153a1456,1460
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
1154a1462,1474
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkVBox" id="source_security_frame">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">6</property>
1157c1477
< 		    <widget class="GtkLabel" id="label443">
---
> 		    <widget class="GtkLabel" id="label515">
1159c1479
< 		      <property name="label" translatable="yes">Configuration</property>
---
> 		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Security&lt;/span&gt;</property>
1161c1481
< 		      <property name="use_markup">False</property>
---
> 		      <property name="use_markup">True</property>
1165c1485
< 		      <property name="xalign">0.5</property>
---
> 		      <property name="xalign">0</property>
1171c1491,1493
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
1174,1187d1495
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">False</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="source_auth_frame">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
1190,1191c1498
< 		    <widget class="GtkVBox" id="vbox60">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkHBox" id="hbox201">
1194c1501
< 		      <property name="spacing">6</property>
---
> 		      <property name="spacing">0</property>
1197c1504
< 			<widget class="GtkHBox" id="hbox44">
---
> 			<widget class="GtkLabel" id="label516">
1199,1200c1506,1522
< 			  <property name="homogeneous">False</property>
< 			  <property name="spacing">3</property>
---
> 			  <property name="label" translatable="yes"></property>
> 			  <property name="use_underline">False</property>
> 			  <property name="use_markup">False</property>
> 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			  <property name="wrap">False</property>
> 			  <property name="selectable">False</property>
> 			  <property name="xalign">0.5</property>
> 			  <property name="yalign">0.5</property>
> 			  <property name="xpad">12</property>
> 			  <property name="ypad">0</property>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
> 		      </child>
1202,1222c1524,1528
< 			  <child>
< 			    <widget class="GtkLabel" id="source_auth_label">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">_Authentication type: </property>
< 			      <property name="use_underline">True</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">0.5</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xpad">0</property>
< 			      <property name="ypad">0</property>
< 			      <property name="mnemonic_widget">source_auth_omenu</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
---
> 		      <child>
> 			<widget class="GtkVBox" id="vbox181">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
1225c1531
< 			    <widget class="GtkOptionMenu" id="source_auth_omenu">
---
> 			    <widget class="GtkHBox" id="source_ssl_hbox">
1227,1228c1533,1534
< 			      <property name="can_focus">True</property>
< 			      <property name="history">0</property>
---
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">12</property>
1230,1231c1536,1537
< 			      <child internal-child="menu">
< 				<widget class="GtkMenu" id="convertwidget13">
---
> 			      <child>
> 				<widget class="GtkLabel" id="lblSourceUseSSL">
1232a1539,1556
> 				  <property name="label" translatable="yes">_Use Secure Connection (SSL):</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">source_use_ssl</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
1234,1240c1558,1562
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget14">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">Password</property>
< 				      <property name="use_underline">True</property>
< 				    </widget>
< 				  </child>
---
> 			      <child>
> 				<widget class="GtkOptionMenu" id="source_use_ssl">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="history">0</property>
1242,1243c1564,1565
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget15">
---
> 				  <child internal-child="menu">
> 				    <widget class="GtkMenu" id="convertwidget9">
1245,1246c1567,1590
< 				      <property name="label" translatable="yes">Kerberos </property>
< 				      <property name="use_underline">True</property>
---
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget10">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Always</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget11">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Whenever Possible</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget12">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Never</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
1249a1594,1598
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
1254,1255c1603,1604
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
---
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
1260c1609
< 			    <widget class="GtkAlignment" id="alignment1">
---
> 			    <widget class="GtkHBox" id="source_ssl_disabled">
1262,1265c1611,1612
< 			      <property name="xalign">1</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xscale">1</property>
< 			      <property name="yscale">1</property>
---
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
1268c1615
< 				<widget class="GtkButton" id="source_check_supported">
---
> 				<widget class="GtkImage" id="image2">
1270,1273c1617,1643
< 				  <property name="can_focus">True</property>
< 				  <property name="label" translatable="yes"> _Check for supported types </property>
< 				  <property name="use_underline">True</property>
< 				  <property name="relief">GTK_RELIEF_NORMAL</property>
---
> 				  <property name="stock">gtk-dialog-warning</property>
> 				  <property name="icon_size">4</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="label514">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">&lt;b&gt;SSL is not supported in this build of evolution&lt;/b&gt;</property>
> 				  <property name="use_underline">False</property>
> 				  <property name="use_markup">True</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
1274a1645,1649
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
1279,1281c1654,1655
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			      <property name="pack_type">GTK_PACK_END</property>
---
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
1291,1345d1664
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="source_remember_password">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Re_member this password</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="lblNote">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Note: you will not be prompted for a password until you connect for the first time</property>
< 			  <property name="use_underline">False</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.03</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
< 		    </widget>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label444">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Authentication</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
1348c1667,1669
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
1375c1696
< 	  <property name="label" translatable="yes">_Receiving Mail</property>
---
> 	  <property name="label" translatable="yes">Receiving Mail</property>
1393c1714
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
1396c1717
< 	  <property name="spacing">3</property>
---
> 	  <property name="spacing">18</property>
1404,1405c1725,1726
< 	      <property name="row_spacing">4</property>
< 	      <property name="column_spacing">8</property>
---
> 	      <property name="row_spacing">18</property>
> 	      <property name="column_spacing">6</property>
1408c1729
< 		<widget class="GtkFrame" id="extra_mailcheck_frame">
---
> 		<widget class="GtkVBox" id="extra_mailcheck_frame">
1410,1496c1731,1732
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
< 
< 		  <child>
< 		    <widget class="GtkTable" id="extra_mailcheck_table">
< 		      <property name="border_width">6</property>
< 		      <property name="visible">True</property>
< 		      <property name="n_rows">1</property>
< 		      <property name="n_columns">2</property>
< 		      <property name="homogeneous">False</property>
< 		      <property name="row_spacing">6</property>
< 		      <property name="column_spacing">6</property>
< 
< 		      <child>
< 			<widget class="GtkHBox" id="extra_mailcheck_hbox">
< 			  <property name="visible">True</property>
< 			  <property name="homogeneous">False</property>
< 			  <property name="spacing">6</property>
< 
< 			  <child>
< 			    <widget class="GtkCheckButton" id="extra_auto_check">
< 			      <property name="visible">True</property>
< 			      <property name="can_focus">True</property>
< 			      <property name="label" translatable="yes">_Automatically check for new mail every</property>
< 			      <property name="use_underline">True</property>
< 			      <property name="relief">GTK_RELIEF_NORMAL</property>
< 			      <property name="active">False</property>
< 			      <property name="inconsistent">False</property>
< 			      <property name="draw_indicator">True</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
< 
< 			  <child>
< 			    <widget class="GtkSpinButton" id="extra_auto_check_min">
< 			      <property name="visible">True</property>
< 			      <property name="can_focus">True</property>
< 			      <property name="climb_rate">1</property>
< 			      <property name="digits">0</property>
< 			      <property name="numeric">True</property>
< 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
< 			      <property name="snap_to_ticks">False</property>
< 			      <property name="wrap">False</property>
< 			      <property name="adjustment">10 1 1440 1 10 10</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
< 
< 			  <child>
< 			    <widget class="GtkLabel" id="label36">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">minute(s)</property>
< 			      <property name="use_underline">False</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">0.5</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xpad">0</property>
< 			      <property name="ypad">0</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			</packing>
< 		      </child>
< 		    </widget>
< 		  </child>
---
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">6</property>
1499c1735
< 		    <widget class="GtkLabel" id="label445">
---
> 		    <widget class="GtkLabel" id="label490">
1501c1737
< 		      <property name="label" translatable="yes">Checking for New Mail</property>
---
> 		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Checking for New Mail&lt;/span&gt;</property>
1503c1739
< 		      <property name="use_markup">False</property>
---
> 		      <property name="use_markup">True</property>
1507c1743
< 		      <property name="xalign">0.5</property>
---
> 		      <property name="xalign">0</property>
1513c1749,1751
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
1516,1556d1753
< 		</widget>
< 		<packing>
< 		  <property name="left_attach">0</property>
< 		  <property name="right_attach">2</property>
< 		  <property name="top_attach">0</property>
< 		  <property name="bottom_attach">1</property>
< 		  <property name="y_options">fill</property>
< 		</packing>
< 	      </child>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">True</property>
< 	    </packing>
< 	  </child>
< 	</widget>
< 	<packing>
< 	  <property name="tab_expand">False</property>
< 	  <property name="tab_fill">True</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkLabel" id="label33">
< 	  <property name="visible">True</property>
< 	  <property name="label" translatable="yes">Receiving _Options</property>
< 	  <property name="use_underline">True</property>
< 	  <property name="use_markup">False</property>
< 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 	  <property name="wrap">False</property>
< 	  <property name="selectable">False</property>
< 	  <property name="xalign">0.5</property>
< 	  <property name="yalign">0.5</property>
< 	  <property name="xpad">0</property>
< 	  <property name="ypad">0</property>
< 	</widget>
< 	<packing>
< 	  <property name="type">tab</property>
< 	</packing>
<       </child>
1558,1717c1755,1759
<       <child>
< 	<widget class="GtkVBox" id="vboxTransportBorder">
< 	  <property name="border_width">6</property>
< 	  <property name="visible">True</property>
< 	  <property name="homogeneous">False</property>
< 	  <property name="spacing">3</property>
< 
< 	  <child>
< 	    <widget class="GtkVBox" id="transport_vbox">
< 	      <property name="visible">True</property>
< 	      <property name="homogeneous">False</property>
< 	      <property name="spacing">3</property>
< 
< 	      <child>
< 		<widget class="GtkTable" id="table5">
< 		  <property name="visible">True</property>
< 		  <property name="n_rows">1</property>
< 		  <property name="n_columns">2</property>
< 		  <property name="homogeneous">False</property>
< 		  <property name="row_spacing">0</property>
< 		  <property name="column_spacing">3</property>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="transport_type_label">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Server _Type: </property>
< 		      <property name="use_underline">True</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">1</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		      <property name="mnemonic_widget">transport_type_omenu</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">0</property>
< 		      <property name="right_attach">1</property>
< 		      <property name="top_attach">0</property>
< 		      <property name="bottom_attach">1</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkOptionMenu" id="transport_type_omenu">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="history">0</property>
< 
< 		      <child internal-child="menu">
< 			<widget class="GtkMenu" id="convertwidget16">
< 			  <property name="visible">True</property>
< 
< 			  <child>
< 			    <widget class="GtkMenuItem" id="convertwidget17">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">SMTP</property>
< 			      <property name="use_underline">True</property>
< 			    </widget>
< 			  </child>
< 
< 			  <child>
< 			    <widget class="GtkMenuItem" id="convertwidget18">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">Sendmail</property>
< 			      <property name="use_underline">True</property>
< 			    </widget>
< 			  </child>
< 			</widget>
< 		      </child>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">1</property>
< 		      <property name="right_attach">2</property>
< 		      <property name="top_attach">0</property>
< 		      <property name="bottom_attach">1</property>
< 		      <property name="x_options"></property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">False</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkHBox" id="hboxTransportDescription">
< 		  <property name="visible">True</property>
< 		  <property name="homogeneous">False</property>
< 		  <property name="spacing">3</property>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label50">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Description:</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">1</property>
< 		      <property name="yalign">0</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">True</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="transport_description">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">description</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">7.45058e-09</property>
< 		      <property name="yalign">0</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">True</property>
< 		      <property name="fill">True</property>
< 		    </packing>
< 		  </child>
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">False</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="transport_frame">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
< 
< 		  <child>
< 		    <widget class="GtkVBox" id="vbox12">
< 		      <property name="border_width">6</property>
< 		      <property name="visible">True</property>
< 		      <property name="homogeneous">False</property>
< 		      <property name="spacing">3</property>
---
> 		  <child>
> 		    <widget class="GtkHBox" id="hbox181">
> 		      <property name="visible">True</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="spacing">0</property>
1720c1762
< 			<widget class="GtkTable" id="table6">
---
> 			<widget class="GtkLabel" id="label491">
1722,1772c1764,1773
< 			  <property name="n_rows">1</property>
< 			  <property name="n_columns">2</property>
< 			  <property name="homogeneous">False</property>
< 			  <property name="row_spacing">4</property>
< 			  <property name="column_spacing">4</property>
< 
< 			  <child>
< 			    <widget class="GtkLabel" id="transport_host_label">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">_Host:</property>
< 			      <property name="use_underline">True</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">1</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xpad">0</property>
< 			      <property name="ypad">0</property>
< 			      <property name="mnemonic_widget">transport_host</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="left_attach">0</property>
< 			      <property name="right_attach">1</property>
< 			      <property name="top_attach">0</property>
< 			      <property name="bottom_attach">1</property>
< 			      <property name="x_options">fill</property>
< 			      <property name="y_options"></property>
< 			    </packing>
< 			  </child>
< 
< 			  <child>
< 			    <widget class="GtkEntry" id="transport_host">
< 			      <property name="visible">True</property>
< 			      <property name="can_focus">True</property>
< 			      <property name="editable">True</property>
< 			      <property name="visibility">True</property>
< 			      <property name="max_length">0</property>
< 			      <property name="text" translatable="yes"></property>
< 			      <property name="has_frame">True</property>
< 			      <property name="invisible_char" translatable="yes">*</property>
< 			      <property name="activates_default">False</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="left_attach">1</property>
< 			      <property name="right_attach">2</property>
< 			      <property name="top_attach">0</property>
< 			      <property name="bottom_attach">1</property>
< 			      <property name="y_options"></property>
< 			    </packing>
< 			  </child>
---
> 			  <property name="label" translatable="yes"></property>
> 			  <property name="use_underline">False</property>
> 			  <property name="use_markup">False</property>
> 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			  <property name="wrap">False</property>
> 			  <property name="selectable">False</property>
> 			  <property name="xalign">0.5</property>
> 			  <property name="yalign">0.5</property>
> 			  <property name="xpad">12</property>
> 			  <property name="ypad">0</property>
1775c1776
< 			  <property name="padding">4</property>
---
> 			  <property name="padding">0</property>
1777c1778
< 			  <property name="fill">True</property>
---
> 			  <property name="fill">False</property>
1782c1783
< 			<widget class="GtkHBox" id="transport_ssl_hbox">
---
> 			<widget class="GtkTable" id="table21">
1783a1785,1786
> 			  <property name="n_rows">1</property>
> 			  <property name="n_columns">1</property>
1785,1807c1788,1789
< 			  <property name="spacing">6</property>
< 
< 			  <child>
< 			    <widget class="GtkLabel" id="lblTransportUseSSL">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">_Use secure connection (SSL):</property>
< 			      <property name="use_underline">True</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">0.5</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xpad">0</property>
< 			      <property name="ypad">0</property>
< 			      <property name="mnemonic_widget">transport_use_ssl</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
---
> 			  <property name="row_spacing">2</property>
> 			  <property name="column_spacing">6</property>
1810c1792
< 			    <widget class="GtkOptionMenu" id="transport_use_ssl">
---
> 			    <widget class="GtkTable" id="extra_mailcheck_table">
1812,1813c1794,1798
< 			      <property name="can_focus">True</property>
< 			      <property name="history">0</property>
---
> 			      <property name="n_rows">1</property>
> 			      <property name="n_columns">2</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="row_spacing">6</property>
> 			      <property name="column_spacing">6</property>
1815,1816c1800,1801
< 			      <child internal-child="menu">
< 				<widget class="GtkMenu" id="convertwidget19">
---
> 			      <child>
> 				<widget class="GtkHBox" id="extra_mailcheck_hbox">
1817a1803,1804
> 				  <property name="homogeneous">False</property>
> 				  <property name="spacing">6</property>
1820c1807
< 				    <widget class="GtkMenuItem" id="convertwidget20">
---
> 				    <widget class="GtkCheckButton" id="extra_auto_check">
1822c1809,1810
< 				      <property name="label" translatable="yes">Always</property>
---
> 				      <property name="can_focus">True</property>
> 				      <property name="label" translatable="yes">Automatically check for _new mail every</property>
1823a1812,1815
> 				      <property name="relief">GTK_RELIEF_NORMAL</property>
> 				      <property name="active">False</property>
> 				      <property name="inconsistent">False</property>
> 				      <property name="draw_indicator">True</property>
1824a1817,1821
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
1828c1825
< 				    <widget class="GtkMenuItem" id="convertwidget21">
---
> 				    <widget class="GtkSpinButton" id="extra_auto_check_min">
1830,1831c1827,1834
< 				      <property name="label" translatable="yes">Whenever Possible</property>
< 				      <property name="use_underline">True</property>
---
> 				      <property name="can_focus">True</property>
> 				      <property name="climb_rate">1</property>
> 				      <property name="digits">0</property>
> 				      <property name="numeric">True</property>
> 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
> 				      <property name="snap_to_ticks">False</property>
> 				      <property name="wrap">False</property>
> 				      <property name="adjustment">10 1 1440 1 10 10</property>
1832a1836,1840
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
1836c1844
< 				    <widget class="GtkMenuItem" id="convertwidget22">
---
> 				    <widget class="GtkLabel" id="label36">
1838c1846
< 				      <property name="label" translatable="yes">Never</property>
---
> 				      <property name="label" translatable="yes">_minute(s)</property>
1839a1848,1856
> 				      <property name="use_markup">False</property>
> 				      <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				      <property name="wrap">False</property>
> 				      <property name="selectable">False</property>
> 				      <property name="xalign">0.5</property>
> 				      <property name="yalign">0.5</property>
> 				      <property name="xpad">0</property>
> 				      <property name="ypad">0</property>
> 				      <property name="mnemonic_widget">extra_auto_check_min</property>
1840a1858,1862
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
1842a1865,1870
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				</packing>
1846,1848c1874,1877
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
---
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
1854,1855c1883,1884
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
1857a1887,1984
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">0</property>
> 		  <property name="right_attach">2</property>
> 		  <property name="top_attach">0</property>
> 		  <property name="bottom_attach">1</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">True</property>
> 	    </packing>
> 	  </child>
> 	</widget>
> 	<packing>
> 	  <property name="tab_expand">False</property>
> 	  <property name="tab_fill">True</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkLabel" id="label33">
> 	  <property name="visible">True</property>
> 	  <property name="label" translatable="yes">Receiving Options</property>
> 	  <property name="use_underline">True</property>
> 	  <property name="use_markup">False</property>
> 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 	  <property name="wrap">False</property>
> 	  <property name="selectable">False</property>
> 	  <property name="xalign">0.5</property>
> 	  <property name="yalign">0.5</property>
> 	  <property name="xpad">0</property>
> 	  <property name="ypad">0</property>
> 	</widget>
> 	<packing>
> 	  <property name="type">tab</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkVBox" id="vboxTransportBorder">
> 	  <property name="border_width">12</property>
> 	  <property name="visible">True</property>
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">18</property>
> 
> 	  <child>
> 	    <widget class="GtkTable" id="table5">
> 	      <property name="visible">True</property>
> 	      <property name="n_rows">2</property>
> 	      <property name="n_columns">3</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="row_spacing">6</property>
> 	      <property name="column_spacing">12</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="transport_type_label">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">Server _Type: </property>
> 		  <property name="use_underline">True</property>
> 		  <property name="use_markup">False</property>
> 		  <property name="justify">GTK_JUSTIFY_RIGHT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		  <property name="mnemonic_widget">transport_type_omenu</property>
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">0</property>
> 		  <property name="right_attach">1</property>
> 		  <property name="top_attach">0</property>
> 		  <property name="bottom_attach">1</property>
> 		  <property name="x_options">fill</property>
> 		  <property name="y_options"></property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkOptionMenu" id="transport_type_omenu">
> 		  <property name="visible">True</property>
> 		  <property name="can_focus">True</property>
> 		  <property name="history">0</property>
> 
> 		  <child internal-child="menu">
> 		    <widget class="GtkMenu" id="convertwidget16">
> 		      <property name="visible">True</property>
1860c1987
< 			<widget class="GtkLabel" id="transport_ssl_disabled">
---
> 			<widget class="GtkMenuItem" id="convertwidget17">
1862,1872c1989,1990
< 			  <property name="sensitive">False</property>
< 			  <property name="label" translatable="yes">(SSL is not supported in this build of evolution)</property>
< 			  <property name="use_underline">False</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
---
> 			  <property name="label" translatable="yes">SMTP</property>
> 			  <property name="use_underline">True</property>
1874,1878d1991
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
1882c1995
< 			<widget class="GtkCheckButton" id="transport_needs_auth">
---
> 			<widget class="GtkMenuItem" id="convertwidget18">
1884,1885c1997
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Ser_ver requires authentication</property>
---
> 			  <property name="label" translatable="yes">Sendmail</property>
1887,1890d1998
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
1892,1896d1999
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
1899a2003,2122
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">1</property>
> 		  <property name="right_attach">2</property>
> 		  <property name="top_attach">0</property>
> 		  <property name="bottom_attach">1</property>
> 		  <property name="x_options"></property>
> 		  <property name="y_options"></property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkFixed" id="fixed2">
> 		  <property name="visible">True</property>
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">2</property>
> 		  <property name="right_attach">3</property>
> 		  <property name="top_attach">0</property>
> 		  <property name="bottom_attach">1</property>
> 		  <property name="y_options">fill</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="transport_description">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">description</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">False</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">True</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">1</property>
> 		  <property name="right_attach">3</property>
> 		  <property name="top_attach">1</property>
> 		  <property name="bottom_attach">2</property>
> 		  <property name="y_options"></property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label50">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">Description:</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">False</property>
> 		  <property name="justify">GTK_JUSTIFY_RIGHT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">0</property>
> 		  <property name="right_attach">1</property>
> 		  <property name="top_attach">1</property>
> 		  <property name="bottom_attach">2</property>
> 		  <property name="x_options">fill</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkHSeparator" id="hseparator3">
> 	      <property name="visible">True</property>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="transport_frame">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label476">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Server Configuration&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox175">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
1902c2125
< 		    <widget class="GtkLabel" id="label446">
---
> 		    <widget class="GtkLabel" id="label477">
1904c2127
< 		      <property name="label" translatable="yes">Server Configuration</property>
---
> 		      <property name="label" translatable="yes"></property>
1912c2135
< 		      <property name="xpad">0</property>
---
> 		      <property name="xpad">12</property>
1916c2139,2141
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
1919,1932d2143
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">True</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="transport_auth_frame">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
1935,1936c2146
< 		    <widget class="GtkVBox" id="vbox61">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkTable" id="table15">
1937a2148,2149
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
1939c2151,2152
< 		      <property name="spacing">3</property>
---
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
1942c2155
< 			<widget class="GtkHBox" id="hbox49">
---
> 			<widget class="GtkVBox" id="vbox12">
1945c2158
< 			  <property name="spacing">3</property>
---
> 			  <property name="spacing">6</property>
1948c2161
< 			    <widget class="GtkLabel" id="transport_auth_label">
---
> 			    <widget class="GtkCheckButton" id="transport_needs_auth">
1950c2163,2164
< 			      <property name="label" translatable="yes">_Authentication Type: </property>
---
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Ser_ver requires authentication</property>
1952,1960c2166,2169
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">0.5</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xpad">0</property>
< 			      <property name="ypad">0</property>
< 			      <property name="mnemonic_widget">transport_auth_omenu</property>
---
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
1970c2179
< 			    <widget class="GtkOptionMenu" id="transport_auth_omenu">
---
> 			    <widget class="GtkTable" id="table6">
1972,1973c2181,2185
< 			      <property name="can_focus">True</property>
< 			      <property name="history">0</property>
---
> 			      <property name="n_rows">1</property>
> 			      <property name="n_columns">2</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="row_spacing">6</property>
> 			      <property name="column_spacing">12</property>
1975,1976c2187,2188
< 			      <child internal-child="menu">
< 				<widget class="GtkMenu" id="convertwidget23">
---
> 			      <child>
> 				<widget class="GtkLabel" id="transport_host_label">
1978,1993c2190,2200
< 
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget24">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">Password</property>
< 				      <property name="use_underline">True</property>
< 				    </widget>
< 				  </child>
< 
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget25">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">Kerberos </property>
< 				      <property name="use_underline">True</property>
< 				    </widget>
< 				  </child>
---
> 				  <property name="label" translatable="yes">_Host:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_RIGHT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">1</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">transport_host</property>
1994a2202,2209
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
1996,2010d2210
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
< 
< 			  <child>
< 			    <widget class="GtkAlignment" id="alignment2">
< 			      <property name="visible">True</property>
< 			      <property name="xalign">1</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xscale">1</property>
< 			      <property name="yscale">1</property>
2013c2213
< 				<widget class="GtkButton" id="transport_check_supported">
---
> 				<widget class="GtkEntry" id="transport_host">
2016,2018c2216,2222
< 				  <property name="label" translatable="yes"> _Check for supported types </property>
< 				  <property name="use_underline">True</property>
< 				  <property name="relief">GTK_RELIEF_NORMAL</property>
---
> 				  <property name="editable">True</property>
> 				  <property name="visibility">True</property>
> 				  <property name="max_length">0</property>
> 				  <property name="text" translatable="yes"></property>
> 				  <property name="has_frame">True</property>
> 				  <property name="invisible_char" translatable="yes">*</property>
> 				  <property name="activates_default">False</property>
2019a2224,2230
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="y_options"></property>
> 				</packing>
2025,2079d2235
< 			      <property name="fill">False</property>
< 			      <property name="pack_type">GTK_PACK_END</property>
< 			    </packing>
< 			  </child>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">True</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkHBox" id="hbox52">
< 			  <property name="visible">True</property>
< 			  <property name="homogeneous">False</property>
< 			  <property name="spacing">3</property>
< 
< 			  <child>
< 			    <widget class="GtkLabel" id="transport_user_label">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">User_name:</property>
< 			      <property name="use_underline">True</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">1</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xpad">0</property>
< 			      <property name="ypad">0</property>
< 			      <property name="mnemonic_widget">transport_user</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
< 
< 			  <child>
< 			    <widget class="GtkEntry" id="transport_user">
< 			      <property name="visible">True</property>
< 			      <property name="can_focus">True</property>
< 			      <property name="editable">True</property>
< 			      <property name="visibility">True</property>
< 			      <property name="max_length">0</property>
< 			      <property name="text" translatable="yes"></property>
< 			      <property name="has_frame">True</property>
< 			      <property name="invisible_char" translatable="yes">*</property>
< 			      <property name="activates_default">False</property>
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">True</property>
2085,2105c2241,2244
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="transport_remember_password">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Remember this _password</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
2109,2124d2247
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label447">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Authentication</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
2126c2249,2251
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
2132c2257
< 		  <property name="expand">False</property>
---
> 		  <property name="expand">True</property>
2143,2174d2267
< 	</widget>
< 	<packing>
< 	  <property name="tab_expand">False</property>
< 	  <property name="tab_fill">True</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkLabel" id="label34">
< 	  <property name="visible">True</property>
< 	  <property name="label" translatable="yes">_Sending Mail</property>
< 	  <property name="use_underline">True</property>
< 	  <property name="use_markup">False</property>
< 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 	  <property name="wrap">False</property>
< 	  <property name="selectable">False</property>
< 	  <property name="xalign">0.5</property>
< 	  <property name="yalign">0.5</property>
< 	  <property name="xpad">0</property>
< 	  <property name="ypad">0</property>
< 	</widget>
< 	<packing>
< 	  <property name="type">tab</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkVBox" id="vboxFoldersBorder">
< 	  <property name="border_width">6</property>
< 	  <property name="visible">True</property>
< 	  <property name="homogeneous">False</property>
< 	  <property name="spacing">3</property>
2177c2270
< 	    <widget class="GtkVBox" id="folders_vbox">
---
> 	    <widget class="GtkVBox" id="transport_auth_frame">
2180c2273
< 	      <property name="spacing">3</property>
---
> 	      <property name="spacing">6</property>
2183c2276
< 		<widget class="GtkFrame" id="folders_frame">
---
> 		<widget class="GtkLabel" id="label478">
2185,2187c2278,2321
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Authentication&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox176">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label479">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
2190,2191c2324
< 		    <widget class="GtkTable" id="folders_table">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkTable" id="table16">
2193,2194c2326,2327
< 		      <property name="n_rows">3</property>
< 		      <property name="n_columns">2</property>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
2196c2329
< 		      <property name="row_spacing">6</property>
---
> 		      <property name="row_spacing">2</property>
2200,2225c2333
< 			<widget class="GtkLabel" id="drafts_label">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Drafts _folder:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">drafts_button</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="sent_label">
---
> 			<widget class="GtkVBox" id="vbox61">
2227,2346c2335,2336
< 			  <property name="label" translatable="yes">Sent _messages folder:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">sent_button</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="Custom" id="drafts_button">
< 			  <property name="visible">True</property>
< 			  <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
< 			  <property name="int1">0</property>
< 			  <property name="int2">0</property>
< 			  <property name="last_modification_time">Wed, 03 Apr 2002 23:03:41 GMT</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="y_options">fill</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="Custom" id="sent_button">
< 			  <property name="visible">True</property>
< 			  <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
< 			  <property name="int1">0</property>
< 			  <property name="int2">0</property>
< 			  <property name="last_modification_time">Wed, 03 Apr 2002 23:03:59 GMT</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="y_options">fill</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkButton" id="default_folders_button">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Restore Defaults</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 		    </widget>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label448">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Sent and Draft Messages</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="type">label_item</property>
< 		    </packing>
< 		  </child>
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">True</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="frame2">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
< 
< 		  <child>
< 		    <widget class="GtkVBox" id="vbox67">
< 		      <property name="visible">True</property>
< 		      <property name="homogeneous">False</property>
< 		      <property name="spacing">0</property>
< 
< 		      <child>
< 			<widget class="GtkHBox" id="hbox61">
< 			  <property name="visible">True</property>
< 			  <property name="homogeneous">False</property>
< 			  <property name="spacing">0</property>
---
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
2349,2350c2339
< 			    <widget class="GtkTable" id="table8">
< 			      <property name="border_width">6</property>
---
> 			    <widget class="GtkTable" id="table31">
2356c2345
< 			      <property name="column_spacing">6</property>
---
> 			      <property name="column_spacing">12</property>
2359c2348
< 				<widget class="GtkCheckButton" id="always_cc">
---
> 				<widget class="GtkLabel" id="transport_auth_label">
2361,2362c2350
< 				  <property name="can_focus">True</property>
< 				  <property name="label" translatable="yes">Always _carbon-copy (Cc) to:</property>
---
> 				  <property name="label" translatable="yes">T_ype: </property>
2364,2367c2352,2360
< 				  <property name="relief">GTK_RELIEF_NORMAL</property>
< 				  <property name="active">False</property>
< 				  <property name="inconsistent">False</property>
< 				  <property name="draw_indicator">True</property>
---
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">transport_auth_omenu</property>
2380c2373
< 				<widget class="GtkCheckButton" id="always_bcc">
---
> 				<widget class="GtkLabel" id="transport_user_label">
2382,2383c2375
< 				  <property name="can_focus">True</property>
< 				  <property name="label" translatable="yes">Always _blind carbon-copy (Bcc) to:</property>
---
> 				  <property name="label" translatable="yes">User_name:</property>
2385,2388c2377,2385
< 				  <property name="relief">GTK_RELIEF_NORMAL</property>
< 				  <property name="active">False</property>
< 				  <property name="inconsistent">False</property>
< 				  <property name="draw_indicator">True</property>
---
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_RIGHT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">transport_user</property>
2401c2398
< 				<widget class="GtkEntry" id="cc_addrs">
---
> 				<widget class="GtkEntry" id="transport_user">
2415,2416c2412,2413
< 				  <property name="top_attach">0</property>
< 				  <property name="bottom_attach">1</property>
---
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
2422c2419
< 				<widget class="GtkEntry" id="bcc_addrs">
---
> 				<widget class="GtkHBox" id="hbox195">
2424,2431c2421,2483
< 				  <property name="can_focus">True</property>
< 				  <property name="editable">True</property>
< 				  <property name="visibility">True</property>
< 				  <property name="max_length">0</property>
< 				  <property name="text" translatable="yes"></property>
< 				  <property name="has_frame">True</property>
< 				  <property name="invisible_char" translatable="yes">*</property>
< 				  <property name="activates_default">False</property>
---
> 				  <property name="homogeneous">False</property>
> 				  <property name="spacing">6</property>
> 
> 				  <child>
> 				    <widget class="GtkOptionMenu" id="transport_auth_omenu">
> 				      <property name="visible">True</property>
> 				      <property name="can_focus">True</property>
> 				      <property name="history">0</property>
> 
> 				      <child internal-child="menu">
> 					<widget class="GtkMenu" id="convertwidget23">
> 					  <property name="visible">True</property>
> 
> 					  <child>
> 					    <widget class="GtkMenuItem" id="convertwidget24">
> 					      <property name="visible">True</property>
> 					      <property name="label" translatable="yes">Password</property>
> 					      <property name="use_underline">True</property>
> 					    </widget>
> 					  </child>
> 
> 					  <child>
> 					    <widget class="GtkMenuItem" id="convertwidget25">
> 					      <property name="visible">True</property>
> 					      <property name="label" translatable="yes">Kerberos </property>
> 					      <property name="use_underline">True</property>
> 					    </widget>
> 					  </child>
> 					</widget>
> 				      </child>
> 				    </widget>
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
> 				  </child>
> 
> 				  <child>
> 				    <widget class="GtkButton" id="transport_check_supported">
> 				      <property name="visible">True</property>
> 				      <property name="can_focus">True</property>
> 				      <property name="label" translatable="yes">Ch_eck for Supported Types </property>
> 				      <property name="use_underline">True</property>
> 				      <property name="relief">GTK_RELIEF_NORMAL</property>
> 				    </widget>
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
> 				  </child>
> 
> 				  <child>
> 				    <widget class="GtkFixed" id="fixed5">
> 				      <property name="visible">True</property>
> 				    </widget>
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">True</property>
> 				      <property name="fill">True</property>
> 				    </packing>
> 				  </child>
2436,2438c2488,2490
< 				  <property name="top_attach">1</property>
< 				  <property name="bottom_attach">2</property>
< 				  <property name="y_options"></property>
---
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="y_options">fill</property>
2444c2496
< 			      <property name="expand">True</property>
---
> 			      <property name="expand">False</property>
2447a2500,2517
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="transport_remember_password">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Remember _password</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
2450,2452c2520,2523
< 			  <property name="padding">0</property>
< 			  <property name="expand">True</property>
< 			  <property name="fill">True</property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
2456,2471d2526
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label449">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Composing Messages</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
2473c2528,2530
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
2479c2536
< 		  <property name="expand">False</property>
---
> 		  <property name="expand">True</property>
2490,2521d2546
< 	</widget>
< 	<packing>
< 	  <property name="tab_expand">False</property>
< 	  <property name="tab_fill">True</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkLabel" id="label35">
< 	  <property name="visible">True</property>
< 	  <property name="label" translatable="yes">_Defaults</property>
< 	  <property name="use_underline">True</property>
< 	  <property name="use_markup">False</property>
< 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 	  <property name="wrap">False</property>
< 	  <property name="selectable">False</property>
< 	  <property name="xalign">0.5</property>
< 	  <property name="yalign">0.5</property>
< 	  <property name="xpad">0</property>
< 	  <property name="ypad">0</property>
< 	</widget>
< 	<packing>
< 	  <property name="type">tab</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkVBox" id="vboxSecurityBorder">
< 	  <property name="border_width">6</property>
< 	  <property name="visible">True</property>
< 	  <property name="homogeneous">False</property>
< 	  <property name="spacing">3</property>
2524c2549
< 	    <widget class="GtkVBox" id="security_vbox">
---
> 	    <widget class="GtkVBox" id="transport_security_frame">
2527c2552
< 	      <property name="spacing">3</property>
---
> 	      <property name="spacing">6</property>
2530c2555
< 		<widget class="GtkFrame" id="pgp_frame">
---
> 		<widget class="GtkLabel" id="label517">
2532,2534c2557,2579
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Security&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox203">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
2537,2538c2582
< 		    <widget class="GtkVBox" id="vboxPGP">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkLabel" id="label518">
2540,2559c2584,2623
< 		      <property name="homogeneous">False</property>
< 		      <property name="spacing">3</property>
< 
< 		      <child>
< 			<widget class="GtkHBox" id="hbox63">
< 			  <property name="border_width">3</property>
< 			  <property name="visible">True</property>
< 			  <property name="homogeneous">False</property>
< 			  <property name="spacing">6</property>
< 
< 			  <child>
< 			    <widget class="GtkLabel" id="pgp_key_id_label">
< 			      <property name="visible">True</property>
< 			      <property name="label" translatable="yes">PGP/GPG _Key ID:</property>
< 			      <property name="use_underline">True</property>
< 			      <property name="use_markup">False</property>
< 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			      <property name="wrap">False</property>
< 			      <property name="selectable">False</property>
< 			      <property name="xalign">0</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkVBox" id="vbox183">
> 		      <property name="visible">True</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkHBox" id="transport_ssl_hbox">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">12</property>
> 
> 			  <child>
> 			    <widget class="GtkLabel" id="lblTransportUseSSL">
> 			      <property name="visible">True</property>
> 			      <property name="label" translatable="yes">_Use Secure Connection (SSL):</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="use_markup">False</property>
> 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
> 			      <property name="wrap">False</property>
> 			      <property name="selectable">False</property>
> 			      <property name="xalign">0.5</property>
2563c2627
< 			      <property name="mnemonic_widget">pgp_key</property>
---
> 			      <property name="mnemonic_widget">transport_use_ssl</property>
2573c2637
< 			    <widget class="GtkEntry" id="pgp_key">
---
> 			    <widget class="GtkOptionMenu" id="transport_use_ssl">
2576,2582c2640,2670
< 			      <property name="editable">True</property>
< 			      <property name="visibility">True</property>
< 			      <property name="max_length">0</property>
< 			      <property name="text" translatable="yes"></property>
< 			      <property name="has_frame">True</property>
< 			      <property name="invisible_char" translatable="yes">*</property>
< 			      <property name="activates_default">False</property>
---
> 			      <property name="history">0</property>
> 
> 			      <child internal-child="menu">
> 				<widget class="GtkMenu" id="convertwidget19">
> 				  <property name="visible">True</property>
> 
> 				  <child>
> 				    <widget class="GtkMenuItem" id="convertwidget20">
> 				      <property name="visible">True</property>
> 				      <property name="label" translatable="yes">Always</property>
> 				      <property name="use_underline">True</property>
> 				    </widget>
> 				  </child>
> 
> 				  <child>
> 				    <widget class="GtkMenuItem" id="convertwidget21">
> 				      <property name="visible">True</property>
> 				      <property name="label" translatable="yes">Whenever Possible</property>
> 				      <property name="use_underline">True</property>
> 				    </widget>
> 				  </child>
> 
> 				  <child>
> 				    <widget class="GtkMenuItem" id="convertwidget22">
> 				      <property name="visible">True</property>
> 				      <property name="label" translatable="yes">Never</property>
> 				      <property name="use_underline">True</property>
> 				    </widget>
> 				  </child>
> 				</widget>
> 			      </child>
2586,2587c2674,2675
< 			      <property name="expand">True</property>
< 			      <property name="fill">True</property>
---
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
2593,2612c2681,2682
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="pgp_always_sign">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">_Always sign outgoing messages when using this account</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
2617c2687
< 			<widget class="GtkCheckButton" id="pgp_no_imip_sign">
---
> 			<widget class="GtkHBox" id="transport_ssl_disabled">
2619,2632c2689,2690
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Don't sign _meeting requests (for Outlook compatibility)</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
---
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
2634,2650c2692,2707
< 		      <child>
< 			<widget class="GtkCheckButton" id="pgp_encrypt_to_self">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Al_ways encrypt to myself when sending encrypted mail</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">True</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
---
> 			  <child>
> 			    <widget class="GtkImage" id="image1">
> 			      <property name="visible">True</property>
> 			      <property name="stock">gtk-dialog-warning</property>
> 			      <property name="icon_size">4</property>
> 			      <property name="xalign">0.5</property>
> 			      <property name="yalign">0.5</property>
> 			      <property name="xpad">0</property>
> 			      <property name="ypad">0</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
2652,2661c2709,2728
< 		      <child>
< 			<widget class="GtkCheckButton" id="pgp_always_trust">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
---
> 			  <child>
> 			    <widget class="GtkLabel" id="transport_ssl_disabled_label">
> 			      <property name="visible">True</property>
> 			      <property name="label" translatable="yes">&lt;b&gt;SSL is not supported in this build of evolution&lt;/b&gt;</property>
> 			      <property name="use_underline">False</property>
> 			      <property name="use_markup">True</property>
> 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
> 			      <property name="wrap">False</property>
> 			      <property name="selectable">False</property>
> 			      <property name="xalign">0</property>
> 			      <property name="yalign">0.5</property>
> 			      <property name="xpad">0</property>
> 			      <property name="ypad">0</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
2665,2666c2732,2733
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
2669a2737,2741
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
2670a2743,2821
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 	</widget>
> 	<packing>
> 	  <property name="tab_expand">False</property>
> 	  <property name="tab_fill">True</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkLabel" id="label34">
> 	  <property name="visible">True</property>
> 	  <property name="label" translatable="yes">Sending Mail</property>
> 	  <property name="use_underline">True</property>
> 	  <property name="use_markup">False</property>
> 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 	  <property name="wrap">False</property>
> 	  <property name="selectable">False</property>
> 	  <property name="xalign">0.5</property>
> 	  <property name="yalign">0.5</property>
> 	  <property name="xpad">0</property>
> 	  <property name="ypad">0</property>
> 	</widget>
> 	<packing>
> 	  <property name="type">tab</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkVBox" id="vboxFoldersBorder">
> 	  <property name="border_width">12</property>
> 	  <property name="visible">True</property>
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">18</property>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="folders_frame">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label482">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Sent and Draft Messages&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox177">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
2673c2824
< 		    <widget class="GtkLabel" id="label450">
---
> 		    <widget class="GtkLabel" id="label483">
2675c2826
< 		      <property name="label" translatable="yes">Pretty Good Privacy (PGP/GPG)</property>
---
> 		      <property name="label" translatable="yes"></property>
2683c2834
< 		      <property name="xpad">0</property>
---
> 		      <property name="xpad">12</property>
2687c2838,2840
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
2690,2703d2842
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">True</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="smime_frame">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
2706,2707c2845
< 		    <widget class="GtkTable" id="smime_table">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkTable" id="table17">
2709,2710c2847,2848
< 		      <property name="n_rows">6</property>
< 		      <property name="n_columns">4</property>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
2712,2811c2850,2851
< 		      <property name="row_spacing">5</property>
< 		      <property name="column_spacing">9</property>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="label469">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Si_gning certificate:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">smime_sign_key</property>
< 			  <accessibility>
< 			    <atkrelation target="smime_sign_key" type="label-for"/>
< 			  </accessibility>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkEntry" id="smime_sign_key">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="label470">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Encry_ption certificate:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">smime_encrypt_key</property>
< 			  <accessibility>
< 			    <atkrelation target="smime_encrypt_key" type="label-for"/>
< 			  </accessibility>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">5</property>
< 			  <property name="bottom_attach">6</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkEntry" id="smime_encrypt_key">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="editable">True</property>
< 			  <property name="visibility">True</property>
< 			  <property name="max_length">0</property>
< 			  <property name="text" translatable="yes"></property>
< 			  <property name="has_frame">True</property>
< 			  <property name="invisible_char" translatable="yes">*</property>
< 			  <property name="activates_default">False</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">5</property>
< 			  <property name="bottom_attach">6</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
---
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
2814c2854
< 			<widget class="GtkButton" id="smime_encrypt_key_select">
---
> 			<widget class="GtkVBox" id="vbox184">
2816,2817c2856,2857
< 			  <property name="can_focus">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
---
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
2820c2860
< 			    <widget class="GtkAlignment" id="alignment28">
---
> 			    <widget class="GtkTable" id="folders_table">
2822,2825c2862,2866
< 			      <property name="xalign">0.5</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xscale">0</property>
< 			      <property name="yscale">0</property>
---
> 			      <property name="n_rows">3</property>
> 			      <property name="n_columns">3</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="row_spacing">6</property>
> 			      <property name="column_spacing">12</property>
2828c2869
< 				<widget class="GtkHBox" id="hbox175">
---
> 				<widget class="GtkLabel" id="drafts_label">
2830,2831c2871,2891
< 				  <property name="homogeneous">False</property>
< 				  <property name="spacing">2</property>
---
> 				  <property name="label" translatable="yes">Drafts _Folder:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">drafts_button</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
2833,2848c2893,2916
< 				  <child>
< 				    <widget class="GtkImage" id="image3">
< 				      <property name="visible">True</property>
< 				      <property name="stock">gtk-open</property>
< 				      <property name="icon_size">4</property>
< 				      <property name="xalign">0.5</property>
< 				      <property name="yalign">0.5</property>
< 				      <property name="xpad">0</property>
< 				      <property name="ypad">0</property>
< 				    </widget>
< 				    <packing>
< 				      <property name="padding">0</property>
< 				      <property name="expand">False</property>
< 				      <property name="fill">False</property>
< 				    </packing>
< 				  </child>
---
> 			      <child>
> 				<widget class="GtkLabel" id="sent_label">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">Sent _Messages Folder:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">sent_button</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
2850,2869c2918,2924
< 				  <child>
< 				    <widget class="GtkLabel" id="button98">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">_Select...</property>
< 				      <property name="use_underline">True</property>
< 				      <property name="use_markup">False</property>
< 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 				      <property name="wrap">False</property>
< 				      <property name="selectable">False</property>
< 				      <property name="xalign">0.5</property>
< 				      <property name="yalign">0.5</property>
< 				      <property name="xpad">0</property>
< 				      <property name="ypad">0</property>
< 				    </widget>
< 				    <packing>
< 				      <property name="padding">0</property>
< 				      <property name="expand">False</property>
< 				      <property name="fill">False</property>
< 				    </packing>
< 				  </child>
---
> 			      <child>
> 				<widget class="Custom" id="sent_button">
> 				  <property name="visible">True</property>
> 				  <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
> 				  <property name="int1">0</property>
> 				  <property name="int2">0</property>
> 				  <property name="last_modification_time">Wed, 03 Apr 2002 23:03:59 GMT</property>
2870a2926,2933
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options">fill</property>
> 				</packing>
2872,2883d2934
< 			    </widget>
< 			  </child>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">2</property>
< 			  <property name="right_attach">3</property>
< 			  <property name="top_attach">5</property>
< 			  <property name="bottom_attach">6</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
2885,2889c2936,2951
< 		      <child>
< 			<widget class="GtkButton" id="smime_sign_key_select">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
---
> 			      <child>
> 				<widget class="Custom" id="drafts_button">
> 				  <property name="visible">True</property>
> 				  <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
> 				  <property name="int1">0</property>
> 				  <property name="int2">0</property>
> 				  <property name="last_modification_time">Wed, 03 Apr 2002 23:03:41 GMT</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="y_options">fill</property>
> 				</packing>
> 			      </child>
2891,2897c2953,2978
< 			  <child>
< 			    <widget class="GtkAlignment" id="alignment29">
< 			      <property name="visible">True</property>
< 			      <property name="xalign">0.5</property>
< 			      <property name="yalign">0.5</property>
< 			      <property name="xscale">0</property>
< 			      <property name="yscale">0</property>
---
> 			      <child>
> 				<widget class="GtkFixed" id="fixed9">
> 				  <property name="visible">True</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">2</property>
> 				  <property name="right_attach">3</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="y_options">fill</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkFixed" id="fixed8">
> 				  <property name="visible">True</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">2</property>
> 				  <property name="right_attach">3</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options">fill</property>
> 				</packing>
> 			      </child>
2900c2981
< 				<widget class="GtkHBox" id="hbox176">
---
> 				<widget class="GtkHBox" id="hbox216">
2903c2984
< 				  <property name="spacing">2</property>
---
> 				  <property name="spacing">0</property>
2906c2987
< 				    <widget class="GtkImage" id="image4">
---
> 				    <widget class="GtkButton" id="default_folders_button">
2908,2913c2989,2992
< 				      <property name="stock">gtk-open</property>
< 				      <property name="icon_size">4</property>
< 				      <property name="xalign">0.5</property>
< 				      <property name="yalign">0.5</property>
< 				      <property name="xpad">0</property>
< 				      <property name="ypad">0</property>
---
> 				      <property name="can_focus">True</property>
> 				      <property name="label">gtk-revert-to-saved</property>
> 				      <property name="use_stock">True</property>
> 				      <property name="relief">GTK_RELIEF_NORMAL</property>
2923c3002
< 				    <widget class="GtkLabel" id="label472">
---
> 				    <widget class="GtkFixed" id="fixed12">
2925,2934d3003
< 				      <property name="label" translatable="yes">_Select...</property>
< 				      <property name="use_underline">True</property>
< 				      <property name="use_markup">False</property>
< 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 				      <property name="wrap">False</property>
< 				      <property name="selectable">False</property>
< 				      <property name="xalign">0.5</property>
< 				      <property name="yalign">0.5</property>
< 				      <property name="xpad">0</property>
< 				      <property name="ypad">0</property>
2938,2939c3007,3008
< 				      <property name="expand">False</property>
< 				      <property name="fill">False</property>
---
> 				      <property name="expand">True</property>
> 				      <property name="fill">True</property>
2942a3012,3017
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">3</property>
> 				  <property name="top_attach">2</property>
> 				  <property name="bottom_attach">3</property>
> 				</packing>
2944a3020,3024
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
> 			    </packing>
2948,3061d3027
< 			  <property name="left_attach">2</property>
< 			  <property name="right_attach">3</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkButton" id="smime_sign_key_clear">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label">gtk-clear</property>
< 			  <property name="use_stock">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">3</property>
< 			  <property name="right_attach">4</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkButton" id="smime_encrypt_key_clear">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label">gtk-clear</property>
< 			  <property name="use_stock">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">3</property>
< 			  <property name="right_attach">4</property>
< 			  <property name="top_attach">5</property>
< 			  <property name="bottom_attach">6</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="smime_encrypt_to_self">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">A_lso encrypt to self when sending encrypted mail</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">4</property>
< 			  <property name="top_attach">4</property>
< 			  <property name="bottom_attach">5</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="smime_encrypt_default">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">_Encrypt outgoing messages (by default)</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">4</property>
< 			  <property name="top_attach">3</property>
< 			  <property name="bottom_attach">4</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkHSeparator" id="hseparator3">
< 			  <property name="visible">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">4</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="y_padding">3</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options">fill</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="smime_sign_default">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Digitally _sign outgoing messages (by default)</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
3063c3029
< 			  <property name="right_attach">4</property>
---
> 			  <property name="right_attach">1</property>
3066,3067d3031
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
3071,3086d3034
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label451">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Secure MIME (S/MIME)</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
3088c3036,3038
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
3094c3044
< 		  <property name="expand">False</property>
---
> 		  <property name="expand">True</property>
3105,3190d3054
< 	</widget>
< 	<packing>
< 	  <property name="tab_expand">False</property>
< 	  <property name="tab_fill">True</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkLabel" id="lblSecurity">
< 	  <property name="visible">True</property>
< 	  <property name="label" translatable="yes">S_ecurity</property>
< 	  <property name="use_underline">True</property>
< 	  <property name="use_markup">False</property>
< 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 	  <property name="wrap">False</property>
< 	  <property name="selectable">False</property>
< 	  <property name="xalign">0.5</property>
< 	  <property name="yalign">0.5</property>
< 	  <property name="xpad">0</property>
< 	  <property name="ypad">0</property>
< 	</widget>
< 	<packing>
< 	  <property name="type">tab</property>
< 	</packing>
<       </child>
<     </widget>
<   </child>
< </widget>
< 
< <widget class="GtkWindow" id="accounts_tab">
<   <property name="title" translatable="yes">Email Accounts</property>
<   <property name="type">GTK_WINDOW_TOPLEVEL</property>
<   <property name="window_position">GTK_WIN_POS_NONE</property>
<   <property name="modal">False</property>
<   <property name="resizable">True</property>
<   <property name="destroy_with_parent">False</property>
< 
<   <child>
<     <widget class="GtkHBox" id="toplevel">
<       <property name="visible">True</property>
<       <property name="homogeneous">False</property>
<       <property name="spacing">6</property>
< 
<       <child>
< 	<widget class="Custom" id="etableMailAccounts">
< 	  <property name="visible">True</property>
< 	  <property name="creation_function">em_account_prefs_treeview_new</property>
< 	  <property name="int1">0</property>
< 	  <property name="int2">0</property>
< 	  <property name="last_modification_time">Wed, 29 Oct 2003 17:47:08 GMT</property>
< 	</widget>
< 	<packing>
< 	  <property name="padding">0</property>
< 	  <property name="expand">True</property>
< 	  <property name="fill">True</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkVBox" id="vboxMailFunctions">
< 	  <property name="border_width">3</property>
< 	  <property name="visible">True</property>
< 	  <property name="homogeneous">False</property>
< 	  <property name="spacing">0</property>
< 
< 	  <child>
< 	    <widget class="GtkLabel" id="lblMailSpacer">
< 	      <property name="visible">True</property>
< 	      <property name="label" translatable="yes">
< </property>
< 	      <property name="use_underline">False</property>
< 	      <property name="use_markup">False</property>
< 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 	      <property name="wrap">False</property>
< 	      <property name="selectable">False</property>
< 	      <property name="xalign">0.5</property>
< 	      <property name="yalign">0.5</property>
< 	      <property name="xpad">0</property>
< 	      <property name="ypad">0</property>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
3193c3057
< 	    <widget class="GtkVButtonBox" id="vbuttonboxMailAccounts">
---
> 	    <widget class="GtkVBox" id="frame2">
3195,3207c3059,3060
< 	      <property name="layout_style">GTK_BUTTONBOX_START</property>
< 	      <property name="spacing">3</property>
< 
< 	      <child>
< 		<widget class="GtkButton" id="cmdAccountAdd">
< 		  <property name="visible">True</property>
< 		  <property name="can_default">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="label">gtk-add</property>
< 		  <property name="use_stock">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
< 		</widget>
< 	      </child>
---
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
3210c3063
< 		<widget class="GtkButton" id="cmdAccountEdit">
---
> 		<widget class="GtkLabel" id="label484">
3212,3217c3065,3074
< 		  <property name="sensitive">False</property>
< 		  <property name="can_default">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="label" translatable="yes">_Edit</property>
< 		  <property name="use_underline">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Composing Messages&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
3218a3076,3080
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
3222c3084
< 		<widget class="GtkButton" id="cmdAccountDelete">
---
> 		<widget class="GtkHBox" id="hbox178">
3224,3346c3086,3087
< 		  <property name="sensitive">False</property>
< 		  <property name="can_default">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="label">gtk-remove</property>
< 		  <property name="use_stock">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
< 		</widget>
< 	      </child>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
< 
< 	  <child>
< 	    <widget class="GtkLabel" id="label421">
< 	      <property name="visible">True</property>
< 	      <property name="label" translatable="yes">
< </property>
< 	      <property name="use_underline">False</property>
< 	      <property name="use_markup">False</property>
< 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 	      <property name="wrap">False</property>
< 	      <property name="selectable">False</property>
< 	      <property name="xalign">0.5</property>
< 	      <property name="yalign">0.5</property>
< 	      <property name="xpad">0</property>
< 	      <property name="ypad">0</property>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
< 
< 	  <child>
< 	    <widget class="GtkVButtonBox" id="vbuttonboxMailExtras">
< 	      <property name="visible">True</property>
< 	      <property name="layout_style">GTK_BUTTONBOX_START</property>
< 	      <property name="spacing">3</property>
< 
< 	      <child>
< 		<widget class="GtkButton" id="cmdAccountDefault">
< 		  <property name="visible">True</property>
< 		  <property name="sensitive">False</property>
< 		  <property name="can_default">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="label" translatable="yes">De_fault</property>
< 		  <property name="use_underline">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
< 		</widget>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkButton" id="cmdAccountAble">
< 		  <property name="visible">True</property>
< 		  <property name="sensitive">False</property>
< 		  <property name="can_default">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="label" translatable="yes">E_nable</property>
< 		  <property name="use_underline">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
< 		</widget>
< 	      </child>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">True</property>
< 	      <property name="fill">True</property>
< 	    </packing>
< 	  </child>
< 	</widget>
< 	<packing>
< 	  <property name="padding">0</property>
< 	  <property name="expand">False</property>
< 	  <property name="fill">True</property>
< 	</packing>
<       </child>
<     </widget>
<   </child>
< </widget>
< 
< <widget class="GtkWindow" id="preferences_tab">
<   <property name="title" translatable="yes">Mail Preferences</property>
<   <property name="type">GTK_WINDOW_TOPLEVEL</property>
<   <property name="window_position">GTK_WIN_POS_NONE</property>
<   <property name="modal">False</property>
<   <property name="resizable">True</property>
<   <property name="destroy_with_parent">False</property>
< 
<   <child>
<     <widget class="GtkNotebook" id="toplevel">
<       <property name="visible">True</property>
<       <property name="can_focus">True</property>
<       <property name="show_tabs">True</property>
<       <property name="show_border">True</property>
<       <property name="tab_pos">GTK_POS_TOP</property>
<       <property name="scrollable">False</property>
<       <property name="enable_popup">False</property>
< 
<       <child>
< 	<widget class="GtkVBox" id="vboxGeneral">
< 	  <property name="border_width">6</property>
< 	  <property name="visible">True</property>
< 	  <property name="homogeneous">False</property>
< 	  <property name="spacing">3</property>
< 
< 	  <child>
< 	    <widget class="GtkFrame" id="frame3">
< 	      <property name="visible">True</property>
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
< 
< 	      <child>
< 		<widget class="GtkVBox" id="vboxMessageFonts">
< 		  <property name="border_width">6</property>
< 		  <property name="visible">True</property>
< 		  <property name="homogeneous">False</property>
< 		  <property name="spacing">3</property>
---
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
3349c3090
< 		    <widget class="GtkCheckButton" id="radFontUseSame">
---
> 		    <widget class="GtkLabel" id="label485">
3351,3357c3092,3101
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Use the same fonts as other applications</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
3367c3111
< 		    <widget class="GtkTable" id="tblScreen">
---
> 		    <widget class="GtkTable" id="table18">
3369,3370c3113,3114
< 		      <property name="n_rows">2</property>
< 		      <property name="n_columns">2</property>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
3372,3373c3116,3117
< 		      <property name="row_spacing">3</property>
< 		      <property name="column_spacing">3</property>
---
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
3376c3120
< 			<widget class="GtkLabel" id="lblScreenVariable">
---
> 			<widget class="GtkTable" id="table8">
3378,3388c3122,3356
< 			  <property name="label" translatable="yes">_Standard Font:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">radFontVariable</property>
---
> 			  <property name="n_rows">2</property>
> 			  <property name="n_columns">1</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">6</property>
> 			  <property name="column_spacing">12</property>
> 
> 			  <child>
> 			    <widget class="GtkVBox" id="vbox186">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkCheckButton" id="always_cc">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="label" translatable="yes">Alway_s carbon-copy (Cc) to:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="relief">GTK_RELIEF_NORMAL</property>
> 				  <property name="active">False</property>
> 				  <property name="inconsistent">False</property>
> 				  <property name="draw_indicator">True</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkHBox" id="hbox210">
> 				  <property name="visible">True</property>
> 				  <property name="homogeneous">False</property>
> 				  <property name="spacing">0</property>
> 
> 				  <child>
> 				    <widget class="GtkLabel" id="label522">
> 				      <property name="visible">True</property>
> 				      <property name="label" translatable="yes"></property>
> 				      <property name="use_underline">False</property>
> 				      <property name="use_markup">False</property>
> 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				      <property name="wrap">False</property>
> 				      <property name="selectable">False</property>
> 				      <property name="xalign">0.5</property>
> 				      <property name="yalign">0.5</property>
> 				      <property name="xpad">12</property>
> 				      <property name="ypad">0</property>
> 				    </widget>
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
> 				  </child>
> 
> 				  <child>
> 				    <widget class="GtkTable" id="table32">
> 				      <property name="visible">True</property>
> 				      <property name="n_rows">1</property>
> 				      <property name="n_columns">1</property>
> 				      <property name="homogeneous">False</property>
> 				      <property name="row_spacing">2</property>
> 				      <property name="column_spacing">6</property>
> 
> 				      <child>
> 					<widget class="GtkVBox" id="vbox187">
> 					  <property name="visible">True</property>
> 					  <property name="homogeneous">False</property>
> 					  <property name="spacing">6</property>
> 
> 					  <child>
> 					    <widget class="GtkEntry" id="cc_addrs">
> 					      <property name="visible">True</property>
> 					      <property name="can_focus">True</property>
> 					      <property name="editable">True</property>
> 					      <property name="visibility">True</property>
> 					      <property name="max_length">0</property>
> 					      <property name="text" translatable="yes"></property>
> 					      <property name="has_frame">True</property>
> 					      <property name="invisible_char" translatable="yes">*</property>
> 					      <property name="activates_default">False</property>
> 					    </widget>
> 					    <packing>
> 					      <property name="padding">0</property>
> 					      <property name="expand">True</property>
> 					      <property name="fill">True</property>
> 					    </packing>
> 					  </child>
> 					</widget>
> 					<packing>
> 					  <property name="left_attach">0</property>
> 					  <property name="right_attach">1</property>
> 					  <property name="top_attach">0</property>
> 					  <property name="bottom_attach">1</property>
> 					</packing>
> 				      </child>
> 				    </widget>
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">True</property>
> 				      <property name="fill">True</property>
> 				    </packing>
> 				  </child>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">True</property>
> 				  <property name="fill">True</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkVBox" id="vbox188">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkCheckButton" id="always_bcc">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="label" translatable="yes">Always _blind carbon-copy (Bcc) to:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="relief">GTK_RELIEF_NORMAL</property>
> 				  <property name="active">False</property>
> 				  <property name="inconsistent">False</property>
> 				  <property name="draw_indicator">True</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkHBox" id="hbox211">
> 				  <property name="visible">True</property>
> 				  <property name="homogeneous">False</property>
> 				  <property name="spacing">0</property>
> 
> 				  <child>
> 				    <widget class="GtkLabel" id="label523">
> 				      <property name="visible">True</property>
> 				      <property name="label" translatable="yes"></property>
> 				      <property name="use_underline">False</property>
> 				      <property name="use_markup">False</property>
> 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				      <property name="wrap">False</property>
> 				      <property name="selectable">False</property>
> 				      <property name="xalign">0.5</property>
> 				      <property name="yalign">0.5</property>
> 				      <property name="xpad">12</property>
> 				      <property name="ypad">0</property>
> 				    </widget>
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
> 				  </child>
> 
> 				  <child>
> 				    <widget class="GtkTable" id="table33">
> 				      <property name="visible">True</property>
> 				      <property name="n_rows">1</property>
> 				      <property name="n_columns">1</property>
> 				      <property name="homogeneous">False</property>
> 				      <property name="row_spacing">2</property>
> 				      <property name="column_spacing">6</property>
> 
> 				      <child>
> 					<widget class="GtkVBox" id="vbox189">
> 					  <property name="visible">True</property>
> 					  <property name="homogeneous">False</property>
> 					  <property name="spacing">6</property>
> 
> 					  <child>
> 					    <widget class="GtkEntry" id="bcc_addrs">
> 					      <property name="visible">True</property>
> 					      <property name="can_focus">True</property>
> 					      <property name="editable">True</property>
> 					      <property name="visibility">True</property>
> 					      <property name="max_length">0</property>
> 					      <property name="text" translatable="yes"></property>
> 					      <property name="has_frame">True</property>
> 					      <property name="invisible_char" translatable="yes">*</property>
> 					      <property name="activates_default">False</property>
> 					    </widget>
> 					    <packing>
> 					      <property name="padding">0</property>
> 					      <property name="expand">True</property>
> 					      <property name="fill">True</property>
> 					    </packing>
> 					  </child>
> 					</widget>
> 					<packing>
> 					  <property name="left_attach">0</property>
> 					  <property name="right_attach">1</property>
> 					  <property name="top_attach">0</property>
> 					  <property name="bottom_attach">1</property>
> 					</packing>
> 				      </child>
> 				    </widget>
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">True</property>
> 				      <property name="fill">True</property>
> 				    </packing>
> 				  </child>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">True</property>
> 				  <property name="fill">True</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			    </packing>
> 			  </child>
3395,3463d3362
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GnomeFontPicker" id="radFontFixed">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="title" translatable="yes">Select HTML fixed width font</property>
< 			  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
< 			  <property name="show_size">True</property>
< 			  <property name="use_font_in_label">False</property>
< 			  <property name="label_font_size">14</property>
< 			  <signal name="font_set" handler="changed"/>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GnomeFontPicker" id="radFontVariable">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="title" translatable="yes">Select HTML variable width font</property>
< 			  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
< 			  <property name="show_size">True</property>
< 			  <property name="use_font_in_label">False</property>
< 			  <property name="label_font_size">14</property>
< 			  <signal name="font_set" handler="changed"/>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="label444">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">_Terminal Font:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">radFontFixed</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
3473a3373,3377
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
3474a3379,3423
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 	</widget>
> 	<packing>
> 	  <property name="tab_expand">False</property>
> 	  <property name="tab_fill">True</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkLabel" id="label35">
> 	  <property name="visible">True</property>
> 	  <property name="label" translatable="yes">Defaults</property>
> 	  <property name="use_underline">True</property>
> 	  <property name="use_markup">False</property>
> 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 	  <property name="wrap">False</property>
> 	  <property name="selectable">False</property>
> 	  <property name="xalign">0.5</property>
> 	  <property name="yalign">0.5</property>
> 	  <property name="xpad">0</property>
> 	  <property name="ypad">0</property>
> 	</widget>
> 	<packing>
> 	  <property name="type">tab</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkVBox" id="vboxSecurityBorder">
> 	  <property name="border_width">12</property>
> 	  <property name="visible">True</property>
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">18</property>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="pgp_frame">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
3477c3426
< 		<widget class="GtkLabel" id="label460">
---
> 		<widget class="GtkLabel" id="label486">
3479c3428
< 		  <property name="label" translatable="yes">Message Fonts</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Pretty Good Privacy (PGP/GPG)&lt;/span&gt;</property>
3481c3430
< 		  <property name="use_markup">False</property>
---
> 		  <property name="use_markup">True</property>
3485c3434
< 		  <property name="xalign">0.5</property>
---
> 		  <property name="xalign">0</property>
3491c3440,3442
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
3494,3507d3444
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
< 
< 	  <child>
< 	    <widget class="GtkFrame" id="frameMessageDisplay">
< 	      <property name="visible">True</property>
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
3510,3511c3447
< 		<widget class="GtkVBox" id="vboxMessageDisplay">
< 		  <property name="border_width">6</property>
---
> 		<widget class="GtkHBox" id="hbox179">
3514c3450
< 		  <property name="spacing">3</property>
---
> 		  <property name="spacing">0</property>
3517c3453
< 		    <widget class="GtkHBox" id="hboxReadTimeout">
---
> 		    <widget class="GtkLabel" id="label487">
3519,3578c3455,3464
< 		      <property name="homogeneous">False</property>
< 		      <property name="spacing">3</property>
< 
< 		      <child>
< 			<widget class="GtkCheckButton" id="chkMarkTimeout">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">_Mark messages as read after</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">False</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkSpinButton" id="spinMarkTimeout">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="climb_rate">1</property>
< 			  <property name="digits">1</property>
< 			  <property name="numeric">True</property>
< 			  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
< 			  <property name="snap_to_ticks">False</property>
< 			  <property name="wrap">False</property>
< 			  <property name="adjustment">1.5 0 10 1 1 1</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="lblSeconds">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">seconds</property>
< 			  <property name="use_underline">False</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
3582,3583c3468,3469
< 		      <property name="expand">True</property>
< 		      <property name="fill">True</property>
---
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
3588c3474
< 		    <widget class="GtkHBox" id="hboxDefaultCharset">
---
> 		    <widget class="GtkTable" id="table19">
3589a3476,3477
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
3591,3613c3479,3480
< 		      <property name="spacing">3</property>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="lblDefaultCharset">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">Default character _encoding:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">omenuCharset</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
---
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
3616c3483
< 			<widget class="GtkOptionMenu" id="omenuCharset">
---
> 			<widget class="GtkVBox" id="vboxPGP">
3618,3619c3485,3486
< 			  <property name="can_focus">True</property>
< 			  <property name="history">0</property>
---
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
3621,3622c3488,3489
< 			  <child internal-child="menu">
< 			    <widget class="GtkMenu" id="convertwidget26">
---
> 			  <child>
> 			    <widget class="GtkHBox" id="hbox63">
3623a3491,3492
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">12</property>
3626c3495
< 				<widget class="GtkMenuItem" id="convertwidget27">
---
> 				<widget class="GtkLabel" id="pgp_key_id_label">
3628c3497
< 				  <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
---
> 				  <property name="label" translatable="yes">PGP/GPG _Key ID:</property>
3629a3499,3507
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">pgp_key</property>
3630a3509,3513
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
3634c3517
< 				<widget class="GtkMenuItem" id="convertwidget28">
---
> 				<widget class="GtkEntry" id="pgp_key">
3636,3637c3519,3526
< 				  <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
< 				  <property name="use_underline">True</property>
---
> 				  <property name="can_focus">True</property>
> 				  <property name="editable">True</property>
> 				  <property name="visibility">True</property>
> 				  <property name="max_length">0</property>
> 				  <property name="text" translatable="yes"></property>
> 				  <property name="has_frame">True</property>
> 				  <property name="invisible_char" translatable="yes">*</property>
> 				  <property name="activates_default">False</property>
3638a3528,3532
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">True</property>
> 				  <property name="fill">True</property>
> 				</packing>
3640a3535,3539
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
3642,3655d3540
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">True</property>
< 		      <property name="fill">True</property>
< 		    </packing>
< 		  </child>
3657,3661c3542,3558
< 		  <child>
< 		    <widget class="GtkHBox" id="hboxHighlightColor">
< 		      <property name="visible">True</property>
< 		      <property name="homogeneous">False</property>
< 		      <property name="spacing">3</property>
---
> 			  <child>
> 			    <widget class="GtkCheckButton" id="pgp_always_sign">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Always _sign outgoing messages when using this account</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
3663,3679c3560,3576
< 		      <child>
< 			<widget class="GtkCheckButton" id="chkHighlightCitations">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">Highlight _quotations with</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <property name="active">True</property>
< 			  <property name="inconsistent">False</property>
< 			  <property name="draw_indicator">True</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
---
> 			  <child>
> 			    <widget class="GtkCheckButton" id="pgp_no_imip_sign">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Don't sign _meeting requests (for Outlook compatibility)</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
3681,3694c3578,3594
< 		      <child>
< 			<widget class="GnomeColorPicker" id="colorpickerHighlightCitations">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="dither">True</property>
< 			  <property name="use_alpha">False</property>
< 			  <property name="title" translatable="yes">Pick a color</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
---
> 			  <child>
> 			    <widget class="GtkCheckButton" id="pgp_encrypt_to_self">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Al_ways encrypt to myself when sending encrypted mail</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">True</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
3696,3708c3596,3612
< 		      <child>
< 			<widget class="GtkLabel" id="lblColor">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">color</property>
< 			  <property name="use_underline">False</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
---
> 			  <child>
> 			    <widget class="GtkCheckButton" id="pgp_always_trust">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
3711,3713c3615,3618
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
3724,3739d3628
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkLabel" id="label452">
< 		  <property name="visible">True</property>
< 		  <property name="label" translatable="yes">Message Display</property>
< 		  <property name="use_underline">False</property>
< 		  <property name="use_markup">False</property>
< 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		  <property name="wrap">False</property>
< 		  <property name="selectable">False</property>
< 		  <property name="xalign">0.5</property>
< 		  <property name="yalign">0.5</property>
< 		  <property name="xpad">0</property>
< 		  <property name="ypad">0</property>
< 		</widget>
3741c3630,3632
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
3753c3644
< 	    <widget class="GtkFrame" id="frameDeletingMail">
---
> 	    <widget class="GtkVBox" id="vbox185">
3755,3802c3646,3647
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
< 
< 	      <child>
< 		<widget class="GtkVBox" id="vboxDeletingMail">
< 		  <property name="border_width">6</property>
< 		  <property name="visible">True</property>
< 		  <property name="homogeneous">False</property>
< 		  <property name="spacing">3</property>
< 
< 		  <child>
< 		    <widget class="GtkCheckButton" id="chkEmptyTrashOnExit">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">Empty _trash folders on exit</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkCheckButton" id="chkConfirmExpunge">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Confirm when expunging a folder</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 		</widget>
< 	      </child>
---
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
3805c3650
< 		<widget class="GtkLabel" id="label453">
---
> 		<widget class="GtkLabel" id="label519">
3807c3652
< 		  <property name="label" translatable="yes">Deleting Mail</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Secure MIME (S/MIME)&lt;/span&gt;</property>
3809c3654
< 		  <property name="use_markup">False</property>
---
> 		  <property name="use_markup">True</property>
3813c3658
< 		  <property name="xalign">0.5</property>
---
> 		  <property name="xalign">0</property>
3819c3664,3666
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
3822,3835d3668
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">True</property>
< 	      <property name="fill">True</property>
< 	    </packing>
< 	  </child>
< 
< 	  <child>
< 	    <widget class="GtkFrame" id="frameNewMailNotify">
< 	      <property name="visible">True</property>
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
3838,3839c3671
< 		<widget class="GtkVBox" id="vboxNewMailNotify">
< 		  <property name="border_width">6</property>
---
> 		<widget class="GtkHBox" id="hbox206">
3842,3879c3674
< 		  <property name="spacing">3</property>
< 
< 		  <child>
< 		    <widget class="GtkRadioButton" id="radNotifyNot">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Do not notify me when new mail arrives</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">True</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkRadioButton" id="radNotifyBeep">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Beep when new mail arrives</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		      <property name="group">radNotifyNot</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
---
> 		  <property name="spacing">0</property>
3882c3677
< 		    <widget class="GtkRadioButton" id="radNotifyPlaySound">
---
> 		    <widget class="GtkLabel" id="label520">
3884,3891c3679,3688
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Play sound file when new mail arrives</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		      <property name="group">radNotifyNot</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
3901,3902c3698
< 		    <widget class="GtkHBox" id="hbox154">
< 		      <property name="border_width">3</property>
---
> 		    <widget class="GtkTable" id="smime_table">
3903a3700,3701
> 		      <property name="n_rows">6</property>
> 		      <property name="n_columns">3</property>
3905c3703,3704
< 		      <property name="spacing">3</property>
---
> 		      <property name="row_spacing">6</property>
> 		      <property name="column_spacing">12</property>
3908c3707
< 			<widget class="GtkLabel" id="lblNotifyFilename">
---
> 			<widget class="GtkEntry" id="smime_sign_key">
3910,3920c3709,3716
< 			  <property name="label" translatable="yes">Specify _filename:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">txtNotifyPlaySound</property>
---
> 			  <property name="can_focus">True</property>
> 			  <property name="editable">True</property>
> 			  <property name="visibility">True</property>
> 			  <property name="max_length">0</property>
> 			  <property name="text" translatable="yes"></property>
> 			  <property name="has_frame">True</property>
> 			  <property name="invisible_char" translatable="yes">*</property>
> 			  <property name="activates_default">False</property>
3923,3925c3719,3723
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="left_attach">1</property>
> 			  <property name="right_attach">2</property>
> 			  <property name="top_attach">1</property>
> 			  <property name="bottom_attach">2</property>
> 			  <property name="y_options"></property>
3930c3728
< 			<widget class="GnomeFileEntry" id="fileNotifyPlaySound">
---
> 			<widget class="GtkEntry" id="smime_encrypt_key">
3932,3949c3730,3737
< 			  <property name="max_saved">10</property>
< 			  <property name="browse_dialog_title" translatable="yes">Execute Command...</property>
< 			  <property name="directory_entry">False</property>
< 			  <property name="modal">False</property>
< 
< 			  <child internal-child="entry">
< 			    <widget class="GtkEntry" id="txtNotifyPlaySound">
< 			      <property name="visible">True</property>
< 			      <property name="can_focus">True</property>
< 			      <property name="editable">True</property>
< 			      <property name="visibility">True</property>
< 			      <property name="max_length">0</property>
< 			      <property name="text" translatable="yes"></property>
< 			      <property name="has_frame">True</property>
< 			      <property name="invisible_char" translatable="yes">*</property>
< 			      <property name="activates_default">False</property>
< 			    </widget>
< 			  </child>
---
> 			  <property name="can_focus">True</property>
> 			  <property name="editable">True</property>
> 			  <property name="visibility">True</property>
> 			  <property name="max_length">0</property>
> 			  <property name="text" translatable="yes"></property>
> 			  <property name="has_frame">True</property>
> 			  <property name="invisible_char" translatable="yes">*</property>
> 			  <property name="activates_default">False</property>
3952,3954c3740,3744
< 			  <property name="padding">0</property>
< 			  <property name="expand">True</property>
< 			  <property name="fill">True</property>
---
> 			  <property name="left_attach">1</property>
> 			  <property name="right_attach">2</property>
> 			  <property name="top_attach">5</property>
> 			  <property name="bottom_attach">6</property>
> 			  <property name="y_options"></property>
3957,3965d3746
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 		</widget>
< 	      </child>
3967,3984c3748,5302
< 	      <child>
< 		<widget class="GtkLabel" id="label454">
< 		  <property name="visible">True</property>
< 		  <property name="label" translatable="yes">New Mail Notification</property>
< 		  <property name="use_underline">False</property>
< 		  <property name="use_markup">False</property>
< 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		  <property name="wrap">False</property>
< 		  <property name="selectable">False</property>
< 		  <property name="xalign">0.5</property>
< 		  <property name="yalign">0.5</property>
< 		  <property name="xpad">0</property>
< 		  <property name="ypad">0</property>
< 		</widget>
< 		<packing>
< 		  <property name="type">label_item</property>
< 		</packing>
< 	      </child>
---
> 		      <child>
> 			<widget class="GtkCheckButton" id="smime_encrypt_to_self">
> 			  <property name="visible">True</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">A_lso encrypt to self when sending encrypted mail</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">3</property>
> 			  <property name="top_attach">4</property>
> 			  <property name="bottom_attach">5</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options"></property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkCheckButton" id="smime_encrypt_default">
> 			  <property name="visible">True</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">_Encrypt outgoing messages (by default)</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">3</property>
> 			  <property name="top_attach">3</property>
> 			  <property name="bottom_attach">4</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options"></property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkCheckButton" id="smime_sign_default">
> 			  <property name="visible">True</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">_Digitally sign outgoing messages (by default)</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">3</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options"></property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkHSeparator" id="hseparator3">
> 			  <property name="visible">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">3</property>
> 			  <property name="top_attach">2</property>
> 			  <property name="bottom_attach">3</property>
> 			  <property name="y_padding">6</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options">fill</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkLabel" id="label470">
> 			  <property name="visible">True</property>
> 			  <property name="label" translatable="yes">Encry_ption certificate:</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="use_markup">False</property>
> 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			  <property name="wrap">False</property>
> 			  <property name="selectable">False</property>
> 			  <property name="xalign">0</property>
> 			  <property name="yalign">0.5</property>
> 			  <property name="xpad">0</property>
> 			  <property name="ypad">0</property>
> 			  <property name="mnemonic_widget">smime_encrypt_key</property>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">5</property>
> 			  <property name="bottom_attach">6</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options"></property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkLabel" id="label469">
> 			  <property name="visible">True</property>
> 			  <property name="label" translatable="yes">Si_gning certificate:</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="use_markup">False</property>
> 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			  <property name="wrap">False</property>
> 			  <property name="selectable">False</property>
> 			  <property name="xalign">0</property>
> 			  <property name="yalign">0.5</property>
> 			  <property name="xpad">0</property>
> 			  <property name="ypad">0</property>
> 			  <property name="mnemonic_widget">smime_sign_key</property>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">1</property>
> 			  <property name="bottom_attach">2</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options"></property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkHBox" id="hbox208">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkButton" id="smime_encrypt_key_select">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 
> 			      <child>
> 				<widget class="GtkAlignment" id="alignment28">
> 				  <property name="visible">True</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xscale">0</property>
> 				  <property name="yscale">0</property>
> 
> 				  <child>
> 				    <widget class="GtkHBox" id="hbox175">
> 				      <property name="visible">True</property>
> 				      <property name="homogeneous">False</property>
> 				      <property name="spacing">2</property>
> 
> 				      <child>
> 					<widget class="GtkImage" id="image3">
> 					  <property name="visible">True</property>
> 					  <property name="stock">gtk-open</property>
> 					  <property name="icon_size">4</property>
> 					  <property name="xalign">0.5</property>
> 					  <property name="yalign">0.5</property>
> 					  <property name="xpad">0</property>
> 					  <property name="ypad">0</property>
> 					</widget>
> 					<packing>
> 					  <property name="padding">0</property>
> 					  <property name="expand">False</property>
> 					  <property name="fill">False</property>
> 					</packing>
> 				      </child>
> 
> 				      <child>
> 					<widget class="GtkLabel" id="button98">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Select...</property>
> 					  <property name="use_underline">True</property>
> 					  <property name="use_markup">False</property>
> 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 					  <property name="wrap">False</property>
> 					  <property name="selectable">False</property>
> 					  <property name="xalign">0.5</property>
> 					  <property name="yalign">0.5</property>
> 					  <property name="xpad">0</property>
> 					  <property name="ypad">0</property>
> 					</widget>
> 					<packing>
> 					  <property name="padding">0</property>
> 					  <property name="expand">False</property>
> 					  <property name="fill">False</property>
> 					</packing>
> 				      </child>
> 				    </widget>
> 				  </child>
> 				</widget>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkButton" id="smime_encrypt_key_clear">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label">gtk-clear</property>
> 			      <property name="use_stock">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">2</property>
> 			  <property name="right_attach">3</property>
> 			  <property name="top_attach">5</property>
> 			  <property name="bottom_attach">6</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options">fill</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkHBox" id="hbox209">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkButton" id="smime_sign_key_select">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 
> 			      <child>
> 				<widget class="GtkAlignment" id="alignment29">
> 				  <property name="visible">True</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xscale">0</property>
> 				  <property name="yscale">0</property>
> 
> 				  <child>
> 				    <widget class="GtkHBox" id="hbox176">
> 				      <property name="visible">True</property>
> 				      <property name="homogeneous">False</property>
> 				      <property name="spacing">2</property>
> 
> 				      <child>
> 					<widget class="GtkImage" id="image4">
> 					  <property name="visible">True</property>
> 					  <property name="stock">gtk-open</property>
> 					  <property name="icon_size">4</property>
> 					  <property name="xalign">0.5</property>
> 					  <property name="yalign">0.5</property>
> 					  <property name="xpad">0</property>
> 					  <property name="ypad">0</property>
> 					</widget>
> 					<packing>
> 					  <property name="padding">0</property>
> 					  <property name="expand">False</property>
> 					  <property name="fill">False</property>
> 					</packing>
> 				      </child>
> 
> 				      <child>
> 					<widget class="GtkLabel" id="label472">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Select...</property>
> 					  <property name="use_underline">True</property>
> 					  <property name="use_markup">False</property>
> 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 					  <property name="wrap">False</property>
> 					  <property name="selectable">False</property>
> 					  <property name="xalign">0.5</property>
> 					  <property name="yalign">0.5</property>
> 					  <property name="xpad">0</property>
> 					  <property name="ypad">0</property>
> 					</widget>
> 					<packing>
> 					  <property name="padding">0</property>
> 					  <property name="expand">False</property>
> 					  <property name="fill">False</property>
> 					</packing>
> 				      </child>
> 				    </widget>
> 				  </child>
> 				</widget>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkButton" id="smime_sign_key_clear">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label">gtk-clear</property>
> 			      <property name="use_stock">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">2</property>
> 			  <property name="right_attach">3</property>
> 			  <property name="top_attach">1</property>
> 			  <property name="bottom_attach">2</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options">fill</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 	</widget>
> 	<packing>
> 	  <property name="tab_expand">False</property>
> 	  <property name="tab_fill">True</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkLabel" id="lblSecurity">
> 	  <property name="visible">True</property>
> 	  <property name="label" translatable="yes">Security</property>
> 	  <property name="use_underline">True</property>
> 	  <property name="use_markup">False</property>
> 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 	  <property name="wrap">False</property>
> 	  <property name="selectable">False</property>
> 	  <property name="xalign">0.5</property>
> 	  <property name="yalign">0.5</property>
> 	  <property name="xpad">0</property>
> 	  <property name="ypad">0</property>
> 	</widget>
> 	<packing>
> 	  <property name="type">tab</property>
> 	</packing>
>       </child>
>     </widget>
>   </child>
> </widget>
> 
> <widget class="GtkWindow" id="accounts_tab">
>   <property name="title" translatable="yes">Email Accounts</property>
>   <property name="type">GTK_WINDOW_TOPLEVEL</property>
>   <property name="window_position">GTK_WIN_POS_NONE</property>
>   <property name="modal">False</property>
>   <property name="resizable">True</property>
>   <property name="destroy_with_parent">False</property>
> 
>   <child>
>     <widget class="GtkHBox" id="toplevel">
>       <property name="visible">True</property>
>       <property name="homogeneous">False</property>
>       <property name="spacing">6</property>
> 
>       <child>
> 	<widget class="Custom" id="etableMailAccounts">
> 	  <property name="visible">True</property>
> 	  <property name="creation_function">em_account_prefs_treeview_new</property>
> 	  <property name="int1">0</property>
> 	  <property name="int2">0</property>
> 	  <property name="last_modification_time">Wed, 29 Oct 2003 17:47:08 GMT</property>
> 	</widget>
> 	<packing>
> 	  <property name="padding">0</property>
> 	  <property name="expand">True</property>
> 	  <property name="fill">True</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkVBox" id="vboxMailFunctions">
> 	  <property name="visible">True</property>
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">18</property>
> 
> 	  <child>
> 	    <widget class="GtkVButtonBox" id="vbuttonboxMailAccounts">
> 	      <property name="visible">True</property>
> 	      <property name="layout_style">GTK_BUTTONBOX_START</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkButton" id="cmdAccountAdd">
> 		  <property name="visible">True</property>
> 		  <property name="can_default">True</property>
> 		  <property name="can_focus">True</property>
> 		  <property name="label">gtk-add</property>
> 		  <property name="use_stock">True</property>
> 		  <property name="relief">GTK_RELIEF_NORMAL</property>
> 		</widget>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkButton" id="cmdAccountEdit">
> 		  <property name="visible">True</property>
> 		  <property name="sensitive">False</property>
> 		  <property name="can_default">True</property>
> 		  <property name="can_focus">True</property>
> 		  <property name="label" translatable="yes">_Edit</property>
> 		  <property name="use_underline">True</property>
> 		  <property name="relief">GTK_RELIEF_NORMAL</property>
> 		</widget>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkButton" id="cmdAccountDelete">
> 		  <property name="visible">True</property>
> 		  <property name="sensitive">False</property>
> 		  <property name="can_default">True</property>
> 		  <property name="can_focus">True</property>
> 		  <property name="label">gtk-remove</property>
> 		  <property name="use_stock">True</property>
> 		  <property name="relief">GTK_RELIEF_NORMAL</property>
> 		</widget>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVButtonBox" id="vbuttonboxMailExtras">
> 	      <property name="visible">True</property>
> 	      <property name="layout_style">GTK_BUTTONBOX_START</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkButton" id="cmdAccountDefault">
> 		  <property name="visible">True</property>
> 		  <property name="sensitive">False</property>
> 		  <property name="can_default">True</property>
> 		  <property name="can_focus">True</property>
> 		  <property name="label" translatable="yes">De_fault</property>
> 		  <property name="use_underline">True</property>
> 		  <property name="relief">GTK_RELIEF_NORMAL</property>
> 		</widget>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkButton" id="cmdAccountAble">
> 		  <property name="visible">True</property>
> 		  <property name="sensitive">False</property>
> 		  <property name="can_default">True</property>
> 		  <property name="can_focus">True</property>
> 		  <property name="label" translatable="yes">E_nable</property>
> 		  <property name="use_underline">True</property>
> 		  <property name="relief">GTK_RELIEF_NORMAL</property>
> 		</widget>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">True</property>
> 	      <property name="fill">True</property>
> 	    </packing>
> 	  </child>
> 	</widget>
> 	<packing>
> 	  <property name="padding">0</property>
> 	  <property name="expand">False</property>
> 	  <property name="fill">True</property>
> 	</packing>
>       </child>
>     </widget>
>   </child>
> </widget>
> 
> <widget class="GtkWindow" id="preferences_tab">
>   <property name="title" translatable="yes">Mail Preferences</property>
>   <property name="type">GTK_WINDOW_TOPLEVEL</property>
>   <property name="window_position">GTK_WIN_POS_NONE</property>
>   <property name="modal">False</property>
>   <property name="resizable">True</property>
>   <property name="destroy_with_parent">False</property>
> 
>   <child>
>     <widget class="GtkNotebook" id="toplevel">
>       <property name="visible">True</property>
>       <property name="can_focus">True</property>
>       <property name="show_tabs">True</property>
>       <property name="show_border">True</property>
>       <property name="tab_pos">GTK_POS_TOP</property>
>       <property name="scrollable">False</property>
>       <property name="enable_popup">False</property>
> 
>       <child>
> 	<widget class="GtkVBox" id="vboxGeneral">
> 	  <property name="border_width">12</property>
> 	  <property name="visible">True</property>
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">18</property>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="frame3">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label492">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Message Fonts&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox182">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label493">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkTable" id="table22">
> 		      <property name="visible">True</property>
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkVBox" id="vboxMessageFonts">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="radFontUseSame">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">_Use the same fonts as other applications</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkTable" id="tblScreen">
> 			      <property name="visible">True</property>
> 			      <property name="n_rows">2</property>
> 			      <property name="n_columns">2</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="row_spacing">6</property>
> 			      <property name="column_spacing">12</property>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="lblScreenVariable">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">_Standard Font:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_RIGHT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">radFontVariable</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GnomeFontPicker" id="radFontFixed">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="title" translatable="yes">Select HTML fixed width font</property>
> 				  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> 				  <property name="show_size">True</property>
> 				  <property name="use_font_in_label">False</property>
> 				  <property name="label_font_size">14</property>
> 				  <signal name="font_set" handler="changed"/>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GnomeFontPicker" id="radFontVariable">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="title" translatable="yes">Select HTML variable width font</property>
> 				  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> 				  <property name="show_size">True</property>
> 				  <property name="use_font_in_label">False</property>
> 				  <property name="label_font_size">14</property>
> 				  <signal name="font_set" handler="changed"/>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="label444">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">_Terminal Font:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_RIGHT</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">radFontFixed</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="frameMessageDisplay">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label494">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Message Display&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox183">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label495">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkTable" id="table23">
> 		      <property name="visible">True</property>
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkVBox" id="vboxMessageDisplay">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkHBox" id="hboxReadTimeout">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkCheckButton" id="chkMarkTimeout">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="label" translatable="yes">_Mark messages as read after</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="relief">GTK_RELIEF_NORMAL</property>
> 				  <property name="active">False</property>
> 				  <property name="inconsistent">False</property>
> 				  <property name="draw_indicator">True</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkSpinButton" id="spinMarkTimeout">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="climb_rate">1</property>
> 				  <property name="digits">1</property>
> 				  <property name="numeric">True</property>
> 				  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
> 				  <property name="snap_to_ticks">False</property>
> 				  <property name="wrap">False</property>
> 				  <property name="adjustment">1.5 0 10 1 1 1</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="lblSeconds">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">seconds</property>
> 				  <property name="use_underline">False</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkHBox" id="hboxHighlightColor">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkCheckButton" id="chkHighlightCitations">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="label" translatable="yes">Highlight _quotations with</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="relief">GTK_RELIEF_NORMAL</property>
> 				  <property name="active">True</property>
> 				  <property name="inconsistent">False</property>
> 				  <property name="draw_indicator">True</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GnomeColorPicker" id="colorpickerHighlightCitations">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="dither">True</property>
> 				  <property name="use_alpha">False</property>
> 				  <property name="title" translatable="yes">Pick a color</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="lblColor">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">color</property>
> 				  <property name="use_underline">False</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkHBox" id="hboxDefaultCharset">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="lblDefaultCharset">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">Default character _encoding:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">omenuCharset</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GtkOptionMenu" id="omenuCharset">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="history">0</property>
> 
> 				  <child internal-child="menu">
> 				    <widget class="GtkMenu" id="convertwidget26">
> 				      <property name="visible">True</property>
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget27">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget28">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
> 				    </widget>
> 				  </child>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">True</property>
> 			      <property name="fill">True</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="frameDeletingMail">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label496">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Delete Mail&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox184">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label497">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkTable" id="table24">
> 		      <property name="visible">True</property>
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkVBox" id="vboxDeletingMail">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="chkEmptyTrashOnExit">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Empty trash folders on e_xit</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="chkConfirmExpunge">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Confirm _when expunging a folder</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="frameNewMailNotify">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label498">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;New Mail Notification&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox185">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label499">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkTable" id="table25">
> 		      <property name="visible">True</property>
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkVBox" id="vboxNewMailNotify">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkRadioButton" id="radNotifyNot">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">_Do not notify me when new mail arrives</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">True</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkRadioButton" id="radNotifyBeep">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Beep w_hen new mail arrives</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			      <property name="group">radNotifyNot</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkRadioButton" id="radNotifyPlaySound">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Play sound file when new mail arri_ves</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			      <property name="group">radNotifyNot</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkHBox" id="hbox154">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="lblNotifyFilename">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">Specify _filename:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">txtNotifyPlaySound</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GnomeFileEntry" id="fileNotifyPlaySound">
> 				  <property name="visible">True</property>
> 				  <property name="max_saved">10</property>
> 				  <property name="browse_dialog_title" translatable="yes">Execute Command...</property>
> 				  <property name="directory_entry">False</property>
> 				  <property name="modal">False</property>
> 
> 				  <child internal-child="entry">
> 				    <widget class="GtkEntry" id="txtNotifyPlaySound">
> 				      <property name="visible">True</property>
> 				      <property name="can_focus">True</property>
> 				      <property name="editable">True</property>
> 				      <property name="visibility">True</property>
> 				      <property name="max_length">0</property>
> 				      <property name="text" translatable="yes"></property>
> 				      <property name="has_frame">True</property>
> 				      <property name="invisible_char" translatable="yes">*</property>
> 				      <property name="activates_default">False</property>
> 				    </widget>
> 				  </child>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">True</property>
> 				  <property name="fill">True</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 	</widget>
> 	<packing>
> 	  <property name="tab_expand">False</property>
> 	  <property name="tab_fill">True</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkLabel" id="lblGeneral">
> 	  <property name="visible">True</property>
> 	  <property name="label" translatable="yes">General</property>
> 	  <property name="use_underline">True</property>
> 	  <property name="use_markup">False</property>
> 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 	  <property name="wrap">False</property>
> 	  <property name="selectable">False</property>
> 	  <property name="xalign">0.5</property>
> 	  <property name="yalign">0.5</property>
> 	  <property name="xpad">0</property>
> 	  <property name="ypad">0</property>
> 	</widget>
> 	<packing>
> 	  <property name="type">tab</property>
> 	</packing>
>       </child>
> 
>       <child>
> 	<widget class="GtkVBox" id="vboxHtmlMail">
> 	  <property name="border_width">12</property>
> 	  <property name="visible">True</property>
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">18</property>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="vbox194">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label530">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;General&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox215">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label531">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkVBox" id="vbox173">
> 		      <property name="visible">True</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkCheckButton" id="chkShowAnimatedImages">
> 			  <property name="visible">True</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">_Show animated images</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkCheckButton" id="chkPromptWantHTML">
> 			  <property name="visible">True</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that don't want them</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
3988,3989c5306,5307
< 	      <property name="expand">True</property>
< 	      <property name="fill">True</property>
---
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
3992,4023d5309
< 	</widget>
< 	<packing>
< 	  <property name="tab_expand">False</property>
< 	  <property name="tab_fill">True</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkLabel" id="lblGeneral">
< 	  <property name="visible">True</property>
< 	  <property name="label" translatable="yes">_General</property>
< 	  <property name="use_underline">True</property>
< 	  <property name="use_markup">False</property>
< 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 	  <property name="wrap">False</property>
< 	  <property name="selectable">False</property>
< 	  <property name="xalign">0.5</property>
< 	  <property name="yalign">0.5</property>
< 	  <property name="xpad">0</property>
< 	  <property name="ypad">0</property>
< 	</widget>
< 	<packing>
< 	  <property name="type">tab</property>
< 	</packing>
<       </child>
< 
<       <child>
< 	<widget class="GtkVBox" id="vboxHtmlMail">
< 	  <property name="border_width">6</property>
< 	  <property name="visible">True</property>
< 	  <property name="homogeneous">False</property>
< 	  <property name="spacing">3</property>
4026c5312
< 	    <widget class="GtkFrame" id="frameLoadingImages">
---
> 	    <widget class="GtkVBox" id="frameLoadingImages">
4028,4030c5314,5336
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label500">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Loading Images&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
4033,4034c5339
< 		<widget class="GtkVBox" id="vboxLoadingImages">
< 		  <property name="border_width">6</property>
---
> 		<widget class="GtkHBox" id="hbox186">
4037c5342
< 		  <property name="spacing">3</property>
---
> 		  <property name="spacing">0</property>
4040c5345
< 		    <widget class="GtkRadioButton" id="radImagesNever">
---
> 		    <widget class="GtkLabel" id="label501">
4042,4048c5347,5356
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Never load images off the net</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">True</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
4058c5366
< 		    <widget class="GtkRadioButton" id="radImagesSometimes">
---
> 		    <widget class="GtkVBox" id="vbox190">
4060,4074c5368,5369
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Load images if sender is in address book</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		      <property name="group">radImagesNever</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
---
> 		      <property name="homogeneous">False</property>
> 		      <property name="spacing">6</property>
4076,4086c5371,5406
< 		  <child>
< 		    <widget class="GtkRadioButton" id="radImagesAlways">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Always load images off the net</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		      <property name="group">radImagesNever</property>
---
> 		      <child>
> 			<widget class="GtkRadioButton" id="radImagesSometimes">
> 			  <property name="visible">True</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">_Load images if sender is in address book</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkRadioButton" id="radImagesAlways">
> 			  <property name="visible">True</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">_Always load images off the net</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			  <property name="group">radImagesSometimes</property>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
> 		      </child>
4090,4091c5410,5411
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
---
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
4095,4110d5414
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkLabel" id="label455">
< 		  <property name="visible">True</property>
< 		  <property name="label" translatable="yes">Loading Images</property>
< 		  <property name="use_underline">False</property>
< 		  <property name="use_markup">False</property>
< 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		  <property name="wrap">False</property>
< 		  <property name="selectable">False</property>
< 		  <property name="xalign">0.5</property>
< 		  <property name="yalign">0.5</property>
< 		  <property name="xpad">0</property>
< 		  <property name="ypad">0</property>
< 		</widget>
4112c5416,5418
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
4122,4157d5427
< 
< 	  <child>
< 	    <widget class="GtkCheckButton" id="chkShowAnimatedImages">
< 	      <property name="visible">True</property>
< 	      <property name="can_focus">True</property>
< 	      <property name="label" translatable="yes">_Show animated images</property>
< 	      <property name="use_underline">True</property>
< 	      <property name="relief">GTK_RELIEF_NORMAL</property>
< 	      <property name="active">False</property>
< 	      <property name="inconsistent">False</property>
< 	      <property name="draw_indicator">True</property>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
< 
< 	  <child>
< 	    <widget class="GtkCheckButton" id="chkPromptWantHTML">
< 	      <property name="visible">True</property>
< 	      <property name="can_focus">True</property>
< 	      <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that don't want them</property>
< 	      <property name="use_underline">True</property>
< 	      <property name="relief">GTK_RELIEF_NORMAL</property>
< 	      <property name="active">False</property>
< 	      <property name="inconsistent">False</property>
< 	      <property name="draw_indicator">True</property>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
4168c5438
< 	  <property name="label" translatable="yes">_HTML Mail</property>
---
> 	  <property name="label" translatable="yes">HTML Mail</property>
4186c5456
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
4189c5459
< 	  <property name="spacing">3</property>
---
> 	  <property name="spacing">18</property>
4192c5462
< 	    <widget class="GtkFrame" id="frameColours">
---
> 	    <widget class="GtkVBox" id="frameColours">
4194,4196c5464,5465
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
4199,4200c5468
< 		<widget class="GtkTable" id="tableColours">
< 		  <property name="border_width">6</property>
---
> 		<widget class="GtkLabel" id="label502">
4202,4318c5470,5486
< 		  <property name="n_rows">6</property>
< 		  <property name="n_columns">3</property>
< 		  <property name="homogeneous">False</property>
< 		  <property name="row_spacing">3</property>
< 		  <property name="column_spacing">3</property>
< 
< 		  <child>
< 		    <widget class="GnomeColorPicker" id="colorLabel0">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="dither">True</property>
< 		      <property name="use_alpha">False</property>
< 		      <property name="title" translatable="yes">Pick a color</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">1</property>
< 		      <property name="right_attach">2</property>
< 		      <property name="top_attach">0</property>
< 		      <property name="bottom_attach">1</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GnomeColorPicker" id="colorLabel1">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="dither">True</property>
< 		      <property name="use_alpha">False</property>
< 		      <property name="title" translatable="yes">Pick a color</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">1</property>
< 		      <property name="right_attach">2</property>
< 		      <property name="top_attach">1</property>
< 		      <property name="bottom_attach">2</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GnomeColorPicker" id="colorLabel2">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="dither">True</property>
< 		      <property name="use_alpha">False</property>
< 		      <property name="title" translatable="yes">Pick a color</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">1</property>
< 		      <property name="right_attach">2</property>
< 		      <property name="top_attach">2</property>
< 		      <property name="bottom_attach">3</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GnomeColorPicker" id="colorLabel3">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="dither">True</property>
< 		      <property name="use_alpha">False</property>
< 		      <property name="title" translatable="yes">Pick a color</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">1</property>
< 		      <property name="right_attach">2</property>
< 		      <property name="top_attach">3</property>
< 		      <property name="bottom_attach">4</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GnomeColorPicker" id="colorLabel4">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="dither">True</property>
< 		      <property name="use_alpha">False</property>
< 		      <property name="title" translatable="yes">Pick a color</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">1</property>
< 		      <property name="right_attach">2</property>
< 		      <property name="top_attach">4</property>
< 		      <property name="bottom_attach">5</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkEntry" id="txtLabel0">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="editable">True</property>
< 		      <property name="visibility">True</property>
< 		      <property name="max_length">0</property>
< 		      <property name="text" translatable="yes">Important</property>
< 		      <property name="has_frame">True</property>
< 		      <property name="invisible_char" translatable="yes">*</property>
< 		      <property name="activates_default">False</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">0</property>
< 		      <property name="right_attach">1</property>
< 		      <property name="top_attach">0</property>
< 		      <property name="bottom_attach">1</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Labels and Colors&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
4320,4340c5488,5492
< 		  <child>
< 		    <widget class="GtkEntry" id="txtLabel1">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="editable">True</property>
< 		      <property name="visibility">True</property>
< 		      <property name="max_length">0</property>
< 		      <property name="text" translatable="yes">Work</property>
< 		      <property name="has_frame">True</property>
< 		      <property name="invisible_char" translatable="yes">*</property>
< 		      <property name="activates_default">False</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">0</property>
< 		      <property name="right_attach">1</property>
< 		      <property name="top_attach">1</property>
< 		      <property name="bottom_attach">2</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
---
> 	      <child>
> 		<widget class="GtkHBox" id="hbox187">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
4343c5495
< 		    <widget class="GtkEntry" id="txtLabel2">
---
> 		    <widget class="GtkLabel" id="label503">
4345,4352c5497,5506
< 		      <property name="can_focus">True</property>
< 		      <property name="editable">True</property>
< 		      <property name="visibility">True</property>
< 		      <property name="max_length">0</property>
< 		      <property name="text" translatable="yes">Personal</property>
< 		      <property name="has_frame">True</property>
< 		      <property name="invisible_char" translatable="yes">*</property>
< 		      <property name="activates_default">False</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
4355,4360c5509,5511
< 		      <property name="left_attach">0</property>
< 		      <property name="right_attach">1</property>
< 		      <property name="top_attach">2</property>
< 		      <property name="bottom_attach">3</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
4365c5516
< 		    <widget class="GtkEntry" id="txtLabel3">
---
> 		    <widget class="GtkTable" id="table27">
4367,4384c5518,5522
< 		      <property name="can_focus">True</property>
< 		      <property name="editable">True</property>
< 		      <property name="visibility">True</property>
< 		      <property name="max_length">0</property>
< 		      <property name="text" translatable="yes">To Do</property>
< 		      <property name="has_frame">True</property>
< 		      <property name="invisible_char" translatable="yes">*</property>
< 		      <property name="activates_default">False</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">0</property>
< 		      <property name="right_attach">1</property>
< 		      <property name="top_attach">3</property>
< 		      <property name="bottom_attach">4</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
4386,4406c5524,5752
< 		  <child>
< 		    <widget class="GtkEntry" id="txtLabel4">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="editable">True</property>
< 		      <property name="visibility">True</property>
< 		      <property name="max_length">0</property>
< 		      <property name="text" translatable="yes">Later</property>
< 		      <property name="has_frame">True</property>
< 		      <property name="invisible_char" translatable="yes">*</property>
< 		      <property name="activates_default">False</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="left_attach">0</property>
< 		      <property name="right_attach">1</property>
< 		      <property name="top_attach">4</property>
< 		      <property name="bottom_attach">5</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
< 		    </packing>
< 		  </child>
---
> 		      <child>
> 			<widget class="GtkTable" id="tableColours">
> 			  <property name="visible">True</property>
> 			  <property name="n_rows">6</property>
> 			  <property name="n_columns">2</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">6</property>
> 			  <property name="column_spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GnomeColorPicker" id="colorLabel0">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="dither">True</property>
> 			      <property name="use_alpha">False</property>
> 			      <property name="title" translatable="yes">Pick a color</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GnomeColorPicker" id="colorLabel1">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="dither">True</property>
> 			      <property name="use_alpha">False</property>
> 			      <property name="title" translatable="yes">Pick a color</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GnomeColorPicker" id="colorLabel2">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="dither">True</property>
> 			      <property name="use_alpha">False</property>
> 			      <property name="title" translatable="yes">Pick a color</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">2</property>
> 			      <property name="bottom_attach">3</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GnomeColorPicker" id="colorLabel3">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="dither">True</property>
> 			      <property name="use_alpha">False</property>
> 			      <property name="title" translatable="yes">Pick a color</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">3</property>
> 			      <property name="bottom_attach">4</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GnomeColorPicker" id="colorLabel4">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="dither">True</property>
> 			      <property name="use_alpha">False</property>
> 			      <property name="title" translatable="yes">Pick a color</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">4</property>
> 			      <property name="bottom_attach">5</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="txtLabel0">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes">Important</property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="txtLabel1">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes">Work</property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="txtLabel2">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes">Personal</property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">2</property>
> 			      <property name="bottom_attach">3</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="txtLabel3">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes">To Do</property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">3</property>
> 			      <property name="bottom_attach">4</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="txtLabel4">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes">Later</property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">4</property>
> 			      <property name="bottom_attach">5</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkHBox" id="hbox188">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkButton" id="cmdRestoreLabels">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="label">gtk-revert-to-saved</property>
> 				  <property name="use_stock">True</property>
> 				  <property name="relief">GTK_RELIEF_NORMAL</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
4408,4414c5754,5780
< 		  <child>
< 		    <widget class="GtkButton" id="cmdRestoreLabels">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Restore defaults</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
---
> 			      <child>
> 				<widget class="GtkFixed" id="fixed3">
> 				  <property name="visible">True</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">True</property>
> 				  <property name="fill">True</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">5</property>
> 			      <property name="bottom_attach">6</property>
> 			      <property name="x_options">fill</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
4417,4422c5783,5785
< 		      <property name="left_attach">2</property>
< 		      <property name="right_attach">3</property>
< 		      <property name="top_attach">5</property>
< 		      <property name="bottom_attach">6</property>
< 		      <property name="x_options">fill</property>
< 		      <property name="y_options"></property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
4426,4441d5788
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkLabel" id="label456">
< 		  <property name="visible">True</property>
< 		  <property name="label" translatable="yes">Labels and Colors</property>
< 		  <property name="use_underline">False</property>
< 		  <property name="use_markup">False</property>
< 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		  <property name="wrap">False</property>
< 		  <property name="selectable">False</property>
< 		  <property name="xalign">0.5</property>
< 		  <property name="yalign">0.5</property>
< 		  <property name="xpad">0</property>
< 		  <property name="ypad">0</property>
< 		</widget>
4443c5790,5792
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
4463c5812
< 	  <property name="label" translatable="yes">C_olors</property>
---
> 	  <property name="label" translatable="yes">Colors</property>
4481c5830
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
4484,4506c5833
< 	  <property name="spacing">0</property>
< 
< 	  <child>
< 	    <widget class="GtkLabel" id="lblHeaders">
< 	      <property name="visible">True</property>
< 	      <property name="label" translatable="yes">&lt;b&gt;_Displayed Mail Headers&lt;/b&gt;</property>
< 	      <property name="use_underline">True</property>
< 	      <property name="use_markup">True</property>
< 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 	      <property name="wrap">False</property>
< 	      <property name="selectable">False</property>
< 	      <property name="xalign">0</property>
< 	      <property name="yalign">0.5</property>
< 	      <property name="xpad">0</property>
< 	      <property name="ypad">0</property>
< 	      <property name="mnemonic_widget">txtHeaders</property>
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
---
> 	  <property name="spacing">18</property>
4509,4510c5836
< 	    <widget class="GtkHBox" id="hboxTreeButtons">
< 	      <property name="border_width">6</property>
---
> 	    <widget class="GtkVBox" id="vbox191">
4513c5839,5860
< 	      <property name="spacing">0</property>
---
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label524">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Displayed Mail Headers&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
4516c5863
< 		<widget class="GtkVBox" id="vboxEntryTree">
---
> 		<widget class="GtkHBox" id="hbox212">
4519c5866
< 		  <property name="spacing">6</property>
---
> 		  <property name="spacing">0</property>
4522c5869
< 		    <widget class="GtkEntry" id="txtHeaders">
---
> 		    <widget class="GtkLabel" id="label525">
4524,4531c5871,5880
< 		      <property name="can_focus">True</property>
< 		      <property name="editable">True</property>
< 		      <property name="visibility">True</property>
< 		      <property name="max_length">0</property>
< 		      <property name="text" translatable="yes"></property>
< 		      <property name="has_frame">True</property>
< 		      <property name="invisible_char" translatable="yes">*</property>
< 		      <property name="activates_default">False</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
4541c5890
< 		    <widget class="GtkScrolledWindow" id="scrolledwindow49">
---
> 		    <widget class="GtkTable" id="table35">
4543,4547c5892,5896
< 		      <property name="can_focus">True</property>
< 		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
< 		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
< 		      <property name="shadow_type">GTK_SHADOW_NONE</property>
< 		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
---
> 		      <property name="n_rows">2</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
4550c5899,6016
< 			<widget class="GtkTreeView" id="treeHeaders">
---
> 			<widget class="GtkTable" id="table34">
> 			  <property name="visible">True</property>
> 			  <property name="n_rows">3</property>
> 			  <property name="n_columns">2</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">6</property>
> 			  <property name="column_spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkEntry" id="txtHeaders">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="editable">True</property>
> 			      <property name="visibility">True</property>
> 			      <property name="max_length">0</property>
> 			      <property name="text" translatable="yes"></property>
> 			      <property name="has_frame">True</property>
> 			      <property name="invisible_char" translatable="yes">*</property>
> 			      <property name="activates_default">False</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkButton" id="cmdHeadersAdd">
> 			      <property name="visible">True</property>
> 			      <property name="sensitive">False</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label">gtk-add</property>
> 			      <property name="use_stock">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkButton" id="cmdHeadersRemove">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label">gtk-remove</property>
> 			      <property name="use_stock">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">2</property>
> 			      <property name="x_options">fill</property>
> 			      <property name="y_options"></property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkFixed" id="fixed10">
> 			      <property name="visible">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">1</property>
> 			      <property name="right_attach">2</property>
> 			      <property name="top_attach">2</property>
> 			      <property name="bottom_attach">3</property>
> 			      <property name="x_options">fill</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkScrolledWindow" id="scrolledwindow49">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> 			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> 			      <property name="shadow_type">GTK_SHADOW_IN</property>
> 			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> 
> 			      <child>
> 				<widget class="GtkTreeView" id="treeHeaders">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="headers_visible">False</property>
> 				  <property name="rules_hint">False</property>
> 				  <property name="reorderable">False</property>
> 				  <property name="enable_search">True</property>
> 				</widget>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">1</property>
> 			      <property name="bottom_attach">3</property>
> 			      <property name="x_options">fill</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkFixed" id="fixed11">
4552,4556d6017
< 			  <property name="can_focus">True</property>
< 			  <property name="headers_visible">False</property>
< 			  <property name="rules_hint">False</property>
< 			  <property name="reorderable">False</property>
< 			  <property name="enable_search">True</property>
4557a6019,6024
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">1</property>
> 			  <property name="bottom_attach">2</property>
> 			</packing>
4573,4616d6039
< 
< 	      <child>
< 		<widget class="GtkVBox" id="vbox162">
< 		  <property name="visible">True</property>
< 		  <property name="homogeneous">False</property>
< 		  <property name="spacing">0</property>
< 
< 		  <child>
< 		    <widget class="GtkButton" id="cmdHeadersAdd">
< 		      <property name="visible">True</property>
< 		      <property name="sensitive">False</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label">gtk-add</property>
< 		      <property name="use_stock">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">6</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkButton" id="cmdHeadersRemove">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label">gtk-remove</property>
< 		      <property name="use_stock">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 		</widget>
< 		<packing>
< 		  <property name="padding">6</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">True</property>
< 		</packing>
< 	      </child>
4652c6075
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
4655c6078
< 	  <property name="spacing">6</property>
---
> 	  <property name="spacing">18</property>
4658c6081
< 	    <widget class="GtkVBox" id="vbox162">
---
> 	    <widget class="GtkVBox" id="vbox192">
4661c6084
< 	      <property name="spacing">3</property>
---
> 	      <property name="spacing">6</property>
4664c6087
< 		<widget class="GtkCheckButton" id="chkCheckIncomingMail">
---
> 		<widget class="GtkLabel" id="label526">
4666,4673c6089,6098
< 		  <property name="tooltip" translatable="yes">Checks incoming mail messages to be Junk</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="label" translatable="yes">Check _Incoming Mail</property>
< 		  <property name="use_underline">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
< 		  <property name="active">False</property>
< 		  <property name="inconsistent">False</property>
< 		  <property name="draw_indicator">True</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;General&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
4680a6106,6177
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox213">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label527">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkTable" id="table36">
> 		      <property name="visible">True</property>
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkCheckButton" id="chkCheckIncomingMail">
> 			  <property name="visible">True</property>
> 			  <property name="tooltip" translatable="yes">Checks incoming mail messages to be Junk</property>
> 			  <property name="can_focus">True</property>
> 			  <property name="label" translatable="yes">Check _Incoming Mail</property>
> 			  <property name="use_underline">True</property>
> 			  <property name="relief">GTK_RELIEF_NORMAL</property>
> 			  <property name="active">False</property>
> 			  <property name="inconsistent">False</property>
> 			  <property name="draw_indicator">True</property>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			  <property name="x_options">fill</property>
> 			  <property name="y_options"></property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
4685c6182
< 	      <property name="fill">True</property>
---
> 	      <property name="fill">False</property>
4690c6187
< 	    <widget class="GtkFrame" id="frameFilterOptions">
---
> 	    <widget class="GtkVBox" id="vbox193">
4692,4698c6189,6190
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
< 
< 	      <child>
< 		<placeholder/>
< 	      </child>
---
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
4701c6193
< 		<widget class="GtkLabel" id="label474">
---
> 		<widget class="GtkLabel" id="label528">
4703c6195
< 		  <property name="label" translatable="yes">Filter Options</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Filter Options&lt;/span&gt;</property>
4705c6197
< 		  <property name="use_markup">False</property>
---
> 		  <property name="use_markup">True</property>
4709c6201
< 		  <property name="xalign">0.5</property>
---
> 		  <property name="xalign">0</property>
4715c6207,6278
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkHBox" id="hbox214">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label529">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkTable" id="table37">
> 		      <property name="visible">True</property>
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkFrame" id="frameFilterOptions">
> 			  <property name="visible">True</property>
> 			  <property name="label_xalign">0</property>
> 			  <property name="label_yalign">0.5</property>
> 			  <property name="shadow_type">GTK_SHADOW_NONE</property>
> 
> 			  <child>
> 			    <placeholder/>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
> 		  </child>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
4722c6285
< 	      <property name="fill">True</property>
---
> 	      <property name="fill">False</property>
4774c6337
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
4777c6340
< 	  <property name="spacing">3</property>
---
> 	  <property name="spacing">18</property>
4780c6343
< 	    <widget class="GtkFrame" id="frameBehavior">
---
> 	    <widget class="GtkVBox" id="frameBehavior">
4782,4784c6345,6367
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label504">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Default Behavior&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
4787,4788c6370
< 		<widget class="GtkVBox" id="vboxBehavior">
< 		  <property name="border_width">6</property>
---
> 		<widget class="GtkHBox" id="hbox189">
4791c6373,6394
< 		  <property name="spacing">3</property>
---
> 		  <property name="spacing">0</property>
> 
> 		  <child>
> 		    <widget class="GtkLabel" id="label505">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
4794c6397
< 		    <widget class="GtkTable" id="tableForwardsReplies">
---
> 		    <widget class="GtkTable" id="table28">
4796,4797c6399,6400
< 		      <property name="n_rows">3</property>
< 		      <property name="n_columns">2</property>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
4799,4800c6402,6403
< 		      <property name="row_spacing">3</property>
< 		      <property name="column_spacing">3</property>
---
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
4803c6406
< 			<widget class="GtkLabel" id="lblForwardStyle">
---
> 			<widget class="GtkVBox" id="vboxBehavior">
4805,4824c6408,6409
< 			  <property name="label" translatable="yes">_Forward style:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
---
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
4826,4848c6411,6427
< 		      <child>
< 			<widget class="GtkLabel" id="lblReplyStyle">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">_Reply style:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
---
> 			  <child>
> 			    <widget class="GtkCheckButton" id="chkSendHTML">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Format messages in _HTML</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
4850,4856c6429,6445
< 		      <child>
< 			<widget class="GtkAlignment" id="alignment25">
< 			  <property name="visible">True</property>
< 			  <property name="xalign">7.45058e-09</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xscale">0</property>
< 			  <property name="yscale">1</property>
---
> 			  <child>
> 			    <widget class="GtkCheckButton" id="chkAutoSmileys">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Automatically _insert smiley images</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
4859c6448
< 			    <widget class="GtkHBox" id="hboxReplyStyle">
---
> 			    <widget class="GtkTable" id="tableForwardsReplies">
4860a6450,6451
> 			      <property name="n_rows">3</property>
> 			      <property name="n_columns">2</property>
4862c6453,6454
< 			      <property name="spacing">0</property>
---
> 			      <property name="row_spacing">6</property>
> 			      <property name="column_spacing">12</property>
4865c6457
< 				<widget class="GtkOptionMenu" id="omenuReplyStyle">
---
> 				<widget class="GtkLabel" id="lblForwardStyle">
4867,4868c6459,6478
< 				  <property name="can_focus">True</property>
< 				  <property name="history">0</property>
---
> 				  <property name="label" translatable="yes">_Forward style:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
4870,4872c6480,6502
< 				  <child internal-child="menu">
< 				    <widget class="GtkMenu" id="convertwidget33">
< 				      <property name="visible">True</property>
---
> 			      <child>
> 				<widget class="GtkLabel" id="lblReplyStyle">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">_Reply style:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				</widget>
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
> 			      </child>
4874,4880c6504,6510
< 				      <child>
< 					<widget class="GtkMenuItem" id="convertwidget34">
< 					  <property name="visible">True</property>
< 					  <property name="label" translatable="yes">Quote original message</property>
< 					  <property name="use_underline">True</property>
< 					</widget>
< 				      </child>
---
> 			      <child>
> 				<widget class="GtkAlignment" id="alignment25">
> 				  <property name="visible">True</property>
> 				  <property name="xalign">7.45058e-09</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xscale">0</property>
> 				  <property name="yscale">1</property>
4882,4888c6512,6516
< 				      <child>
< 					<widget class="GtkMenuItem" id="convertwidget35">
< 					  <property name="visible">True</property>
< 					  <property name="label" translatable="yes">Do not quote original message</property>
< 					  <property name="use_underline">True</property>
< 					</widget>
< 				      </child>
---
> 				  <child>
> 				    <widget class="GtkHBox" id="hboxReplyStyle">
> 				      <property name="visible">True</property>
> 				      <property name="homogeneous">False</property>
> 				      <property name="spacing">0</property>
4891c6519
< 					<widget class="GtkMenuItem" id="convertwidget36">
---
> 					<widget class="GtkOptionMenu" id="omenuReplyStyle">
4893,4894c6521,6552
< 					  <property name="label" translatable="yes">Attach original message</property>
< 					  <property name="use_underline">True</property>
---
> 					  <property name="can_focus">True</property>
> 					  <property name="history">0</property>
> 
> 					  <child internal-child="menu">
> 					    <widget class="GtkMenu" id="convertwidget33">
> 					      <property name="visible">True</property>
> 
> 					      <child>
> 						<widget class="GtkMenuItem" id="convertwidget34">
> 						  <property name="visible">True</property>
> 						  <property name="label" translatable="yes">Quote original message</property>
> 						  <property name="use_underline">True</property>
> 						</widget>
> 					      </child>
> 
> 					      <child>
> 						<widget class="GtkMenuItem" id="convertwidget35">
> 						  <property name="visible">True</property>
> 						  <property name="label" translatable="yes">Do not quote original message</property>
> 						  <property name="use_underline">True</property>
> 						</widget>
> 					      </child>
> 
> 					      <child>
> 						<widget class="GtkMenuItem" id="convertwidget36">
> 						  <property name="visible">True</property>
> 						  <property name="label" translatable="yes">Attach original message</property>
> 						  <property name="use_underline">True</property>
> 						</widget>
> 					      </child>
> 					    </widget>
> 					  </child>
4895a6554,6558
> 					<packing>
> 					  <property name="padding">0</property>
> 					  <property name="expand">False</property>
> 					  <property name="fill">False</property>
> 					</packing>
4901,4903c6564,6569
< 				  <property name="padding">0</property>
< 				  <property name="expand">False</property>
< 				  <property name="fill">False</property>
---
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">1</property>
> 				  <property name="bottom_attach">2</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
4906,4929d6571
< 			    </widget>
< 			  </child>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">1</property>
< 			  <property name="bottom_attach">2</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkHBox" id="hboxForwardStyle">
< 			  <property name="visible">True</property>
< 			  <property name="homogeneous">False</property>
< 			  <property name="spacing">0</property>
< 
< 			  <child>
< 			    <widget class="GtkOptionMenu" id="omenuForwardStyle">
< 			      <property name="visible">True</property>
< 			      <property name="can_focus">True</property>
< 			      <property name="history">0</property>
4931,4932c6573,6574
< 			      <child internal-child="menu">
< 				<widget class="GtkMenu" id="convertwidget37">
---
> 			      <child>
> 				<widget class="GtkHBox" id="hboxForwardStyle">
4933a6576,6577
> 				  <property name="homogeneous">False</property>
> 				  <property name="spacing">0</property>
4936c6580
< 				    <widget class="GtkMenuItem" id="convertwidget38">
---
> 				    <widget class="GtkOptionMenu" id="omenuForwardStyle">
4938,4941c6582,6583
< 				      <property name="label" translatable="yes">Attachment</property>
< 				      <property name="use_underline">True</property>
< 				    </widget>
< 				  </child>
---
> 				      <property name="can_focus">True</property>
> 				      <property name="history">0</property>
4943,4949c6585,6587
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget39">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">Inline</property>
< 				      <property name="use_underline">True</property>
< 				    </widget>
< 				  </child>
---
> 				      <child internal-child="menu">
> 					<widget class="GtkMenu" id="convertwidget37">
> 					  <property name="visible">True</property>
4951,4955c6589,6613
< 				  <child>
< 				    <widget class="GtkMenuItem" id="convertwidget40">
< 				      <property name="visible">True</property>
< 				      <property name="label" translatable="yes">Quoted</property>
< 				      <property name="use_underline">True</property>
---
> 					  <child>
> 					    <widget class="GtkMenuItem" id="convertwidget38">
> 					      <property name="visible">True</property>
> 					      <property name="label" translatable="yes">Attachment</property>
> 					      <property name="use_underline">True</property>
> 					    </widget>
> 					  </child>
> 
> 					  <child>
> 					    <widget class="GtkMenuItem" id="convertwidget39">
> 					      <property name="visible">True</property>
> 					      <property name="label" translatable="yes">Inline</property>
> 					      <property name="use_underline">True</property>
> 					    </widget>
> 					  </child>
> 
> 					  <child>
> 					    <widget class="GtkMenuItem" id="convertwidget40">
> 					      <property name="visible">True</property>
> 					      <property name="label" translatable="yes">Quoted</property>
> 					      <property name="use_underline">True</property>
> 					    </widget>
> 					  </child>
> 					</widget>
> 				      </child>
4956a6615,6619
> 				    <packing>
> 				      <property name="padding">0</property>
> 				      <property name="expand">False</property>
> 				      <property name="fill">False</property>
> 				    </packing>
4958a6622,6629
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">0</property>
> 				  <property name="bottom_attach">1</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options">fill</property>
> 				</packing>
4960,5011d6630
< 			    </widget>
< 			    <packing>
< 			      <property name="padding">0</property>
< 			      <property name="expand">False</property>
< 			      <property name="fill">False</property>
< 			    </packing>
< 			  </child>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">0</property>
< 			  <property name="bottom_attach">1</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options">fill</property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkLabel" id="lblCharset">
< 			  <property name="visible">True</property>
< 			  <property name="label" translatable="yes">C_haracter set:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">omenuCharset</property>
< 			</widget>
< 			<packing>
< 			  <property name="left_attach">0</property>
< 			  <property name="right_attach">1</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
< 			</packing>
< 		      </child>
< 
< 		      <child>
< 			<widget class="GtkOptionMenu" id="omenuCharset">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="history">0</property>
< 
< 			  <child internal-child="menu">
< 			    <widget class="GtkMenu" id="convertwidget41">
< 			      <property name="visible">True</property>
5014c6633
< 				<widget class="GtkMenuItem" id="convertwidget42">
---
> 				<widget class="GtkLabel" id="lblCharset">
5016c6635
< 				  <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
---
> 				  <property name="label" translatable="yes">C_haracter set:</property>
5017a6637,6645
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">omenuCharset</property>
5018a6647,6654
> 				<packing>
> 				  <property name="left_attach">0</property>
> 				  <property name="right_attach">1</property>
> 				  <property name="top_attach">2</property>
> 				  <property name="bottom_attach">3</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
5022c6658
< 				<widget class="GtkMenuItem" id="convertwidget43">
---
> 				<widget class="GtkOptionMenu" id="omenuCharset">
5024,5025c6660,6683
< 				  <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
< 				  <property name="use_underline">True</property>
---
> 				  <property name="can_focus">True</property>
> 				  <property name="history">0</property>
> 
> 				  <child internal-child="menu">
> 				    <widget class="GtkMenu" id="convertwidget41">
> 				      <property name="visible">True</property>
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget42">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
> 
> 				      <child>
> 					<widget class="GtkMenuItem" id="convertwidget43">
> 					  <property name="visible">True</property>
> 					  <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
> 					  <property name="use_underline">True</property>
> 					</widget>
> 				      </child>
> 				    </widget>
> 				  </child>
5026a6685,6692
> 				<packing>
> 				  <property name="left_attach">1</property>
> 				  <property name="right_attach">2</property>
> 				  <property name="top_attach">2</property>
> 				  <property name="bottom_attach">3</property>
> 				  <property name="x_options">fill</property>
> 				  <property name="y_options"></property>
> 				</packing>
5028a6695,6699
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
5032,5037c6703,6706
< 			  <property name="left_attach">1</property>
< 			  <property name="right_attach">2</property>
< 			  <property name="top_attach">2</property>
< 			  <property name="bottom_attach">3</property>
< 			  <property name="x_options">fill</property>
< 			  <property name="y_options"></property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
5043,5080c6712,6713
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkCheckButton" id="chkSendHTML">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">Format messages in _HTML</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkCheckButton" id="chkAutoSmileys">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Automatically insert smiley images</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
---
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
5083a6717,6721
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
5084a6723,6735
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkVBox" id="frameAlerts">
> 	      <property name="visible">True</property>
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
5087c6738
< 		<widget class="GtkLabel" id="label457">
---
> 		<widget class="GtkLabel" id="label506">
5089c6740
< 		  <property name="label" translatable="yes">Default Behavior</property>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Alerts&lt;/span&gt;</property>
5091c6742
< 		  <property name="use_markup">False</property>
---
> 		  <property name="use_markup">True</property>
5095c6746
< 		  <property name="xalign">0.5</property>
---
> 		  <property name="xalign">0</property>
5101c6752,6754
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
5104,5117d6756
< 	    </widget>
< 	    <packing>
< 	      <property name="padding">0</property>
< 	      <property name="expand">False</property>
< 	      <property name="fill">False</property>
< 	    </packing>
< 	  </child>
< 
< 	  <child>
< 	    <widget class="GtkFrame" id="frameAlerts">
< 	      <property name="visible">True</property>
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
5120,5121c6759
< 		<widget class="GtkVBox" id="vboxAlerts">
< 		  <property name="border_width">6</property>
---
> 		<widget class="GtkHBox" id="hbox190">
5124c6762
< 		  <property name="spacing">3</property>
---
> 		  <property name="spacing">0</property>
5127c6765
< 		    <widget class="GtkCheckButton" id="chkPromptEmptySubject">
---
> 		    <widget class="GtkLabel" id="label507">
5129,5135c6767,6776
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">_Prompt when sending messages with an empty subject line</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
5145c6786
< 		    <widget class="GtkCheckButton" id="chkPromptBccOnly">
---
> 		    <widget class="GtkTable" id="table29">
5147,5153c6788,6842
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">Pr_ompt when sending messages with only Bcc recipients defined</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
---
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
> 
> 		      <child>
> 			<widget class="GtkVBox" id="vboxAlerts">
> 			  <property name="visible">True</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="chkPromptEmptySubject">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">_Prompt when sending messages with an empty subject line</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="chkPromptBccOnly">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Pr_ompt when sending messages with only Bcc recipients defined</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
> 			</packing>
> 		      </child>
5157,5158c6846,6847
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
---
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
5162,5177d6850
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkLabel" id="label458">
< 		  <property name="visible">True</property>
< 		  <property name="label" translatable="yes">Alerts</property>
< 		  <property name="use_underline">False</property>
< 		  <property name="use_markup">False</property>
< 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		  <property name="wrap">False</property>
< 		  <property name="selectable">False</property>
< 		  <property name="xalign">0.5</property>
< 		  <property name="yalign">0.5</property>
< 		  <property name="xpad">0</property>
< 		  <property name="ypad">0</property>
< 		</widget>
5179c6852,6854
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
5186c6861
< 	      <property name="fill">True</property>
---
> 	      <property name="fill">False</property>
5199c6874
< 	  <property name="label" translatable="yes">_General</property>
---
> 	  <property name="label" translatable="yes">General</property>
5217c6892
< 	  <property name="border_width">3</property>
---
> 	  <property name="border_width">12</property>
5220c6895
< 	  <property name="spacing">3</property>
---
> 	  <property name="spacing">18</property>
5224d6898
< 	      <property name="border_width">6</property>
5262,5282d6935
< 		    <widget class="GtkLabel" id="label455">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes"></property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_CENTER</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
5286c6939
< 		      <property name="spacing">3</property>
---
> 		      <property name="spacing">6</property>
5358c7011
< 	      <property name="spacing">3</property>
---
> 	      <property name="spacing">6</property>
5404c7057
< 	  <property name="label" translatable="yes">_Signatures</property>
---
> 	  <property name="label" translatable="yes">Signatures</property>
5422c7075
< 	  <property name="border_width">6</property>
---
> 	  <property name="border_width">12</property>
5425c7078
< 	  <property name="spacing">6</property>
---
> 	  <property name="spacing">18</property>
5437c7090
< 		  <property name="yalign">0.5</property>
---
> 		  <property name="yalign">0</property>
5488c7141
< 	    <widget class="GtkHBox" id="hboxLanguages">
---
> 	    <widget class="GtkVBox" id="vbox178">
5494c7147
< 		<widget class="GtkScrolledWindow" id="scrolledwindow48">
---
> 		<widget class="GtkLabel" id="label510">
5496,5512c7149,7158
< 		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
< 		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
< 		  <property name="shadow_type">GTK_SHADOW_IN</property>
< 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
< 
< 		  <child>
< 		    <widget class="GtkTreeView" id="clistSpellCheckLanguage">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="headers_visible">True</property>
< 		      <property name="rules_hint">False</property>
< 		      <property name="reorderable">False</property>
< 		      <property name="enable_search">True</property>
< 		      <signal name="select_row" handler="spellLanguageSelectRow"/>
< 		      <signal name="unselect_row" handler="spellLanguageUnselectRow"/>
< 		    </widget>
< 		  </child>
---
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Languages&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
5516,5517c7162,7163
< 		  <property name="expand">True</property>
< 		  <property name="fill">True</property>
---
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
5522c7168
< 		<widget class="GtkVBox" id="vbox159">
---
> 		<widget class="GtkHBox" id="hbox192">
5525c7171
< 		  <property name="spacing">5</property>
---
> 		  <property name="spacing">0</property>
5528c7174
< 		    <widget class="GtkLabel" id="label454">
---
> 		    <widget class="GtkLabel" id="label511">
5533c7179
< 		      <property name="justify">GTK_JUSTIFY_CENTER</property>
---
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
5538c7184
< 		      <property name="xpad">0</property>
---
> 		      <property name="xpad">12</property>
5549c7195
< 		    <widget class="GtkVButtonBox" id="vbuttonbox26">
---
> 		    <widget class="GtkHBox" id="hboxLanguages">
5551,5552c7197,7198
< 		      <property name="layout_style">GTK_BUTTONBOX_START</property>
< 		      <property name="spacing">0</property>
---
> 		      <property name="homogeneous">False</property>
> 		      <property name="spacing">6</property>
5555c7201
< 			<widget class="GtkButton" id="buttonSpellCheckEnable">
---
> 			<widget class="GtkScrolledWindow" id="scrolledwindow48">
5557,5563c7203,7244
< 			  <property name="sensitive">False</property>
< 			  <property name="can_default">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="label" translatable="yes">_Enable</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="relief">GTK_RELIEF_NORMAL</property>
< 			  <signal name="clicked" handler="spellLanguageEnable"/>
---
> 			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> 			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> 			  <property name="shadow_type">GTK_SHADOW_IN</property>
> 			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> 
> 			  <child>
> 			    <widget class="GtkTreeView" id="clistSpellCheckLanguage">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="headers_visible">True</property>
> 			      <property name="rules_hint">False</property>
> 			      <property name="reorderable">False</property>
> 			      <property name="enable_search">True</property>
> 			      <signal name="select_row" handler="spellLanguageSelectRow"/>
> 			      <signal name="unselect_row" handler="spellLanguageUnselectRow"/>
> 			    </widget>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkVButtonBox" id="vbuttonbox26">
> 			  <property name="layout_style">GTK_BUTTONBOX_START</property>
> 			  <property name="spacing">0</property>
> 
> 			  <child>
> 			    <widget class="GtkButton" id="buttonSpellCheckEnable">
> 			      <property name="visible">True</property>
> 			      <property name="sensitive">False</property>
> 			      <property name="can_default">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">_Enable</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <signal name="clicked" handler="spellLanguageEnable"/>
> 			    </widget>
> 			  </child>
5564a7246,7250
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
5576c7262
< 		  <property name="expand">False</property>
---
> 		  <property name="expand">True</property>
5589c7275
< 	    <widget class="GtkFrame" id="frameSpellChecking">
---
> 	    <widget class="GtkVBox" id="frameSpellChecking">
5591,5593c7277,7299
< 	      <property name="label_xalign">0</property>
< 	      <property name="label_yalign">0.5</property>
< 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 	      <property name="homogeneous">False</property>
> 	      <property name="spacing">6</property>
> 
> 	      <child>
> 		<widget class="GtkLabel" id="label508">
> 		  <property name="visible">True</property>
> 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Options&lt;/span&gt;</property>
> 		  <property name="use_underline">False</property>
> 		  <property name="use_markup">True</property>
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		  <property name="wrap">False</property>
> 		  <property name="selectable">False</property>
> 		  <property name="xalign">0</property>
> 		  <property name="yalign">0.5</property>
> 		  <property name="xpad">0</property>
> 		  <property name="ypad">0</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
5596,5597c7302
< 		<widget class="GtkVBox" id="vboxOptions">
< 		  <property name="border_width">6</property>
---
> 		<widget class="GtkHBox" id="hbox191">
5600c7305
< 		  <property name="spacing">3</property>
---
> 		  <property name="spacing">0</property>
5603c7308
< 		    <widget class="GtkCheckButton" id="chkEnableSpellChecking">
---
> 		    <widget class="GtkLabel" id="label509">
5605,5611c7310,7319
< 		      <property name="can_focus">True</property>
< 		      <property name="label" translatable="yes">Check spelling while I _type</property>
< 		      <property name="use_underline">True</property>
< 		      <property name="relief">GTK_RELIEF_NORMAL</property>
< 		      <property name="active">False</property>
< 		      <property name="inconsistent">False</property>
< 		      <property name="draw_indicator">True</property>
---
> 		      <property name="label" translatable="yes"></property>
> 		      <property name="use_underline">False</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0.5</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">12</property>
> 		      <property name="ypad">0</property>
5621c7329
< 		    <widget class="GtkHBox" id="hboxSpellCheckColor">
---
> 		    <widget class="GtkTable" id="table30">
5622a7331,7332
> 		      <property name="n_rows">1</property>
> 		      <property name="n_columns">1</property>
5624c7334,7335
< 		      <property name="spacing">6</property>
---
> 		      <property name="row_spacing">2</property>
> 		      <property name="column_spacing">6</property>
5627c7338
< 			<widget class="GtkLabel" id="lblSpellCheckColor">
---
> 			<widget class="GtkVBox" id="vboxOptions">
5629,5646c7340,7359
< 			  <property name="label" translatable="yes">Color for _misspelled words:</property>
< 			  <property name="use_underline">True</property>
< 			  <property name="use_markup">False</property>
< 			  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 			  <property name="wrap">False</property>
< 			  <property name="selectable">False</property>
< 			  <property name="xalign">0.5</property>
< 			  <property name="yalign">0.5</property>
< 			  <property name="xpad">0</property>
< 			  <property name="ypad">0</property>
< 			  <property name="mnemonic_widget">colorpickerSpellCheckColor</property>
< 			</widget>
< 			<packing>
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
< 			</packing>
< 		      </child>
---
> 			  <property name="homogeneous">False</property>
> 			  <property name="spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkCheckButton" id="chkEnableSpellChecking">
> 			      <property name="visible">True</property>
> 			      <property name="can_focus">True</property>
> 			      <property name="label" translatable="yes">Check spelling while I _type</property>
> 			      <property name="use_underline">True</property>
> 			      <property name="relief">GTK_RELIEF_NORMAL</property>
> 			      <property name="active">False</property>
> 			      <property name="inconsistent">False</property>
> 			      <property name="draw_indicator">True</property>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">False</property>
> 			    </packing>
> 			  </child>
5648,5655c7361,7410
< 		      <child>
< 			<widget class="GnomeColorPicker" id="colorpickerSpellCheckColor">
< 			  <property name="visible">True</property>
< 			  <property name="can_focus">True</property>
< 			  <property name="dither">True</property>
< 			  <property name="use_alpha">False</property>
< 			  <property name="title" translatable="yes">Pick a color</property>
< 			  <signal name="color_set" handler="spellColorSet"/>
---
> 			  <child>
> 			    <widget class="GtkHBox" id="hboxSpellCheckColor">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">6</property>
> 
> 			      <child>
> 				<widget class="GtkLabel" id="lblSpellCheckColor">
> 				  <property name="visible">True</property>
> 				  <property name="label" translatable="yes">Color for _misspelled words:</property>
> 				  <property name="use_underline">True</property>
> 				  <property name="use_markup">False</property>
> 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
> 				  <property name="wrap">False</property>
> 				  <property name="selectable">False</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
> 				  <property name="xpad">0</property>
> 				  <property name="ypad">0</property>
> 				  <property name="mnemonic_widget">colorpickerSpellCheckColor</property>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 
> 			      <child>
> 				<widget class="GnomeColorPicker" id="colorpickerSpellCheckColor">
> 				  <property name="visible">True</property>
> 				  <property name="can_focus">True</property>
> 				  <property name="dither">True</property>
> 				  <property name="use_alpha">False</property>
> 				  <property name="title" translatable="yes">Pick a color</property>
> 				  <signal name="color_set" handler="spellColorSet"/>
> 				</widget>
> 				<packing>
> 				  <property name="padding">0</property>
> 				  <property name="expand">False</property>
> 				  <property name="fill">False</property>
> 				</packing>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="padding">0</property>
> 			      <property name="expand">False</property>
> 			      <property name="fill">True</property>
> 			    </packing>
> 			  </child>
5658,5660c7413,7416
< 			  <property name="padding">0</property>
< 			  <property name="expand">False</property>
< 			  <property name="fill">False</property>
---
> 			  <property name="left_attach">0</property>
> 			  <property name="right_attach">1</property>
> 			  <property name="top_attach">0</property>
> 			  <property name="bottom_attach">1</property>
5666c7422
< 		      <property name="expand">False</property>
---
> 		      <property name="expand">True</property>
5671,5686d7426
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkLabel" id="label459">
< 		  <property name="visible">True</property>
< 		  <property name="label" translatable="yes">Options</property>
< 		  <property name="use_underline">False</property>
< 		  <property name="use_markup">False</property>
< 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		  <property name="wrap">False</property>
< 		  <property name="selectable">False</property>
< 		  <property name="xalign">0.5</property>
< 		  <property name="yalign">0.5</property>
< 		  <property name="xpad">0</property>
< 		  <property name="ypad">0</property>
< 		</widget>
5688c7428,7430
< 		  <property name="type">label_item</property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
5708c7450
< 	  <property name="label" translatable="yes">Spell _Checking</property>
---
> 	  <property name="label" translatable="yes">Spell Checking</property>
5727a7470
>   <property name="border_width">12</property>
5737d7479
<       <property name="border_width">4</property>
5740c7482
<       <property name="spacing">4</property>
---
>       <property name="spacing">12</property>
5747c7489
< 	<widget class="GtkFrame" id="frame4">
---
> 	<widget class="GtkVBox" id="frame4">
5749,5751c7491,7492
< 	  <property name="label_xalign">0</property>
< 	  <property name="label_yalign">0.5</property>
< 	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">6</property>
5754,5755c7495,7516
< 	    <widget class="GtkTable" id="tblPrint">
< 	      <property name="border_width">4</property>
---
> 	    <widget class="GtkLabel" id="label512">
> 	      <property name="visible">True</property>
> 	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Printed Fonts&lt;/span&gt;</property>
> 	      <property name="use_underline">False</property>
> 	      <property name="use_markup">True</property>
> 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
> 	      <property name="wrap">False</property>
> 	      <property name="selectable">False</property>
> 	      <property name="xalign">0</property>
> 	      <property name="yalign">0.5</property>
> 	      <property name="xpad">0</property>
> 	      <property name="ypad">0</property>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkHBox" id="hbox194">
5757,5758d7517
< 	      <property name="n_rows">2</property>
< 	      <property name="n_columns">2</property>
5760,5761c7519
< 	      <property name="row_spacing">4</property>
< 	      <property name="column_spacing">6</property>
---
> 	      <property name="spacing">0</property>
5764c7522
< 		<widget class="GtkLabel" id="lblPrintVariable">
---
> 		<widget class="GtkLabel" id="label513">
5766,5767c7524,7525
< 		  <property name="label" translatable="yes">V_ariable-width:</property>
< 		  <property name="use_underline">True</property>
---
> 		  <property name="label" translatable="yes"></property>
> 		  <property name="use_underline">False</property>
5769c7527
< 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
---
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
5772c7530
< 		  <property name="xalign">0</property>
---
> 		  <property name="xalign">0.5</property>
5774c7532
< 		  <property name="xpad">0</property>
---
> 		  <property name="xpad">12</property>
5776d7533
< 		  <property name="mnemonic_widget">print_variable</property>
5779,5784c7536,7538
< 		  <property name="left_attach">0</property>
< 		  <property name="right_attach">1</property>
< 		  <property name="top_attach">0</property>
< 		  <property name="bottom_attach">1</property>
< 		  <property name="x_options">fill</property>
< 		  <property name="y_options"></property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
5789c7543
< 		<widget class="GtkLabel" id="lblPrintFixed">
---
> 		<widget class="GtkTable" id="tblPrint">
5791,5811c7545,7549
< 		  <property name="label" translatable="yes">Fi_xed -width:</property>
< 		  <property name="use_underline">True</property>
< 		  <property name="use_markup">False</property>
< 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
< 		  <property name="wrap">False</property>
< 		  <property name="selectable">False</property>
< 		  <property name="xalign">0</property>
< 		  <property name="yalign">0.5</property>
< 		  <property name="xpad">0</property>
< 		  <property name="ypad">0</property>
< 		  <property name="mnemonic_widget">print_fixed</property>
< 		</widget>
< 		<packing>
< 		  <property name="left_attach">0</property>
< 		  <property name="right_attach">1</property>
< 		  <property name="top_attach">1</property>
< 		  <property name="bottom_attach">2</property>
< 		  <property name="x_options">fill</property>
< 		  <property name="y_options"></property>
< 		</packing>
< 	      </child>
---
> 		  <property name="n_rows">2</property>
> 		  <property name="n_columns">2</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="row_spacing">6</property>
> 		  <property name="column_spacing">12</property>
5813,5832c7551,7574
< 	      <child>
< 		<widget class="GnomeFontPicker" id="print_fixed">
< 		  <property name="visible">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="title" translatable="yes">Select HTML fixed width font for printing</property>
< 		  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
< 		  <property name="show_size">True</property>
< 		  <property name="use_font_in_label">False</property>
< 		  <property name="label_font_size">14</property>
< 		  <signal name="font_set" handler="changed"/>
< 		</widget>
< 		<packing>
< 		  <property name="left_attach">1</property>
< 		  <property name="right_attach">2</property>
< 		  <property name="top_attach">1</property>
< 		  <property name="bottom_attach">2</property>
< 		  <property name="x_options">fill</property>
< 		  <property name="y_options"></property>
< 		</packing>
< 	      </child>
---
> 		  <child>
> 		    <widget class="GtkLabel" id="lblPrintVariable">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes">V_ariable-width:</property>
> 		      <property name="use_underline">True</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_CENTER</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">0</property>
> 		      <property name="ypad">0</property>
> 		      <property name="mnemonic_widget">print_variable</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="left_attach">0</property>
> 		      <property name="right_attach">1</property>
> 		      <property name="top_attach">0</property>
> 		      <property name="bottom_attach">1</property>
> 		      <property name="x_options">fill</property>
> 		      <property name="y_options"></property>
> 		    </packing>
> 		  </child>
5834,5843c7576,7641
< 	      <child>
< 		<widget class="GnomeFontPicker" id="print_variable">
< 		  <property name="visible">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="title" translatable="yes">Select HTML variable width font for printing</property>
< 		  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
< 		  <property name="show_size">True</property>
< 		  <property name="use_font_in_label">False</property>
< 		  <property name="label_font_size">14</property>
< 		  <signal name="font_set" handler="changed"/>
---
> 		  <child>
> 		    <widget class="GtkLabel" id="lblPrintFixed">
> 		      <property name="visible">True</property>
> 		      <property name="label" translatable="yes">Fi_xed -width:</property>
> 		      <property name="use_underline">True</property>
> 		      <property name="use_markup">False</property>
> 		      <property name="justify">GTK_JUSTIFY_CENTER</property>
> 		      <property name="wrap">False</property>
> 		      <property name="selectable">False</property>
> 		      <property name="xalign">0</property>
> 		      <property name="yalign">0.5</property>
> 		      <property name="xpad">0</property>
> 		      <property name="ypad">0</property>
> 		      <property name="mnemonic_widget">print_fixed</property>
> 		    </widget>
> 		    <packing>
> 		      <property name="left_attach">0</property>
> 		      <property name="right_attach">1</property>
> 		      <property name="top_attach">1</property>
> 		      <property name="bottom_attach">2</property>
> 		      <property name="x_options">fill</property>
> 		      <property name="y_options"></property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GnomeFontPicker" id="print_fixed">
> 		      <property name="visible">True</property>
> 		      <property name="can_focus">True</property>
> 		      <property name="title" translatable="yes">Select HTML fixed width font for printing</property>
> 		      <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> 		      <property name="show_size">True</property>
> 		      <property name="use_font_in_label">False</property>
> 		      <property name="label_font_size">14</property>
> 		      <signal name="font_set" handler="changed"/>
> 		    </widget>
> 		    <packing>
> 		      <property name="left_attach">1</property>
> 		      <property name="right_attach">2</property>
> 		      <property name="top_attach">1</property>
> 		      <property name="bottom_attach">2</property>
> 		      <property name="x_options">fill</property>
> 		      <property name="y_options"></property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GnomeFontPicker" id="print_variable">
> 		      <property name="visible">True</property>
> 		      <property name="can_focus">True</property>
> 		      <property name="title" translatable="yes">Select HTML variable width font for printing</property>
> 		      <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> 		      <property name="show_size">True</property>
> 		      <property name="use_font_in_label">False</property>
> 		      <property name="label_font_size">14</property>
> 		      <signal name="font_set" handler="changed"/>
> 		    </widget>
> 		    <packing>
> 		      <property name="left_attach">1</property>
> 		      <property name="right_attach">2</property>
> 		      <property name="top_attach">0</property>
> 		      <property name="bottom_attach">1</property>
> 		      <property name="x_options">fill</property>
> 		      <property name="y_options"></property>
> 		    </packing>
> 		  </child>
5846,5851c7644,7646
< 		  <property name="left_attach">1</property>
< 		  <property name="right_attach">2</property>
< 		  <property name="top_attach">0</property>
< 		  <property name="bottom_attach">1</property>
< 		  <property name="x_options">fill</property>
< 		  <property name="y_options"></property>
---
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
5855,5870d7649
< 	  </child>
< 
< 	  <child>
< 	    <widget class="GtkLabel" id="label461">
< 	      <property name="visible">True</property>
< 	      <property name="label" translatable="yes">Printed Fonts</property>
< 	      <property name="use_underline">False</property>
< 	      <property name="use_markup">False</property>
< 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 	      <property name="wrap">False</property>
< 	      <property name="selectable">False</property>
< 	      <property name="xalign">0.5</property>
< 	      <property name="yalign">0.5</property>
< 	      <property name="xpad">0</property>
< 	      <property name="ypad">0</property>
< 	    </widget>
5872c7651,7653
< 	      <property name="type">label_item</property>
---
> 	      <property name="padding">0</property>
> 	      <property name="expand">True</property>
> 	      <property name="fill">True</property>
5886a7668
>   <property name="border_width">6</property>
5893c7675
<   <property name="has_separator">True</property>
---
>   <property name="has_separator">False</property>
5899c7681
<       <property name="spacing">6</property>
---
>       <property name="spacing">12</property>
5955c7737
< 		  <property name="spacing">12</property>
---
> 		  <property name="spacing">6</property>
5961c7743
< 		      <property name="yalign">0.5</property>
---
> 		      <property name="yalign">0</property>
6002a7785,7795
> 		<widget class="GtkHSeparator" id="hseparator4">
> 		  <property name="visible">True</property>
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
6009c7802
< 		  <property name="column_spacing">6</property>
---
> 		  <property name="column_spacing">12</property>
6122,6123c7915,7916
< 	      <property name="expand">True</property>
< 	      <property name="fill">True</property>
---
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
6147c7940
<       <property name="border_width">6</property>
---
>       <property name="border_width">12</property>
6150c7943
<       <property name="spacing">3</property>
---
>       <property name="spacing">6</property>
Index: mail/mail-search.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-search.glade,v
retrieving revision 1.2
diff -r1.2 mail-search.glade
4a5
> <requires lib="gnome"/>
6a8
>   <property name="border_width">6</property>
12c14
<   <property name="resizable">False</property>
---
>   <property name="resizable">True</property>
14c16
<   <property name="has_separator">True</property>
---
>   <property name="has_separator">False</property>
20c22
<       <property name="spacing">0</property>
---
>       <property name="spacing">12</property>
60c62
< 	<widget class="GtkFrame" id="frame1">
---
> 	<widget class="GtkVBox" id="vbox1">
63,65c65,66
< 	  <property name="label_xalign">0</property>
< 	  <property name="label_yalign">0.5</property>
< 	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 	  <property name="homogeneous">False</property>
> 	  <property name="spacing">6</property>
68,69c69
< 	    <widget class="GtkVBox" id="vbox1">
< 	      <property name="border_width">6</property>
---
> 	    <widget class="GtkHBox" id="hbox1">
72c72
< 	      <property name="spacing">6</property>
---
> 	      <property name="spacing">12</property>
75c75
< 		<widget class="GtkHBox" id="hbox1">
---
> 		<widget class="GtkLabel" id="label2">
77,130c77
< 		  <property name="homogeneous">False</property>
< 		  <property name="spacing">6</property>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label2">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Find:</property>
< 		      <property name="use_underline">False</property>
< 		      <property name="use_markup">False</property>
< 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
< 		      <property name="wrap">False</property>
< 		      <property name="selectable">False</property>
< 		      <property name="xalign">0.5</property>
< 		      <property name="yalign">0.5</property>
< 		      <property name="xpad">0</property>
< 		      <property name="ypad">0</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">False</property>
< 		      <property name="fill">False</property>
< 		    </packing>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkEntry" id="search_entry">
< 		      <property name="visible">True</property>
< 		      <property name="can_focus">True</property>
< 		      <property name="editable">True</property>
< 		      <property name="visibility">True</property>
< 		      <property name="max_length">0</property>
< 		      <property name="text" translatable="yes"></property>
< 		      <property name="has_frame">True</property>
< 		      <property name="invisible_char" translatable="yes">*</property>
< 		      <property name="activates_default">False</property>
< 		    </widget>
< 		    <packing>
< 		      <property name="padding">0</property>
< 		      <property name="expand">True</property>
< 		      <property name="fill">True</property>
< 		    </packing>
< 		  </child>
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">False</property>
< 		  <property name="fill">False</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkLabel" id="search_matches_label">
< 		  <property name="visible">True</property>
< 		  <property name="label" translatable="yes"></property>
---
> 		  <property name="label" translatable="yes">Find:</property>
133c80
< 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
---
> 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
149c96
< 		<widget class="GtkCheckButton" id="search_case_check">
---
> 		<widget class="GtkEntry" id="search_entry">
152,157c99,105
< 		  <property name="label" translatable="yes">Case Sensitive</property>
< 		  <property name="use_underline">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
< 		  <property name="active">False</property>
< 		  <property name="inconsistent">False</property>
< 		  <property name="draw_indicator">True</property>
---
> 		  <property name="editable">True</property>
> 		  <property name="visibility">True</property>
> 		  <property name="max_length">0</property>
> 		  <property name="text" translatable="yes"></property>
> 		  <property name="has_frame">True</property>
> 		  <property name="invisible_char" translatable="yes">*</property>
> 		  <property name="activates_default">False</property>
161,162c109,110
< 		  <property name="expand">False</property>
< 		  <property name="fill">False</property>
---
> 		  <property name="expand">True</property>
> 		  <property name="fill">True</property>
165a114,118
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
> 	    </packing>
169c122
< 	    <widget class="GtkLabel" id="search_subject_label">
---
> 	    <widget class="GtkLabel" id="search_matches_label">
171c124
< 	      <property name="label" translatable="yes">Search</property>
---
> 	      <property name="label" translatable="yes"></property>
174c127
< 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
---
> 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
177c130
< 	      <property name="xalign">0.5</property>
---
> 	      <property name="xalign">1</property>
183c136,156
< 	      <property name="type">label_item</property>
---
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">True</property>
> 	    </packing>
> 	  </child>
> 
> 	  <child>
> 	    <widget class="GtkCheckButton" id="search_case_check">
> 	      <property name="visible">True</property>
> 	      <property name="can_focus">True</property>
> 	      <property name="label" translatable="yes">Case Sensitive</property>
> 	      <property name="use_underline">True</property>
> 	      <property name="relief">GTK_RELIEF_NORMAL</property>
> 	      <property name="active">False</property>
> 	      <property name="inconsistent">False</property>
> 	      <property name="draw_indicator">True</property>
> 	    </widget>
> 	    <packing>
> 	      <property name="padding">0</property>
> 	      <property name="expand">False</property>
> 	      <property name="fill">False</property>
Index: mail/mail-security.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-security.glade,v
retrieving revision 1.2
diff -r1.2 mail-security.glade
4a5
> <requires lib="gnome"/>
6a8
>   <property name="border_width">6</property>
14c16
<   <property name="has_separator">True</property>
---
>   <property name="has_separator">False</property>
20c22
<       <property name="spacing">0</property>
---
>       <property name="spacing">6</property>
48a51
> 	  <property name="border_width">6</property>
59c62
< 	      <property name="border_width">6</property>
---
> 	      <property name="border_width">12</property>
62c65
< 	      <property name="spacing">6</property>
---
> 	      <property name="spacing">18</property>
65c68
< 		<widget class="GtkFrame" id="frame5">
---
> 		<widget class="GtkVBox" id="frame5">
67,69c70,71
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
---
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">6</property>
72,73c74
< 		    <widget class="GtkVBox" id="signature_vbox">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkLabel" id="label464">
75,87c76
< 		      <property name="homogeneous">False</property>
< 		      <property name="spacing">0</property>
< 
< 		      <child>
< 			<placeholder/>
< 		      </child>
< 		    </widget>
< 		  </child>
< 
< 		  <child>
< 		    <widget class="GtkLabel" id="label475">
< 		      <property name="visible">True</property>
< 		      <property name="label" translatable="yes">Digital Signature</property>
---
> 		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Digital Signature&lt;/span&gt;</property>
89c78
< 		      <property name="use_markup">False</property>
---
> 		      <property name="use_markup">True</property>
93c82
< 		      <property name="xalign">0.5</property>
---
> 		      <property name="xalign">0</property>
99c88,90
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
102,115d92
< 		</widget>
< 		<packing>
< 		  <property name="padding">0</property>
< 		  <property name="expand">True</property>
< 		  <property name="fill">True</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="GtkFrame" id="frame6">
< 		  <property name="visible">True</property>
< 		  <property name="label_xalign">0</property>
< 		  <property name="label_yalign">0.5</property>
< 		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
118,119c95
< 		    <widget class="GtkVBox" id="encryption_vbox">
< 		      <property name="border_width">6</property>
---
> 		    <widget class="GtkHBox" id="hbox170">
125c101,152
< 			<placeholder/>
---
> 			<widget class="GtkLabel" id="label465">
> 			  <property name="visible">True</property>
> 			  <property name="label" translatable="yes"></property>
> 			  <property name="use_underline">False</property>
> 			  <property name="use_markup">False</property>
> 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			  <property name="wrap">False</property>
> 			  <property name="selectable">False</property>
> 			  <property name="xalign">0.5</property>
> 			  <property name="yalign">0.5</property>
> 			  <property name="xpad">12</property>
> 			  <property name="ypad">0</property>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkTable" id="table10">
> 			  <property name="visible">True</property>
> 			  <property name="n_rows">1</property>
> 			  <property name="n_columns">1</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">2</property>
> 			  <property name="column_spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkVBox" id="signature_vbox">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">0</property>
> 
> 			      <child>
> 				<placeholder/>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
> 			</packing>
127a155,159
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
> 		    </packing>
128a161,173
> 		</widget>
> 		<packing>
> 		  <property name="padding">0</property>
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkVBox" id="frame6">
> 		  <property name="visible">True</property>
> 		  <property name="homogeneous">False</property>
> 		  <property name="spacing">6</property>
131c176
< 		    <widget class="GtkLabel" id="label476">
---
> 		    <widget class="GtkLabel" id="label477">
133c178
< 		      <property name="label" translatable="yes">Encryption</property>
---
> 		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Encryption&lt;/span&gt;</property>
135c180
< 		      <property name="use_markup">False</property>
---
> 		      <property name="use_markup">True</property>
139c184
< 		      <property name="xalign">0.5</property>
---
> 		      <property name="xalign">0</property>
145c190,260
< 		      <property name="type">label_item</property>
---
> 		      <property name="padding">0</property>
> 		      <property name="expand">False</property>
> 		      <property name="fill">False</property>
> 		    </packing>
> 		  </child>
> 
> 		  <child>
> 		    <widget class="GtkHBox" id="hbox171">
> 		      <property name="visible">True</property>
> 		      <property name="homogeneous">False</property>
> 		      <property name="spacing">0</property>
> 
> 		      <child>
> 			<widget class="GtkLabel" id="label478">
> 			  <property name="visible">True</property>
> 			  <property name="label" translatable="yes"></property>
> 			  <property name="use_underline">False</property>
> 			  <property name="use_markup">False</property>
> 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
> 			  <property name="wrap">False</property>
> 			  <property name="selectable">False</property>
> 			  <property name="xalign">0.5</property>
> 			  <property name="yalign">0.5</property>
> 			  <property name="xpad">12</property>
> 			  <property name="ypad">0</property>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">False</property>
> 			  <property name="fill">False</property>
> 			</packing>
> 		      </child>
> 
> 		      <child>
> 			<widget class="GtkTable" id="table11">
> 			  <property name="visible">True</property>
> 			  <property name="n_rows">1</property>
> 			  <property name="n_columns">1</property>
> 			  <property name="homogeneous">False</property>
> 			  <property name="row_spacing">2</property>
> 			  <property name="column_spacing">6</property>
> 
> 			  <child>
> 			    <widget class="GtkVBox" id="encryption_vbox">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">0</property>
> 
> 			      <child>
> 				<placeholder/>
> 			      </child>
> 			    </widget>
> 			    <packing>
> 			      <property name="left_attach">0</property>
> 			      <property name="right_attach">1</property>
> 			      <property name="top_attach">0</property>
> 			      <property name="bottom_attach">1</property>
> 			    </packing>
> 			  </child>
> 			</widget>
> 			<packing>
> 			  <property name="padding">0</property>
> 			  <property name="expand">True</property>
> 			  <property name="fill">True</property>
> 			</packing>
> 		      </child>
> 		    </widget>
> 		    <packing>
> 		      <property name="padding">0</property>
> 		      <property name="expand">True</property>
> 		      <property name="fill">True</property>
151,152c266,267
< 		  <property name="expand">True</property>
< 		  <property name="fill">True</property>
---
> 		  <property name="expand">False</property>
> 		  <property name="fill">False</property>
Index: mail/message-tags.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-tags.glade,v
retrieving revision 1.6
diff -r1.6 message-tags.glade
4a5
> <requires lib="gnome"/>
14c15
<   <property name="has_separator">True</property>
---
>   <property name="has_separator">False</property>
17c18
<     <widget class="GtkVBox" id="vbox2">
---
>     <widget class="GtkVBox" id="vbox3">
20c21
<       <property name="spacing">3</property>
---
>       <property name="spacing">12</property>
60a62
> 	  <property name="border_width">6</property>
63c65
< 	  <property name="spacing">6</property>
---
> 	  <property name="spacing">12</property>
145c147
< 	      <property name="n_rows">2</property>
---
> 	      <property name="n_rows">3</property>
179c181
< 		  <property name="label" translatable="yes">_Due by:</property>
---
> 		  <property name="label" translatable="yes">_Due By:</property>
219,257d220
< 		<widget class="GtkCheckButton" id="completed">
< 		  <property name="visible">True</property>
< 		  <property name="can_focus">True</property>
< 		  <property name="label" translatable="yes">C_ompleted</property>
< 		  <property name="use_underline">True</property>
< 		  <property name="relief">GTK_RELIEF_NORMAL</property>
< 		  <property name="active">False</property>
< 		  <property name="inconsistent">False</property>
< 		  <property name="draw_indicator">True</property>
< 		</widget>
< 		<packing>
< 		  <property name="left_attach">2</property>
< 		  <property name="right_attach">3</property>
< 		  <property name="top_attach">1</property>
< 		  <property name="bottom_attach">2</property>
< 		  <property name="x_options">fill</property>
< 		  <property name="y_options"></property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
< 		<widget class="Custom" id="target_date">
< 		  <property name="visible">True</property>
< 		  <property name="creation_function">target_date_new</property>
< 		  <property name="int1">0</property>
< 		  <property name="int2">0</property>
< 		  <property name="last_modification_time">Sat, 09 Feb 2002 00:20:24 GMT</property>
< 		</widget>
< 		<packing>
< 		  <property name="left_attach">1</property>
< 		  <property name="right_attach">2</property>
< 		  <property name="top_attach">1</property>
< 		  <property name="bottom_attach">2</property>
< 		  <property name="x_options">fill</property>
< 		  <property name="y_options">fill</property>
< 		</packing>
< 	      </child>
< 
< 	      <child>
316a280,317
> 
> 	      <child>
> 		<widget class="Custom" id="target_date">
> 		  <property name="visible">True</property>
> 		  <property name="creation_function">target_date_new</property>
> 		  <property name="int1">0</property>
> 		  <property name="int2">0</property>
> 		  <property name="last_modification_time">Sat, 09 Feb 2002 00:20:24 GMT</property>
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">1</property>
> 		  <property name="right_attach">3</property>
> 		  <property name="top_attach">1</property>
> 		  <property name="bottom_attach">2</property>
> 		  <property name="y_options">fill</property>
> 		</packing>
> 	      </child>
> 
> 	      <child>
> 		<widget class="GtkCheckButton" id="completed">
> 		  <property name="visible">True</property>
> 		  <property name="can_focus">True</property>
> 		  <property name="label" translatable="yes">C_ompleted</property>
> 		  <property name="use_underline">True</property>
> 		  <property name="relief">GTK_RELIEF_NORMAL</property>
> 		  <property name="active">False</property>
> 		  <property name="inconsistent">False</property>
> 		  <property name="draw_indicator">True</property>
> 		</widget>
> 		<packing>
> 		  <property name="left_attach">1</property>
> 		  <property name="right_attach">3</property>
> 		  <property name="top_attach">2</property>
> 		  <property name="bottom_attach">3</property>
> 		  <property name="x_options">fill</property>
> 		  <property name="y_options"></property>
> 		</packing>
> 	      </child>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]