diff -urN a/mail/mail-config.ui b/mail/mail-config.ui
--- a/mail/mail-config.ui	2011-04-27 17:36:35.043295494 +0100
+++ b/mail/mail-config.ui	2011-05-02 12:49:42.314000024 +0100
@@ -2130,691 +2130,706 @@
     <property name="use_underline">True</property>
     <property name="justify">center</property>
   </object>
-  <object class="GtkVBox" id="vboxSecurityBorder">
+  <object class="GtkScrolledWindow" id="vboxSecurityBorder">
     <property name="visible">True</property>
-    <property name="border_width">12</property>
-    <property name="spacing">12</property>
-    <child>
-      <object class="GtkVBox" id="general_vbox">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">General</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox3">
-            <property name="visible">True</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="pgp_no_imip_sign">
-                <property name="label" translatable="yes">_Do not sign meeting requests (for Outlook compatibility)</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
+    <property name="can_focus">True</property>
+    <property name="sensitive">True</property>
+    <property name="hscrollbar_policy">automatic</property>
+    <property name="vscrollbar_policy">automatic</property>
+    <property name="shadow_type">in</property>
     <child>
-      <object class="GtkVBox" id="pgp_frame">
-        <property name="visible">True</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label486">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pretty Good Privacy (PGP/GPG)</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox179">
-            <property name="visible">True</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label558">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkTable" id="table19">
-                <property name="visible">True</property>
-                <property name="column_spacing">6</property>
-                <property name="row_spacing">2</property>
-                <child>
-                  <object class="GtkVBox" id="vboxPGP">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox63">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="pgp_key_id_label">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">PGP/GPG _Key ID:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">pgp_key</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="pgp_key">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox4">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="pgp_hash_algo_label">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Si_gning algorithm:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">pgp_hash_algo</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="pgp_hash_algo">
-                            <property name="visible">True</property>
-                            <property name="model">hash_algo_model</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="pgp_hash_algo_renderer"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="pgp_always_sign">
-                        <property name="label" translatable="yes">Al_ways sign outgoing messages when using this account</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="pgp_encrypt_to_self">
-                        <property name="label" translatable="yes">Always encrypt to _myself when sending encrypted messages</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="pgp_always_trust">
-                        <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
+      <object class="GtkViewport" id="viewportForVboxSecurityBorder"> 
+	<property name="visible">True</property>
+	<child>
+	  <object class="GtkVBox" id="innerVboxSecurityBorder">
+	    <property name="visible">True</property>
+	    <property name="border_width">12</property>
+	    <property name="spacing">12</property>
+	    <child>
+	      <object class="GtkVBox" id="general_vbox">
+		<property name="visible">True</property>
+		<child>
+		  <object class="GtkLabel" id="label3">
+		    <property name="visible">True</property>
+		    <property name="xalign">0</property>
+		    <property name="label" translatable="yes">General</property>
+		    <attributes>
+		      <attribute name="weight" value="bold"/>
+		    </attributes>
+		  </object>
+		  <packing>
+		    <property name="expand">False</property>
+		    <property name="fill">False</property>
+		    <property name="position">0</property>
+		  </packing>
+		</child>
+		<child>
+		  <object class="GtkHBox" id="hbox3">
+		    <property name="visible">True</property>
+		    <property name="spacing">12</property>
+		    <child>
+		      <object class="GtkLabel" id="label4">
+			<property name="visible">True</property>
+		      </object>
+		      <packing>
+			<property name="expand">False</property>
+			<property name="fill">False</property>
+			<property name="position">0</property>
+		      </packing>
+		    </child>
+		    <child>
+		      <object class="GtkCheckButton" id="pgp_no_imip_sign">
+			<property name="label" translatable="yes">_Do not sign meeting requests (for Outlook compatibility)</property>
+			<property name="visible">True</property>
+			<property name="can_focus">True</property>
+			<property name="receives_default">False</property>
+			<property name="use_underline">True</property>
+			<property name="draw_indicator">True</property>
+		      </object>
+		      <packing>
+			<property name="expand">False</property>
+			<property name="fill">False</property>
+			<property name="position">1</property>
+		      </packing>
+		    </child>
+		  </object>
+		  <packing>
+		    <property name="expand">False</property>
+		    <property name="fill">False</property>
+		    <property name="position">1</property>
+		  </packing>
+		</child>
+	      </object>
+	      <packing>
+		<property name="expand">False</property>
+		<property name="fill">False</property>
+		<property name="position">0</property>
+	      </packing>
+	    </child>
+	    <child>
+	      <object class="GtkVBox" id="pgp_frame">
+		<property name="visible">True</property>
+		<property name="spacing">6</property>
+		<child>
+		  <object class="GtkLabel" id="label486">
+		    <property name="visible">True</property>
+		    <property name="xalign">0</property>
+		    <property name="label" translatable="yes">Pretty Good Privacy (PGP/GPG)</property>
+		    <attributes>
+		      <attribute name="weight" value="bold"/>
+		    </attributes>
+		  </object>
+		  <packing>
+		    <property name="expand">False</property>
+		    <property name="fill">False</property>
+		    <property name="position">0</property>
+		  </packing>
+		</child>
+		<child>
+		  <object class="GtkHBox" id="hbox179">
+		    <property name="visible">True</property>
+		    <property name="spacing">12</property>
+		    <child>
+		      <object class="GtkLabel" id="label558">
+			<property name="visible">True</property>
+		      </object>
+		      <packing>
+			<property name="expand">False</property>
+			<property name="fill">False</property>
+			<property name="position">0</property>
+		      </packing>
+		    </child>
+		    <child>
+		      <object class="GtkTable" id="table19">
+			<property name="visible">True</property>
+			<property name="column_spacing">6</property>
+			<property name="row_spacing">2</property>
+			<child>
+			  <object class="GtkVBox" id="vboxPGP">
+			    <property name="visible">True</property>
+			    <property name="spacing">6</property>
+			    <child>
+			      <object class="GtkHBox" id="hbox63">
+				<property name="visible">True</property>
+				<property name="spacing">12</property>
+				<child>
+				  <object class="GtkLabel" id="pgp_key_id_label">
+				    <property name="visible">True</property>
+				    <property name="xalign">0</property>
+				    <property name="label" translatable="yes">PGP/GPG _Key ID:</property>
+				    <property name="use_underline">True</property>
+				    <property name="mnemonic_widget">pgp_key</property>
+				  </object>
+				  <packing>
+				    <property name="expand">False</property>
+				    <property name="fill">False</property>
+				    <property name="position">0</property>
+				  </packing>
+				</child>
+				<child>
+				  <object class="GtkEntry" id="pgp_key">
+				    <property name="visible">True</property>
+				    <property name="can_focus">True</property>
+				  </object>
+				  <packing>
+				    <property name="position">1</property>
+				  </packing>
+				</child>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">0</property>
+			      </packing>
+			    </child>
+			    <child>
+			      <object class="GtkHBox" id="hbox4">
+				<property name="visible">True</property>
+				<property name="spacing">12</property>
+				<child>
+				  <object class="GtkLabel" id="pgp_hash_algo_label">
+				    <property name="visible">True</property>
+				    <property name="xalign">0</property>
+				    <property name="label" translatable="yes">Si_gning algorithm:</property>
+				    <property name="use_underline">True</property>
+				    <property name="mnemonic_widget">pgp_hash_algo</property>
+				  </object>
+				  <packing>
+				    <property name="expand">False</property>
+				    <property name="fill">False</property>
+				    <property name="position">0</property>
+				  </packing>
+				</child>
+				<child>
+				  <object class="GtkComboBox" id="pgp_hash_algo">
+				    <property name="visible">True</property>
+				    <property name="model">hash_algo_model</property>
+				    <child>
+				      <object class="GtkCellRendererText" id="pgp_hash_algo_renderer"/>
+				      <attributes>
+					<attribute name="text">0</attribute>
+				      </attributes>
+				    </child>
+				  </object>
+				  <packing>
+				    <property name="expand">False</property>
+				    <property name="fill">False</property>
+				    <property name="position">1</property>
+				  </packing>
+				</child>
+			      </object>
+			      <packing>
+				<property name="position">1</property>
+			      </packing>
+			    </child>
+			    <child>
+			      <object class="GtkCheckButton" id="pgp_always_sign">
+				<property name="label" translatable="yes">Al_ways sign outgoing messages when using this account</property>
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<property name="use_underline">True</property>
+				<property name="draw_indicator">True</property>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">2</property>
+			      </packing>
+			    </child>
+			    <child>
+			      <object class="GtkCheckButton" id="pgp_encrypt_to_self">
+				<property name="label" translatable="yes">Always encrypt to _myself when sending encrypted messages</property>
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<property name="use_underline">True</property>
+				<property name="active">True</property>
+				<property name="draw_indicator">True</property>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">3</property>
+			      </packing>
+			    </child>
+			    <child>
+			      <object class="GtkCheckButton" id="pgp_always_trust">
+				<property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property>
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<property name="use_underline">True</property>
+				<property name="draw_indicator">True</property>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">4</property>
+			      </packing>
+			    </child>
+			  </object>
+			</child>
+		      </object>
+		      <packing>
+			<property name="position">1</property>
+		      </packing>
+		    </child>
+		  </object>
+		  <packing>
+		    <property name="position">1</property>
+		  </packing>
+		</child>
+	      </object>
+	      <packing>
+		<property name="expand">False</property>
+		<property name="fill">False</property>
+		<property name="position">1</property>
+	      </packing>
+	    </child>
+	    <child>
+	      <object class="GtkVBox" id="smime_vbox">
+		<property name="visible">True</property>
+		<property name="spacing">6</property>
+		<child>
+		  <object class="GtkLabel" id="label519">
+		    <property name="visible">True</property>
+		    <property name="xalign">0</property>
+		    <property name="label" translatable="yes">Secure MIME (S/MIME)</property>
+		    <attributes>
+		      <attribute name="weight" value="bold"/>
+		    </attributes>
+		  </object>
+		  <packing>
+		    <property name="expand">False</property>
+		    <property name="fill">False</property>
+		    <property name="position">0</property>
+		  </packing>
+		</child>
+		<child>
+		  <object class="GtkHBox" id="hbox206">
+		    <property name="visible">True</property>
+		    <property name="spacing">12</property>
+		    <child>
+		      <object class="GtkLabel" id="label559">
+			<property name="visible">True</property>
+		      </object>
+		      <packing>
+			<property name="expand">False</property>
+			<property name="fill">False</property>
+			<property name="position">0</property>
+		      </packing>
+		    </child>
+		    <child>
+		      <object class="GtkTable" id="smime_table">
+			<property name="visible">True</property>
+			<property name="n_rows">7</property>
+			<property name="n_columns">3</property>
+			<property name="column_spacing">12</property>
+			<property name="row_spacing">6</property>
+			<child>
+			  <object class="GtkEntry" id="smime_sign_key">
+			    <property name="visible">True</property>
+			    <property name="can_focus">True</property>
+			  </object>
+			  <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>
+			  <object class="GtkEntry" id="smime_encrypt_key">
+			    <property name="visible">True</property>
+			    <property name="can_focus">True</property>
+			  </object>
+			  <packing>
+			    <property name="left_attach">1</property>
+			    <property name="right_attach">2</property>
+			    <property name="top_attach">6</property>
+			    <property name="bottom_attach">7</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkCheckButton" id="smime_encrypt_to_self">
+			    <property name="label" translatable="yes">Also encrypt to sel_f when sending encrypted messages</property>
+			    <property name="visible">True</property>
+			    <property name="can_focus">True</property>
+			    <property name="receives_default">False</property>
+			    <property name="use_underline">True</property>
+			    <property name="draw_indicator">True</property>
+			  </object>
+			  <packing>
+			    <property name="right_attach">3</property>
+			    <property name="top_attach">5</property>
+			    <property name="bottom_attach">6</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkCheckButton" id="smime_encrypt_default">
+			    <property name="label" translatable="yes">Encrypt out_going messages (by default)</property>
+			    <property name="visible">True</property>
+			    <property name="can_focus">True</property>
+			    <property name="receives_default">False</property>
+			    <property name="use_underline">True</property>
+			    <property name="draw_indicator">True</property>
+			  </object>
+			  <packing>
+			    <property name="right_attach">3</property>
+			    <property name="top_attach">4</property>
+			    <property name="bottom_attach">5</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkCheckButton" id="smime_sign_default">
+			    <property name="label" translatable="yes">Digitally sign o_utgoing messages (by default)</property>
+			    <property name="visible">True</property>
+			    <property name="can_focus">True</property>
+			    <property name="receives_default">False</property>
+			    <property name="use_underline">True</property>
+			    <property name="draw_indicator">True</property>
+			  </object>
+			  <packing>
+			    <property name="right_attach">3</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkHSeparator" id="hseparator1">
+			    <property name="visible">True</property>
+			  </object>
+			  <packing>
+			    <property name="right_attach">3</property>
+			    <property name="top_attach">3</property>
+			    <property name="bottom_attach">4</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options">GTK_FILL</property>
+			    <property name="y_padding">6</property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkLabel" id="label1">
+			    <property name="visible">True</property>
+			    <property name="xalign">0</property>
+			    <property name="label" translatable="yes">Encry_ption certificate:</property>
+			    <property name="use_underline">True</property>
+			    <property name="mnemonic_widget">smime_encrypt_key</property>
+			  </object>
+			  <packing>
+			    <property name="top_attach">6</property>
+			    <property name="bottom_attach">7</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkLabel" id="label469">
+			    <property name="visible">True</property>
+			    <property name="xalign">0</property>
+			    <property name="label" translatable="yes">Sig_ning certificate:</property>
+			    <property name="use_underline">True</property>
+			    <property name="mnemonic_widget">smime_sign_key</property>
+			  </object>
+			  <packing>
+			    <property name="top_attach">1</property>
+			    <property name="bottom_attach">2</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkHBox" id="hbox208">
+			    <property name="visible">True</property>
+			    <property name="spacing">6</property>
+			    <child>
+			      <object class="GtkButton" id="smime_encrypt_key_select">
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<child>
+				  <object class="GtkAlignment" id="alignment28">
+				    <property name="visible">True</property>
+				    <property name="xscale">0</property>
+				    <property name="yscale">0</property>
+				    <child>
+				      <object class="GtkHBox" id="hbox1">
+					<property name="visible">True</property>
+					<property name="spacing">2</property>
+					<child>
+					  <object class="GtkImage" id="image3">
+					    <property name="visible">True</property>
+					    <property name="stock">gtk-open</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">0</property>
+					  </packing>
+					</child>
+					<child>
+					  <object class="GtkLabel" id="button98">
+					    <property name="visible">True</property>
+					    <property name="label" translatable="yes">S_elect...</property>
+					    <property name="use_underline">True</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">1</property>
+					  </packing>
+					</child>
+				      </object>
+				    </child>
+				  </object>
+				</child>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">0</property>
+			      </packing>
+			    </child>
+			    <child>
+			      <object class="GtkButton" id="smime_encrypt_key_clear">
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<child>
+				  <object class="GtkAlignment" id="alignment35">
+				    <property name="visible">True</property>
+				    <property name="xscale">0</property>
+				    <property name="yscale">0</property>
+				    <child>
+				      <object class="GtkHBox" id="hbox230">
+					<property name="visible">True</property>
+					<property name="spacing">2</property>
+					<child>
+					  <object class="GtkImage" id="image10">
+					    <property name="visible">True</property>
+					    <property name="stock">gtk-clear</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">0</property>
+					  </packing>
+					</child>
+					<child>
+					  <object class="GtkLabel" id="label577">
+					    <property name="visible">True</property>
+					    <property name="label" translatable="yes">Clea_r</property>
+					    <property name="use_underline">True</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">1</property>
+					  </packing>
+					</child>
+				      </object>
+				    </child>
+				  </object>
+				</child>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">1</property>
+			      </packing>
+			    </child>
+			  </object>
+			  <packing>
+			    <property name="left_attach">2</property>
+			    <property name="right_attach">3</property>
+			    <property name="top_attach">6</property>
+			    <property name="bottom_attach">7</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options">GTK_FILL</property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkHBox" id="hbox209">
+			    <property name="visible">True</property>
+			    <property name="spacing">6</property>
+			    <child>
+			      <object class="GtkButton" id="smime_sign_key_select">
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<child>
+				  <object class="GtkAlignment" id="alignment29">
+				    <property name="visible">True</property>
+				    <property name="xscale">0</property>
+				    <property name="yscale">0</property>
+				    <child>
+				      <object class="GtkHBox" id="hbox2">
+					<property name="visible">True</property>
+					<property name="spacing">2</property>
+					<child>
+					  <object class="GtkImage" id="image4">
+					    <property name="visible">True</property>
+					    <property name="stock">gtk-open</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">0</property>
+					  </packing>
+					</child>
+					<child>
+					  <object class="GtkLabel" id="label2">
+					    <property name="visible">True</property>
+					    <property name="label" translatable="yes">_Select...</property>
+					    <property name="use_underline">True</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">1</property>
+					  </packing>
+					</child>
+				      </object>
+				    </child>
+				  </object>
+				</child>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">0</property>
+			      </packing>
+			    </child>
+			    <child>
+			      <object class="GtkButton" id="smime_sign_key_clear">
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<child>
+				  <object class="GtkAlignment" id="alignment34">
+				    <property name="visible">True</property>
+				    <property name="xscale">0</property>
+				    <property name="yscale">0</property>
+				    <child>
+				      <object class="GtkHBox" id="hbox229">
+					<property name="visible">True</property>
+					<property name="spacing">2</property>
+					<child>
+					  <object class="GtkImage" id="image9">
+					    <property name="visible">True</property>
+					    <property name="stock">gtk-clear</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">0</property>
+					  </packing>
+					</child>
+					<child>
+					  <object class="GtkLabel" id="label576">
+					    <property name="visible">True</property>
+					    <property name="label" translatable="yes">Cle_ar</property>
+					    <property name="use_underline">True</property>
+					  </object>
+					  <packing>
+					    <property name="expand">False</property>
+					    <property name="fill">False</property>
+					    <property name="position">1</property>
+					  </packing>
+					</child>
+				      </object>
+				    </child>
+				  </object>
+				</child>
+			      </object>
+			      <packing>
+				<property name="expand">False</property>
+				<property name="fill">False</property>
+				<property name="position">1</property>
+			      </packing>
+			    </child>
+			  </object>
+			  <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">GTK_FILL</property>
+			    <property name="y_options">GTK_FILL</property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkLabel" id="smime_hash_algo_label">
+			    <property name="visible">True</property>
+			    <property name="xalign">0</property>
+			    <property name="label" translatable="yes">Signing _algorithm:</property>
+			    <property name="use_underline">True</property>
+			    <property name="mnemonic_widget">smime_hash_algo</property>
+			  </object>
+			  <packing>
+			    <property name="top_attach">2</property>
+			    <property name="bottom_attach">3</property>
+			    <property name="x_options">GTK_FILL</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <object class="GtkAlignment" id="smime_hash_algo_alignment">
+			    <property name="visible">True</property>
+			    <property name="xalign">0</property>
+			    <property name="xscale">0</property>
+			    <child>
+			      <object class="GtkComboBox" id="smime_hash_algo">
+				<property name="visible">True</property>
+				<property name="model">hash_algo_model</property>
+				<child>
+				  <object class="GtkCellRendererText" id="smime_hash_algo_renderer"/>
+				  <attributes>
+				    <attribute name="text">0</attribute>
+				  </attributes>
+				</child>
+			      </object>
+			    </child>
+			  </object>
+			  <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">GTK_FILL</property>
+			    <property name="y_options"></property>
+			  </packing>
+			</child>
+			<child>
+			  <placeholder/>
+			</child>
+		      </object>
+		      <packing>
+			<property name="position">1</property>
+		      </packing>
+		    </child>
+		  </object>
+		  <packing>
+		    <property name="position">1</property>
+		  </packing>
+		</child>
+	      </object>
+	      <packing>
+		<property name="expand">False</property>
+		<property name="fill">False</property>
+		<property name="position">2</property>
+	      </packing>
+	    </child>
+	  </object>
+	</child>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="smime_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label519">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Secure MIME (S/MIME)</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox206">
-            <property name="visible">True</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label559">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkTable" id="smime_table">
-                <property name="visible">True</property>
-                <property name="n_rows">7</property>
-                <property name="n_columns">3</property>
-                <property name="column_spacing">12</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkEntry" id="smime_sign_key">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <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>
-                  <object class="GtkEntry" id="smime_encrypt_key">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="smime_encrypt_to_self">
-                    <property name="label" translatable="yes">Also encrypt to sel_f when sending encrypted messages</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="smime_encrypt_default">
-                    <property name="label" translatable="yes">Encrypt out_going messages (by default)</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="smime_sign_default">
-                    <property name="label" translatable="yes">Digitally sign o_utgoing messages (by default)</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="right_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator1">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                    <property name="y_padding">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Encry_ption certificate:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">smime_encrypt_key</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label469">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Sig_ning certificate:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">smime_sign_key</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox208">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkButton" id="smime_encrypt_key_select">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment28">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox1">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image3">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-open</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="button98">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">S_elect...</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="smime_encrypt_key_clear">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment35">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox230">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image10">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-clear</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label577">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Clea_r</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox209">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkButton" id="smime_sign_key_select">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment29">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox2">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image4">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-open</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label2">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">_Select...</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="smime_sign_key_clear">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment34">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox229">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image9">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-clear</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label576">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Cle_ar</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <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">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="smime_hash_algo_label">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Signing _algorithm:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">smime_hash_algo</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="smime_hash_algo_alignment">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="xscale">0</property>
-                    <child>
-                      <object class="GtkComboBox" id="smime_hash_algo">
-                        <property name="visible">True</property>
-                        <property name="model">hash_algo_model</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="smime_hash_algo_renderer"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <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">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">2</property>
-      </packing>
     </child>
   </object>
   <object class="GtkLabel" id="lblSecurity">
