diff --git a/mozilla/suite/common/pref/pref-tabs.xul b/mozilla/suite/common/pref/pref-tabs.xul
index 43c8aee19eb..cf0a3beb599 100644
--- a/mozilla/suite/common/pref/pref-tabs.xul
+++ b/mozilla/suite/common/pref/pref-tabs.xul
@@ -39,85 +39,115 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE page [
+<!DOCTYPE overlay [
 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">
 %platformCommunicationDTD;
 <!ENTITY % tabsDTD SYSTEM "chrome://communicator/locale/pref/pref-tabs.dtd">
 %tabsDTD;
 ]>
 
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-tabs.xul');"
-      headertitle="&tabHeader.label;">
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["tabStrip", "tabBackground", "middleClick", "urlBar", "loadGroup",
-                       "newWindowGroup", "externalGroup"];
-  ]]>
-  </script>
-  <groupbox id="generalTabPreferences" align="start">
-    <caption label="&tabDisplay.label;"/>
-    <checkbox id="tabStrip"
-              label="&autoHide.label;" 
-              accesskey="&autoHide.accesskey;" 
-              prefstring="browser.tabs.autoHide"/>
-    <checkbox id="tabBackground"
-              label="&background.label;" 
-              accesskey="&background.accesskey;" 
-              prefstring="browser.tabs.loadInBackground"
-              reversed="true"/>
-  </groupbox>
+  <prefpane id="tabs_pane"
+            label="&tabHeader.label;">
 
-  <groupbox id="loadGroupPreferences" align="start">
-    <caption label="&loadGroup.label;"/>
-    <radiogroup id="loadGroup" orient="horizontal" prefstring="browser.tabs.loadGroup">
-      <radio value="0" label="&loadGroupAppend.label;"
-             accesskey="&loadGroupAppend.accesskey;"/>
-      <radio value="1" label="&loadGroupReplace.label;"
-             accesskey="&loadGroupReplace.accesskey;"/>
-    </radiogroup> 
-  </groupbox>
+    <preferences id="tabs_preferences">
+      <preference id="browser.tabs.autoHide"
+                  name="browser.tabs.autoHide"
+                  type="bool"/>
+      <preference id="browser.tabs.loadInBackground"
+                  name="browser.tabs.loadInBackground"
+                  type="bool"
+                  inverted="true"/>
+      <preference id="browser.tabs.loadGroup"
+                  name="browser.tabs.loadGroup"
+                  type="int"/>
+      <preference id="browser.tabs.opentabfor.middleclick"
+                  name="browser.tabs.opentabfor.middleclick"
+                  type="bool"/>
+      <preference id="browser.tabs.opentabfor.urlbar"
+                  name="browser.tabs.opentabfor.urlbar"
+                  type="bool"/>
+      <preference id="browser.link.open_newwindow"
+                  name="browser.link.open_newwindow"
+                  type="int"/>
+      <preference id="browser.link.open_external"
+                  name="browser.link.open_external"
+                  type="int"/>
+    </preferences>
+            
+      <groupbox id="generalTabPreferences" align="start">
+        <caption label="&tabDisplay.label;"/>
+        <checkbox id="tabStrip"
+                  label="&autoHide.label;" 
+                  accesskey="&autoHide.accesskey;" 
+                  preference="browser.tabs.autoHide"/>
+        <checkbox id="tabBackground"
+                  label="&background.label;" 
+                  accesskey="&background.accesskey;" 
+                  preference="browser.tabs.loadInBackground"/>
+      </groupbox>
+
+      <groupbox id="loadGroupPreferences" align="start">
+        <caption label="&loadGroup.label;"/>
+        <radiogroup id="loadGroup"
+                    orient="horizontal"
+                    preference="browser.tabs.loadGroup">
+          <radio value="0"
+                 label="&loadGroupAppend.label;"
+                 accesskey="&loadGroupAppend.accesskey;"/>
+          <radio value="1"
+                 label="&loadGroupReplace.label;"
+                 accesskey="&loadGroupReplace.accesskey;"/>
+        </radiogroup> 
+      </groupbox>
   
-  <groupbox id="useTabPreferences" align="start">
-    <caption label="&openTabs.label;"/>
-      <checkbox id="middleClick"
-                label="&middleClick.label;" 
-                accesskey="&middleClick.accesskey;" 
-                prefstring="browser.tabs.opentabfor.middleclick"/>
+      <groupbox id="useTabPreferences" align="start">
+        <caption label="&openTabs.label;"/>
+          <checkbox id="middleClick"
+                    label="&middleClick.label;" 
+                    accesskey="&middleClick.accesskey;" 
+                    preference="browser.tabs.opentabfor.middleclick"/>
+          <checkbox id="urlBar"
+                    label="&urlbar.label;" 
+                    accesskey="&urlbar.accesskey;" 
+                    preference="browser.tabs.opentabfor.urlbar"/>
+      </groupbox>
 
-      <checkbox id="urlBar"
-                label="&urlbar.label;" 
-                accesskey="&urlbar.accesskey;" 
-                prefstring="browser.tabs.opentabfor.urlbar"/>
-  </groupbox>
+      <hbox equalsize="always">
+        <groupbox flex="1">
+          <caption label="&newWindow.label;"/>
+          <description>&newWindowDescription.label;</description>
+          <radiogroup id="newWindowGroup"
+                      preference="browser.link.open_newwindow">
+            <radio value="1"
+                   label="&openCurrent.label;"
+                   accesskey="&newWindowGroupCurrent.accesskey;"/>
+            <radio value="3"
+                   label="&openTab.label;"
+                   accesskey="&newWindowGroupTab.accesskey;"/>
+            <radio value="2"
+                   label="&openWindow.label;"
+                   accesskey="&newWindowGroupWindow.accesskey;"/>
+          </radiogroup> 
+        </groupbox>
 
-  <hbox equalsize="always">
-    <groupbox flex="1">
-      <caption label="&newWindow.label;"/>
-      <description>&newWindowDescription.label;</description>
-      <radiogroup id="newWindowGroup" prefstring="browser.link.open_newwindow">
-        <radio value="1" label="&openCurrent.label;"
-               accesskey="&newWindowGroupCurrent.accesskey;"/>
-        <radio value="3" label="&openTab.label;"
-               accesskey="&newWindowGroupTab.accesskey;"/>
-        <radio value="2" label="&openWindow.label;"
-               accesskey="&newWindowGroupWindow.accesskey;"/>
-      </radiogroup> 
-    </groupbox>
-
-    <groupbox flex="1">
-      <caption label="&external.label;"/>
-      <description>&externalDescription.label;</description>
-      <radiogroup id="externalGroup" prefstring="browser.link.open_external">
-        <radio value="1" label="&openCurrent.label;"
-               accesskey="&externalGroupCurrent.accesskey;"/>
-        <radio value="3" label="&openTab.label;"
-               accesskey="&externalGroupTab.accesskey;"/>
-        <radio value="2" label="&openWindow.label;"
-               accesskey="&externalGroupWindow.accesskey;"/>
-      </radiogroup> 
-    </groupbox>
-  </hbox>
-
-</page>
+        <groupbox flex="1">
+          <caption label="&external.label;"/>
+          <description>&externalDescription.label;</description>
+          <radiogroup id="externalGroup"
+                      preference="browser.link.open_external">
+            <radio value="1"
+                   label="&openCurrent.label;"
+                   accesskey="&externalGroupCurrent.accesskey;"/>
+            <radio value="3"
+                   label="&openTab.label;"
+                   accesskey="&externalGroupTab.accesskey;"/>
+            <radio value="2"
+                   label="&openWindow.label;"
+                   accesskey="&externalGroupWindow.accesskey;"/>
+          </radiogroup> 
+        </groupbox>
+      </hbox>
+   </prefpane>
+</overlay>
diff --git a/mozilla/suite/common/pref/preferences.xul b/mozilla/suite/common/pref/preferences.xul
index 249e9d18cb5..e9153cd4209 100644
--- a/mozilla/suite/common/pref/preferences.xul
+++ b/mozilla/suite/common/pref/preferences.xul
@@ -108,8 +108,12 @@
                     url="chrome://communicator/content/pref/pref-smart_browsing.xul"/>
           <treeitem label="&search.label;"
                     url="chrome://communicator/content/pref/pref-search.xul"/>
-          <treeitem label="&tabWindows.label;"
+-->
+          <treeitem id="tabsItem" label="&tabWindows.label;"
+                    prefpane="tabs_pane"
+                    helpTopic="navigator_pref_tabbed_browsing"
                     url="chrome://communicator/content/pref/pref-tabs.xul"/>
+<!-- commenting out yet unmigrated panels
           <treeitem label="&download.label;"
                     url="chrome://communicator/content/pref/pref-download.xul"/>
 -->