diff --git a/mozilla/mail/base/content/ABSearchDialog.xul b/mozilla/mail/base/content/ABSearchDialog.xul
index 580439ba859..2e0a7acfb9d 100644
--- a/mozilla/mail/base/content/ABSearchDialog.xul
+++ b/mozilla/mail/base/content/ABSearchDialog.xul
@@ -33,15 +33,16 @@
 %SearchDialogDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window id="searchAddressBookWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         onload="searchOnLoad();"
         onunload="searchOnUnload();"
         onclose="onSearchStop();"
         windowtype="mailnews:absearch"
         title="&abSearchDialogTitle.label;"
-        width="640" height="470"
-        persist="screenX screenY width height">
+        style="width: 52em; height: 36em;"
+        persist="screenX screenY width height sizemode">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
@@ -65,7 +66,7 @@
 
   <dummy class="usesMailWidgets"/>
     
-    <vbox flex="1">
+    <vbox id="searchTerms" flex="3" persist="height">
       <vbox>
         <hbox align="center">
           <label value="&abSearchHeading.label;" accesskey="&abSearchHeading.accesskey;"/>
@@ -101,14 +102,14 @@
 
     <splitter id="gray_horizontal_splitter" collapse="after" persist="state"/>
 
-    <vbox flex="1">
+    <vbox id="searchResultListBox" flex="4" persist="height">
       <vbox id="searchResultListBox" flex="1" >
         <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain"
               context="threadPaneContext"
               onclick="AbResultsPaneOnClick(event);"
               onselect="this.view.selectionChanged();"
               sortCol="GeneratedName"
-              persist="sortCol height">
+              persist="sortCol">
 
           <treecols id="abResultsTreeCols">
           <!-- these column ids must match up to the mork column names, except for GeneratedName, see nsIAddrDatabase.idl -->
diff --git a/mozilla/mail/base/content/SearchDialog.xul b/mozilla/mail/base/content/SearchDialog.xul
index ccbb7268039..771ce40859a 100644
--- a/mozilla/mail/base/content/SearchDialog.xul
+++ b/mozilla/mail/base/content/SearchDialog.xul
@@ -26,15 +26,16 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" >
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window id="searchMailWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         onload="searchOnLoad();"
         onunload="searchOnUnload();"
         onclose="onSearchStop();"
         windowtype="mailnews:search"
         title="&searchDialogTitle.label;"
-        width="640" height="470"
-        persist="screenX screenY width height">
+        style="width: 52em; height: 36em;"
+        persist="screenX screenY width height sizemode">
 
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
@@ -79,7 +80,7 @@
 
   <dummy class="usesMailWidgets"/>
     
-    <vbox flex="1">
+    <vbox id="searchTerms" flex="3" persist="height">
       <vbox>
          <hbox align="center">
          <label value="&searchHeading.label;" accesskey="&searchHeading.accesskey;"
@@ -107,7 +108,7 @@
     
     <splitter id="gray_horizontal_splitter" collapse="after" persist="state"/>
     
-    <vbox flex="1">
+    <vbox id="searchResultListBox" flex="4" persist="height">
       <vbox id="searchResultListBox" flex="1">
         <tree id="threadTree" persist="lastfoldersent" flex="1" enableColumnDrag="true" _selectDelay="500" class="plain focusring" lastfoldersent="false"
               disableKeyNavigation="true"
diff --git a/mozilla/mail/base/content/subscribe.xul b/mozilla/mail/base/content/subscribe.xul
index 5100ab302d3..7c4abf199ea 100644
--- a/mozilla/mail/base/content/subscribe.xul
+++ b/mozilla/mail/base/content/subscribe.xul
@@ -22,11 +22,11 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribe.dtd">
 
-<dialog xmlns:NC="http://home.netscape.com/NC-rdf#" 
+<dialog id="subscribeWindow"
+        xmlns:NC="http://home.netscape.com/NC-rdf#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&subscribeDialog.title;"
-        width="500"
-        height="400"
+        style="width: 44em; height: 33em;"
         persist="width height screenX screenY"
         onload="SubscribeOnLoad()"
         onunload="SubscribeOnUnload()"