diff --git a/editor/ui/composer/content/editor.js b/editor/ui/composer/content/editor.js
index 7e8c50cb1a29..b28fa08d8c6f 100644
--- a/editor/ui/composer/content/editor.js
+++ b/editor/ui/composer/content/editor.js
@@ -95,6 +95,12 @@ const kEditorToolbarPrefs = "editor.toolbars.showbutton.";
 const kUseCssPref         = "editor.use_css";
 const kCRInParagraphsPref = "editor.CR_creates_new_p";
 
+function getEngineWebBrowserPrint()
+{
+  return content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                .getInterface(Components.interfaces.nsIWebBrowserPrint);
+}
+
 function ShowHideToolbarSeparators(toolbar) {
   var childNodes = toolbar.childNodes;
   var separator = null;
diff --git a/mail/base/content/msgPrintEngine.xul b/mail/base/content/msgPrintEngine.xul
index edb6fa1eed39..b39ca28f04ab 100644
--- a/mail/base/content/msgPrintEngine.xul
+++ b/mail/base/content/msgPrintEngine.xul
@@ -46,7 +46,6 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         onload="OnLoadPrintEngine()"
-        onunload="OnUnloadPrintEngine()"
         width="750"
         height="500"
         screenX="10" screenY="10"
@@ -62,7 +61,6 @@
   <script src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
   <script src="chrome://messenger/content/msgPrintEngine.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
 
   <!-- The main display frame -->
   <browser id="content" type="content-primary" name="content" src="about:blank" flex="1" disablehistory="true" disablesecurity="true"/>
diff --git a/mailnews/base/resources/content/msgPrintEngine.js b/mailnews/base/resources/content/msgPrintEngine.js
index 2873b89b0066..1f8b46903cf6 100644
--- a/mailnews/base/resources/content/msgPrintEngine.js
+++ b/mailnews/base/resources/content/msgPrintEngine.js
@@ -43,8 +43,6 @@ var printEngineContractID      = "@mozilla.org/messenger/msgPrintEngine;1";
 var printEngineWindow;
 var printEngine;
 var printSettings = null;
-var doingPrintPreview = false;
-var gWebProgress;
 
 const kMsgBundle = "chrome://messenger/locale/messenger.properties";
 
@@ -52,71 +50,41 @@ const kMsgBundle = "chrome://messenger/locale/messenger.properties";
 function OnLoadPrintEngine()
 {
   PrintEngineCreateGlobals();
-	InitPrintEngineWindow();
+  InitPrintEngineWindow();
   printEngine.startPrintOperation(printSettings);
 }
 
-function OnUnloadPrintEngine()
-{
-  if (printEngine.doPrintPreview) {
-    var webBrowserPrint = printEngine.webBrowserPrint;
-    webBrowserPrint.exitPrintPreview(); 
-  }
-}
-
 function PrintEngineCreateGlobals()
 {
-	/* get the print engine instance */
-	printEngine = Components.classes[printEngineContractID].createInstance();
-	printEngine = printEngine.QueryInterface(Components.interfaces.nsIMsgPrintEngine);
+  /* get the print engine instance */
+  printEngine = Components.classes[printEngineContractID].createInstance();
+  printEngine = printEngine.QueryInterface(Components.interfaces.nsIMsgPrintEngine);
+}
+
+function getEngineWebBrowserPrint()
+{
+  return printEngine.webBrowserPrint;
 }
 
 function getWebNavigation()
 {
   try {
-    return document.getElementById("content").webNavigation;
+    return getPPBrowser().webNavigation;
   } catch (e) {
     return null;
   }
 }
 
-function showPrintPreviewToolbar()
+function getNavToolbox()
 {
-  const kXULNS = 
-    "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-  var printPreviewTB = document.createElementNS(kXULNS, "toolbar");
-  printPreviewTB.setAttribute("printpreview", true);
-  printPreviewTB.setAttribute("id", "print-preview-toolbar");
-
-  var navToolbox = document.getElementById("content");
-  navToolbox.parentNode.insertBefore(printPreviewTB, navToolbox);
-  
+  return document.getElementById("content");
 }
 
-function BrowserExitPrintPreview()
+function getPPBrowser()
 {
-  window.close();
+  return document.getElementById("content");
 }
 
-// This observer is called once the progress dialog has been "opened"
-var gPrintPreviewObs = {
-  observe: function(aSubject, aTopic, aData)
-  {
-    setTimeout(FinishPrintPreview, 0);
-  },
-
-  QueryInterface : function(iid)
-  {
-    if (iid.equals(Components.interfaces.nsIObserver) ||
-        iid.equals(Components.interfaces.nsISupportsWeakReference) ||
-        iid.equals(Components.interfaces.nsISupports))
-      return this;
-
-    throw Components.results.NS_NOINTERFACE;
-  }
-};
-
 function getBundle(aURI)
 {
   if (!aURI)
@@ -155,76 +123,23 @@ function setPPTitle(aTitle)
   document.title = title;
 }
 
-function PrintPreview()
+function onEnterPrintPreview()
 {
-  var webBrowserPrint = printEngine.webBrowserPrint;
-
-  // Here we get the PrintingPromptService tso we can display the PP Progress from script
-  // For the browser implemented via XUL with the PP toolbar we cannot let it be
-  // automatically opened from the print engine because the XUL scrollbars in the PP window
-  // will layout before the content window and a crash will occur.
-  //
-  // Doing it all from script, means it lays out before hand and we can let printing do it's own thing
-  gWebProgress = new Object();
-
-  var printPreviewParams    = new Object();
-  var notifyOnOpen          = new Object();
-  var printingPromptService = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"]
-                                  .getService(Components.interfaces.nsIPrintingPromptService);
-  if (printingPromptService) {
-    // just in case we are already printing, 
-    // an error code could be returned if the Prgress Dialog is already displayed
-    try {
-      printingPromptService.showProgress(this, webBrowserPrint, printSettings, gPrintPreviewObs, false, gWebProgress, 
-                                         printPreviewParams, notifyOnOpen);
-      if (printPreviewParams.value) {
-        var webNav = getWebNavigation();
-        printPreviewParams.value.docTitle = webNav.document.title;
-        printPreviewParams.value.docURL   = webNav.currentURI.spec;
-      }
-
-      // this tells us whether we should continue on with PP or 
-      // wait for the callback via the observer
-      if (!notifyOnOpen.value.valueOf() || gWebProgress.value == null) {
-        FinishPrintPreview();
-      }
-    } catch (e) {
-      FinishPrintPreview();
-    }
-  }
-}
-
-function FinishPrintPreview()
-{
-  var webBrowserPrint = printEngine.webBrowserPrint;
-  try {
-    if (webBrowserPrint) {
-      webBrowserPrint.printPreview(printSettings, null, gWebProgress.value);
-    }
- 
-    // show the toolbar after we go into print preview mode so
-    // that we can initialize the toolbar with total num pages
-    showPrintPreviewToolbar();
-    setPPTitle(getWebNavigation().document.title);
-
-    content.focus();
-  } catch (e) {
-    // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
-    // causing an exception to be thrown which we catch here.
-    // Unfortunately this will also consume helpful failures, so add a
-    //dump(e+"\n");
-  }
+  setPPTitle(getWebNavigation().document.title);
   printEngine.showWindow(true);
 }
 
+function onExitPrintPreview()
+{
+  window.close();
+}
 
 // Pref listener constants
 const gStartupPPObserver =
 {
-  printengine:null,
   observe: function(subject, topic, prefName)
   {
-    this.printengine.PrintPreview();
+    PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview);
   }
 };
 
@@ -251,9 +166,7 @@ function InitPrintEngineWindow()
     }
 
     if (window.arguments[4]) {
-      doingPrintPreview = window.arguments[4];
-      //printEngine.showWindow(doingPrintPreview);
-      printEngine.doPrintPreview = doingPrintPreview;
+      printEngine.doPrintPreview = window.arguments[4];
     } else {
       printEngine.doPrintPreview = false;
     }
@@ -271,7 +184,6 @@ function InitPrintEngineWindow()
       printEngine.setParentWindow(null);
     }
 
-    gStartupPPObserver.printengine = this;
     printEngine.setStatusFeedback(statusFeedback);
     printEngine.setStartupPPObserver(gStartupPPObserver);
 
diff --git a/mailnews/base/resources/content/msgPrintEngine.xul b/mailnews/base/resources/content/msgPrintEngine.xul
index de3d462c159b..b8982b569b30 100644
--- a/mailnews/base/resources/content/msgPrintEngine.xul
+++ b/mailnews/base/resources/content/msgPrintEngine.xul
@@ -45,7 +45,6 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         onload="OnLoadPrintEngine()"
-        onunload="OnUnloadPrintEngine()"
         width="750"
         height="500"
         screenX="10" screenY="10"
diff --git a/xpfe/browser/resources/content/browser.js b/xpfe/browser/resources/content/browser.js
index 8c950a975cba..a113eeb1d4a8 100644
--- a/xpfe/browser/resources/content/browser.js
+++ b/xpfe/browser/resources/content/browser.js
@@ -42,9 +42,7 @@ const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
 var gPrintSettingsAreGlobal = true;
 var gSavePrintSettings = true;
 var gChromeState = null; // chrome state before we went into print preview
-var gOldCloseHandler = null; // close handler before we went into print preview
 var gInPrintPreviewMode = false;
-var gWebProgress        = null;
 
 function getWebNavigation()
 {
@@ -144,156 +142,40 @@ function toggleAffectedChrome(aHide)
     SidebarRebuild();
 }
 
-function showPrintPreviewToolbar()
+function onEnterPrintPreview()
 {
   toggleAffectedChrome(true);
-  const kXULNS = 
-    "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-  var printPreviewTB = document.createElementNS(kXULNS, "toolbar");
-  printPreviewTB.setAttribute("printpreview", true);
-  printPreviewTB.setAttribute("id", "print-preview-toolbar");
-
-  var navToolbox = document.getElementById("navigator-toolbox");
-  navToolbox.parentNode.insertBefore(printPreviewTB, navToolbox);
+  gInPrintPreviewMode = true;
 }
 
-function BrowserExitPrintPreview()
+function onExitPrintPreview()
 {
   gInPrintPreviewMode = false;
-
-  var browser = getBrowser();
-  browser.setAttribute("handleCtrlPageUpDown", "true");
-
-  // remove the print preview toolbar
-  var navToolbox = document.getElementById("navigator-toolbox");
-  var printPreviewTB = document.getElementById("print-preview-toolbar");
-  navToolbox.parentNode.removeChild(printPreviewTB);
-
   // restore chrome to original state
   toggleAffectedChrome(false);
-
-  // restore old onclose handler if we found one before previewing
-  var mainWin = document.getElementById("main-window");
-  mainWin.setAttribute("onclose", gOldCloseHandler);
-
-  // exit print preview galley mode in content area
-  var ifreq = content.QueryInterface(
-    Components.interfaces.nsIInterfaceRequestor);
-  var webBrowserPrint = ifreq.getInterface(
-    Components.interfaces.nsIWebBrowserPrint);     
-  webBrowserPrint.exitPrintPreview(); 
-  content.focus();
 }
 
-// This observer is called once the progress dialog has been "opened"
-var gPrintPreviewObs = {
-    observe: function(aSubject, aTopic, aData)
-    {
-      setTimeout(FinishPrintPreview, 0);
-    },
+function getEngineWebBrowserPrint()
+{
+  return content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                .getInterface(Components.interfaces.nsIWebBrowserPrint);
+}
 
-    QueryInterface : function(iid)
-    {
-     if (iid.equals(Components.interfaces.nsIObserver) || 
-         iid.equals(Components.interfaces.nsISupportsWeakReference) || 
-         iid.equals(Components.interfaces.nsISupports)) {
-      return this;
-     }
-     
-     throw Components.results.NS_NOINTERFACE;
-    }
-};
+function getNavToolbox()
+{
+  return document.getElementById("navigator-toolbox");
+}
+
+function getPPBrowser()
+{
+  return document.getElementById("browser");
+}
 
 function BrowserPrintPreview()
 {
-  var ifreq;
-  var webBrowserPrint;  
-  try {
-    ifreq = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-    webBrowserPrint = ifreq.getInterface(Components.interfaces.nsIWebBrowserPrint);     
-    gPrintSettings = GetPrintSettings();
-
-  } catch (e) {
-    // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
-    // causing an exception to be thrown which we catch here.
-    // Unfortunately this will also consume helpful failures, so add a
-    // dump(e); // if you need to debug
-  }
-
-  // Here we get the PrintingPromptService tso we can display the PP Progress from script
-  // For the browser implemented via XUL with the PP toolbar we cannot let it be
-  // automatically opened from the print engine because the XUL scrollbars in the PP window
-  // will layout before the content window and a crash will occur.
-  //
-  // Doing it all from script, means it lays out before hand and we can let printing do it's own thing
-  gWebProgress = new Object();
-
-  var printPreviewParams    = new Object();
-  var notifyOnOpen          = new Object();
-  var printingPromptService = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"]
-                                  .getService(Components.interfaces.nsIPrintingPromptService);
-  if (printingPromptService) {
-    // just in case we are already printing, 
-    // an error code could be returned if the Prgress Dialog is already displayed
-    try {
-      printingPromptService.showProgress(this, webBrowserPrint, gPrintSettings, gPrintPreviewObs, false, gWebProgress, 
-                                         printPreviewParams, notifyOnOpen);
-      if (printPreviewParams.value) {
-        var webNav = getWebNavigation();
-        printPreviewParams.value.docTitle = webNav.document.title;
-        printPreviewParams.value.docURL   = webNav.currentURI.spec;
-      }
-
-      // this tells us whether we should continue on with PP or 
-      // wait for the callback via the observer
-      if (!notifyOnOpen.value.valueOf() || gWebProgress.value == null) {
-        FinishPrintPreview();
-      }
-    } catch (e) {
-      FinishPrintPreview();
-    }
-  }
+  PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview);
 }
 
-function FinishPrintPreview()
-{
-  var browser = getBrowser();
-  try {
-    var ifreq = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-    var webBrowserPrint = ifreq.getInterface(Components.interfaces.nsIWebBrowserPrint);     
-    if (webBrowserPrint) {
-      gPrintSettings = GetPrintSettings();
-      webBrowserPrint.printPreview(gPrintSettings, null, gWebProgress.value);
-    }
-
-    gInPrintPreviewMode = true;
-
-    browser.setAttribute("handleCtrlPageUpDown", "false");
-
-    var mainWin = document.getElementById("main-window");
-
-    // save previous close handler to restoreon exiting print preview mode
-    if (mainWin.hasAttribute("onclose"))
-      gOldCloseHandler = mainWin.getAttribute("onclose");
-    else
-      gOldCloseHandler = null;
-    mainWin.setAttribute("onclose", "BrowserExitPrintPreview(); return false;");
- 
-    // show the toolbar after we go into print preview mode so
-    // that we can initialize the toolbar with total num pages
-    showPrintPreviewToolbar();
-
-    content.focus();
-  } catch (e) {
-    // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
-    // causing an exception to be thrown which we catch here.
-    // Unfortunately this will also consume helpful failures, so add a
-    // dump(e); // if you need to debug
-  }
-}
-
-
 function BrowserSetDefaultCharacterSet(aCharset)
 {
   // no longer needed; set when setting Force; see bug 79608
diff --git a/xpfe/communicator/resources/content/printPreviewBindings.xml b/xpfe/communicator/resources/content/printPreviewBindings.xml
index e6f3906d6544..9a3a5c04b10a 100644
--- a/xpfe/communicator/resources/content/printPreviewBindings.xml
+++ b/xpfe/communicator/resources/content/printPreviewBindings.xml
@@ -51,38 +51,36 @@
 
     <content>
       <xul:button label="&print.label;" accesskey="&print.accesskey;"
-        oncommand="NSPrint();"/>
+        oncommand="PrintUtils.print();"/>
 
       <xul:button label="&pageSetup.label;" accesskey="&pageSetup.accesskey;"
-        oncommand="doPageSetup();"/>
-      
-      <xul:toolbarseparator/>
+        oncommand="this.parentNode.doPageSetup();"/>
 
       <xul:vbox align="center" pack="center">
-        <xul:label value="&page.label;"/>
+        <xul:label value="&page.label;" accesskey="&page.accesskey;" control="pageNumber"/>
       </xul:vbox>
       <xul:toolbarbutton class="toolbarbutton-icon home-arrow"
-        oncommand="parentNode.navigate(0, 0, 'home');"/>
+        oncommand="parentNode.navigate(0, 0, 'home');" tooltiptext="&homearrow.tooltip;"/>
       <xul:toolbarbutton class="toolbarbutton-icon last-arrow" 
-        oncommand="parentNode.navigate(-1, 0, 0);"/>
+        oncommand="parentNode.navigate(-1, 0, 0);" tooltiptext="&leftarrow.tooltip;"/>
       <xul:hbox align="center" pack="center">
-        <xul:textbox size="3" value="1" lastvalid="1"
+        <xul:textbox id="pageNumber" size="3" value="1" lastvalid="1"
           onchange="navigate(0, this.value, 0);"/>
         <xul:label value="&of.label;"/>
         <xul:label value="1"/>
       </xul:hbox>
       <xul:toolbarbutton class="toolbarbutton-icon next-arrow" 
-        oncommand="parentNode.navigate(1, 0, 0);"/>
+        oncommand="parentNode.navigate(1, 0, 0);" tooltiptext="&rightarrow.tooltip;"/>
       <xul:toolbarbutton class="toolbarbutton-icon end-arrow"
-        oncommand="parentNode.navigate(0, 0, 'end');"/>
+        oncommand="parentNode.navigate(0, 0, 'end');" tooltiptext="&endarrow.tooltip;"/>
 
-      <xul:toolbarseparator/>
+      <xul:toolbarseparator class="toolbarseparator-primary"/>
       <xul:vbox align="center" pack="center">
-        <xul:label value="&scale.label;"/>
+        <xul:label value="&scale.label;" accesskey="&scale.accesskey;" control="scale"/>
       </xul:vbox>
 
       <xul:hbox align="center" pack="center">
-        <xul:menulist crop="none"
+        <xul:menulist id="scale" crop="none"
           oncommand="parentNode.parentNode.scale(this.selectedItem.value);">
           <xul:menupopup>
             <xul:menuitem value="0.3" label="&p30.label;"/>
@@ -105,22 +103,21 @@
         </xul:menulist>
       </xul:hbox>
 
-      <xul:toolbarseparator/>
-      <xul:vbox align="center" pack="center">
-        <xul:hbox align="center" pack="center">
-          <xul:toolbarbutton label="&portrait.label;" 
-            accesskey="&portrait.accesskey;" checked="true"
-            type="radio" group="orient" class="toolbar-portrait-page"
-            oncommand="parentNode.parentNode.parentNode.orient('portrait');"/>
-          <xul:toolbarbutton label="&landscape.label;" accesskey="&landscape.accesskey;"
-            type="radio" group="orient" class="toolbar-landscape-page"
-            oncommand="parentNode.parentNode.parentNode.orient('landscape');"/>
-        </xul:hbox>
-      </xul:vbox>
+      <xul:toolbarseparator class="toolbarseparator-primary"/>
+      <xul:hbox align="center" pack="center">
+        <xul:toolbarbutton label="&portrait.label;" checked="true"
+          accesskey="&portrait.accesskey;"
+          type="radio" group="orient" class="toolbar-portrait-page"
+          oncommand="parentNode.parentNode.orient('portrait');"/>
+        <xul:toolbarbutton label="&landscape.label;"
+          accesskey="&landscape.accesskey;"
+          type="radio" group="orient" class="toolbar-landscape-page"
+          oncommand="parentNode.parentNode.orient('landscape');"/>
+      </xul:hbox>
 
-      <xul:toolbarseparator/>
+      <xul:toolbarseparator class="toolbarseparator-primary"/>
       <xul:button label="&close.label;" accesskey="&close.accesskey;"
-        oncommand="BrowserExitPrintPreview();"/>
+        oncommand="PrintUtils.exitPrintPreview();"/>
       <xul:data value="&customPrompt.title;"/>
     </content>
 
@@ -132,28 +129,28 @@
         document.getAnonymousNodes(this)[0]
       </field>
       <field name="mPageTextBox">
-        document.getAnonymousNodes(this)[6].firstChild
+        document.getAnonymousNodes(this)[5].firstChild
       </field>
       <field name="mTotalPages">
-        document.getAnonymousNodes(this)[6].lastChild
+        document.getAnonymousNodes(this)[5].lastChild
       </field>
       <field name="mScaleLabel">
-        document.getAnonymousNodes(this)[10].firstChild
+        document.getAnonymousNodes(this)[9].firstChild
       </field>
       <field name="mScaleCombobox">
-        document.getAnonymousNodes(this)[11].firstChild
+        document.getAnonymousNodes(this)[10].firstChild
       </field>
       <field name="mOrientButtonsBox">
-        document.getAnonymousNodes(this)[13].firstChild
+        document.getAnonymousNodes(this)[12]
       </field>
       <field name="mPortaitButton">
-        this.mOrientButtonsBox.firstChild
+        this.mOrientButtonsBox.childNodes[0]
       </field>
       <field name="mLandscapeButton">
-        this.mOrientButtonsBox.lastChild
+        this.mOrientButtonsBox.childNodes[1]
       </field>
       <field name="mCustomTitle">
-        document.getAnonymousNodes(this)[16].getAttribute("value");
+        document.getAnonymousNodes(this)[15].firstChild
       </field>
       <field name="mPrintPreviewObs">
       </field>
@@ -164,12 +161,10 @@
       <![CDATA[
         this._debug("constructor");
 
-        var print = _getWebBrowserPrint();
-        try {
-          this.mTotalPages.value = print.printPreviewNumPages;
-          _getValuesFromPS();
-        } catch(e) {}
+        var print = PrintUtils.getWebBrowserPrint();
+        this.mTotalPages.value = print.printPreviewNumPages;
 
+        this.updateToolbar();
 
         // Hide the ``Print...'' button when the underlying gfx code does not
         // support multiple devicecontext to be used concurrently
@@ -210,9 +205,9 @@
           // hide page setup button
           document.getAnonymousNodes(this)[1].setAttribute("hidden", "true");
 
-          // hide scale widgets (indices: 9, 10, 11, 12)
-          // hide orient widget (index: 13)
-          for (var i = 9; i <= 13; ++i)
+          // hide scale widgets (indices: 8, 9, 10, 11)
+          // hide orient widgets (indices: 12, 13)
+          for (var i = 8; i <= 13; ++i)
           {
             document.getAnonymousNodes(this)[i].setAttribute("hidden", "true");
           }
@@ -223,14 +218,13 @@
       <method name="doPageSetup">
         <body>
         <![CDATA[
-          if (NSPrintSetup()) {
+          var didOK = PrintUtils.showPageSetup();
+          if (didOK) {
             // the changes that effect the UI
-            this._getValuesFromPS();
+            this.updateToolbar();
 
             // Now do PrintPreview
-            var print    = this._getWebBrowserPrint();
-            this.doPrintPreview(print, print.currentPrintSettings,
-                                this.mTotalPages, null);
+            PrintUtils.printPreview();
           }
         ]]>
         </body>
@@ -244,13 +238,10 @@
         <![CDATA[
           this._debug("navigate: " + aDirection + " " + aPageNum + 
                       " " + aHomeOrEnd);
-          
-          if (this.mPageTextBox.getAttribute("lastvalid") == aPageNum) {
-            return;
-          }
-          
-          var print = this._getWebBrowserPrint();
+
+          var print = PrintUtils.getWebBrowserPrint();
           var validInput = false;
+          var total;
 
           // we use only one of aHomeOrEnd, aDirection, or aPageNum
           if (aHomeOrEnd)
@@ -272,10 +263,12 @@
           }
           else if (aDirection)
           {
-            var newPageNum = parseInt(this.mPageTextBox.value) + aDirection;
+            var textBoxStr = this.mPageTextBox.value;
+            var newPageNum = parseInt(textBoxStr) + aDirection;
+            total = print.printPreviewNumPages;
 
             // bounds check potentially user-entered number
-            if (newPageNum > 0 && newPageNum <= print.printPreviewNumPages)
+            if (newPageNum > 0 && newPageNum <= total)
             {
               this.mPageTextBox.value = newPageNum;
               print.printPreviewNavigate(
@@ -285,8 +278,10 @@
           }
           else 
           {
+            total = print.printPreviewNumPages;
+
             // bounds check potentially user-entered number
-            if (aPageNum > 0 && aPageNum <= print.printPreviewNumPages)
+            if (aPageNum > 0 && aPageNum <= total)
             {
               print.printPreviewNavigate(
                 print.PRINTPREVIEW_GOTO_PAGENUM, aPageNum);
@@ -315,13 +310,15 @@
         <parameter name="aValue"/>
         <body>
         <![CDATA[
-          var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
-          var result = {value:aValue};
+          var value = Math.round(aValue);
+          var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                                        .getService(Components.interfaces.nsIPromptService);
+          var result = {value:value};
           var confirmed = promptService.prompt(window, this.mCustomTitle,
                                                this.mScaleLabel.value, result,
-                                               null, {value:aValue});
+                                               null, {value:value});
           this._debug("confirmed: " + confirmed);
-          if (!confirmed || !result.value || result.value == "") {
+          if (!confirmed || !result.value || result.value == "" || result.value == value) {
             return(-1);
           }
           return result.value;
@@ -337,106 +334,29 @@
 
           aValue = new Number(aValue);
 
-          for (var i=0;i<scaleValues.length;i++) {
+          for (var i = 0; i < scaleValues.length; i++) {
             if (aValue == scaleValues[i]) {
               this.mScaleCombobox.selectedIndex = i;
-              this.mScaleCombobox.setAttribute('lastValidInx', this.mScaleCombobox.selectedIndex);
               return;
             }
           }
-
           this.mScaleCombobox.value = "Custom";
-          this.mScaleCombobox.setAttribute('lastValidInx', 14);
         ]]>
         </body>
       </method>
 
-      <method name="doPrintPreview">
-        <parameter name="aWebBrowserPrint"/>
-        <parameter name="aPrintSettings"/>
-        <parameter name="aTotalPages"/>
-        <parameter name="aScaleCombobox"/>
-        <body>
-        <![CDATA[
-
-          // This observer is called once the progress dialog has been "opened"
-          this.mPrintPreviewObs = {
-              mDOMWin:null,
-              mWebBrowserPrint:null,
-              mPrintSettings:null,
-              mWebProgress:null,
-              mTotalPages:null,
-              mScaleCombobox:null,
-
-              observe: function(aSubject, aTopic, aData)
-              {
-                // First do PrintPreview
-                this.mWebBrowserPrint.printPreview(this.mPrintSettings, this.mDOMWin, this.mWebProgress.value);
-
-                // update total number of pages since this could have changed
-                this.mTotalPages.value = this.mWebBrowserPrint.printPreviewNumPages;
-                if (this.mScaleCombobox) {
-                  this.mScaleCombobox.setAttribute('lastValidInx', this.mScaleCombobox.selectedIndex);
-                }
-              },
-
-              QueryInterface : function(iid)
-              {
-               if (iid.equals(Components.interfaces.nsIObserver) || iid.equals(Components.interfaces.nsISupportsWeakReference))
-                return this;
-     
-               throw Components.results.NS_NOINTERFACE;
-              }
-          };
-
-          // Here we get the PrintingPromptService tso we can display the PP Progress from script
-          // For the browser implemented via XUL with the PP toolbar we cannot let it be
-          // automatically opened from the print engine because the XUL scrollbars in the PP window
-          // will layout before the content window and a crash will occur.
-          //
-          // Doing it all from script, means it lays out before hand and we can let printing do it's own thing
-          this.mWebProgress = new Object();
-
-          // set up observer's global data for invoking Print Preview
-          this.mPrintPreviewObs.mDOMWin          = content;
-          this.mPrintPreviewObs.mWebBrowserPrint = aWebBrowserPrint;
-          this.mPrintPreviewObs.mPrintSettings   = aPrintSettings;
-          this.mPrintPreviewObs.mWebProgress     = this.mWebProgress;
-          this.mPrintPreviewObs.mTotalPages      = aTotalPages;
-          this.mPrintPreviewObs.mScaleCombobox   = aScaleCombobox;
-
-          var printPreviewParams    = new Object();
-          var notifyOnOpen          = new Object();
-          var printingPromptService = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"]
-                                          .getService(Components.interfaces.nsIPrintingPromptService);
-          if (printingPromptService) {
-            printingPromptService.showProgress(content, aWebBrowserPrint,
-                                               aPrintSettings,
-                                               this.mPrintPreviewObs, false, this.mWebProgress, 
-                                               printPreviewParams, notifyOnOpen);
-            if (printPreviewParams.value) {
-              var webNav = getWebNavigation();
-              printPreviewParams.value.docTitle = webNav.document.title;
-              printPreviewParams.value.docURL   = webNav.currentURI.spec;
-            }
-          }
-        ]]>
-        </body>
-      </method>
-
-
       <method name="scale">
         <parameter name="aValue"/>
         <body>
         <![CDATA[
           this._debug("scale: " + aValue);
 
-          var print = this._getWebBrowserPrint();
-          var settings = print.currentPrintSettings;
+          var settings = PrintUtils.getPrintSettings();
           if (aValue == "ShrinkToFit") {
             if (!settings.shrinkToFit) {
               settings.shrinkToFit = true;
-              this.doPrintPreview(print, settings, this.mTotalPages, this.mScaleCombobox);
+              this.savePrintSettings(settings, settings.kInitSaveShrinkToFit | settings.kInitSaveScaling);
+              PrintUtils.printPreview();
             }
             return;
           }
@@ -453,10 +373,15 @@
           }
 
           this.setScaleCombobox(aValue);
+          this.mScaleCombobox.setAttribute('lastValidInx', this.mScaleCombobox.selectedIndex);
 
-          settings.shrinkToFit = false;
-          settings.scaling = aValue;
-          this.doPrintPreview(print, settings, this.mTotalPages, null);
+          if (settings.scaling != aValue)
+          {
+            settings.shrinkToFit = false;
+            settings.scaling = aValue;
+            this.savePrintSettings(settings, settings.kInitSaveShrinkToFit | settings.kInitSaveScaling);
+            PrintUtils.printPreview();
+          }
         ]]>
         </body>
       </method>
@@ -467,43 +392,25 @@
         <![CDATA[
           this._debug("orient: " + aOrientation);
 
-          var orientValue;
           const kIPrintSettings = Components.interfaces.nsIPrintSettings;
-          if (aOrientation == "portrait")
+          var orientValue = (aOrientation == "portrait") ? kIPrintSettings.kPortraitOrientation :
+                                                           kIPrintSettings.kLandscapeOrientation;
+          var settings = PrintUtils.getPrintSettings();
+          if (settings.orientation != orientValue)
           {
-            this.mPortaitButton.checked = true;
-            this.mLandscapeButton.checked = false;
-            orientValue = kIPrintSettings.kPortraitOrientation;
-          } 
-          else
-          {
-            this.mPortaitButton.checked = false;
-            this.mLandscapeButton.checked = true;
-            orientValue = kIPrintSettings.kLandscapeOrientation;
+            settings.orientation = orientValue;
+            this.savePrintSettings(settings, settings.kInitSaveOrientation);
+            PrintUtils.printPreview();
           }
-
-          var print = this._getWebBrowserPrint();
-          var settings = print.currentPrintSettings;
-          settings.orientation = orientValue;
-          this.doPrintPreview(print, settings, this.mTotalPages, null);
         ]]>
         </body>
       </method>
 
-      <method name="_getWebBrowserPrint">
+      <method name="updateToolbar">
         <body>
         <![CDATA[
-          return content
-                   .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                   .getInterface(Components.interfaces.nsIWebBrowserPrint);
-        ]]>
-        </body>
-      </method>
-
-      <method name="_getValuesFromPS">
-        <body>
-        <![CDATA[
-          var settings = this._getWebBrowserPrint().currentPrintSettings;
+          var print = PrintUtils.getWebBrowserPrint();
+          var settings = PrintUtils.getPrintSettings();
 
           var isPortrait = settings.orientation == Components.interfaces.nsIPrintSettings.kPortraitOrientation;
 
@@ -513,15 +420,26 @@
           if (settings.shrinkToFit) {
             this._debug("setting ShrinkToFit");
             this.mScaleCombobox.value = "ShrinkToFit";
-            this.mScaleCombobox.setAttribute('lastValidInx', 13);
           } else {
             this.setScaleCombobox(settings.scaling);
           }
 
+          this.mTotalPages.value = print.printPreviewNumPages;
+          this.mPageTextBox.value = 1;
         ]]>
         </body>
       </method>
 
+      <method name="savePrintSettings">
+        <parameter name="settings"/>
+        <parameter name="flags"/>
+        <body><![CDATA[
+          var printService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
+                                       .getService(Components.interfaces.nsIPrintSettingsService);
+          printService.savePrintSettingsToPrefs(settings, true, flags);
+        ]]></body>
+      </method>
+
       <method name="_debug">
         <parameter name="aMsg"/>
         <body>
diff --git a/xpfe/communicator/resources/content/printing.js b/xpfe/communicator/resources/content/printing.js
index 49a460c807ea..cc50be0d3a7c 100644
--- a/xpfe/communicator/resources/content/printing.js
+++ b/xpfe/communicator/resources/content/printing.js
@@ -38,123 +38,273 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gPrintSettings = null;
 var gPrintSettingsAreGlobal = false;
 var gSavePrintSettings = false;
 
-function setPrinterDefaultsForSelectedPrinter(aPrintService)
-{
-  if (gPrintSettings.printerName == "") {
-    gPrintSettings.printerName = aPrintService.defaultPrinterName;
-  }
+var PrintUtils = {
 
-  // First get any defaults from the printer 
-  aPrintService.initPrintSettingsFromPrinter(gPrintSettings.printerName, gPrintSettings);
-
-  // now augment them with any values from last time
-  aPrintService.initPrintSettingsFromPrefs(gPrintSettings, true, gPrintSettings.kInitSaveAll);
-}
-
-function GetPrintSettings()
-{
-  try {
-    if (gPrintSettings == null) {
-      var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                           .getService(Components.interfaces.nsIPrefBranch);
-      if (pref) {
-        gPrintSettingsAreGlobal = pref.getBoolPref("print.use_global_printsettings", false);
-        gSavePrintSettings = pref.getBoolPref("print.save_print_settings", false);
-      }
-
-      var printService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
-                                        .getService(Components.interfaces.nsIPrintSettingsService);
-      if (gPrintSettingsAreGlobal) {
-        gPrintSettings = printService.globalPrintSettings;
-        setPrinterDefaultsForSelectedPrinter(printService);
-      } else {
-        gPrintSettings = printService.newPrintSettings;
-      }
-    }
-  } catch (e) {
-    dump("GetPrintSettings() "+e+"\n");
-  }
-
-  return gPrintSettings;
-}
-
-function goPageSetup(domwin, printSettings)
-{
-  try {
-    if (printSettings == null) {
-      dump("***************** PrintSettings arg is null!");
+  showPageSetup: function ()
+  {
+    try {
+      var printSettings = this.getPrintSettings();
+      var printingPromptService = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"]
+                                            .getService(Components.interfaces.nsIPrintingPromptService);
+      printingPromptService.showPageSetup(window, printSettings, null);
+    } catch (e) {
+      dump("showPageSetup "+e+"\n");
       return false;
     }
+    return true;
+  },
 
-    // This code calls the printoptions service to bring up the printoptions
-    // dialog.  This will be an xp dialog if the platform did not override
-    // the ShowPrintSetupDialog method.
+  print: function ()
+  {
+    var webBrowserPrint = this.getWebBrowserPrint();
+    var printSettings = this.getPrintSettings();
+    try {
+      webBrowserPrint.print(printSettings, null);
+      if (gPrintSettingsAreGlobal && gSavePrintSettings) {
+        var printService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
+                                     .getService(Components.interfaces.nsIPrintSettingsService);
+        printService.savePrintSettingsToPrefs(printSettings, true, 
+                                              printSettings.kInitSaveAll);
+        printService.savePrintSettingsToPrefs(printSettings, false,
+                                              printSettings.kInitSavePrinterName);
+      }
+    } catch (e) {
+      // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
+      // causing an exception to be thrown which we catch here.
+      // Unfortunately this will also consume helpful failures, so add a
+      // dump("print: "+e+"\n"); // if you need to debug
+    }
+  },
+
+  printPreview: function (aEnterPPCallback, aExitPPCallback)
+  {
+    // if we're already in PP mode, don't set the callbacks; chances
+    // are they're null because someone is calling printPreview() to
+    // get us to refresh the display.
+    var pptoolbar = document.getElementById("print-preview-toolbar");
+    if (!pptoolbar) {
+      this._onEnterPP = aEnterPPCallback;
+      this._onExitPP  = aExitPPCallback;
+    } else {
+      // collapse the browser - it will be shown in
+      // onEnterPrintPreview; this forces a reflow which fixes display
+      // issues in bug 267422.
+      var browser = getPPBrowser();
+      if (browser)
+        browser.collapsed = true;
+    }
+
+    this._webProgressPP = {};
+    var ppParams        = {};
+    var notifyOnOpen    = {};
+    var webBrowserPrint = this.getWebBrowserPrint();
+    var printSettings   = this.getPrintSettings();
+    // Here we get the PrintingPromptService so we can display the PP Progress from script
+    // For the browser implemented via XUL with the PP toolbar we cannot let it be
+    // automatically opened from the print engine because the XUL scrollbars in the PP window
+    // will layout before the content window and a crash will occur.
+    // Doing it all from script, means it lays out before hand and we can let printing do it's own thing
     var printingPromptService = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"]
-                                             .getService(Components.interfaces.nsIPrintingPromptService);
-    printingPromptService.showPageSetup(domwin, printSettings, null);
-  } catch(e) {
-    // Note: Pressing Cancel gets here too.
+                                          .getService(Components.interfaces.nsIPrintingPromptService);
+    // just in case we are already printing, 
+    // an error code could be returned if the Progress Dialog is already displayed
+    try {
+      printingPromptService.showProgress(this, webBrowserPrint, printSettings, this._obsPP, false,
+                                         this._webProgressPP, ppParams, notifyOnOpen);
+      if (ppParams.value) {
+        var webNav = getWebNavigation();
+        ppParams.value.docTitle = webNav.document.title;
+        ppParams.value.docURL   = webNav.currentURI.spec;
+      }
 
-    return false; 
+      // this tells us whether we should continue on with PP or 
+      // wait for the callback via the observer
+      if (!notifyOnOpen.value.valueOf() || this._webProgressPP.value == null)
+        this.enterPrintPreview();
+    } catch (e) {
+      this.enterPrintPreview();
+    }
+  },
+
+  getWebBrowserPrint: function ()
+  {
+    return getEngineWebBrowserPrint();
+  },
+
+  ////////////////////////////////////////
+  // "private" methods. Don't use them. //
+  ////////////////////////////////////////
+
+  setPrinterDefaultsForSelectedPrinter: function (aPrintService, aPrintSettings)
+  {
+    if (!aPrintSettings.printerName)
+      aPrintSettings.printerName = aPrintService.defaultPrinterName;
+
+    // First get any defaults from the printer 
+    aPrintService.initPrintSettingsFromPrinter(aPrintSettings.printerName, aPrintSettings);
+    // now augment them with any values from last time
+    aPrintService.initPrintSettingsFromPrefs(aPrintSettings, true, aPrintSettings.kInitSaveAll);
+  },
+
+  getPrintSettings: function ()
+  {
+    var pref = Components.classes["@mozilla.org/preferences-service;1"]
+                         .getService(Components.interfaces.nsIPrefBranch);
+    if (pref) {
+      gPrintSettingsAreGlobal = pref.getBoolPref("print.use_global_printsettings", false);
+      gSavePrintSettings = pref.getBoolPref("print.save_print_settings", false);
+    }
+
+    var printSettings;
+    try {
+      var printService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
+                                   .getService(Components.interfaces.nsIPrintSettingsService);
+      if (gPrintSettingsAreGlobal) {
+        printSettings = printService.globalPrintSettings;
+        this.setPrinterDefaultsForSelectedPrinter(printService, printSettings);
+      } else {
+        printSettings = printService.newPrintSettings;
+      }
+    } catch (e) {
+      dump("getPrintSettings: "+e+"\n");
+    }
+    return printSettings;
+  },
+
+  _chromeState: {},
+  _closeHandlerPP: null,
+  _webProgressPP: null,
+  _onEnterPP: null,
+  _onExitPP: null,
+
+  // This observer is called once the progress dialog has been "opened"
+  _obsPP: 
+  {
+    observe: function(aSubject, aTopic, aData)
+    {
+      // delay the print preview to show the content of the progress dialog
+      setTimeout(function () { PrintUtils.enterPrintPreview(); }, 0);
+    },
+
+    QueryInterface : function(iid)
+    {
+      if (iid.equals(Components.interfaces.nsIObserver) ||
+          iid.equals(Components.interfaces.nsISupportsWeakReference) ||
+          iid.equals(Components.interfaces.nsISupports))
+        return this;   
+      throw Components.results.NS_NOINTERFACE;
+    }
+  },
+
+  enterPrintPreview: function ()
+  {
+    var webBrowserPrint = this.getWebBrowserPrint();
+    var printSettings   = this.getPrintSettings();
+    try {
+      webBrowserPrint.printPreview(printSettings, null, this._webProgressPP.value);
+    } catch (e) {
+      // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
+      // causing an exception to be thrown which we catch here.
+      // Unfortunately this will also consume helpful failures, so add a
+      // dump(e); // if you need to debug
+      return;
+    }
+
+    var printPreviewTB = document.getElementById("print-preview-toolbar");
+    if (printPreviewTB) {
+      printPreviewTB.updateToolbar();
+      var browser = getPPBrowser();
+      if (browser)
+        browser.collapsed = false;
+      return;
+    }
+
+    // show the toolbar after we go into print preview mode so
+    // that we can initialize the toolbar with total num pages
+    const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    printPreviewTB = document.createElementNS(XUL_NS, "toolbar");
+    printPreviewTB.setAttribute("printpreview", true);
+    printPreviewTB.setAttribute("id", "print-preview-toolbar");
+
+    var navToolbox = getNavToolbox();
+    navToolbox.parentNode.insertBefore(printPreviewTB, navToolbox);
+
+    // copy the window close handler
+    if (document.documentElement.hasAttribute("onclose"))
+      this._closeHandlerPP = document.documentElement.getAttribute("onclose");
+    else
+      this._closeHandlerPP = null;
+    document.documentElement.setAttribute("onclose", "PrintUtils.exitPrintPreview(); return false;");
+
+    // disable chrome shortcuts...
+    window.addEventListener("keypress", this.onKeyPressPP, true);
+ 
+    // _content.focus();
+    navToolbox.focus();
+
+    // on Enter PP Call back
+    if (this._onEnterPP) {
+      this._onEnterPP();
+      this._onEnterPP = null;
+    }
+  },
+
+  exitPrintPreview: function ()
+  {
+    window.removeEventListener("keypress", this.onKeyPressPP, true);
+
+    // restore the old close handler
+    document.documentElement.setAttribute("onclose", this._closeHandlerPP);
+    this._closeHandlerPP = null;
+
+    var webBrowserPrint = this.getWebBrowserPrint();
+    webBrowserPrint.exitPrintPreview(); 
+
+    // remove the print preview toolbar
+    var navToolbox = getNavToolbox();
+    var printPreviewTB = document.getElementById("print-preview-toolbar");
+    navToolbox.parentNode.removeChild(printPreviewTB);
+
+    // _content.focus();
+    navToolbox.focus();
+
+    // on Exit PP Call back
+    if (this._onExitPP) {
+      this._onExitPP();
+      this._onExitPP = null;
+    }
+  },
+
+  onKeyPressPP: function (aEvent)
+  {
+    var closeKey;
+    try {
+      closeKey = document.getElementById("key_close")
+                         .getAttribute("key");
+      closeKey = aEvent["DOM_VK_"+closeKey];
+    } catch (e) {}
+    var isModif = aEvent.ctrlKey || aEvent.metaKey;
+    // ESC and Ctrl-W exits the PP
+    if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE || isModif &&
+        (aEvent.charCode == closeKey || aEvent.charCode == closeKey + 32))
+      PrintUtils.exitPrintPreview();
+    // cancel shortkeys
+    if (isModif) {
+      aEvent.preventDefault();
+      aEvent.stopPropagation();
+    }
   }
-  return true;
 }
 
 function NSPrintSetup()
 {
-  var didOK = false;
-  try {
-    gPrintSettings = GetPrintSettings();
-
-    var webBrowserPrint = null;
-    if (content) {
-      webBrowserPrint = content
-        .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-        .getInterface(Components.interfaces.nsIWebBrowserPrint);
-    }
-
-    didOK = goPageSetup(window, gPrintSettings);
-    if (didOK) {
-      if (webBrowserPrint) {
-        if (gPrintSettingsAreGlobal && gSavePrintSettings) {
-          var psService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
-                                            .getService(Components.interfaces.nsIPrintSettingsService);
-          psService.savePrintSettingsToPrefs(gPrintSettings, false, gPrintSettings.kInitSaveNativeData);
-        }
-      }
-    }
-  } catch (e) {
-    dump("NSPrintSetup() " + e + "\n");
-  }
-  return didOK;
+  PrintUtils.showPageSetup();
 }
 
 function NSPrint()
 {
-  try {
-    var webBrowserPrint = content
-          .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-          .getInterface(Components.interfaces.nsIWebBrowserPrint);
-    if (webBrowserPrint) {
-      gPrintSettings = GetPrintSettings();
-      webBrowserPrint.print(gPrintSettings, null);
-      if (gPrintSettingsAreGlobal && gSavePrintSettings) {
-        var psService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
-                                          .getService(Components.interfaces.nsIPrintSettingsService);
-        psService.savePrintSettingsToPrefs(gPrintSettings, true,
-                                           gPrintSettings.kInitSaveAll);
-        psService.savePrintSettingsToPrefs(gPrintSettings, false,
-                                           gPrintSettings.kInitSavePrinterName);
-      }
-    }
-  } catch (e) {
-    // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
-    // causing an exception to be thrown which we catch here.
-    // Unfortunately this will also consume helpful failures, so add a
-    // dump(e); // if you need to debug
-  }
+  PrintUtils.print();
 }
diff --git a/xpfe/communicator/resources/locale/en-US/printPreview.dtd b/xpfe/communicator/resources/locale/en-US/printPreview.dtd
index 37e64ae1cdb0..1a5da04cf00e 100644
--- a/xpfe/communicator/resources/locale/en-US/printPreview.dtd
+++ b/xpfe/communicator/resources/locale/en-US/printPreview.dtd
@@ -40,11 +40,13 @@
 <!ENTITY pageSetup.label      "Page Setup...">
 <!ENTITY pageSetup.accesskey  "u">
 <!ENTITY page.label           "Page:">
+<!ENTITY page.accesskey       "a">
 <!ENTITY of.label             "of">
 <!ENTITY scale.label          "Scale:">
+<!ENTITY scale.accesskey      "S">
 <!ENTITY percent.label        "&#037;">
 <!ENTITY portrait.label       "Portrait">
-<!ENTITY portrait.accesskey   "t">
+<!ENTITY portrait.accesskey   "o">
 <!ENTITY landscape.label      "Landscape">
 <!ENTITY landscape.accesskey  "L">
 <!ENTITY close.label          "Close">
@@ -64,3 +66,8 @@
 <!ENTITY Custom.label         "Custom...">
 <!ENTITY ShrinkToFit.label    "Shrink To Fit">
 <!ENTITY customPrompt.title   "Custom Scale...">
+
+<!ENTITY homearrow.tooltip    "First page">
+<!ENTITY endarrow.tooltip     "Last page">
+<!ENTITY rightarrow.tooltip   "Next page">
+<!ENTITY leftarrow.tooltip    "Previous page">