diff --git a/mozilla/mail/components/preferences/compose.xul b/mozilla/mail/components/preferences/compose.xul
index c2816ea965f..89399302f57 100644
--- a/mozilla/mail/components/preferences/compose.xul
+++ b/mozilla/mail/components/preferences/compose.xul
@@ -81,14 +81,14 @@
       <preference id="msgcompose.background_color" name="msgcompose.background_color" type="string"/>      
     </preferences>
 
-    <tabbox id="composePrefs" onselect="gComposePane.tabSelectionChanged();">
+    <tabbox id="composePrefs" flex="1" onselect="gComposePane.tabSelectionChanged();">
       <tabs>
         <tab label="&itemGeneral.label;"/>
         <tab label="&itemAutoComplete.label;"/>
         <tab label="&itemSpellCheck.label;"/>
       </tabs>
 
-      <tabpanels>
+      <tabpanels flex="1">
         <tabpanel orient="vertical">
           <groupbox>
             <hbox align="center">
diff --git a/mozilla/mail/components/preferences/general.xul b/mozilla/mail/components/preferences/general.xul
index 6e805a290d2..8d4e31bf65a 100644
--- a/mozilla/mail/components/preferences/general.xul
+++ b/mozilla/mail/components/preferences/general.xul
@@ -146,6 +146,5 @@
           </hbox>          
         </radiogroup>
     </groupbox>
-    <separator/>
   </prefpane>
 </overlay>
diff --git a/mozilla/mail/components/preferences/preferences.xul b/mozilla/mail/components/preferences/preferences.xul
index b636e586e6f..6eae5708bec 100644
--- a/mozilla/mail/components/preferences/preferences.xul
+++ b/mozilla/mail/components/preferences/preferences.xul
@@ -70,7 +70,7 @@
 #endif
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 #ifdef USE_WIN_TITLE_STYLE
-            style="&prefWindow.styleWin;">
+            style="&prefWindow.styleWindows;">
 #else
 #ifdef XP_MACOSX
             style="&prefWindow.styleMac;">
diff --git a/mozilla/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd b/mozilla/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
index 7e0f3b16d16..210e2587fc2 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
@@ -1,7 +1,7 @@
 
 <!ENTITY  prefWindow.titleWin     "Options">
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
-<!ENTITY  prefWindow.styleWin     "width: 44em; height: 38em;">
+<!ENTITY  prefWindow.styleWindows "width: 44em; min-height: 38.5em;">
 <!ENTITY  prefWindow.styleMac     "width: 47em;">
 <!ENTITY  prefWindow.styleUnix    "width: 42em;">