diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 9f167ac97..7cdf8d267 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -9727,7 +9727,7 @@ JID: whatever@jabber.org</property>
 	      </child>
 	    </widget>
 	    <packing>
-	      <property name="padding">6</property>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
 	    </packing>
@@ -9848,23 +9848,31 @@ JID: whatever@jabber.org</property>
 	      <property name="spacing">5</property>
 
 	      <child>
-		<widget class="GtkToggleButton" id="gpg_togglebutton">
+		<widget class="GtkEventBox" id="gpg_eventbox">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Toggle OpenPGP encryption</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">False</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
+		  <property name="tooltip" translatable="yes">Click to toggle OpenPGP encryption</property>
+		  <property name="visible_window">True</property>
+		  <property name="above_child">False</property>
 
 		  <child>
-		    <widget class="GtkImage" id="image433">
+		    <widget class="GtkToggleButton" id="gpg_togglebutton">
 		      <property name="visible">True</property>
-		      <property name="stock">gtk-dialog-authentication</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="relief">GTK_RELIEF_NONE</property>
+		      <property name="focus_on_click">False</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+
+		      <child>
+			<widget class="GtkImage" id="image433">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-dialog-authentication</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>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -13764,7 +13772,7 @@ the Jabber network.</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkButton" id="button35">
+		    <widget class="GtkButton" id="add_proxy_button">
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
@@ -13772,11 +13780,12 @@ the Jabber network.</property>
 		      <property name="use_stock">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
+		      <signal name="clicked" handler="on_add_proxy_button_clicked" last_modification_time="Wed, 08 Jun 2005 10:54:19 GMT"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkButton" id="button36">
+		    <widget class="GtkButton" id="remove_proxy_button">
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
@@ -13784,6 +13793,7 @@ the Jabber network.</property>
 		      <property name="use_stock">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
+		      <signal name="clicked" handler="on_remove_proxy_button_clicked" last_modification_time="Wed, 08 Jun 2005 10:54:25 GMT"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -13885,7 +13895,7 @@ the Jabber network.</property>
 			  </child>
 
 			  <child>
-			    <widget class="GtkComboBox" id="combobox1">
+			    <widget class="GtkComboBox" id="proxytype_combobox">
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">HTTP Connect</property>
 			    </widget>
@@ -13899,7 +13909,7 @@ the Jabber network.</property>
 			  </child>
 
 			  <child>
-			    <widget class="GtkEntry" id="entry4">
+			    <widget class="GtkEntry" id="proxyname_entry">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
@@ -14174,6 +14184,7 @@ the Jabber network.</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="on_useauth_checkbutton_toggled" last_modification_time="Wed, 08 Jun 2005 10:56:33 GMT"/>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -14237,7 +14248,7 @@ the Jabber network.</property>
 	  <property name="spacing">12</property>
 
 	  <child>
-	    <widget class="GtkButton" id="button38">
+	    <widget class="GtkButton" id="close_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -14245,6 +14256,7 @@ the Jabber network.</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Wed, 08 Jun 2005 10:55:17 GMT"/>
 	    </widget>
 	  </child>
 	</widget>