diff --git a/mailnews/base/prefs/resources/content/custreceipt.xul b/mailnews/base/prefs/resources/content/custreceipt.xul
index 75d14c1a516..8fcbdde7432 100644
--- a/mailnews/base/prefs/resources/content/custreceipt.xul
+++ b/mailnews/base/prefs/resources/content/custreceipt.xul
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/custreceipt.dtd">
 
@@ -7,61 +9,51 @@
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 		title="&window.title;"
 		class="dialog"
-		onload="StartUp('Mailnews-Customize Receipts')" >
+		align="vertical">
 
-<html:script language="javascript">
+	<box align="vertical" style="width:100%">
+	<box orient="horizontal" style="width:100%">
+			<spring flex="1"/>
+     <text class="label" value="&notInToCc.label;" accesskey="&notInToCc.accesskey;" for="NotInToCc"/>
+      <menulist id="NotInToCc" pref="true" preftype="int" prefstring="mail.mdn.report.not_in_to_cc"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="0" value="&neverSend.label;"/>
+          <menuitem data="1" value="&automatically.label;"/>
+          <menuitem data="2" value="&askMe.label;"/>
+        </menupopup>
+      </menulist>
+	</box>
 
-function DoOKButton() 
-{
-	top.window.close();
-}
+	<box orient="horizontal" style="width:100%">
+			<spring flex="1"/>
+      <text class="label" value="&outside.label;" accesskey="&outside.accesskey;" for="OutsideDomain"/>
+      <menulist id="OutsideDomain" pref="true" preftype="int" prefstring="mail.mdn.report.outside_domain"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="0" value="&neverSend.label;"/>
+          <menuitem data="1" value="&automatically.label;"/>
+          <menuitem data="2" value="&askMe.label;"/>
+        </menupopup>
+      </menulist>
+	</box>
 
-function DoCancelButton() 
-{
-	top.window.close();
-}
+	<box orient="horizontal" style="width:100%">
+ 			<spring flex="1"/>
+     <text class="label" value="&other.label;" accesskey="&other.accesskey;" for="Other"/>
+      <menulist id="Other" pref="true" preftype="int" prefstring="mail.mdn.report.other"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="0" value="&neverSend.label;"/>
+          <menuitem data="1" value="&automatically.label;"/>
+          <menuitem data="2" value="&askMe.label;"/>
+        </menupopup>
+      </menulist>
+	</box>
+	</box>
 
-</html:script>
+	<spring style="height:1em"/>
+		
+	<box id="okCancelButtons"/>
 
-<html:div flex="100%">
-
-<html:br/>
-&sendReceipt.label;
-<html:form>
-	<html:table>
-		<html:tr><html:td> &notInToCc.label;
-			<html:select>
-			<html:option>&neverSend.label;</html:option>
-			<html:option>&automatically.label;</html:option>
-			<html:option>&askMe.label;</html:option>
-			</html:select>
-		</html:td></html:tr>
-		<html:tr><html:td>&outside.label;
-			<html:select>
-			<html:option>&neverSend.label;</html:option>
-			<html:option>&automatically.label;</html:option>
-			<html:option>&askMe.label;</html:option>
-			</html:select>
-		</html:td></html:tr>
-		<html:tr><html:td>&other.label;
-			<html:select>
-			<html:option>&neverSend.label;</html:option>
-			<html:option>&automatically.label;</html:option>
-			<html:option>&askMe.label;</html:option>
-			</html:select>
-		</html:td></html:tr>
-	</html:table>
-</html:form>
-
-<html:br/>
-<html:form>
-	<html:table>
-    <html:tr><html:td>
-		<html:input name="ok" type="button" value="&ok.label;" onclick="DoOKButton()"/>
-		<html:input name="cancel" type="button" value="&cancel.label;" onclick="DoCancelButton()"/>
-	</html:td></html:tr>
-	</html:table>
-</html:form>
-
-</html:div>
-</window>
+</window>
\ No newline at end of file
diff --git a/mailnews/base/prefs/resources/content/pref-receipts.xul b/mailnews/base/prefs/resources/content/pref-receipts.xul
index acb11f98299..03bf3fe6fce 100644
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -17,7 +17,7 @@
     
     function doCustomize() 
     {
-    	var dialog = window.openDialog("chrome://messenger/content/custreceipt.xul","","chrome");
+    	var dialog = window.openDialog("chrome://messenger/content/custreceipt.xul","","modal=yes,chrome,resizable=no", 0);
     }
   ]]>  
   </script>
diff --git a/mailnews/base/prefs/resources/locale/en-US/custreceipt.dtd b/mailnews/base/prefs/resources/locale/en-US/custreceipt.dtd
index 7ecc6d63ac1..b6e172aa1ef 100644
--- a/mailnews/base/prefs/resources/locale/en-US/custreceipt.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/custreceipt.dtd
@@ -30,3 +30,8 @@ Rights Reserved.
 <!ENTITY other.label "In all other cases:">
 <!ENTITY ok.label "Ok">
 <!ENTITY cancel.label "Cancel">
+
+<!ENTITY notInToCc.accesskey "t">
+<!ENTITY outside.accesskey   "o">
+<!ENTITY other.accesskey     "a">
+