Bug 1627927 - Rewrite callers of chrome "redirects" chrome://messenger/skin/ to chrome://messenger/skin/messenger.css. r=pmorris
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Tue, 07 Apr 2020 20:32:37 +0300
changeset 38739 01f9b5a1e9f81915a215833faa5b61c9011938ec
parent 38738 02acd483616d778bc6d73f8bf03683caed49163d
child 38740 aab13fd352ab560eb42d1d500db3df034863e93d
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewerspmorris
bugs1627927
Bug 1627927 - Rewrite callers of chrome "redirects" chrome://messenger/skin/ to chrome://messenger/skin/messenger.css. r=pmorris # Rewrite chrome://messenger/skin/ to chrome://messenger/skin/messenger.css find . -type f -not -path "*.hg/*" -not -path "./suite/*" -not -path "./editor/*" -regex ".*\.\(js\|jsm\|css\|xhtml\)$" -exec sed -i -E 's#(chrome://messenger/skin/)"#\1messenger.css"#g' {} \;
common/src/customizeToolbar.xhtml
mail/base/content/glodaFacetView.css
mail/base/content/newInstall.xhtml
mail/components/im/content/chat-conversation.js
mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml
mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
mail/extensions/openpgp/content/ui/enigmailKeySelection.xhtml
mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml
mail/extensions/openpgp/content/ui/keyDetailsDlg.xhtml
mail/themes/linux/mail/accountWizard.css
mail/themes/linux/mail/addrbook/abContactsPanel.css
mail/themes/linux/mail/addrbook/addressbook.css
mail/themes/linux/mail/addrbook/cardDialog.css
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/linux/mail/dialogs.css
mail/themes/linux/mail/filterDialog.css
mail/themes/linux/mail/junkMail.css
mail/themes/linux/mail/mailWindow1.css
mail/themes/linux/mail/messageWindow.css
mail/themes/linux/mail/msgSelectOffline.css
mail/themes/linux/mail/smime/certFetchingStatus.css
mail/themes/linux/mail/smime/msgCompSecurityInfo.css
mail/themes/linux/mail/smime/msgReadSecurityInfo.css
mail/themes/linux/mail/subscribe.css
mail/themes/osx/mail/accountWizard.css
mail/themes/osx/mail/addrbook/abContactsPanel.css
mail/themes/osx/mail/addrbook/addressbook.css
mail/themes/osx/mail/addrbook/cardDialog.css
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/osx/mail/dialogs.css
mail/themes/osx/mail/filterDialog.css
mail/themes/osx/mail/junkMail.css
mail/themes/osx/mail/mailWindow1.css
mail/themes/osx/mail/messageWindow.css
mail/themes/osx/mail/msgSelectOffline.css
mail/themes/osx/mail/smime/certFetchingStatus.css
mail/themes/osx/mail/smime/msgCompSecurityInfo.css
mail/themes/osx/mail/smime/msgReadSecurityInfo.css
mail/themes/osx/mail/subscribe.css
mail/themes/shared/mail/accountCentral.css
mail/themes/shared/mail/accountManage.css
mail/themes/shared/mail/newmailalert.css
mail/themes/shared/mail/searchDialog.css
mail/themes/windows/mail/accountWizard.css
mail/themes/windows/mail/addrbook/abContactsPanel.css
mail/themes/windows/mail/addrbook/addressbook.css
mail/themes/windows/mail/addrbook/cardDialog.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/dialogs.css
mail/themes/windows/mail/filterDialog.css
mail/themes/windows/mail/junkMail.css
mail/themes/windows/mail/mailWindow1.css
mail/themes/windows/mail/messageWindow.css
mail/themes/windows/mail/msgSelectOffline.css
mail/themes/windows/mail/smime/certFetchingStatus.css
mail/themes/windows/mail/smime/msgCompSecurityInfo.css
mail/themes/windows/mail/smime/msgReadSecurityInfo.css
mail/themes/windows/mail/subscribe.css
mailnews/addrbook/prefs/content/pref-directory-add.xhtml
mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
mailnews/base/search/content/CustomHeaders.xhtml
mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
mailnews/import/content/fieldMapImport.xhtml
suite/themes/classic/mac/messenger/accountManage.css
suite/themes/classic/mac/messenger/addressbook/addressbook.css
suite/themes/classic/mac/messenger/filterDialog.css
suite/themes/classic/mac/messenger/mailWindow1.css
suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
suite/themes/classic/mac/messenger/searchDialog.css
suite/themes/classic/messenger/accountCentral.css
suite/themes/classic/messenger/accountManage.css
suite/themes/classic/messenger/accountWizard.css
suite/themes/classic/messenger/addressbook/addressbook.css
suite/themes/classic/messenger/addressbook/cardDialog.css
suite/themes/classic/messenger/addressbook/selectAddressesDialog.css
suite/themes/classic/messenger/dialogs.css
suite/themes/classic/messenger/filterDialog.css
suite/themes/classic/messenger/mailWindow1.css
suite/themes/classic/messenger/messageWindow.css
suite/themes/classic/messenger/messengercompose/messengercompose.css
suite/themes/classic/messenger/newmailalert.css
suite/themes/classic/messenger/prefPanels.css
suite/themes/classic/messenger/searchDialog.css
suite/themes/classic/messenger/smime/certFetchingStatus.css
suite/themes/classic/messenger/smime/msgCompSecurityInfo.css
suite/themes/classic/messenger/smime/msgReadSecurityInfo.css
suite/themes/classic/messenger/subscribe.css
suite/themes/modern/messenger/accountCentral.css
suite/themes/modern/messenger/accountManage.css
suite/themes/modern/messenger/accountWizard.css
suite/themes/modern/messenger/addressbook/addressbook.css
suite/themes/modern/messenger/addressbook/cardDialog.css
suite/themes/modern/messenger/addressbook/selectAddressesDialog.css
suite/themes/modern/messenger/dialogs.css
suite/themes/modern/messenger/filterDialog.css
suite/themes/modern/messenger/mailWindow1.css
suite/themes/modern/messenger/messageWindow.css
suite/themes/modern/messenger/messengercompose/messengercompose.css
suite/themes/modern/messenger/newmailalert.css
suite/themes/modern/messenger/prefPanels.css
suite/themes/modern/messenger/searchDialog.css
suite/themes/modern/messenger/smime/certFetchingStatus.css
suite/themes/modern/messenger/smime/msgCompSecurityInfo.css
suite/themes/modern/messenger/smime/msgReadSecurityInfo.css
suite/themes/modern/messenger/subscribe.css
--- a/common/src/customizeToolbar.xhtml
+++ b/common/src/customizeToolbar.xhtml
@@ -17,17 +17,17 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 #ifdef MOZ_SUITE
 <?xml-stylesheet href="chrome://communicator/content/customizeToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/customizeToolbar.css" type="text/css"?>
 #else
 <?xml-stylesheet href="chrome://messenger/content/customizeToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/customizeToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
 #endif
 <?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
--- a/mail/base/content/glodaFacetView.css
+++ b/mail/base/content/glodaFacetView.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 body,
 html {
   margin: 0;
   padding: 0;
   height: 100%;
 }
 
--- a/mail/base/content/newInstall.xhtml
+++ b/mail/base/content/newInstall.xhtml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE window>
 
-<?xml-stylesheet href="chrome://messenger/skin/"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/newInstall.css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="init()"
         data-l10n-id="connection-window">
   <html:link rel="localization" href="branding/brand.ftl"/>
   <html:link rel="localization" href="messenger/newInstall.ftl"/>
--- a/mail/components/im/content/chat-conversation.js
+++ b/mail/components/im/content/chat-conversation.js
@@ -1276,17 +1276,17 @@
           image = "voice";
         } else if (buddy.founder) {
           image = "founder";
         }
       }
       if (image) {
         aItem.firstElementChild.setAttribute(
           "src",
-          "chrome://messenger/skin/" + image + ".png"
+          "chrome://messenger/skin/messenger.css" + image + ".png"
         );
       } else {
         aItem.firstElementChild.removeAttribute("src");
       }
     }
 
     /**
      * Compute color for a nick
--- a/mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!--
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % enigMailDTD SYSTEM "chrome://openpgp/content/strings/enigmail.dtd" >
 %enigMailDTD;
 ]>
--- a/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!--
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
--- a/mail/extensions/openpgp/content/ui/enigmailKeySelection.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailKeySelection.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!--
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % enigMailDTD SYSTEM "chrome://openpgp/content/strings/enigmail.dtd" >
 %enigMailDTD;
 ]>
--- a/mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!--
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % enigMailDTD SYSTEM "chrome://openpgp/content/strings/enigmail.dtd" >
 %enigMailDTD;
 ]>
--- a/mail/extensions/openpgp/content/ui/keyDetailsDlg.xhtml
+++ b/mail/extensions/openpgp/content/ui/keyDetailsDlg.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!--
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % enigMailDTD SYSTEM "chrome://openpgp/content/strings/enigmail.dtd" >
 %enigMailDTD;
 ]>
--- a/mail/themes/linux/mail/accountWizard.css
+++ b/mail/themes/linux/mail/accountWizard.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountWizard.css ==============================================
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account wizard :::::: */
 
 .awIdentityLabel {
   width: 8em;
   margin-inline-start: 5px;
--- a/mail/themes/linux/mail/addrbook/abContactsPanel.css
+++ b/mail/themes/linux/mail/addrbook/abContactsPanel.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== sidebarPanel.css ===============================================
   == Styles for the Address Book sidebar panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/addressbook/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #abContactsPanel {
   -moz-appearance: toolbox;
   background-color: -moz-Dialog;
 }
--- a/mail/themes/linux/mail/addrbook/addressbook.css
+++ b/mail/themes/linux/mail/addrbook/addressbook.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== addressbook.css ================================================
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #ab-toolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
   border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
--- a/mail/themes/linux/mail/addrbook/cardDialog.css
+++ b/mail/themes/linux/mail/addrbook/cardDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== cardViewOverlay.css ============================================
   == Styles for Address Book dialogs.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
   width: 42ch;
 }
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 #attachments-box[empty] > #attachmentBucket:focus {
   box-shadow: 0 0 2px Highlight inset, 0 0 2px Highlight inset;
 }
 
--- a/mail/themes/linux/mail/dialogs.css
+++ b/mail/themes/linux/mail/dialogs.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== dialogs.css ====================================================
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: button-like menus ::::: */
 
 menu.push {
   border: 1px outset ThreeDFace;
   padding: 2px;
--- a/mail/themes/linux/mail/filterDialog.css
+++ b/mail/themes/linux/mail/filterDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: columns :::::: */
 
 treecolpicker {
   display: none;
 }
--- a/mail/themes/linux/mail/junkMail.css
+++ b/mail/themes/linux/mail/junkMail.css
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
 /*===== junkMail=======.css ==============================================
   == Styles for the junk mail dialog
  ======================================================================== */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
   margin-inline-start: 20px;
 }
--- a/mail/themes/linux/mail/mailWindow1.css
+++ b/mail/themes/linux/mail/mailWindow1.css
@@ -3,17 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #messengerBox {
   background-color: -moz-Dialog;
--- a/mail/themes/linux/mail/messageWindow.css
+++ b/mail/themes/linux/mail/messageWindow.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messageWindow.css ==============================================
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .mail-toolbox {
   margin-top: 0;
   padding-top: 0;
 }
--- a/mail/themes/linux/mail/msgSelectOffline.css
+++ b/mail/themes/linux/mail/msgSelectOffline.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgSelectOffline.css =================================================
    == The dialog where you select which folders to enable for offline use.
    ========================================================================== */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/folderPane.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treechildren::-moz-tree-image(syncCol) {
   list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
 }
 
--- a/mail/themes/linux/mail/smime/certFetchingStatus.css
+++ b/mail/themes/linux/mail/smime/certFetchingStatus.css
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/mail/themes/linux/mail/smime/msgCompSecurityInfo.css
+++ b/mail/themes/linux/mail/smime/msgCompSecurityInfo.css
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treecolpicker {
   display: none;
 }
--- a/mail/themes/linux/mail/smime/msgReadSecurityInfo.css
+++ b/mail/themes/linux/mail/smime/msgReadSecurityInfo.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #signatureLabel {
   font-weight: bold;
 }
 
 #signatureCert {
--- a/mail/themes/linux/mail/subscribe.css
+++ b/mail/themes/linux/mail/subscribe.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== subscribe.css ==================================================
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Subscription Icons  :::::: */
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
--- a/mail/themes/osx/mail/accountWizard.css
+++ b/mail/themes/osx/mail/accountWizard.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountWizard.css ==============================================
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account wizard :::::: */
 
 .awIdentityLabel {
   width: 8em;
   margin-inline-start: 5px;
--- a/mail/themes/osx/mail/addrbook/abContactsPanel.css
+++ b/mail/themes/osx/mail/addrbook/abContactsPanel.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== sidebarPanel.css ===============================================
   == Styles for the Address Book sidebar panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/addressbook/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #abContactsPanel {
   -moz-appearance: none !important;
   background-color: transparent;
 }
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== addressbook.css ================================================
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #ab-bar2 {
   /* Cover the titlebar with the toolbox background */
   margin-top: -22px;
   padding: 22px 4px 0;
 }
 
--- a/mail/themes/osx/mail/addrbook/cardDialog.css
+++ b/mail/themes/osx/mail/addrbook/cardDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== cardViewOverlay.css ============================================
   == Styles for the Address Book Card view.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
   width: 42ch;
 }
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 #compose-toolbox:-moz-lwtheme::before {
   content: "";
   display: -moz-box;
   position: absolute;
--- a/mail/themes/osx/mail/dialogs.css
+++ b/mail/themes/osx/mail/dialogs.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== dialogs.css ====================================================
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: button-like menus ::::: */
 
 menu.push {
   border: 1px outset ThreeDFace;
   padding: 2px;
--- a/mail/themes/osx/mail/filterDialog.css
+++ b/mail/themes/osx/mail/filterDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #filterListDialog {
   padding: 0px;
 }
 
 #filterHeader {
--- a/mail/themes/osx/mail/junkMail.css
+++ b/mail/themes/osx/mail/junkMail.css
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
 /*===== junkMail=======.css ==============================================
   == Styles for the junk mail dialog
  ======================================================================== */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
   margin-inline-start: 20px;
 }
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -3,17 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #messengerBox:-moz-lwtheme {
   background-color: -moz-OddTreeRow;
--- a/mail/themes/osx/mail/messageWindow.css
+++ b/mail/themes/osx/mail/messageWindow.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messageWindow.css ==============================================
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Mail Toolbars and Menubars ::::: */
 
 .mail-toolbox {
   border-bottom: 0;
--- a/mail/themes/osx/mail/msgSelectOffline.css
+++ b/mail/themes/osx/mail/msgSelectOffline.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgSelectOffline.css =================================================
   == Styles for the Offline Use dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Mail Folders ::::: */
 
 treechildren::-moz-tree-image(folderNameCol) {
   margin-inline-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
--- a/mail/themes/osx/mail/smime/certFetchingStatus.css
+++ b/mail/themes/osx/mail/smime/certFetchingStatus.css
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/mail/themes/osx/mail/smime/msgCompSecurityInfo.css
+++ b/mail/themes/osx/mail/smime/msgCompSecurityInfo.css
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treecolpicker {
   display: none;
 }
--- a/mail/themes/osx/mail/smime/msgReadSecurityInfo.css
+++ b/mail/themes/osx/mail/smime/msgReadSecurityInfo.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #signatureLabel {
   font-weight: bold;
 }
 
 #signatureCert {
--- a/mail/themes/osx/mail/subscribe.css
+++ b/mail/themes/osx/mail/subscribe.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== subscribe.css ==================================================
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: subscribed icons  :::::: */
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
   margin-inline-end: 2px;
--- a/mail/themes/shared/mail/accountCentral.css
+++ b/mail/themes/shared/mail/accountCentral.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 html {
   height: 100%;
 }
 
 :root {
   --bg-color: #ffffff;
   --bg-watermark: url("chrome://messenger/skin/images/account-watermark.png");
--- a/mail/themes/shared/mail/accountManage.css
+++ b/mail/themes/shared/mail/accountManage.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountManage.css ==============================================
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://global/skin/in-content/common.css");
 @import url("chrome://messenger/skin/preferences/preferences.css");
 
 window > vbox {
   padding-block: 40px;
   padding-inline: 25px 28px;
 }
 
--- a/mail/themes/shared/mail/newmailalert.css
+++ b/mail/themes/shared/mail/newmailalert.css
@@ -2,17 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== alert.css =====================================================
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #newMailAlertNotification {
   min-height: 60px;
   border: 1px solid threedshadow;
   border-radius: 3px;
   background-color: -moz-Dialog;
--- a/mail/themes/shared/mail/searchDialog.css
+++ b/mail/themes/shared/mail/searchDialog.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 
 #searchTerms {
   margin-top: 8px;
 }
 
 #booleanAndGroup,
 #searchTermBox,
--- a/mail/themes/windows/mail/accountWizard.css
+++ b/mail/themes/windows/mail/accountWizard.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountWizard.css ==============================================
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account wizard :::::: */
 
 .awIdentityLabel {
   width: 8em;
   margin-inline-start: 5px;
--- a/mail/themes/windows/mail/addrbook/abContactsPanel.css
+++ b/mail/themes/windows/mail/addrbook/abContactsPanel.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== sidebarPanel.css ===============================================
   == Styles for the Address Book sidebar panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/addressbook/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #abContactsPanel {
   -moz-appearance: toolbox;
   background-color: -moz-Dialog;
 }
--- a/mail/themes/windows/mail/addrbook/addressbook.css
+++ b/mail/themes/windows/mail/addrbook/addressbook.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== addressbook.css ================================================
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #abContent {
   background-color: -moz-Dialog;
 }
 
 /* ::::: results pane ::::: */
 
--- a/mail/themes/windows/mail/addrbook/cardDialog.css
+++ b/mail/themes/windows/mail/addrbook/cardDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== cardViewOverlay.css ============================================
   == Styles for Address Book dialogs.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
   width: 42ch;
 }
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 #attachmentBucket {
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
--- a/mail/themes/windows/mail/dialogs.css
+++ b/mail/themes/windows/mail/dialogs.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== dialogs.css ====================================================
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: button-like menus ::::: */
 
 menu.push {
   border: 1px outset ThreeDFace;
   padding: 2px;
--- a/mail/themes/windows/mail/filterDialog.css
+++ b/mail/themes/windows/mail/filterDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: columns :::::: */
 
 treecolpicker {
   display: none;
 }
--- a/mail/themes/windows/mail/junkMail.css
+++ b/mail/themes/windows/mail/junkMail.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*===== junkMail=======.css ==============================================
   == Styles for the junk mail dialog
  ======================================================================== */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
   margin-inline-start: 20px;
 }
--- a/mail/themes/windows/mail/mailWindow1.css
+++ b/mail/themes/windows/mail/mailWindow1.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #messengerBox {
   background-color: -moz-Dialog;
--- a/mail/themes/windows/mail/messageWindow.css
+++ b/mail/themes/windows/mail/messageWindow.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messageWindow.css ==============================================
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #messengerWindow {
   -moz-appearance: window;
   background-color: -moz-Dialog;
 }
--- a/mail/themes/windows/mail/msgSelectOffline.css
+++ b/mail/themes/windows/mail/msgSelectOffline.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgSelectOffline.css =================================================
   == Styles for the Offline Use dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Mail Folders ::::: */
 
 treechildren::-moz-tree-image(folderNameCol) {
   margin-inline-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder.png");
--- a/mail/themes/windows/mail/smime/certFetchingStatus.css
+++ b/mail/themes/windows/mail/smime/certFetchingStatus.css
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/mail/themes/windows/mail/smime/msgCompSecurityInfo.css
+++ b/mail/themes/windows/mail/smime/msgCompSecurityInfo.css
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treecolpicker {
   display: none;
 }
--- a/mail/themes/windows/mail/smime/msgReadSecurityInfo.css
+++ b/mail/themes/windows/mail/smime/msgReadSecurityInfo.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #signatureLabel {
   font-weight: bold;
 }
 
 #signatureCert {
--- a/mail/themes/windows/mail/subscribe.css
+++ b/mail/themes/windows/mail/subscribe.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== subscribe.css ==================================================
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Subscription Icons  :::::: */
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
   margin-inline-end: 2px;
--- a/mailnews/addrbook/prefs/content/pref-directory-add.xhtml
+++ b/mailnews/addrbook/prefs/content/pref-directory-add.xhtml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-directory-add.dtd">
 
 <window style="width: &newDirectoryWidth;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
--- a/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
+++ b/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-directory.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&pref.ldap.window.title;"
         onload="onInitEditDirectories();"
         onunload="onUninitEditDirectories();">
 <dialog id="editDirectories"
--- a/mailnews/base/search/content/CustomHeaders.xhtml
+++ b/mailnews/base/search/content/CustomHeaders.xhtml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 #ifdef MOZ_THUNDERBIRD
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 #else
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 #endif
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/CustomHeaders.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
    - This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger-newsblog/skin/feed-subscriptions.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % feedDTD SYSTEM "chrome://messenger-newsblog/locale/feed-subscriptions.dtd">
     %feedDTD;
--- a/mailnews/import/content/fieldMapImport.xhtml
+++ b/mailnews/import/content/fieldMapImport.xhtml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 #ifdef MOZ_THUNDERBIRD
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 #else
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 #endif
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/fieldMapImport.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/fieldMapImport.dtd">
 
--- a/suite/themes/classic/mac/messenger/accountManage.css
+++ b/suite/themes/classic/mac/messenger/accountManage.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountManage.css ==============================================
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
   margin-inline-start: 20px;
 }
--- a/suite/themes/classic/mac/messenger/addressbook/addressbook.css
+++ b/suite/themes/classic/mac/messenger/addressbook/addressbook.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== addressbook.css ================================================
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 #addressbookWindow {
   -moz-appearance: none;
   background-color: #EEEEEE;
 }
--- a/suite/themes/classic/mac/messenger/filterDialog.css
+++ b/suite/themes/classic/mac/messenger/filterDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: columns :::::: */
 
 treechildren::-moz-tree-image(activeColumn) {
   list-style-image: url("chrome://messenger/skin/icons/dot.png");
 }
--- a/suite/themes/classic/mac/messenger/mailWindow1.css
+++ b/suite/themes/classic/mac/messenger/mailWindow1.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #messengerWindow {
   -moz-appearance: none;
   background-color: #EEEEEE;
--- a/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
+++ b/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
 
 #button-send {
   list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
   -moz-image-region: rect(330px 29px 359px 0);
--- a/suite/themes/classic/mac/messenger/searchDialog.css
+++ b/suite/themes/classic/mac/messenger/searchDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== searchDialog.css ===============================================
   == Styles for the Mail Search dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: box sizes ::::: */
 
 #searchTermTree {
   min-height: 50px;
 }
--- a/suite/themes/classic/messenger/accountCentral.css
+++ b/suite/themes/classic/messenger/accountCentral.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountCentral.css ==========================================
   == Styles for the Messenger Account Central panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #acctCentralGrid {
   background-color: #FFFFFF;
 }
 
 spacer {
--- a/suite/themes/classic/messenger/accountManage.css
+++ b/suite/themes/classic/messenger/accountManage.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountManage.css ==============================================
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
   margin-inline-start: 20px;
 }
--- a/suite/themes/classic/messenger/accountWizard.css
+++ b/suite/themes/classic/messenger/accountWizard.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountWizard.css ==============================================
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account wizard :::::: */
 
 .awIdentityLabel {
   width: 8em; 
   margin-inline-start: 5px;
--- a/suite/themes/classic/messenger/addressbook/addressbook.css
+++ b/suite/themes/classic/messenger/addressbook/addressbook.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== addressbook.css ================================================
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: primary toolbar buttons ::::: */
 
 #button-newcard {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
--- a/suite/themes/classic/messenger/addressbook/cardDialog.css
+++ b/suite/themes/classic/messenger/addressbook/cardDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== cardViewOverlay.css ============================================
   == Styles for the Address Book Card view.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
   width: 42ch;
 }
--- a/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css
+++ b/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== selectAddressesDialog.css ======================================
   == Styles for the Select Addresses Dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Select Addresses dialog ::::: */
 #topBox {
   padding: 0.5em 0 1.0em;
 }
 
--- a/suite/themes/classic/messenger/dialogs.css
+++ b/suite/themes/classic/messenger/dialogs.css
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== dialogs.css ====================================================
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: styles for messenger dialogs ::::: */
 
--- a/suite/themes/classic/messenger/filterDialog.css
+++ b/suite/themes/classic/messenger/filterDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: columns :::::: */
 
 treechildren::-moz-tree-image(activeColumn) {
   list-style-image: url("chrome://messenger/skin/icons/dot.png");
 }
--- a/suite/themes/classic/messenger/mailWindow1.css
+++ b/suite/themes/classic/messenger/mailWindow1.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* :::::
    :: Make sure the min height is small so we can
    :: resize the pane vertically -EDV
--- a/suite/themes/classic/messenger/messageWindow.css
+++ b/suite/themes/classic/messenger/messageWindow.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messageWindow.css ==============================================
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/threadPaneLabels.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: message header borders ::::: */
 
 #msgHeaderView {
--- a/suite/themes/classic/messenger/messengercompose/messengercompose.css
+++ b/suite/themes/classic/messenger/messengercompose/messengercompose.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
 
 #button-send {
   list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
   -moz-image-region: rect(330px 29px 359px 0);
--- a/suite/themes/classic/messenger/newmailalert.css
+++ b/suite/themes/classic/messenger/newmailalert.css
@@ -2,17 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== alert.css =====================================================
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #newMailAlertNotification {
   min-height: 60px;
   border: ridge SteelBlue 4px;
 }
 
--- a/suite/themes/classic/messenger/prefPanels.css
+++ b/suite/themes/classic/messenger/prefPanels.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== prefPanels.css =================================================
   == Styles for the Messenger preference panels.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Tags ::::: */
 
 #tagList > listhead {
   text-align: center;
 }
--- a/suite/themes/classic/messenger/searchDialog.css
+++ b/suite/themes/classic/messenger/searchDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== searchDialog.css ===============================================
   == Styles for the Mail Search dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: box sizes ::::: */
 
 #searchTermTree {
   min-height: 50px;
 }
--- a/suite/themes/classic/messenger/smime/certFetchingStatus.css
+++ b/suite/themes/classic/messenger/smime/certFetchingStatus.css
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/suite/themes/classic/messenger/smime/msgCompSecurityInfo.css
+++ b/suite/themes/classic/messenger/smime/msgCompSecurityInfo.css
@@ -1,11 +1,11 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css
+++ b/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #signatureLabel {
   font-weight: bold;
 }
 
 #signatureCert {
--- a/suite/themes/classic/messenger/subscribe.css
+++ b/suite/themes/classic/messenger/subscribe.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== subscribe.css ==================================================
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: subscribed icons  :::::: */
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
   margin-inline-end: 2px;
--- a/suite/themes/modern/messenger/accountCentral.css
+++ b/suite/themes/modern/messenger/accountCentral.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountCentral.css ==========================================
   == Styles for the Messenger Account Central panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #acctCentralGrid {
   background-color: #FFFFFF;
 }
 
 spacer {
--- a/suite/themes/modern/messenger/accountManage.css
+++ b/suite/themes/modern/messenger/accountManage.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountManage.css ==============================================
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
   margin-inline-start: 20px;
 }
--- a/suite/themes/modern/messenger/accountWizard.css
+++ b/suite/themes/modern/messenger/accountWizard.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountWizard.css ==============================================
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: account wizard :::::: */
 
 .awIdentityLabel {
   width: 8em;
   margin-inline-start: 5px;
--- a/suite/themes/modern/messenger/addressbook/addressbook.css
+++ b/suite/themes/modern/messenger/addressbook/addressbook.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== addressbook.css ================================================
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: primary toolbar masthead ::::: */
 
 #ab-bar2 > .toolbar-holder > .toolbar-primary-icon {
   background-image: url("chrome://messenger/skin/addressbook/icons/mast-ab.gif");
--- a/suite/themes/modern/messenger/addressbook/cardDialog.css
+++ b/suite/themes/modern/messenger/addressbook/cardDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== cardViewOverlay.css ============================================
   == Styles for the Address Book Card view.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
   width: 42ch;
 }
--- a/suite/themes/modern/messenger/addressbook/selectAddressesDialog.css
+++ b/suite/themes/modern/messenger/addressbook/selectAddressesDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== selectAddressesDialog.css ======================================
   == Styles for the Select Addresses Dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Select Addresses dialog ::::: */
 
 #topBox {
   padding: 0.5em 0 1.0em;
 }
--- a/suite/themes/modern/messenger/dialogs.css
+++ b/suite/themes/modern/messenger/dialogs.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== dialogs.css ====================================================
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: fieldMapImport.xul ::::: */
 
 .importsampledata {
   border-left: 3px solid #C2D0D0;
   padding-inline-start: 10px;
--- a/suite/themes/modern/messenger/filterDialog.css
+++ b/suite/themes/modern/messenger/filterDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: columns :::::: */
 
 treechildren::-moz-tree-image(activeColumn) {
   list-style-image: url("chrome://global/skin/checkbox/cbox.gif");
 }
--- a/suite/themes/modern/messenger/mailWindow1.css
+++ b/suite/themes/modern/messenger/mailWindow1.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* :::::
    :: Make sure the min height is small so we can
    :: resize the pane vertically -EDV
--- a/suite/themes/modern/messenger/messageWindow.css
+++ b/suite/themes/modern/messenger/messageWindow.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messageWindow.css ==============================================
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/threadPaneLabels.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/suite/themes/modern/messenger/messengercompose/messengercompose.css
+++ b/suite/themes/modern/messenger/messengercompose/messengercompose.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar masthead ::::: */
 
 #composeToolbar > .toolbar-holder > .toolbar-primary-icon {
   background-image: url("chrome://messenger/skin/messengercompose/icons/mast-msgcomp.gif");
 }
--- a/suite/themes/modern/messenger/newmailalert.css
+++ b/suite/themes/modern/messenger/newmailalert.css
@@ -2,17 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== alert.css =====================================================
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #newMailAlertNotification {
   min-height: 60px;
   border: ridge #5486DA 4px;
 }
 
--- a/suite/themes/modern/messenger/prefPanels.css
+++ b/suite/themes/modern/messenger/prefPanels.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== prefPanels.css =================================================
   == Styles for the Messenger preference panels.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Tags ::::: */
 
 #tagList > listhead {
   text-align: center;
 }
--- a/suite/themes/modern/messenger/searchDialog.css
+++ b/suite/themes/modern/messenger/searchDialog.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== searchDialog.css ===============================================
   == Styles for the Mail Search dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Search Dialog adjustments ::::: */
 
 
 #searchTermTree {
   min-height: 50px;
--- a/suite/themes/modern/messenger/smime/certFetchingStatus.css
+++ b/suite/themes/modern/messenger/smime/certFetchingStatus.css
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/suite/themes/modern/messenger/smime/msgCompSecurityInfo.css
+++ b/suite/themes/modern/messenger/smime/msgCompSecurityInfo.css
@@ -1,11 +1,11 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/suite/themes/modern/messenger/smime/msgReadSecurityInfo.css
+++ b/suite/themes/modern/messenger/smime/msgReadSecurityInfo.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgReadSecurityInfo.css ========================================
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #signatureLabel {
   font-weight: bold;
 }
 
 #signatureCert {
--- a/suite/themes/modern/messenger/subscribe.css
+++ b/suite/themes/modern/messenger/subscribe.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== subscribe.css ==================================================
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: subscribed icons  :::::: */
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
   list-style-image: url("chrome://global/skin/checkbox/cbox.gif");