diff --git a/mozilla/suite/common/pref/pref-cookies.xul b/mozilla/suite/common/pref/pref-cookies.xul
index 086fb59f2b7..12a270f279d 100644
--- a/mozilla/suite/common/pref/pref-cookies.xul
+++ b/mozilla/suite/common/pref/pref-cookies.xul
@@ -90,10 +90,11 @@
     </radiogroup>
 
     <separator/>
-
-    <checkbox id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
-              pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
-              prefattribute="checked"/>
+    <box autostretch="never">
+      <checkbox id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
+                pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
+                prefattribute="checked"/>
+    </box>
 
     <separator/>
 
diff --git a/mozilla/suite/common/pref/pref-debug1.xul b/mozilla/suite/common/pref/pref-debug1.xul
index 75871b8ae4d..5c9f534b76f 100644
--- a/mozilla/suite/common/pref/pref-debug1.xul
+++ b/mozilla/suite/common/pref/pref-debug1.xul
@@ -26,12 +26,12 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug1.dtd" >
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
-		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');">
 
-  <script language="JavaScript">
+  <script type="text/javascript">
   <![CDATA[
     var _elementIDs = ["nglayoutDebugPaintFlashing", "nglayoutDebugPaintDumping",
                        "nglayoutDebugInvalidateDumping", "nglayoutDebugEventDumping", 
@@ -47,25 +47,26 @@
   <!-- Event Debugging -->  
   <titledbox orient="vertical">
     <title><text value="&debugEventDebugging.label;"/></title>
-
-    <checkbox id="nglayoutDebugPaintFlashing" value="&debugPaintFlashing.label;"
-              pref="true" preftype="bool" prefstring="nglayout.debug.paint_flashing"
-              prefattribute="checked"/>
-    <checkbox id="nglayoutDebugPaintDumping" value="&debugPaintDumping.label;"
-              pref="true" preftype="bool" prefstring="nglayout.debug.paint_dumping"
-              prefattribute="checked"/>
-    <checkbox id="nglayoutDebugInvalidateDumping" value="&debugInvalidateDumping.label;"
-              pref="true" preftype="bool" prefstring="nglayout.debug.invalidate_dumping"
-              prefattribute="checked"/>
-    <checkbox id="nglayoutDebugEventDumping" value="&debugEventDumping.label;"
-              pref="true" preftype="bool" prefstring="nglayout.debug.invalidate_dumping"
-              prefattribute="checked"/>              
-    <checkbox id="nglayoutDebugMotionEventDumping" value="&debugMotionEventDumping.label;"
-              pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
-              prefattribute="checked"/>
-    <checkbox id="nglayoutDebugCrossingEventDumping" value="&debugCrossingEventDumping.label;"
-              pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
-              prefattribute="checked"/>
+    <vbox autostretch="never">
+      <checkbox id="nglayoutDebugPaintFlashing" value="&debugPaintFlashing.label;"
+                pref="true" preftype="bool" prefstring="nglayout.debug.paint_flashing"
+                prefattribute="checked"/>
+      <checkbox id="nglayoutDebugPaintDumping" value="&debugPaintDumping.label;"
+                pref="true" preftype="bool" prefstring="nglayout.debug.paint_dumping"
+                prefattribute="checked"/>
+      <checkbox id="nglayoutDebugInvalidateDumping" value="&debugInvalidateDumping.label;"
+                pref="true" preftype="bool" prefstring="nglayout.debug.invalidate_dumping"
+                prefattribute="checked"/>
+      <checkbox id="nglayoutDebugEventDumping" value="&debugEventDumping.label;"
+                pref="true" preftype="bool" prefstring="nglayout.debug.invalidate_dumping"
+                prefattribute="checked"/>              
+      <checkbox id="nglayoutDebugMotionEventDumping" value="&debugMotionEventDumping.label;"
+                pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
+                prefattribute="checked"/>
+      <checkbox id="nglayoutDebugCrossingEventDumping" value="&debugCrossingEventDumping.label;"
+                pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
+                prefattribute="checked"/>
+    </vbox>
   </titledbox>
 
 </window>
diff --git a/mozilla/suite/common/pref/pref-debug2.xul b/mozilla/suite/common/pref/pref-debug2.xul
index 677eca05006..4b28a554664 100644
--- a/mozilla/suite/common/pref/pref-debug2.xul
+++ b/mozilla/suite/common/pref/pref-debug2.xul
@@ -45,12 +45,14 @@
 
   <titledbox orient="vertical">
     <title><text value="&debugNetworking.label;"/></title>
-    <checkbox id="browserEnableKeepAlive" value="&debugEnableKeepAlive.label;"
-              pref="true" preftype="bool" prefstring="network.http.keep-alive"
-              prefattribute="checked"/>
-    <checkbox id="browserEnablePipelining" value="&debugEnablePipelining.label;"
-              pref="true" preftype="bool" prefstring="network.http.pipelining"
-              prefattribute="checked"/>
+    <vbox autostretch="never">
+      <checkbox id="browserEnableKeepAlive" value="&debugEnableKeepAlive.label;"
+                pref="true" preftype="bool" prefstring="network.http.keep-alive"
+                prefattribute="checked"/>
+      <checkbox id="browserEnablePipelining" value="&debugEnablePipelining.label;"
+                pref="true" preftype="bool" prefstring="network.http.pipelining"
+                prefattribute="checked"/>
+    </vbox>
     <text class="label" value="&httpVersion.label;"  for="httpVersionString"/>
     <textfield id="httpVersionString" wsm_persist="true"  maxlength="3" flex="0"
               pref="true" preftype="string" prefstring="network.http.version"
diff --git a/mozilla/suite/common/pref/pref-fonts.xul b/mozilla/suite/common/pref/pref-fonts.xul
index 9f975e2ab66..1c95b0167d5 100644
--- a/mozilla/suite/common/pref/pref-fonts.xul
+++ b/mozilla/suite/common/pref/pref-fonts.xul
@@ -26,15 +26,15 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 <window id="fontPanel"
         xmlns:html="http://www.w3.org/1999/xhtml"
-		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         title="&window.title;" 
         orient="vertical"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">
 
-  <script language="javascript" src="chrome://communicator/content/pref/pref-fonts.js"></script>
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javaScript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+  <script type="text/javascript" src="chrome://communicator/content/pref/pref-fonts.js"/>
+  <script type="text/javascript" src="chrome://global/content/strres.js"/>
+  <script type="text/javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
   <box class="box-smallheader" title="&lHeader;"/>
   
@@ -201,10 +201,12 @@
 
     <separator class="thin"/>
     
-    <!-- note that this removes the ability to select dynamic fonts -->
-    <checkbox id="browserUseDocumentFonts" 
-              value="&useDocumentFonts.label;" accesskey="&useDocumentFonts.accesskey;"
-              preftype="int" prefstring="browser.display.use_document_fonts"/>
+    <box autostretch="never">
+      <!-- note that this removes the ability to select dynamic fonts -->
+      <checkbox id="browserUseDocumentFonts" 
+                value="&useDocumentFonts.label;" accesskey="&useDocumentFonts.accesskey;"
+                preftype="int" prefstring="browser.display.use_document_fonts"/>
+    </box>
 
   </titledbox>
 
diff --git a/mozilla/suite/common/pref/pref-images.xul b/mozilla/suite/common/pref/pref-images.xul
index ee01827deea..bf7ebcb13e9 100644
--- a/mozilla/suite/common/pref/pref-images.xul
+++ b/mozilla/suite/common/pref/pref-images.xul
@@ -99,17 +99,19 @@
     </radiogroup>
 
     <separator observes="haveImageBlocking"/>
-
-    <checkbox id="networkImageWarnAboutImages" value="&warnAboutImages.label;"
-              accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
-              pref="true" preftype="bool" prefattribute="checked"
-              prefstring="network.image.warnAboutImages"/>
+    <box autostretch="never">
+      <checkbox id="networkImageWarnAboutImages" value="&warnAboutImages.label;"
+                accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
+                pref="true" preftype="bool" prefattribute="checked"
+                prefstring="network.image.warnAboutImages"/>
+    </box>
 
     <separator observes="haveImageBlocking"/>
 
-    <box autostretch="never" halign="right" observes="haveImageBlocking">
+    <box autostretch="never" halign="right">
       <button class="dialog" id="viewImages" value="&viewImages.label;"
-              accesskey="&viewImages.accesskey;" oncommand="viewImages();"/>
+              accesskey="&viewImages.accesskey;" oncommand="viewImages();"
+              observes="haveImageBlocking"/>
     </box>
 
   </titledbox>
diff --git a/mozilla/suite/common/pref/pref-proxies.xul b/mozilla/suite/common/pref/pref-proxies.xul
index cd387860c29..61243b180c4 100644
--- a/mozilla/suite/common/pref/pref-proxies.xul
+++ b/mozilla/suite/common/pref/pref-proxies.xul
@@ -28,20 +28,20 @@
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
 <window xmlns:html="http://www.w3.org/1999/xhtml"
-    		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');">
 
-  <script language="JavaScript">
+  <script type="text/javascript">
   <![CDATA[
     var _elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP",                        "networkProxyHTTP_Port", "networkProxySSL", "networkProxySSL_Port", "networkProxySOCKS",                        "networkProxySOCKS_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
   ]]>
   </script>
         
-	<script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
-  <script language="JavaScript" src="chrome://communicator/content/pref/pref-proxies.js"></script>
+  <script type="text/javascript" src="chrome://global/content/strres.js"/>
+  <script type="text/javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="text/javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>
   
   <box class="box-smallheader" title="&lHeader;"/>
 
@@ -52,8 +52,10 @@
     <radiogroup id="networkProxyType" orient="vertical"
                 pref="true" preftype="int" prefstring="network.proxy.type"
                 prefattribute="data">
-      <radio group="networkProxyType" data="0" value="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;" oncommand="DoEnabling();"/>
-      <radio group="networkProxyType" data="1" value="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;" oncommand="DoEnabling();"/>
+      <vbox autostretch="never">
+        <radio group="networkProxyType" data="0" value="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;"                oncommand="DoEnabling();"/>
+        <radio group="networkProxyType" data="1" value="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;"                oncommand="DoEnabling();"/>
+      </vbox>
       <grid class="indent" flex="1">
         <columns>
           <column/>
@@ -112,7 +114,9 @@
           </row>
         </rows>
       </grid>
-      <radio group="networkProxyType" data="2" value="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;" oncommand="DoEnabling();"/>
+      <box autostretch="never">
+        <radio group="networkProxyType" data="2" value="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"                        oncommand="DoEnabling();"/>
+      </box>
       <box class="indent" flex="1">
         <textfield id="networkProxyAutoconfigURL" flex="1" 
                    pref="true" preftype="string" prefstring="network.proxy.autoconfig_url"
diff --git a/mozilla/suite/common/pref/pref-search.xul b/mozilla/suite/common/pref/pref-search.xul
index 3dfe1bb1562..6cb13d9fbe4 100755
--- a/mozilla/suite/common/pref/pref-search.xul
+++ b/mozilla/suite/common/pref/pref-search.xul
@@ -28,14 +28,14 @@
         class="color-dialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"  title="&title.label;"
-	    orient="vertical">
+        orient="vertical">
 
-  <script language="JavaScript">
+  <script type="text/javascript">
   <![CDATA[
     var _elementIDs = ["engineList","openSidebarPanel"];
   ]]>
   </script> 
-  <script language="JavaScript" src="chrome://communicator/content/pref/pref-search.js"></script>       
+  <script type="text/javascript" src="chrome://communicator/content/pref/pref-search.js"/>      
         
   <box class="box-smallheader" title="&lHeader;"/>
 
@@ -58,9 +58,11 @@
 
   <titledbox orient="vertical">
     <title><text value="&searchResults.label;"/></title>
-    <checkbox id="openSidebarPanel" value="&openSidebarSearchPanel.label;" accesskey="&openSidebarSearchPanel.accesskey;"
-              pref="true" preftype="bool" prefstring="browser.search.opensidebarsearchpanel"
-              prefattribute="checked"/>
+    <box autostretch="never">
+      <checkbox id="openSidebarPanel" value="&openSidebarSearchPanel.label;" accesskey="&openSidebarSearchPanel.accesskey;"
+                pref="true" preftype="bool" prefstring="browser.search.opensidebarsearchpanel"
+                prefattribute="checked"/>
+    </box>
   </titledbox>
 
 </window>
diff --git a/mozilla/suite/common/pref/pref-winhooks.xul b/mozilla/suite/common/pref/pref-winhooks.xul
index 6da15336794..f2e424763cf 100644
--- a/mozilla/suite/common/pref/pref-winhooks.xul
+++ b/mozilla/suite/common/pref/pref-winhooks.xul
@@ -41,7 +41,7 @@
         onload="parent.initPanel('chrome://communicator/content/pref/pref-winhooks.xul');"
         orient="vertical">
 
-<script language="JavaScript" src="chrome://communicator/content/pref/pref-winhooks.js"></script>
+<script type="text/javascript" src="chrome://communicator/content/pref/pref-winhooks.js"/>
     
     <box class="box-smallheader" title="&title.label;"/>
 
@@ -80,7 +80,9 @@
             </box>
         </titledbox>
         <!-- Misc -->
-        <checkbox id="showDialog" value="&showDialog.label;"/>
+        <box autostretch="never">
+          <checkbox id="showDialog" value="&showDialog.label;"/>
+        </box>
 
 </window>