From 9ffb9ffba3a9ebeaa844ef6d78b89cc6d28c93e8 Mon Sep 17 00:00:00 2001
From: "Stefan.Borggraefe%gmx.de" <Stefan.Borggraefe%gmx.de>
Date: Wed, 7 Jul 2004 11:32:45 +0000
Subject: [PATCH] Bug 226956: Convert users of dialogOverlay.xul in mailnews/
 to <dialog>. The patch also corrects some minor UI issues like missing/wrong
 access keys. r=neil, sr=mscott

---
 .../resources/content/replicationProgress.js  | 13 +--
 .../resources/content/replicationProgress.xul | 82 -----------------
 .../locale/en-US/replicationProgress.dtd      | 41 ---------
 .../content/abAddressBookNameDialog.js        |  2 -
 .../content/abAddressBookNameDialog.xul       | 38 +++-----
 .../locale/en-US/abAddressBookNameDialog.dtd  | 39 --------
 .../base/resources/content/newFolderDialog.js |  9 +-
 .../resources/content/newFolderDialog.xul     | 30 ++----
 .../resources/content/renameFolderDialog.js   |  9 +-
 .../resources/content/renameFolderDialog.xul  | 28 ++----
 .../locale/en-US/renameFolderDialog.dtd       |  2 +-
 .../resources/content/askSendFormat.js        | 21 ++---
 .../resources/content/askSendFormat.xul       | 28 +++---
 .../resources/locale/en-US/askSendFormat.dtd  | 25 -----
 .../resources/content/msgCompSecurityInfo.js  |  2 -
 .../resources/content/msgCompSecurityInfo.xul | 29 +++---
 .../resources/content/msgReadSecurityInfo.js  |  2 -
 .../resources/content/msgReadSecurityInfo.xul | 22 ++---
 .../locale/en-US/msgCompSecurityInfo.dtd      | 13 ---
 .../news/resources/content/downloadheaders.js | 20 +---
 .../resources/content/downloadheaders.xul     | 32 ++++---
 .../locale/en-US/downloadheaders.dtd          | 49 ----------
 .../resources/locale/en-US/news.properties    | 92 -------------------
 .../messenger/smime/msgReadSecurityInfo.css   | 68 --------------
 .../messenger/smime/msgReadSecurityInfo.css   | 68 --------------
 25 files changed, 92 insertions(+), 672 deletions(-)

diff --git a/mailnews/addrbook/prefs/resources/content/replicationProgress.js b/mailnews/addrbook/prefs/resources/content/replicationProgress.js
index 81c89c762cc..d96f9927c80 100644
--- a/mailnews/addrbook/prefs/resources/content/replicationProgress.js
+++ b/mailnews/addrbook/prefs/resources/content/replicationProgress.js
@@ -60,13 +60,6 @@ function onLoad()
   Replicate();
 }
 
-function DoReplicationClose()
-{
-  // XXX todo, confirm the cancel
-  onCancelReplication(false);
-  return true;
-}
-
 var progressListener = {
   onStateChange: function(aWebProgress, aRequest, aStateFlags, aStatus)
   {
@@ -126,18 +119,18 @@ function Replicate()
   }
 }
 
-function onCancelReplication(closeWindow)
+function onCancelReplication()
 {
   try {
+    // XXX todo, confirm the cancel
     gReplicationService.cancelReplication(gCurrentDirectoryPrefName);
   }
   catch (ex) {
     // XXX todo
     // perhaps replication hasn't started yet?  This can happen if you hit cancel after attempting to replication when offline 
     dump("unexpected failure while cancelling.  ex=" + ex + "\n");
-    if (closeWindow)
-      window.close();
   }
+  return true;
 }
 
 function SetProgressText(textStr)
diff --git a/mailnews/addrbook/prefs/resources/content/replicationProgress.xul b/mailnews/addrbook/prefs/resources/content/replicationProgress.xul
index 40ad3123adb..e69de29bb2d 100644
--- a/mailnews/addrbook/prefs/resources/content/replicationProgress.xul
+++ b/mailnews/addrbook/prefs/resources/content/replicationProgress.xul
@@ -1,82 +0,0 @@
-<?xml version="1.0"?> 
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.
-   -
-   - The Initial Developer of the Original Code is
-   - Srilatha Moturi <srilatha@netscape.com>
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Rajiv Dayal <rdayal@netscape.com>
-   -  Seth Spitzer <sspitzer@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
-
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/replicationProgress.dtd">
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="replicationProgress"
-        style="width: 36em;"
-        class="dialog"
-        onload="onLoad()"
-        onclose="return DoReplicationClose()">
-
-  <stringbundle id="bundle_replication" src="chrome://messenger/locale/addressbook/replicationProgress.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/replicationProgress.js"/>
-    <separator/>
-    <grid flex="1">
-      <columns>
-        <column/>
-        <column flex="1"/>
-      </columns>
-      <rows>
-        <row>
-          <hbox pack="end">
-            <label value="&status.label;"/>
-          </hbox>
-          <label id="replication.status"/>
-        </row>
-        <row class="thin-separator">             
-          <hbox pack="end">
-            <label value="&progress.label;"/>
-          </hbox>
-          <progressmeter id="replication.progress" mode="normal" value="0"/>
-        </row>
-      </rows>
-    </grid>
-    <separator/>
-    <hbox id="CancelButton" pack="end">
-      <button id="cancel" label="&replicationCancel.label;" accesskey="&replicationCancel.accesskey;" oncommand="onCancelReplication(true);"/>
-    </hbox>
-
-</window>
diff --git a/mailnews/addrbook/prefs/resources/locale/en-US/replicationProgress.dtd b/mailnews/addrbook/prefs/resources/locale/en-US/replicationProgress.dtd
index d579ee2ea0e..e69de29bb2d 100644
--- a/mailnews/addrbook/prefs/resources/locale/en-US/replicationProgress.dtd
+++ b/mailnews/addrbook/prefs/resources/locale/en-US/replicationProgress.dtd
@@ -1,41 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.
-   -
-   - The Initial Developer of the Original Code is
-   - Srilatha Moturi <srilatha@netscape.com>
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Rajiv Dayal <rdayal@netscape.com>
-   -  Seth Spitzer <sspitzer@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<!ENTITY status.label   "Status:">
-<!ENTITY progress.label "Progress:">
-<!ENTITY replicationCancel.label "Cancel">
-<!ENTITY replicationCancel.accesskey "C">
diff --git a/mailnews/addrbook/resources/content/abAddressBookNameDialog.js b/mailnews/addrbook/resources/content/abAddressBookNameDialog.js
index 211962b1431..2d46587b1e0 100644
--- a/mailnews/addrbook/resources/content/abAddressBookNameDialog.js
+++ b/mailnews/addrbook/resources/content/abAddressBookNameDialog.js
@@ -5,8 +5,6 @@ function abNameOnLoad()
 {
   var abName = "";
   
-	doSetOKCancel(abNameOKButton, 0);
-
 	// look in arguments[0] for parameters
 	if ("arguments" in window && window.arguments[0])
 	{
diff --git a/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul b/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
index 8d4dba82823..84a6952e66d 100644
--- a/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
+++ b/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
@@ -38,32 +38,18 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abAddressBookNameDialog.dtd">
 
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abAddressBookNameDialog.dtd">
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&abAddressBookNameDialog.title;"
+        style="width: 36em;"
+        onload="abNameOnLoad();"
+        ondialogaccept="return abNameOKButton();">
 
+  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog"
-        onload="abNameOnLoad()"
-        style="padding:10px"> 
-        
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
-
-	<keyset id="dialogKeys"/>
-
-	<vbox style="width:36em; min-height:12em">
-		
-		<spacer flex="1"/>
-
-                <label control="name" style="margin-bottom:.3em" value="&name.label;"/>
-		
-		<textbox tabindex="0" id="name" style="width: 100%"/>
-		
-		<spacer flex="1"/>
-		
-		<hbox id="okCancelButtons"/>
-		
-	</vbox>
-
-</window>
+  <hbox align="center">
+    <label control="name" value="&name.label;" accesskey="&name.accesskey;"/>
+    <textbox id="name" flex="1"/>
+  </hbox>
+</dialog>
diff --git a/mailnews/addrbook/resources/locale/en-US/abAddressBookNameDialog.dtd b/mailnews/addrbook/resources/locale/en-US/abAddressBookNameDialog.dtd
index 988750a93a0..e69de29bb2d 100644
--- a/mailnews/addrbook/resources/locale/en-US/abAddressBookNameDialog.dtd
+++ b/mailnews/addrbook/resources/locale/en-US/abAddressBookNameDialog.dtd
@@ -1,39 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
-<!-- Labels -->
-<!ENTITY name.label			"Address Book Name">
diff --git a/mailnews/base/resources/content/newFolderDialog.js b/mailnews/base/resources/content/newFolderDialog.js
index 685484ff901..cf2969b1934 100644
--- a/mailnews/base/resources/content/newFolderDialog.js
+++ b/mailnews/base/resources/content/newFolderDialog.js
@@ -48,7 +48,7 @@ function onLoad()
 
   dialog = {};
 
-  dialog.OKButton = document.getElementById("ok");
+  dialog.OKButton = document.documentElement.getButton("accept");
 
   dialog.nameField = document.getElementById("name");
   dialog.nameField.focus();
@@ -75,7 +75,6 @@ function onLoad()
 
   moveToAlertPosition();
   doEnabling();
-  doSetOKCancel(onOK, onCancel);
 }
 
 function onOK()
@@ -94,12 +93,6 @@ function onOK()
   return true;
 }
 
-function onCancel()
-{
-  // close the window
-  return true;
-}
-
 function onFoldersOnly()
 {
   dialog.folderType = FOLDERS;
diff --git a/mailnews/base/resources/content/newFolderDialog.xul b/mailnews/base/resources/content/newFolderDialog.xul
index 0eaa02044e7..df14818144a 100644
--- a/mailnews/base/resources/content/newFolderDialog.xul
+++ b/mailnews/base/resources/content/newFolderDialog.xul
@@ -24,29 +24,22 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/newFolderDialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/newFolderDialog.dtd">
 
-<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+<dialog xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&newFolderDialog.title;"
-        class="dialog"
-        onload="onLoad();">
+        onload="onLoad();"
+        ondialogaccept="return onOK();">
 
   <stringbundleset id="stringbundleset"/>
   <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/newFolderDialog.js"/>
 
-  <keyset id="dialogKeys"/>
-
-  <vbox>
-
-    <spacer flex="1"/>
-
     <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
-    <textbox tabindex="0" id="name" oninput="doEnabling();"/>
+    <textbox id="name" oninput="doEnabling();"/>
 
     <separator/>
 
@@ -63,20 +56,11 @@
 
       <separator class="thin"/>
 
-      <radiogroup id="folderGroup">
+      <radiogroup id="folderGroup" orient="horizontal" class="indent">
         <radio oncommand="onFoldersOnly();" label="&foldersOnly.label;"/>
         <radio oncommand="onMessagesOnly();" label="&messagesOnly.label;" selected="true"/>
-        <spacer flex="100%"/>
       </radiogroup>
 
     </vbox>
 
-    <spacer flex="1"/>
-
-    <separator/>
-
-    <hbox id="okCancelButtonsRight"/>
-
-  </vbox>
-
-</window>
+</dialog>
diff --git a/mailnews/base/resources/content/renameFolderDialog.js b/mailnews/base/resources/content/renameFolderDialog.js
index 71e145597a8..54aede8887f 100644
--- a/mailnews/base/resources/content/renameFolderDialog.js
+++ b/mailnews/base/resources/content/renameFolderDialog.js
@@ -46,7 +46,7 @@ function onLoad()
 
   dialog = {};
 
-  dialog.OKButton = document.getElementById("ok");
+  dialog.OKButton = document.documentElement.getButton("accept");
 
   dialog.nameField = document.getElementById("name");
   dialog.nameField.value = arguments.name;
@@ -61,7 +61,6 @@ function onLoad()
 
   moveToAlertPosition();
   doEnabling();
-  doSetOKCancel(onOK, onCancel);
 }
 
 function onOK()
@@ -71,12 +70,6 @@ function onOK()
   return true;
 }
 
-function onCancel()
-{
-  // close the window
-  return true;
-}
-
 function doEnabling()
 {
   if (dialog.nameField.value) {
diff --git a/mailnews/base/resources/content/renameFolderDialog.xul b/mailnews/base/resources/content/renameFolderDialog.xul
index 027b813dc43..8f5cc855148 100644
--- a/mailnews/base/resources/content/renameFolderDialog.xul
+++ b/mailnews/base/resources/content/renameFolderDialog.xul
@@ -24,34 +24,22 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<!-- Contains the currently unused msgRenameFolderPicker.
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
+-->
 
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/renameFolderDialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/renameFolderDialog.dtd">
 
-<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+<dialog xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&renameFolderDialog.title;"
-        class="dialog"
+        ondialogaccept="return onOK();"
         onload="onLoad();">
 
   <stringbundleset id="stringbundleset"/>
   <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
 
-  <keyset id="dialogKeys"/>
-
-  <vbox>
-
-    <spacer flex="100%"/>
-
-    <label value="&rename.label;" accesskey="&rename.accesskey;" control="name"/>
-    <textbox tabindex="0" id="name" oninput="doEnabling();"/>
-
-    <spacer flex="100%"/>
-
-    <hbox id="okCancelButtons"/>
-
-  </vbox>
-
-</window>
+  <label value="&rename.label;" accesskey="&rename.accesskey;" control="name"/>
+  <textbox id="name" oninput="doEnabling();"/>
+</dialog>
diff --git a/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd b/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd
index e963187c836..382e2f13e49 100644
--- a/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd
+++ b/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd
@@ -23,4 +23,4 @@
 
 <!ENTITY renameFolderDialog.title          "Rename Folder">
 <!ENTITY rename.label                      "Enter the new name for your folder:">
-<!ENTITY rename.accesskey                  "e">
+<!ENTITY rename.accesskey                  "E">
diff --git a/mailnews/compose/resources/content/askSendFormat.js b/mailnews/compose/resources/content/askSendFormat.js
index 31f6a06292e..d7d4102b526 100644
--- a/mailnews/compose/resources/content/askSendFormat.js
+++ b/mailnews/compose/resources/content/askSendFormat.js
@@ -147,23 +147,14 @@ function Startup()
       }
 
       //change the button label
-      var buttonlabels = document.getElementById("okCancelButtons");
-      element = document.getElementById("ok");
-      element.setAttribute("label", buttonlabels.getAttribute("button1Label"));
-      element = document.getElementById("cancel");
-      element.setAttribute("label", buttonlabels.getAttribute("button2Label"));
+      var buttonlabels = document.getElementById("hiddenLabels");
+      var sendButton = document.documentElement.getButton("accept");
+      sendButton.setAttribute("label", buttonlabels.getAttribute("sendLabel"));
 /*
-      element = document.getElementById("Button2");
-      element.setAttribute("value", buttonlabels.getAttribute("button3Label"));
-      element.removeAttribute("hidden");
-      element.setAttribute("disabled", "true");
-      element = document.getElementById("Button3");
-      element.setAttribute("value", buttonlabels.getAttribute("button4Label"));
-      element.removeAttribute("hidden");
-      element.setAttribute("disabled", "true");
+      var recipientsButton = document.documentElement.getButton("disclosure");
+      recipientsButton.setAttribute("value", buttonlabels.getAttribute("recipientsLabel"));
+      recipientsButton.setAttribute("disabled", "true");
 */        
-      //set buttons action
-      doSetOKCancel(Send, Cancel, Recipients, Help);
     }
   }
   else 
diff --git a/mailnews/compose/resources/content/askSendFormat.xul b/mailnews/compose/resources/content/askSendFormat.xul
index bc3ff9a6989..59309d867c6 100644
--- a/mailnews/compose/resources/content/askSendFormat.xul
+++ b/mailnews/compose/resources/content/askSendFormat.xul
@@ -2,20 +2,20 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/askSendFormat.dtd">
 
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/askSendFormat.dtd">
-
-<window id="askSendFormat"
+<dialog id="askSendFormat"
     title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    buttonpack="center"
     onload="Startup()"
-    class="dialog">
+    ondialogaccept="return Send();"
+    ondialogdisclosure="return Recipients();"
+    ondialoghelp="return Help();"
+    ondialogcancel="return Cancel();">
 
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
 
-<keyset id="dialogKeys"/>
-
     <spacer style="height:0.5em"/>
     <hbox>
         <spacer style="width:10px"/>
@@ -54,18 +54,12 @@
         <spacer style="width:10px"/>
     </hbox>
 
-    <spacer style="height:1em"/>
-  <hbox id="okCancelButtons"
-        button1Label="&send.label;"
-        button2Label="&cancel.label;"
-      button3Label="&recipients.label;"
-      button4Label="&help.label;"
-  />
-  <hbox id="hiddenLabels"
+  <data id="hiddenLabels"
+        sendLabel="&send.label;"
+        recipientsLabel="&recipients.label;"
         plainTextAndHtmlRecommendedLabel="&plainTextAndHtmlRecommended.label;"
         plainTextOnlyRecommendedLabel="&plainTextOnlyRecommended.label;"
         htmlOnlyRecommendedLabel="&htmlOnlyRecommended.label;"
   />
-    <spacer style="height:1em" />
 
-</window>
+</dialog>
diff --git a/mailnews/compose/resources/locale/en-US/askSendFormat.dtd b/mailnews/compose/resources/locale/en-US/askSendFormat.dtd
index 038492e8d27..e69de29bb2d 100644
--- a/mailnews/compose/resources/locale/en-US/askSendFormat.dtd
+++ b/mailnews/compose/resources/locale/en-US/askSendFormat.dtd
@@ -1,25 +0,0 @@
-<!--LOCALIZATION NOTE askSendFormat.dtd UI for dialog that asks the user, which format to use for sending a message -->
-<!ENTITY windowTitle.label "HTML Mail Question">
-
-<!ENTITY recipient.label "Some of the recipients are not listed as being able to receive HTML mail.">
-
-<!ENTITY convertibleDefault.label "">
-<!ENTITY convertibleYes.label "Your message can be converted to plain text without losing information.">
-<!ENTITY convertibleAltering.label "Your message can be converted to plain text without losing important information. However, the plain text version might look different from what you saw in the composer.">
-<!ENTITY convertibleNo.label "However, you used formatting (e.g. colors) that will not be converted to plain text.">
-
-<!ENTITY question.label "Would you like to convert the message to plain text or send it in HTML anyway?">
-
-<!ENTITY plainTextAndHtml.label "Send in Plain Text and HTML">
-<!ENTITY plainTextOnly.label "Send in Plain Text Only">
-<!ENTITY htmlOnly.label "Send in HTML Only">
-
-<!ENTITY plainTextAndHtmlRecommended.label "Send in Plain Text and HTML (recommended)">
-<!ENTITY plainTextOnlyRecommended.label "Send in Plain Text Only (recommended)">
-<!ENTITY htmlOnlyRecommended.label "Send in HTML Only (recommended)">
-<!ENTITY recommended.label "(recommended)">
-
-<!ENTITY send.label "Send">
-<!ENTITY cancel.label "Cancel">
-<!ENTITY recipients.label "Recipients...">
-<!ENTITY help.label "Help">
diff --git a/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.js b/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.js
index a8024eb8672..6476824d861 100644
--- a/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.js
+++ b/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.js
@@ -80,8 +80,6 @@ function getStatusExplanation(value)
 
 function onLoad()
 {
-  document.getElementById("cancel").setAttribute("collapsed", "true");
-
   var params = window.arguments[0];
   if (!params)
     return;
diff --git a/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul b/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul
index c222e4583f7..ccc5ba9dcbf 100644
--- a/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul
+++ b/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul
@@ -38,22 +38,20 @@
 <?xml-sheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgCompSecurityInfo.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/msgCompSecurityInfo.dtd">
 
-<!DOCTYPE window SYSTEM "chrome://messenger-smime/locale/msgCompSecurityInfo.dtd">
-
-<window id="msgCompSecurityInfo" title="&title.label;"
-  class="dialog"
+<dialog id="msgCompSecurityInfo" title="&title.label;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 50em;"
+  persist="width height"
+  buttons="accept,help"
+  ondialoghelp="doHelpButton();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-<script type="application/x-javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
+  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
 
-<stringbundle id="bundle_smime_comp_info" src="chrome://messenger-smime/locale/msgCompSecurityInfo.properties"/> 
-
-<vbox id="outer_vbox">
+  <stringbundle id="bundle_smime_comp_info" src="chrome://messenger-smime/locale/msgCompSecurityInfo.properties"/> 
 
   <description>&subject.plaintextWarning;</description>
   <separator class="thin"/>
@@ -78,7 +76,7 @@
   <separator class="thin"/>
   <label value="&status.certificates;"/>
 
-  <listbox id="infolist" style="height: 10em;" flex="1"
+  <listbox id="infolist" flex="1"
         onselect="onSelectionChange(event);">
     <listcols>
       <listcol flex="3" width="0"/>
@@ -98,12 +96,7 @@
   </listbox>
   <hbox pack="start">
     <button id="viewCertButton" disabled="true"
-            label="&view.label;"
+            label="&view.label;" accesskey="&view.accesskey;"
             oncommand="viewSelectedCert();"/>
   </hbox>
-
-  <separator class="thin"/>
-  <keyset id="dialogKeys"/>
-  <hbox id="okCancelHelpButtonsRight"/>
-</vbox>
-</window>
+</dialog>
diff --git a/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.js b/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.js
index 58d7570ed3a..03d5871657f 100644
--- a/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.js
+++ b/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.js
@@ -62,8 +62,6 @@ function setText(id, value) {
 
 function onLoad()
 {
-  document.getElementById("cancel").setAttribute("collapsed", "true");
-
   var pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);
   var isupport = pkiParams.getISupportAtIndex(1);
   if (isupport) {
diff --git a/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul b/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul
index fa8fc1f8158..a8002898af9 100644
--- a/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul
+++ b/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul
@@ -38,20 +38,20 @@
 <?xml-sheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSecurityInfo.css" type="text/css"?> 
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/msgReadSecurityInfo.dtd">
 
-<!DOCTYPE window SYSTEM "chrome://messenger-smime/locale/msgReadSecurityInfo.dtd">
-
-<window id="msgReadSecurityInfo" title="&status.label;"
+<dialog id="msgReadSecurityInfo" title="&status.label;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  style="width: 40em;"
+  buttons="accept,help"
+  ondialoghelp="doHelpButton();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-<script type="application/x-javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
+  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
 
-<stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/> 
+  <stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/> 
 
-<vbox id="outer_vbox">
   <vbox flex="1">
     <label id="signatureLabel"/>
     <label id="signatureHeader" collapsed="true"/>
@@ -99,8 +99,4 @@
       </hbox>
     </vbox>
   </vbox>
-  <separator class="thin"/>
-  <keyset id="dialogKeys"/>
-  <hbox id="okCancelHelpButtonsRight"/>
-</vbox>
-</window>
+</dialog>
diff --git a/mailnews/extensions/smime/resources/locale/en-US/msgCompSecurityInfo.dtd b/mailnews/extensions/smime/resources/locale/en-US/msgCompSecurityInfo.dtd
index 6a2a9b56180..e69de29bb2d 100644
--- a/mailnews/extensions/smime/resources/locale/en-US/msgCompSecurityInfo.dtd
+++ b/mailnews/extensions/smime/resources/locale/en-US/msgCompSecurityInfo.dtd
@@ -1,13 +0,0 @@
-<!--LOCALIZATION NOTE msgCompSecurityInfo.dtd UI for viewing security status when composing a message -->
-
-<!ENTITY title.label "Message Security">
-<!ENTITY subject.plaintextWarning "Please note: Subject lines of email messages are never encrypted.">
-<!ENTITY status.heading "The contents of your message will be sent as follows:">
-<!ENTITY status.signed "Digitally signed:">
-<!ENTITY status.encrypted "Encrypted:">
-<!ENTITY status.certificates "Certificates:">
-<!ENTITY view.label "View">
-<!ENTITY tree.recipient "Recipient:">
-<!ENTITY tree.status "Status:">
-<!ENTITY tree.issuedDate "Issued:">
-<!ENTITY tree.expiresDate "Expires:">
diff --git a/mailnews/news/resources/content/downloadheaders.js b/mailnews/news/resources/content/downloadheaders.js
index 51c62b69a2d..ade992fe5d5 100644
--- a/mailnews/news/resources/content/downloadheaders.js
+++ b/mailnews/news/resources/content/downloadheaders.js
@@ -53,7 +53,6 @@ var args = null;
 
 function OnLoad()
 {
-    doSetOKCancel(OkButtonCallback, CancelButtonCallback);
     gNewsBundle = document.getElementById("bundle_news");
 
     if ("arguments" in window && window.arguments[0]) {
@@ -66,16 +65,13 @@ function OnLoad()
         nntpServer = server.QueryInterface(Components.interfaces.nsINntpIncomingServer);
 
         var downloadHeadersTitlePrefix = gNewsBundle.getString("downloadHeadersTitlePrefix");
-        var downloadHeadersInfoText1 = gNewsBundle.getString("downloadHeadersInfoText1");
-        var downloadHeadersInfoText2 = gNewsBundle.getString("downloadHeadersInfoText2");
         var okButtonText = gNewsBundle.getString("okButtonText");
 
         window.title = downloadHeadersTitlePrefix;
 
-        // this is not i18n friendly, fix this
-        var infotext = downloadHeadersInfoText1 + " " + args.articleCount + " " + downloadHeadersInfoText2;
-        setText('info',infotext);
-        var okbutton = document.getElementById("ok");
+        var infotext =  gNewsBundle.getFormattedString("downloadHeadersInfoText", [args.articleCount]);
+        setText('info', infotext);
+        var okbutton = document.documentElement.getButton("accept");
         okbutton.setAttribute("label", okButtonText);
         setText("newsgroupLabel", args.groupName);
     }
@@ -119,12 +115,6 @@ function setupDownloadUI(enable) {
     var checkbox = document.getElementById("markread");
     var numberFld = document.getElementById("number");
 
-    if (enable) {
-        checkbox.removeAttribute("disabled");
-        numberFld.removeAttribute("disabled");
-    }
-    else {
-        checkbox.setAttribute("disabled", "true");
-        numberFld.setAttribute("disabled", "true");
-    }
+    checkbox.disabled = !enable;
+    numberFld.disabled = !enable;
 }
diff --git a/mailnews/news/resources/content/downloadheaders.xul b/mailnews/news/resources/content/downloadheaders.xul
index e3177eb21e7..d55ef169a63 100644
--- a/mailnews/news/resources/content/downloadheaders.xul
+++ b/mailnews/news/resources/content/downloadheaders.xul
@@ -39,37 +39,39 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?> 
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/downloadheaders.dtd">
 
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/downloadheaders.dtd">
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog" style="max-width: 27em;"
-        onload="OnLoad()">
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        style="max-width: 27em;"
+        buttonpack="center"
+        ondialogaccept="return OkButtonCallback();"
+        ondialogcancel="return CancelButtonCallback();"
+        onload="OnLoad();">
 
   <stringbundle id="bundle_news" src="chrome://messenger/locale/news.properties"/>
   <script type="application/x-javascript" src="chrome://messenger/content/downloadheaders.js" />
 
-  <keyset id="dialogKeys"/>
-  
   <description class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel"/> 
   <description style="width: 25em; max-width: 25em;" id="info"/>
   <separator class="thin"/>
   <vbox class="indent">
     <radiogroup id="downloadGroup">
-      <radio id="all" label="&all.label;" oncommand="setupDownloadUI(false);"/> 
+      <radio id="all" label="&all.label;" accesskey="&all.accesskey;"
+             oncommand="setupDownloadUI(false);"/>
       <separator class="thin"/>
       <hbox align="center" valign="middle">
-        <radio id="some" selected="true" label="&download.label;" oncommand="setupDownloadUI(true);"/>
+        <radio id="some" selected="true" label="&download.label;"
+               accesskey="&download.accesskey;"
+               oncommand="setupDownloadUI(true);"/>
         <textbox id="number" size="7"/>
-        <description value="&headers.label;" />
+        <label value="&headers.label;" accesskey="&headers.accesskey;"
+               control="number"/>
       </hbox>
     </radiogroup>
+
     <hbox class="indent" align="start">
-      <checkbox id="markread" label="&mark.label;"/>
+      <checkbox id="markread" label="&mark.label;" accesskey="&mark.accesskey;"/>
     </hbox>
   </vbox>
-  <separator/>
-  <hbox id="okCancelButtonsRight"/>
   
-</window>
+</dialog>
diff --git a/mailnews/news/resources/locale/en-US/downloadheaders.dtd b/mailnews/news/resources/locale/en-US/downloadheaders.dtd
index e3847ecd05d..e69de29bb2d 100644
--- a/mailnews/news/resources/locale/en-US/downloadheaders.dtd
+++ b/mailnews/news/resources/locale/en-US/downloadheaders.dtd
@@ -1,49 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY all.label	"Download all headers">
-<!--LOCALIZATION NOTE (download.label):
-    consider the download.label and headers.label as a single sentence
-	 with the number of headers to be downloaded inserted between them:
-	 EXAMPLE: "Download" <some number> "headers"
-	 Either label could be set to null ("") if required grammatically.
--->
-
-<!ENTITY download.label "Download">
-<!--LOCALIZATION NOTE (headers.label): see note for download.label -->
-<!ENTITY headers.label 	"headers">
-<!ENTITY mark.label	"Mark remaining headers as read">
diff --git a/mailnews/news/resources/locale/en-US/news.properties b/mailnews/news/resources/locale/en-US/news.properties
index a000b193239..e69de29bb2d 100644
--- a/mailnews/news/resources/locale/en-US/news.properties
+++ b/mailnews/news/resources/locale/en-US/news.properties
@@ -1,92 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Seth Spitzer <sspitzer@netscape.com>
-#   David Bienvenu <bienvenu@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-downloadHeadersTitlePrefix=Download Headers
-# LOCALIZATION NOTE ( downloadHeadersInfoText1 ): Translate the following two
-# items as the beginning and ending of a single sentence: downloadHeadersInfoText1 + number(not translated) + downloadHeadersInfoText2
-downloadHeadersInfoText1=There are
-# LOCALIZATION NOTE ( downloadHeadersInfoText2 ): See note for downloadHeadersInfoText1
-downloadHeadersInfoText2=new message headers to download for this newsgroup.
-htmlNewsErrorTitle=Error!
-# LOCALIZATION NOTE ( htmlNewsError ): In the following item, translate only "Error!" and "newsgroup server responded:"
-htmlNewsError=<H1>Error!</H1>newsgroup server responded: 
-# LOCALIZATION NOTE ( articleExpired ): In the following item, translate only "Perhaps the article has expired"
-articleExpired=<B><P>Perhaps the article has expired</P></B>
-removeExpiredArtLinkText=Click here to remove all expired articles
-cancelDisallowed=This message does not appear to be from you.  You may only cancel your own posts, not those made by others.
-cancelConfirm=Are you sure you want to cancel this message?
-messageCancelled=Message cancelled.
-enterUsername=Please enter a username for news server access:
-enterPassword=Please enter a password for news server access:
-enterPasswordTitle=News Server Password Required
-okButtonText=Download
-
-noNewMessages=There are no new messages on the server.
-downloadingHeaders=Downloading %S of %S headers
-downloadingArticles=Downloading articles %S-%S
-bytesReceived=Downloading newsgroups: %S received (%SKB read at %SKB/sec)
-checkingForNewNews=Checking newsgroup %S of %S on %S for new messages
-downloadingArticlesForOffline=Downloading articles %S-%S in %S
-
-onlyCancelOneMessage=You can only cancel one article at a time.
-
-# LOCALIZATION NOTE (autoUnsubscribeText): %1$S is the newsgroup and %2$S is the newsgroup-server it is being removed from.
-autoUnsubscribeText=The newsgroup %1$S does not appear to exist on the host %2$S.  Would you like to unsubscribe from it?
-
-# LOCALIZATION NOTE (autoSubscribeText): %1$S is the newsgroup.
-autoSubscribeText=Would you like to subscribe to %1$S?
-
-# LOCALIZATION NOTE (Error -304): In the following item, don't translate "NNTP"
-# Error - server error
-## @name NNTP_ERROR_MESSAGE
-## @loc None
--304=A News (NNTP) error occurred:  
-
-# Error - newsgroup scan error
-## @name NNTP_NEWSGROUP_SCAN_ERROR
-## @loc None
--305=A News error occurred.  The scan of all newsgroups is incomplete.  Try to View All Newsgroups again
-
-# Error - NNTP authinfo failure
-## @name NNTP_AUTH_FAILED
-## @loc None
--260=An authorization error occurred.  Please try entering your name and/or password again.
-
-# Error - TCP error
-## @name TCP_ERROR
-## @loc None
--206=A communications error occurred.  Try connecting again.  TCP Error:
diff --git a/themes/classic/messenger/smime/msgReadSecurityInfo.css b/themes/classic/messenger/smime/msgReadSecurityInfo.css
index 977de637853..e69de29bb2d 100644
--- a/themes/classic/messenger/smime/msgReadSecurityInfo.css
+++ b/themes/classic/messenger/smime/msgReadSecurityInfo.css
@@ -1,68 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ===== msgReadSecurityInfo.css ========================================
-  == Styles for the security info window when displaying received mail.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#msgReadSecurityInfo {
-  width: 40em;
-  max-width: 50em;
-}
-
-#outer_vbox {
-  margin: 5px;
-}
-
-#signatureLabel {
-  font-weight: bold;
-}
-
-#signatureCert {
-  margin: 5px;
-}
-
-#encryptionLabel {
-  font-weight: bold;
-}
-
-#encryptionCert {
-  margin: 5px;
-}
diff --git a/themes/modern/messenger/smime/msgReadSecurityInfo.css b/themes/modern/messenger/smime/msgReadSecurityInfo.css
index 977de637853..e69de29bb2d 100644
--- a/themes/modern/messenger/smime/msgReadSecurityInfo.css
+++ b/themes/modern/messenger/smime/msgReadSecurityInfo.css
@@ -1,68 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ===== msgReadSecurityInfo.css ========================================
-  == Styles for the security info window when displaying received mail.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#msgReadSecurityInfo {
-  width: 40em;
-  max-width: 50em;
-}
-
-#outer_vbox {
-  margin: 5px;
-}
-
-#signatureLabel {
-  font-weight: bold;
-}
-
-#signatureCert {
-  margin: 5px;
-}
-
-#encryptionLabel {
-  font-weight: bold;
-}
-
-#encryptionCert {
-  margin: 5px;
-}