diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 3367e41..1551709 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -2621,7 +2621,7 @@ Personal</property>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="frame72">
+		    <widget class="GtkLabel" id="home_label">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">&lt;b&gt;Home&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
diff --git a/calendar/gui/dialogs/alarm-dialog.glade b/calendar/gui/dialogs/alarm-dialog.glade
index 91b23c5..5b5be4f 100644
--- a/calendar/gui/dialogs/alarm-dialog.glade
+++ b/calendar/gui/dialogs/alarm-dialog.glade
@@ -516,7 +516,7 @@ days</property>
 			  <property name="column_spacing">6</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label2">
+			    <widget class="GtkLabel" id="label7">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">Mes_sage:</property>
 			      <property name="use_underline">True</property>
@@ -648,7 +648,7 @@ days</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label3">
+			    <widget class="GtkLabel" id="label8">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Sound:</property>
 			      <property name="use_underline">True</property>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 984e509..ee729bd 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -1125,7 +1125,7 @@ Days</property>
             <property name="border_width">12</property>
             <property name="spacing">6</property>
 	    <child>
-	      <widget class="GtkLabel" id="label65">
+	      <widget class="GtkLabel" id="label67">
 	        <property name="visible">True</property>
 	        <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Alarms&lt;/span&gt;</property>
 	        <property name="use_underline">False</property>
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index f1bb4e1..19e2529 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -1113,7 +1113,7 @@ b</property>
 		  <property name="spacing">3</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox71">
+		    <widget class="GtkHBox" id="hbox72">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index bc88e6e..776fe91 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2533,7 +2533,7 @@ For example: "Work" or "Personal"</property>
         <property name="can_focus">True</property>
         <property name="scrollable">True</property>
         <child>
-          <widget class="GtkVBox" id="vboxGeneral">
+          <widget class="GtkVBox" id="vboxGeneralPT">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -3143,7 +3143,7 @@ b</property>
           </widget>
         </child>
         <child>
-          <widget class="GtkLabel" id="lblGeneral">
+          <widget class="GtkLabel" id="lblGeneralPT">
             <property name="visible">True</property>
             <property name="label" translatable="yes">General</property>
             <property name="use_underline">True</property>
@@ -4064,7 +4064,7 @@ b</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child>
-          <widget class="GtkVBox" id="vboxGeneral">
+          <widget class="GtkVBox" id="vboxGeneralCT">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -4465,7 +4465,7 @@ Quoted</property>
           </widget>
         </child>
         <child>
-          <widget class="GtkLabel" id="lblGeneral">
+          <widget class="GtkLabel" id="lblGeneralCT">
             <property name="visible">True</property>
             <property name="label" translatable="yes">General</property>
             <property name="use_underline">True</property>
@@ -4687,7 +4687,7 @@ Quoted</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hboxImageAndHelp">
+                              <widget class="GtkHBox" id="hboxImageAndHelpSpellCheck">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
@@ -5014,7 +5014,7 @@ Quoted</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkHBox" id="hboxImageAndHelp">
+                  <widget class="GtkHBox" id="hboxImageAndHelpSignature">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
                     <child>
@@ -5215,7 +5215,7 @@ for display purposes only. </property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child>
-          <widget class="GtkVBox" id="vboxGeneral">
+          <widget class="GtkVBox" id="vboxGeneralNPT">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -5293,7 +5293,7 @@ for display purposes only. </property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkTable" id="table8">
+                              <widget class="GtkTable" id="table9">
                                 <property name="visible">True</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">4</property>
@@ -5560,7 +5560,7 @@ for display purposes only. </property>
           </widget>
         </child>
         <child>
-          <widget class="GtkLabel" id="lblGeneral">
+          <widget class="GtkLabel" id="lblGeneralNPT">
             <property name="visible">True</property>
             <property name="label" translatable="yes">General</property>
           </widget>
diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade
index 67feb18..0c84180 100644
--- a/mail/mail-dialogs.glade
+++ b/mail/mail-dialogs.glade
@@ -353,7 +353,7 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <widget class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
@@ -385,7 +385,7 @@
                     <property name="xscale">0</property>
                     <property name="yscale">0</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <widget class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
@@ -401,7 +401,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label1">
+                          <widget class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">_Accept License</property>
                             <property name="use_underline">True</property>
@@ -694,7 +694,7 @@ b</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkVBox" id="vbox3">
+                  <widget class="GtkVBox" id="vbox4">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
                     <property name="spacing">6</property>
@@ -775,7 +775,7 @@ b</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkVBox" id="vbox1">
+                          <widget class="GtkVBox" id="vbox5">
                             <property name="visible">True</property>
                             <property name="spacing">1</property>
                             <child>
diff --git a/modules/addressbook/ldap-config.glade b/modules/addressbook/ldap-config.glade
index f87cf84..5c095f7 100644
--- a/modules/addressbook/ldap-config.glade
+++ b/modules/addressbook/ldap-config.glade
@@ -320,7 +320,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox123">
+			    <widget class="GtkHBox" id="hbox129">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
diff --git a/plugins/groupwise-features/proxy-add-dialog.glade b/plugins/groupwise-features/proxy-add-dialog.glade
index a8622f2..5deb089 100644
--- a/plugins/groupwise-features/proxy-add-dialog.glade
+++ b/plugins/groupwise-features/proxy-add-dialog.glade
@@ -183,7 +183,7 @@
 				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkHBox" id="hbox1">
+					<widget class="GtkHBox" id="hbox2">
 					  <property name="visible">True</property>
 					  <property name="homogeneous">False</property>
 					  <property name="spacing">2</property>
diff --git a/plugins/groupwise-features/proxy-listing.glade b/plugins/groupwise-features/proxy-listing.glade
index 5f33da2..16e5c5d 100644
--- a/plugins/groupwise-features/proxy-listing.glade
+++ b/plugins/groupwise-features/proxy-listing.glade
@@ -50,7 +50,7 @@
 	  <property name="enable_popup">False</property>
 
 	  <child>
-	    <widget class="GtkVBox" id="proxy_vbox">
+	    <widget class="GtkVBox" id="proxy_tab_vbox">
 	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 91016a6..37eab8b 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -661,11 +661,11 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 					      "proxy-listing.glade",
 					      NULL);
-		priv->xml_tab = glade_xml_new (gladefile, "proxy_vbox", NULL);
+		priv->xml_tab = glade_xml_new (gladefile, "proxy_tab_vbox", NULL);
 		g_free (gladefile);
 
 		if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {
-			priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_vbox"));
+			priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_tab_vbox"));
 			priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml_tab, "proxy_access_list"));
 			priv->store =  gtk_tree_store_new (2,
 							   GDK_TYPE_PIXBUF,
diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade
index 3b41036..e2042fe 100644
--- a/widgets/table/e-table-config.glade
+++ b/widgets/table/e-table-config.glade
@@ -1099,7 +1099,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label12">
+		<widget class="GtkLabel" id="space_label">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>
@@ -2351,7 +2351,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label22">
+		<widget class="GtkLabel" id="space_label2">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>
