diff --git a/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul b/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul
index 954ec60d4ba..226a52aaa06 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul
@@ -46,9 +46,9 @@ Contributors:
   <dialogheader title="&addressing.label;"/>
   
   <separator class="thin"/>
-  <vbox flex="1">
+  <groupbox>
     <description>&addressingText.label;</description>
-	<radiogroup class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
+	  <radiogroup class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
       <observes element="identity.overrideGlobalPref" attribute="disabled"/>
       <radio id="useGlobalPref" value="0" label="&useGlobal.label;"/>
       <hbox align="center">
@@ -58,7 +58,7 @@ Contributors:
         </menulist>
         <button id="editButton" label="&editDirectories.label;" oncommand="onEditDirectories();"/>
       </hbox>
-    </radiogroup>
-      
-  </vbox>
+    </radiogroup>      
+  </groupbox>
+
 </page>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-main.xul b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
index 9db72e14acf..31fd3645458 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
@@ -24,7 +24,7 @@
     
     <separator class="thin"/>
     
-    <groupbox flex="1" style="width: 20em !important;">
+    <groupbox style="width: 20em !important;">
       <caption label="&identityTitle.label;"/>
       <description>&identityDesc.label;</description>
       <separator class="thin"/>
@@ -56,6 +56,8 @@
           </row>
         </rows>
       </grid>
+      
+      <separator class="thin"/>
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="identity.attachSignature" label="&signature.label;" flex="1"
@@ -63,6 +65,7 @@
                   prefattribute="value"
                   prefstring="mail.identity.%identitykey%.attach_signature"/>
       </hbox>
+
       <hbox align="center" class="indent">
         <textbox wsm_persist="true" id="identity.signature" datatype="nsILocalFile" flex="1" name="identity.signature"
                  observes="broadcaster_attachSignature"
@@ -82,7 +85,7 @@
                   prefstring="mail.identity.%identitykey%.compose_html"/>
       </hbox>
 
-      <spacer flex="1"/>
+      <separator class="thin"/>
 
       <hbox>
         <spacer flex="1"/>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-server.xul b/mozilla/mailnews/base/prefs/resources/content/am-server.xul
index 51fa5aa8f0e..bf5f8161358 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-server.xul
@@ -235,12 +235,13 @@ Contributors:
   </vbox>
   </vbox>
   </groupbox>
-  <spacer flex="100%"/>
-    <vbox>
+
+  <separator class="thin"/>
+  <vbox>
     <label value="&localPath.label;" control="server.localPath"/>
     <textbox wsm_persist="true" id="server.localPath"
-            datatype="nsIFileSpec"
-            class="uri-element"
-            prefstring="mail.server.%serverkey%.directory"/>
-    </vbox>
+             datatype="nsIFileSpec"
+             class="uri-element"
+             prefstring="mail.server.%serverkey%.directory"/>
+  </vbox>
 </page>