diff --git a/mail/components/prefwindow/content/pref-calibrate-screen.xul b/mail/components/prefwindow/content/pref-calibrate-screen.xul
index 468a983cc75e..9dcc54732239 100644
--- a/mail/components/prefwindow/content/pref-calibrate-screen.xul
+++ b/mail/components/prefwindow/content/pref-calibrate-screen.xul
@@ -21,15 +21,14 @@
   
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 
-<window id="calibrateScreen"
+<dialog id="calibrateScreen"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&calibrateDialog.title;"
-        class="dialog" 
         onload="Init();"
+        ondialogaccept="return onOK();"
+        ondialogcancel="return onCancel();"
         persist="screenX screenY">
 
   <script type="application/x-javascript" 
@@ -45,9 +44,9 @@
     <hbox align="center">
       <label value="&calibrate.instructions;"/>
     </hbox>
-      
+
     <separator class="thin"/>
-      
+
     <hbox align="center">
       <textbox id="horizSize" size="5"/>
       <menulist id="units" persist="value">
@@ -55,15 +54,11 @@
           <menuitem value="centimetres" label="&units.centimetres;"/>
           <menuitem value="inches" label="&units.inches;"/>
         </menupopup>
-      </menulist>              
-
+      </menulist>
     </hbox>
-    
+
     <separator/>
 
-    <keyset id="dialogKeys"/>
-    <hbox id="okCancelButtonsRight"/>
-
   </vbox>
-  
-</window>
+
+</dialog>
diff --git a/mail/components/prefwindow/content/pref-fonts.js b/mail/components/prefwindow/content/pref-fonts.js
index 39e1e0af95a7..c019a234143e 100644
--- a/mail/components/prefwindow/content/pref-fonts.js
+++ b/mail/components/prefwindow/content/pref-fonts.js
@@ -666,7 +666,6 @@ function setResolution( resolution )
 function Init()
   {
       sizeToContent();
-      doSetOKCancel(onOK, onCancel);
       document.getElementById("horizSize").focus();
   }