diff --git a/mozilla/suite/common/jar.mn b/mozilla/suite/common/jar.mn
index 1f0e9f96d00..53c02fa54bd 100644
--- a/mozilla/suite/common/jar.mn
+++ b/mozilla/suite/common/jar.mn
@@ -170,6 +170,7 @@ comm.jar:
    content/communicator/pref/pref-languages.xul                     (pref/pref-languages.xul)
    content/communicator/pref/pref-languages-add.xul                 (pref/pref-languages-add.xul)
    content/communicator/pref/pref-locales.xul                       (pref/pref-locales.xul)
+   content/communicator/pref/pref-mousewheel.js                     (pref/pref-mousewheel.js)
    content/communicator/pref/pref-mousewheel.xul                    (pref/pref-mousewheel.xul)
    content/communicator/pref/pref-navigator.js                      (pref/pref-navigator.js)
    content/communicator/pref/pref-navigator.xul                     (pref/pref-navigator.xul)
diff --git a/mozilla/suite/common/pref/pref-mousewheel.xul b/mozilla/suite/common/pref/pref-mousewheel.xul
index fa3675b708e..5d9c934a6e5 100644
--- a/mozilla/suite/common/pref/pref-mousewheel.xul
+++ b/mozilla/suite/common/pref/pref-mousewheel.xul
@@ -42,272 +42,339 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 
-<!DOCTYPE page [
+<!DOCTYPE overlay [
 <!ENTITY % platformCommunicatorDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd" >
 %platformCommunicatorDTD;
 <!ENTITY % prefMousewheelDTD SYSTEM "chrome://communicator/locale/pref/pref-mousewheel.dtd" >
 %prefMousewheelDTD;
 ]>
 
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-mousewheel.xul');"
-      headertitle="&pref.mouseWheel.title;">
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <prefpane id="mousewheel_pane"
+            label="&pref.mouseWheel.title;"
+            script="chrome://communicator/content/pref/pref-mousewheel.js">
 
-  <script type="application/x-javascript">
-  <![CDATA[
-  var _elementIDs = ["mousewheelWithNoKeyAction", "mousewheelWithNoKeyNumlines", "mousewheelWithNoKeySysNumlines", 
-                     "mousewheelWithAltKeyAction", "mousewheelWithAltKeyNumlines", "mousewheelWithAltKeySysNumlines", 
-                     "mousewheelWithCtrlKeyAction", "mousewheelWithCtrlKeyNumlines", "mousewheelWithCtrlKeySysNumlines", 
-                     "mousewheelWithShiftKeyAction", "mousewheelWithShiftKeyNumlines", "mousewheelWithShiftKeySysNumlines",
-                     "mousewheelHorizWithNoKeyAction", "mousewheelWithNoKeyNumchars", "mousewheelWithNoKeySysNumchars", 
-                     "mousewheelHorizWithAltKeyAction", "mousewheelWithAltKeyNumchars", "mousewheelWithAltKeySysNumchars", 
-                     "mousewheelHorizWithCtrlKeyAction", "mousewheelWithCtrlKeyNumchars", "mousewheelWithCtrlKeySysNumchars", 
-                     "mousewheelHorizWithShiftKeyAction", "mousewheelWithShiftKeyNumchars", "mousewheelWithShiftKeySysNumchars"]; 
+    <preferences id="mousewheel_preferences">
+      <preference id="mousewheel.withnokey.action"
+                  name="mousewheel.withnokey.action"
+                  type="int"/>
+      <preference id="mousewheel.withnokey.numlines"
+                  name="mousewheel.withnokey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.withnokey.sysnumlines"
+                  name="mousewheel.withnokey.sysnumlines"
+                  type="bool"/>
+      <preference id="mousewheel.horizscroll.withnokey.action"
+                  name="mousewheel.horizscroll.withnokey.action"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withnokey.numlines"
+                  name="mousewheel.horizscroll.withnokey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withnokey.sysnumlines"
+                  name="mousewheel.horizscroll.withnokey.sysnumlines"
+                  type="bool"/>
+      <preference id="mousewheel.withaltkey.action"
+                  name="mousewheel.withaltkey.action"
+                  type="int"/>
+      <preference id="mousewheel.withaltkey.numlines"
+                  name="mousewheel.withaltkey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.withaltkey.sysnumlines"
+                  name="mousewheel.withaltkey.sysnumlines"
+                  type="bool"/>
+      <preference id="mousewheel.horizscroll.withaltkey.action"
+                  name="mousewheel.horizscroll.withaltkey.action"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withaltkey.numlines"
+                  name="mousewheel.horizscroll.withaltkey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withaltkey.sysnumlines"
+                  name="mousewheel.horizscroll.withaltkey.sysnumlines"
+                  type="bool"/>
+      <preference id="mousewheel.withcontrolkey.action"
+                  name="mousewheel.withcontrolkey.action"
+                  type="int"/>
+      <preference id="mousewheel.withcontrolkey.numlines"
+                  name="mousewheel.withcontrolkey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.withcontrolkey.sysnumlines"
+                  name="mousewheel.withcontrolkey.sysnumlines"
+                  type="bool"/>
+      <preference id="mousewheel.horizscroll.withcontrolkey.action"
+                  name="mousewheel.horizscroll.withcontrolkey.action"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withcontrolkey.numlines"
+                  name="mousewheel.horizscroll.withcontrolkey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withcontrolkey.sysnumlines"
+                  name="mousewheel.horizscroll.withcontrolkey.sysnumlines"
+                  type="bool"/>
+      <preference id="mousewheel.withshiftkey.action"
+                  name="mousewheel.withshiftkey.action"
+                  type="int"/>
+      <preference id="mousewheel.withshiftkey.numlines"
+                  name="mousewheel.withshiftkey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.withshiftkey.sysnumlines"
+                  name="mousewheel.withshiftkey.sysnumlines"
+                  type="bool"/>
+      <preference id="mousewheel.horizscroll.withshiftkey.action"
+                  name="mousewheel.horizscroll.withshiftkey.action"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withshiftkey.numlines"
+                  name="mousewheel.horizscroll.withshiftkey.numlines"
+                  type="int"/>
+      <preference id="mousewheel.horizscroll.withshiftkey.sysnumlines"
+                  name="mousewheel.horizscroll.withshiftkey.sysnumlines"
+                  type="bool"/>
+    </preferences>
 
-  function switchPage( aElement )
-  {
-    var deck = document.getElementById( "modifierDeck" );
-    deck.setAttribute( "selectedIndex", aElement.selectedItem.value );
-  }
+    <description>&mouseWheelPanel.label;</description>
 
-  function Startup()
-  {
-    var fields = ["mousewheelWithNoKeyNumlines", "mousewheelWithAltKeyNumlines", "mousewheelWithCtrlKeyNumlines", "mousewheelWithShiftKeyNumlines",
-                  "mousewheelWithNoKeyNumchars", "mousewheelWithAltKeyNumchars", "mousewheelWithCtrlKeyNumchars", "mousewheelWithShiftKeyNumchars"];
-    var checkboxes = ["mousewheelWithNoKeySysNumlines", "mousewheelWithAltKeySysNumlines", "mousewheelWithCtrlKeySysNumlines", "mousewheelWithShiftKeySysNumlines",
-                      "mousewheelWithNoKeySysNumchars", "mousewheelWithAltKeySysNumchars", "mousewheelWithCtrlKeySysNumchars", "mousewheelWithShiftKeySysNumchars"];
-    for (var i = 0; i < checkboxes.length; i++)
-      enableField(document.getElementById(checkboxes[i]), fields[i], false);
-  }
-  
-  function enableField(aCheckbox, aNodeID, setFocus)
-  {
-    var el = document.getElementById(aNodeID);
-    el.disabled = aCheckbox.checked || parent.hPrefWindow.getPrefIsLocked(el.getAttribute("prefstring"));
+    <separator class="thin"/>
+    
+    <tabbox class="indent">
+      <tabs>
+        <tab label="&usingJustTheWheel.label;"/>
+        <tab label="&usingWheelAndAlt.label;"/>
+        <tab label="&usingWheelAndCtrl.label;"/>
+        <tab label="&usingWheelAndShft.label;"/>
+      </tabs>
 
-    if (!el.disabled && setFocus)
-      el.focus();
-  }
-
-  ]]>
-  </script>
-
-  <description>&mouseWheelPanel.label;</description>
-
-  <separator class="thin"/>
-  
-  <tabbox class="indent">
-    <tabs>
-      <tab label="&usingJustTheWheel.label;"/>
-      <tab label="&usingWheelAndAlt.label;"/>
-      <tab label="&usingWheelAndCtrl.label;"/>
-      <tab label="&usingWheelAndShft.label;"/>
-    </tabs>
-
-    <tabpanels>
-      
-      <!-- no key modifiers -->
-      <vbox>
+      <tabpanels>
+        
+        <!-- no key modifiers -->
         <groupbox>
-          <caption label="&mousewheelGroup.label;"/>
-          <radiogroup id="mousewheelWithNoKeyAction"
-                      prefstring="mousewheel.withnokey.action">
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithNoKeyNumlines" size="3" 
-                           preftype="int" prefstring="mousewheel.withnokey.numlines"
-                           prefattribute="value"/>
-                  <label value="&scrollLines.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithNoKeySysNumlines" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefault.accesskey;"
-                          prefstring="mousewheel.withnokey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithNoKeyNumlines', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-        <groupbox>
-          <caption label="&mousewheelHorizGroup.label;"/>
-          <radiogroup id="mousewheelHorizWithNoKeyAction"
-                      prefstring="mousewheel.horizscroll.withnokey.action">
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithNoKeyNumchars" size="3" 
-                           preftype="int" prefstring="mousewheel.horizscroll.withnokey.numlines"
-                           prefattribute="value"/>
-                  <label value="&scrollChars.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithNoKeySysNumchars" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefaultHoriz.accesskey;"
-                          prefstring="mousewheel.horizscroll.withnokey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithNoKeyNumchars', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-      </vbox>
-          
-      <!-- alt modifiers -->
-      <vbox>
-        <groupbox>
-          <caption label="&mousewheelGroup.label;"/>
-          <radiogroup id="mousewheelWithAltKeyAction"
-                      prefstring="mousewheel.withaltkey.action">
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithAltKeyNumlines" size="3" 
-                           preftype="int" prefstring="mousewheel.withaltkey.numlines"/>
-                  <label value="&scrollLines.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithAltKeySysNumlines" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefault.accesskey;"
-                          prefstring="mousewheel.withaltkey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithAltKeyNumlines', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-        <groupbox>
-          <caption label="&mousewheelHorizGroup.label;"/>
-          <radiogroup id="mousewheelHorizWithAltKeyAction"
-                      prefstring="mousewheel.horizscroll.withaltkey.action">
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithAltKeyNumchars" size="3" 
-                            preftype="int" prefstring="mousewheel.horizscroll.withaltkey.numlines"/>
-                  <label value="&scrollChars.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithAltKeySysNumchars" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefaultHoriz.accesskey;"
-                          prefstring="mousewheel.horizscroll.withaltkey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithAltKeyNumchars', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-      </vbox>
-  
-      <!-- ctrl modifiers -->
-      <vbox>
-        <groupbox>
-          <caption label="&mousewheelGroup.label;"/>
-          <radiogroup id="mousewheelWithCtrlKeyAction"
-                      prefstring="mousewheel.withcontrolkey.action" >
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithCtrlKeyNumlines" size="3" 
-                           preftype="int" prefstring="mousewheel.withcontrolkey.numlines"/>
-                  <label value="&scrollLines.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithCtrlKeySysNumlines" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefault.accesskey;"
-                          prefstring="mousewheel.withcontrolkey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithCtrlKeyNumlines', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-        <groupbox>
-          <caption label="&mousewheelHorizGroup.label;"/>
-          <radiogroup id="mousewheelHorizWithCtrlKeyAction"
-                      prefstring="mousewheel.horizscroll.withcontrolkey.action" >
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithCtrlKeyNumchars" size="3" 
-                           preftype="int" prefstring="mousewheel.horizscroll.withcontrolkey.numlines"/>
-                  <label value="&scrollChars.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithCtrlKeySysNumchars" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefaultHoriz.accesskey;"
-                          prefstring="mousewheel.horizscroll.withcontrolkey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithCtrlKeyNumchars', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-      </vbox>
-  
-      <!-- shift modifiers -->
-      <vbox>
-        <groupbox>
-          <caption label="&mousewheelGroup.label;"/>
-          <radiogroup id="mousewheelWithShiftKeyAction"
-                      prefstring="mousewheel.withshiftkey.action">
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithShiftKeyNumlines" size="3" 
-                             preftype="int" prefstring="mousewheel.withshiftkey.numlines"/>
-                  <label value="&scrollLines.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithShiftKeySysNumlines" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefault.accesskey;"
-                          prefstring="mousewheel.withshiftkey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithShiftKeyNumlines', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-        <groupbox>
-          <caption label="&mousewheelHorizGroup.label;"/>
-          <radiogroup id="mousewheelHorizWithShiftKeyAction"
-                      prefstring="mousewheel.horizscroll.withshiftkey.action">
-            <hbox align="start">
-              <radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
-              <vbox align="start">
-                <hbox align="center">
-                  <textbox id="mousewheelWithShiftKeyNumchars" size="3" 
-                             preftype="int" prefstring="mousewheel.horizscroll.withshiftkey.numlines"/>
-                  <label value="&scrollChars.label;"/>
-                </hbox>
-                <checkbox id="mousewheelWithShiftKeySysNumchars" label="&useSystemDefault.label;"
-                          accesskey="&useSystemDefaultHoriz.accesskey;"
-                          prefstring="mousewheel.horizscroll.withshiftkey.sysnumlines"
-                          oncommand="enableField(this, 'mousewheelWithShiftKeyNumchars', true);"/>
-              </vbox>
-            </hbox>
-            <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
-            <radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
-            <radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
-          </radiogroup>
-        </groupbox>
-      </vbox>
-    </tabpanels>     
-  </tabbox>
-</page>
+          <caption>
+            <menulist oncommand="this.parentNode.nextSibling.selectedIndex = this.selectedIndex;">
+              <menupopup>
+                <menuitem label="&mousewheelGroup.label;"/>
+                <menuitem label="&mousewheelHorizGroup.label;"/>
+              </menupopup>
+            </menulist>
+          </caption>
 
+          <deck>
+            <radiogroup id="mousewheelWithNoKeyAction"
+                        preference="mousewheel.withnokey.action">
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithNoKeyNumlines" size="3" 
+                             checkbox="mousewheel.withnokey.sysnumlines"
+                             preference="mousewheel.withnokey.numlines"/>
+                    <label value="&scrollLines.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithNoKeySysNumlines" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.withnokey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+
+            <radiogroup id="mousewheelHorizWithNoKeyAction"
+                        preference="mousewheel.horizscroll.withnokey.action">
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithNoKeyNumchars" size="3" 
+                             checkbox="mousewheel.horizscroll.withnokey.sysnumlines"
+                             preference="mousewheel.horizscroll.withnokey.numlines"/>
+                    <label value="&scrollChars.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithNoKeySysNumchars" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.horizscroll.withnokey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+          </deck>
+        </groupbox>
+            
+        <!-- alt modifiers -->
+        <groupbox>
+          <caption>
+            <menulist oncommand="this.parentNode.nextSibling.selectedIndex = this.selectedIndex;">
+              <menupopup>
+                <menuitem label="&mousewheelGroup.label;"/>
+                <menuitem label="&mousewheelHorizGroup.label;"/>
+              </menupopup>
+            </menulist>
+          </caption>
+
+          <deck>
+            <radiogroup id="mousewheelWithAltKeyAction"
+                        preference="mousewheel.withaltkey.action">
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithAltKeyNumlines" size="3" 
+                             checkbox="mousewheel.withaltkey.sysnumlines"
+                             preference="mousewheel.withaltkey.numlines"/>
+                    <label value="&scrollLines.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithAltKeySysNumlines" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.withaltkey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+
+            <radiogroup id="mousewheelHorizWithAltKeyAction"
+                        preference="mousewheel.horizscroll.withaltkey.action">
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithAltKeyNumchars" size="3" 
+                             checkbox="mousewheel.horizscroll.withaltkey.sysnumlines"
+                             preference="mousewheel.horizscroll.withaltkey.numlines"/>
+                    <label value="&scrollChars.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithAltKeySysNumchars" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.horizscroll.withaltkey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+          </deck>
+        </groupbox>
+    
+        <!-- ctrl modifiers -->
+        <groupbox>
+          <caption>
+            <menulist oncommand="this.parentNode.nextSibling.selectedIndex = this.selectedIndex;">
+              <menupopup>
+                <menuitem label="&mousewheelGroup.label;"/>
+                <menuitem label="&mousewheelHorizGroup.label;"/>
+              </menupopup>
+            </menulist>
+          </caption>
+
+          <deck>
+            <radiogroup id="mousewheelWithCtrlKeyAction"
+                        preference="mousewheel.withcontrolkey.action" >
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithCtrlKeyNumlines" size="3" 
+                             checkbox="mousewheel.withcontrolkey.sysnumlines"
+                             preference="mousewheel.withcontrolkey.numlines"/>
+                    <label value="&scrollLines.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithCtrlKeySysNumlines" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.withcontrolkey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+
+            <radiogroup id="mousewheelHorizWithCtrlKeyAction"
+                        preference="mousewheel.horizscroll.withcontrolkey.action" >
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithCtrlKeyNumchars" size="3" 
+                             checkbox="mousewheel.horizscroll.withcontrolkey.sysnumlines"
+                             preference="mousewheel.horizscroll.withcontrolkey.numlines"/>
+                    <label value="&scrollChars.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithCtrlKeySysNumchars" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.horizscroll.withcontrolkey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+          </deck>
+        </groupbox>
+    
+        <!-- shift modifiers -->
+        <groupbox>
+          <caption>
+            <menulist oncommand="this.parentNode.nextSibling.selectedIndex = this.selectedIndex;">
+              <menupopup>
+                <menuitem label="&mousewheelGroup.label;"/>
+                <menuitem label="&mousewheelHorizGroup.label;"/>
+              </menupopup>
+            </menulist>
+          </caption>
+
+          <deck>
+            <radiogroup id="mousewheelWithShiftKeyAction"
+                        preference="mousewheel.withshiftkey.action">
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithShiftKeyNumlines" size="3" 
+                             checkbox="mousewheel.withshiftkey.sysnumlines"
+                             preference="mousewheel.withshiftkey.numlines"/>
+                    <label value="&scrollLines.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithShiftKeySysNumlines" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.withshiftkey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+
+            <radiogroup id="mousewheelHorizWithShiftKeyAction"
+                        preference="mousewheel.horizscroll.withshiftkey.action">
+              <hbox align="start">
+                <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+                <vbox align="start">
+                  <hbox align="center">
+                    <textbox id="mousewheelWithShiftKeyNumchars" size="3" 
+                             checkbox="mousewheel.horizscroll.withshiftkey.sysnumlines"
+                             preference="mousewheel.horizscroll.withshiftkey.numlines"/>
+                    <label value="&scrollChars.label;"/>
+                  </hbox>
+                  <checkbox id="mousewheelWithShiftKeySysNumchars" label="&useSystemDefault.label;"
+                            accesskey="&useSystemDefault.accesskey;"
+                            preference="mousewheel.horizscroll.withshiftkey.sysnumlines"/>
+                </vbox>
+              </hbox>
+              <radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+              <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
+              <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
+              <radio value="5" label="&zoom.label;" accesskey="&zoom.accesskey;"/>
+            </radiogroup>
+          </deck>
+        </groupbox>
+      </tabpanels>     
+    </tabbox>
+  </prefpane>
+</overlay>
diff --git a/mozilla/suite/common/pref/preferences.xul b/mozilla/suite/common/pref/preferences.xul
index e71f490485b..62a7789369e 100644
--- a/mozilla/suite/common/pref/preferences.xul
+++ b/mozilla/suite/common/pref/preferences.xul
@@ -157,9 +157,12 @@
                     url="chrome://communicator/content/pref/pref-http.xul"/>
           <treeitem label="&smart.label;"
                     url="chrome://communicator/content/pref/pref-smartupdate.xul"/>
+-->
           <treeitem id="mousewheelItem"
+                    prefpane="mousewheel_pane"
                     label="&mousewheel.label;"
                     url="chrome://communicator/content/pref/pref-mousewheel.xul"/>
+<!--
         </treechildren>
       </treeitem>
 -->
diff --git a/mozilla/suite/common/pref/preftree.xul b/mozilla/suite/common/pref/preftree.xul
index 353547aa87c..58bf1adc3f2 100644
--- a/mozilla/suite/common/pref/preftree.xul
+++ b/mozilla/suite/common/pref/preftree.xul
@@ -193,7 +193,7 @@
         </treeitem>
         <treeitem id="mousewheelItem">
           <treerow>
-            <treecell url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
+            <treecell label="(Migrated: &mousewheel.label;)"/>
           </treerow>  
         </treeitem> 
       </treechildren>
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-mousewheel.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-mousewheel.dtd
index 59aaf931671..2ad2507d16d 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-mousewheel.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/pref-mousewheel.dtd
@@ -11,19 +11,17 @@
 <!ENTITY mousewheelHorizGroup.label      "Horizontal scrolling">
 <!ENTITY scroll.label                    "Scroll the document by ">
 <!ENTITY scroll.accesskey                "S">
-<!ENTITY scrollHoriz.accesskey           "c">
-<!ENTITY scrollLines.label               " lines">
-<!ENTITY scrollChars.label               " characters">
+<!ENTITY scrollLines.label               "lines">
+<!ENTITY scrollChars.label               "characters">
 <!ENTITY useSystemDefault.label          "Use system default">
 <!ENTITY useSystemDefault.accesskey      "U">
-<!ENTITY useSystemDefaultHoriz.accesskey "d">
 <!ENTITY scrollPgUpPgDn.label            "Scroll a page up or a page down">
-<!ENTITY scrollPgUpPgDn.accesskey        "c">
+<!ENTITY scrollPgUpPgDn.accesskey        "p">
 <!ENTITY scrollPgLtPgRt.label            "Scroll a page left or a page right">
-<!ENTITY scrollPgLtPgRt.accesskey        "o">
+<!ENTITY scrollPgLtPgRt.accesskey        "p">
 <!ENTITY history.label                   "Move back and forward in the browsing history">
 <!ENTITY history.accesskey               "M">
-<!ENTITY historyHoriz.accesskey          "b">
 <!ENTITY textsize.label                  "Make the text larger or smaller">
 <!ENTITY textsize.accesskey              "t">
-<!ENTITY textsizeHoriz.accesskey         "e">
+<!ENTITY zoom.label                      "Zoom the page in or out">
+<!ENTITY zoom.accesskey                  "Z">