Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

182 files changed, 4195 insertions, 0 deletions

diff --git a/comm/suite/themes/classic/messenger/accountCentral.css b/comm/suite/themes/classic/messenger/accountCentral.css
new file mode 100644
index 0000000000..fdde99c557
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/accountCentral.css
@@ -0,0 +1,120 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#acctCentralGrid {
+  background-color: #FFFFFF;
+}
+
+spacer {
+  max-height: .5em;
+}
+
+spacer.big {
+  max-height: 4em;
+}
+
+/* ::::: rows ::::: */
+
+#acctCentralHeaderRow {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-inline-start: 10px;
+  padding-inline-end: 0px;
+  font-size: 180%;
+  font-weight: bold;
+  color: #000000;
+}
+
+.acctCentralRow {
+  -moz-binding: url("chrome://communicator/skin/communicatorBindings.xml#row-iconic");
+  margin-inline-start: 10px;
+  font-size: 125%;
+  color: #000000;
+}
+
+.row-iconic-icon {
+  list-style-image: inherit;
+  margin-inline-end: 10px;
+}
+
+.acctCentralRowTitleBox {
+  background-color: -moz-dialog;
+  font-size: 150%;
+  font-weight: bold;
+  color: -moz-fieldtext;
+}
+
+/* ::::: links ::::: */
+
+.acctCentralLinkText {
+  cursor: pointer;
+  color: #212731;
+  text-decoration: underline;
+}
+
+.acctCentralLinkText:hover {
+  color: #39598E;
+}
+
+.acctCentralLinkText:hover:active {
+  color: #000000;
+}
+
+/* ::::: row icons ::::: */
+
+#ReadMessages {
+  list-style-image: url("chrome://messenger/skin/icons/acct-read.png");
+}
+
+#ComposeMessage {
+  list-style-image: url("chrome://messenger/skin/icons/acct-compose.png");
+}
+
+#SubscribeNewsgroups {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SubscribeImapFolders {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SubscribeRSS {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SearchMessages {
+  list-style-image: url("chrome://messenger/skin/icons/acct-search.png");
+}
+
+#AccountSettings {
+  list-style-image: url("chrome://messenger/skin/icons/acct-prefs.png");
+}
+
+#CreateAccount {
+  list-style-image: url("chrome://messenger/skin/icons/acct-newaccount.png");
+}
+
+#CreateFilters {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
+
+#OfflineSettings {
+  list-style-image: url("chrome://messenger/skin/icons/acct-prefs.png");
+}
+
+#JunkSettingsMail {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
+
+#JunkSettingsNews {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
diff --git a/comm/suite/themes/classic/messenger/accountManage.css b/comm/suite/themes/classic/messenger/accountManage.css
new file mode 100644
index 0000000000..4fce958ede
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/accountManage.css
@@ -0,0 +1,61 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: account manager :::::: */
+
+.specialFolderPickerGrid {
+  margin-inline-start: 20px;
+}
+
+.fccReplyFollowsParent {
+  margin-inline-start: 20px;
+}
+
+.selectForOfflineUseButton {
+  list-style-image: url("chrome://communicator/skin/icons/offline.png");
+}
+
+.selectForOfflineUseButton > .button-box > .button-icon {
+  margin-inline-start: 4px;
+  margin-inline-end: 4px;
+}
+
+.signatureBox {
+  font-family: -moz-fixed;
+}
+
+listitem[default="true"],
+#identitiesList > listitem:first-child {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(isDefaultServer-true) {
+  text-decoration: underline;
+}
+
+#accounttree treechildren::-moz-tree-indentation {
+  width: 1ch;
+}
+
+/* ::::: SMTP Server Panel :::::: */
+
+.smtpServerListItem {
+  padding-inline-start: 3px;
+}
+
+#backgroundBox {
+  background-color: ThreeDLightShadow;
+}
+
+#smtpServerInfoBox textbox {
+  background-color: transparent;
+}
diff --git a/comm/suite/themes/classic/messenger/accountWizard.css b/comm/suite/themes/classic/messenger/accountWizard.css
new file mode 100644
index 0000000000..265f83b5c0
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/accountWizard.css
@@ -0,0 +1,26 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: account wizard :::::: */
+
+.awIdentityLabel {
+  width: 8em; 
+  margin-inline-start: 5px;
+}
+
+.serverLabel {
+  width: 8em;
+}
+
+.serverDataBox {
+  margin-inline-start: 15px;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/abResultsPane.css b/comm/suite/themes/classic/messenger/addressbook/abResultsPane.css
new file mode 100644
index 0000000000..a5cc6b2e7e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/abResultsPane.css
@@ -0,0 +1,16 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+treechildren::-moz-tree-image(GeneratedName) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+}
+
+treechildren::-moz-tree-image(GeneratedName, MailList) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
+}
+
diff --git a/comm/suite/themes/classic/messenger/addressbook/addressPanes.css b/comm/suite/themes/classic/messenger/addressbook/addressPanes.css
new file mode 100644
index 0000000000..4a854b9cca
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/addressPanes.css
@@ -0,0 +1,36 @@
+/* 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/. */
+
+/* ===== addressPanes.css ================================================
+  == Styles for directory pane.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: directory pane icons ::::: */
+
+treechildren::-moz-tree-image(DirCol) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsMailList-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsRemote-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.png");
+}
+
+#dirTree [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#dirTree [sortDirection="descending"] {
+  list-style-image: none;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/addressbook.css b/comm/suite/themes/classic/messenger/addressbook/addressbook.css
new file mode 100644
index 0000000000..f645a367c3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/addressbook.css
@@ -0,0 +1,317 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* ::::: Trees ::::: */
+
+treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+treechildren::-moz-tree-twisty {
+  padding-bottom: 1px;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-newcard:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+} 
+
+#button-newcard:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#button-newcard[disabled] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+} 
+
+#button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-newlist:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+} 
+
+#button-newlist:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#button-newlist[disabled] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+} 
+
+#button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-editcard:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-editcard:hover:active {
+  -moz-image-region: rect(30px 89px 59px 60px);
+}
+
+#button-editcard[disabled] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+} 
+
+#button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmessage:hover {
+  -moz-image-region: rect(150px 59px 179px 30px);
+} 
+
+#button-newmessage:hover:active {
+  -moz-image-region: rect(150px 89px 179px 60px);
+} 
+
+#button-newmessage[disabled] {
+  -moz-image-region: rect(150px 119px 179px 90px) !important;
+}
+
+#button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#button-abdelete:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-abdelete:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#button-abdelete[disabled] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-newcard,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-newcard:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newcard:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newcard[disabled] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newlist,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-newlist:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newlist:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newlist[disabled] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-editcard,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-editcard:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-editcard:hover:active {
+  -moz-image-region: rect(20px 59px 39px 40px);
+}
+
+toolbar[iconsize="small"] > #button-editcard[disabled] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newmessage,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #button-newmessage:hover {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmessage:hover:active {
+  -moz-image-region: rect(100px 59px 119px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newmessage[disabled] {
+  -moz-image-region: rect(100px 79px 119px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-abdelete,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #button-abdelete:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-abdelete:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #button-abdelete[disabled] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+#blankResultsPaneMessage {
+  font-style: italic;
+}
+
+#localResultsOnlyMessage {
+  font-style: italic;
+  text-align: center;
+}
+
+/* CardView styles - used in the Card View Pane */
+
+#CardViewOuterBox {
+  border-left: 1px solid ThreeDShadow;
+  border-top: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+}
+
+#CardViewBox {
+  -moz-user-focus: ignore;
+  overflow: auto;
+  min-width: 150px;
+  border-left: 1px solid ThreeDDarkShadow;
+  border-top: 1px solid ThreeDDarkShadow;
+  border-bottom: 1px solid ThreeDLightShadow;
+  border-right: 1px solid ThreeDLightShadow;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+#CardViewInnerBox {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 0 8px;
+}
+
+#CardTitle {
+  font-size: 150%;
+  font-weight: bold;
+  border-bottom: 2px solid -moz-FieldText;
+  min-width: 120px;
+  margin: 0px;
+}
+
+.cardViewColumn {
+  margin-inline-end: 10px;
+}
+ 
+.cardViewGroup {
+  margin-top: 8px;
+  padding-bottom: 5px;
+  min-width: 50px;
+}
+
+.CardViewHeading {
+  padding: 1px;
+  padding-inline-start: 5px;
+  margin: 0px 0px 1px;
+  background-color: #CCCCFF;
+  color: black;
+  font-weight: bold;
+  min-width: 30px;
+}
+
+#cvPhoto {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
+}
+
+#cvBuddyIcon {
+  padding-inline-start: 20px;
+  padding-top: 2px;
+}
+
+.CardViewText,
+.CardViewLink {
+  padding-inline-start: 20px;
+  padding-inline-end: 2px;
+  min-width: 30px;
+  margin: 0px;
+}
+
+.CardViewLink {
+  text-decoration: underline;
+  color: -moz-nativehyperlinktext;
+  cursor: pointer;
+}
+
+
+#cvHomeMapIt, #cvWorkMapIt {
+  margin-bottom: 0px;
+}
+
+html|a {
+  padding-inline-start: 0px;
+  padding-inline-end: 2px;
+  border: none !important;
+}
+
+html|p {
+  border: none !important;
+}
+
+/* ::::: border adjustments ::::: */
+
+#abResultsTree {
+  border-left: 1px solid ThreeDShadow;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#CardViewOuterBox:-moz-lwtheme,
+treecols:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/cardDialog.css b/comm/suite/themes/classic/messenger/addressbook/cardDialog.css
new file mode 100644
index 0000000000..9d4d091024
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/cardDialog.css
@@ -0,0 +1,72 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Card Edit dialog ::::: */
+
+.CardEditWidth {
+  width: 42ch;
+}
+
+.CardEditLabel {
+  text-align: end;
+}
+
+.PhoneEditWidth {
+  width: 24ch;
+}
+
+.AddressCardEditWidth {
+  width: 72ch;
+}
+
+.YearWidth {
+  width: 8ch;
+}
+
+.stateZipSpacer {
+  width: 6ch;
+}
+
+.ZipWidth {
+  width: 14ch;
+}
+
+#photo {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
+}
+
+#GenericPhotoList[value="default"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic-tiny.png");
+}
+
+#PhotoContainer {
+  margin: 5px;
+}
+
+#PhotoDropTarget {
+  margin-top: 5px;
+}
+
+#PhotoDropTarget:hover {
+  border: 1px dashed #CACAFF;
+}
+
+#ProgressContainer {
+  max-height: 0;
+  transition: all .5s ease-out;
+  overflow: hidden;
+}
+
+#ProgressContainer.expanded {
+  margin-top: 10px;
+  max-height: 40px; /* something higher than the actual height, but not too large */
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/abcard.png b/comm/suite/themes/classic/messenger/addressbook/icons/abcard.png
new file mode 100644
index 0000000000..7937bda57e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/abcard.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/ablist.png b/comm/suite/themes/classic/messenger/addressbook/icons/ablist.png
new file mode 100644
index 0000000000..a892125591
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/ablist.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/addrbook.png b/comm/suite/themes/classic/messenger/addressbook/icons/addrbook.png
new file mode 100644
index 0000000000..3eafea43c4
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/addrbook.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons-small.png b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons-small.png
new file mode 100644
index 0000000000..9c6f2519e1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons-small.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons.png b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons.png
new file mode 100644
index 0000000000..782397570e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic-tiny.png b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic-tiny.png
new file mode 100644
index 0000000000..300c09e914
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic-tiny.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic.png b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic.png
new file mode 100644
index 0000000000..452f1cf655
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook-error.png b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook-error.png
new file mode 100644
index 0000000000..ba79dbc4ca
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook-error.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook.png b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook.png
new file mode 100644
index 0000000000..ea661f4a26
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/secure-remote-addrbook.png b/comm/suite/themes/classic/messenger/addressbook/icons/secure-remote-addrbook.png
new file mode 100644
index 0000000000..a7612cf489
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/secure-remote-addrbook.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css b/comm/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css
new file mode 100644
index 0000000000..062cf13c44
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css
@@ -0,0 +1,48 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Select Addresses dialog ::::: */
+#topBox {
+  padding: 0.5em 0 1.0em;
+}
+
+#abResultsTree {
+  min-width: 10px;
+}
+
+#resultsBox {
+  border: 1px solid #000000;
+}
+
+#addToBucketButtonBox {
+  min-width: 10px;
+  padding: 0.3em; 
+}
+
+#addressBucket {
+  min-width: 10px;
+}
+
+#newEditButtonBox {
+  padding-top: 0.5em; 
+  padding-inline-end: 0px;
+  margin-inline-start: 0px;
+}
+
+.middle-button-spacer {
+  width: 10px;
+}
+
+.above-remove-spacer {
+  width: 10px;
+  height: 15px;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/sidebarPanel.css b/comm/suite/themes/classic/messenger/addressbook/sidebarPanel.css
new file mode 100644
index 0000000000..842fc33d26
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/sidebarPanel.css
@@ -0,0 +1,12 @@
+/* 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/addressbook/addressbook.css");
+  
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
diff --git a/comm/suite/themes/classic/messenger/addressingWidget.css b/comm/suite/themes/classic/messenger/addressingWidget.css
new file mode 100644
index 0000000000..f0e58cceba
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressingWidget.css
@@ -0,0 +1,41 @@
+/* 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/. */
+
+/* ::::: addressing widget ::::: */
+  
+#addressingWidget {
+  -moz-user-focus: none;
+  width: 0;
+}  
+
+#typecol-addressingWidget {
+  min-width: 9em;
+  border-right: 1px solid #CACAFF;
+}
+
+.addressingWidgetItem,
+.dummy-row {
+  border: none !important;
+  background-color: inherit !important;
+  color: inherit !important;
+}
+
+.addressingWidgetCell {
+  border-bottom: 1px solid #CACAFF;
+  padding: 0px;
+}
+
+.addressingWidgetCell:first-child {
+  border-top: none;
+}
+
+.dummy-row-cell:first-child {
+  border-top: none;
+  border-bottom: 1px solid #CACAFF;
+}
+
+.person-icon {
+  margin: 0 3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+}
diff --git a/comm/suite/themes/classic/messenger/browserRequest.css b/comm/suite/themes/classic/messenger/browserRequest.css
new file mode 100644
index 0000000000..0924641265
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/browserRequest.css
@@ -0,0 +1,40 @@
+/* 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/. */
+
+#security-button {
+  width: 20px;
+  padding-right: 5px;
+  background-repeat: no-repeat;
+}
+
+#security-button[level="high"] {
+  background-image: url("chrome://messenger/skin/icons/secure.png");
+}
+
+#security-button[level="broken"] {
+  background-image: url("chrome://messenger/skin/icons/insecure.png");
+}
+
+#security-button[loading="true"] {
+  background-image: url("chrome://messenger/skin/icons/loading.png");
+  background-position: 4px 2px;
+}
+
+#header {
+  overflow: hidden;
+  border-bottom: 1px solid black;
+}
+
+#addressbox {
+  font-weight: bold;
+  font-size: normal;
+  -moz-appearance: textfield;
+  overflow: hidden;
+  margin: 0px 5px;
+  font-weight: normal;
+}
+
+#headerMessage {
+  margin-top: 4px;
+}
diff --git a/comm/suite/themes/classic/messenger/dialogs.css b/comm/suite/themes/classic/messenger/dialogs.css
new file mode 100644
index 0000000000..83710494dd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/dialogs.css
@@ -0,0 +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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: styles for messenger dialogs ::::: */
+
diff --git a/comm/suite/themes/classic/messenger/filterDialog.css b/comm/suite/themes/classic/messenger/filterDialog.css
new file mode 100644
index 0000000000..87ae896f14
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/filterDialog.css
@@ -0,0 +1,67 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: columns :::::: */
+
+listcell.listcell-iconic > .listcell-label {
+  display: none;
+}
+
+listcell[enabled="false"] {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+listcell[enabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
+
+.search-menulist, .search-value-menulist {
+  width: 12em;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+#FilterEditor {
+  padding: 0px;
+}
+
+#filterListDialog {
+  padding: 0px;
+}
+
+.filler {
+  padding-inline-end: 22px;
+}
+
+.ruleaction {
+  border: 1px solid transparent;
+}
+
+.ruleactionitem {
+  min-width: 20em;
+}
+
+.ruleaction-type {
+  min-width: 15em;
+}
diff --git a/comm/suite/themes/classic/messenger/folderMenus.css b/comm/suite/themes/classic/messenger/folderMenus.css
new file mode 100644
index 0000000000..c14ec4d25a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/folderMenus.css
@@ -0,0 +1,124 @@
+/* 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/. */
+
+/* ===== folderMenus.css ================================================
+  == Icons for menus which represent mail folder.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: folder icons for menus ::::: */
+
+.folderMenuItem {
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+.folderMenuItem[open="true"] {
+list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
+}
+
+.folderMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+.folderMenuItem[ServerType="rss"] {
+  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+/* ..... special folders ..... */
+
+.folderMenuItem[SpecialFolder="Inbox"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+.folderMenuItem[SpecialFolder="Inbox"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Sent"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+.folderMenuItem[SpecialFolder="Sent"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Outbox"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+.folderMenuItem[SpecialFolder="Outbox"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Templates"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+.folderMenuItem[SpecialFolder="Templates"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Junk"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+.folderMenuItem[SpecialFolder="Junk"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Trash"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+.folderMenuItem[SpecialFolder="Trash"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Virtual"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+}
+
+/* ..... servers ..... */
+
+.folderMenuItem[IsServer="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.folderMenuItem[IsServer="true"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="none"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="rss"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
diff --git a/comm/suite/themes/classic/messenger/folderPane.css b/comm/suite/themes/classic/messenger/folderPane.css
new file mode 100644
index 0000000000..c4f0b7d736
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/folderPane.css
@@ -0,0 +1,251 @@
+/* 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/. */
+
+/* ===== folderPane.css =================================================
+  == Styles for the Folder pane in the Messenger 3-pane window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Trees ::::: */
+
+treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+treechildren::-moz-tree-twisty {
+  padding-bottom: 1px;
+}
+
+/* ::::: mail folder ::::: */
+
+treechildren::-moz-tree-image(folderNameCol) {
+  margin-inline-end: 2px;
+}
+
+.icon-holder[type="folder"],
+treechildren::-moz-tree-image(folderNameCol) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+/* ..... IMAP shared ..... */
+
+.icon-holder[type="folder"][ImapShared="true"],
+treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
+}
+
+/* ..... mail folder with new messages ..... */
+
+treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-new.png");
+}
+
+/* ..... News ..... */
+
+.icon-holder[type="folder"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+.icon-holder[type="folder"][ServerType="nntp"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.png");
+}
+
+/* ..... Feeds ..... */
+
+.icon-holder[type="folder"][ServerType="rss"],
+treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
+  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+.icon-holder[type="folder"][ServerType="rss"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+/* ..... Inbox ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Inbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+.icon-holder[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
+}
+
+/* ..... Sent ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Sent"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+/* ..... Outbox ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Outbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+/* ..... Drafts ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Drafts"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+/* ..... Templates ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Templates"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+/* ..... Junk ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Junk"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+/* ..... Trash ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Trash"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+/* ..... Saved Searches ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Virtual"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true) {
+  font-weight: bold;
+}
+
+/* ..... Server Folders ..... */
+
+.icon-holder[type="folder"][IsServer="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"],
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="none"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
+  list-style-image: url("chrome://messenger/skin/icons/local-mailhost.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="rss"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+/* ::::: All Servers ::::: */
+
+treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
+treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
+  color: gray;
+  font-style: italic;
+}
+
+.tree-folder-checkbox {
+  list-style-image: none;
+}
+
+treechildren::-moz-tree-image(syncCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+treechildren::-moz-tree-image(syncCol, isServer-true) {
+  list-style-image: none;
+}
+
+#folderUnreadCol,
+#folderTotalCol,
+#folderSizeCol {
+  text-align: right;
+}
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}
+
+/* ::::: Folder Summary Popup ::::: */
+
+.folderSummary-message-row {
+  /* This max width ends up dictating the overall width of the popup
+     because it controls how large the preview, subject and sender text can be
+     before cropping kicks in */
+  max-width: 450px;
+}
+
+.folderSummary-subject {
+  font-weight: bold; 
+}
+
+.folderSummary-previewText {
+  color: GrayText;
+}
+
+/* Virtual Folder List Dialog */
+
+treechildren::-moz-tree-image(selectedColumn) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(selectedColumn, selected-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
diff --git a/comm/suite/themes/classic/messenger/folderPaneExtras.css b/comm/suite/themes/classic/messenger/folderPaneExtras.css
new file mode 100644
index 0000000000..f315e6e12c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/folderPaneExtras.css
@@ -0,0 +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/. */
+
+/* distributors / ISPs can override folder pane icons
+ * see http://www.mozilla.org/mailnews/arch/folderpaneextras.html
+ */
diff --git a/comm/suite/themes/classic/messenger/icons/acct-compose.png b/comm/suite/themes/classic/messenger/icons/acct-compose.png
new file mode 100644
index 0000000000..e6789dfab8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-compose.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-filters.png b/comm/suite/themes/classic/messenger/icons/acct-filters.png
new file mode 100644
index 0000000000..24815bbd79
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-filters.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-newaccount.png b/comm/suite/themes/classic/messenger/icons/acct-newaccount.png
new file mode 100644
index 0000000000..963a061440
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-newaccount.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-prefs.png b/comm/suite/themes/classic/messenger/icons/acct-prefs.png
new file mode 100644
index 0000000000..3ebb66c8ec
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-prefs.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-read.png b/comm/suite/themes/classic/messenger/icons/acct-read.png
new file mode 100644
index 0000000000..771f9ea98c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-read.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-search.png b/comm/suite/themes/classic/messenger/icons/acct-search.png
new file mode 100644
index 0000000000..20fcb23fd9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-search.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-subscribe.png b/comm/suite/themes/classic/messenger/icons/acct-subscribe.png
new file mode 100644
index 0000000000..b36aaf00eb
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-subscribe.png
diff --git a/comm/suite/themes/classic/messenger/icons/attach.png b/comm/suite/themes/classic/messenger/icons/attach.png
new file mode 100644
index 0000000000..dbdd623cd9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/attachment-col.png b/comm/suite/themes/classic/messenger/icons/attachment-col.png
new file mode 100644
index 0000000000..3830005149
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attachment-col.png
diff --git a/comm/suite/themes/classic/messenger/icons/attachment-selected.png b/comm/suite/themes/classic/messenger/icons/attachment-selected.png
new file mode 100644
index 0000000000..15c0faf3ce
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attachment-selected.png
diff --git a/comm/suite/themes/classic/messenger/icons/attachment.png b/comm/suite/themes/classic/messenger/icons/attachment.png
new file mode 100644
index 0000000000..be96529197
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attachment.png
diff --git a/comm/suite/themes/classic/messenger/icons/check.png b/comm/suite/themes/classic/messenger/icons/check.png
new file mode 100644
index 0000000000..2f00ab3f9b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/check.png
diff --git a/comm/suite/themes/classic/messenger/icons/dot.png b/comm/suite/themes/classic/messenger/icons/dot.png
new file mode 100644
index 0000000000..519b937ae9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/dot.png
diff --git a/comm/suite/themes/classic/messenger/icons/flagcol.png b/comm/suite/themes/classic/messenger/icons/flagcol.png
new file mode 100644
index 0000000000..837eb51f06
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/flagcol.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-closed.png b/comm/suite/themes/classic/messenger/icons/folder-closed.png
new file mode 100644
index 0000000000..2add76b7ce
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-closed.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft-open.png b/comm/suite/themes/classic/messenger/icons/folder-draft-open.png
new file mode 100644
index 0000000000..8db1357802
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-draft-share-open.png
new file mode 100644
index 0000000000..c0fdb86954
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft-share.png b/comm/suite/themes/classic/messenger/icons/folder-draft-share.png
new file mode 100644
index 0000000000..9862b25a19
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft.png b/comm/suite/themes/classic/messenger/icons/folder-draft.png
new file mode 100644
index 0000000000..fdaf8b60bd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-new.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-new.png
new file mode 100644
index 0000000000..ee76303adb
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-open.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-open.png
new file mode 100644
index 0000000000..f22eca5273
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-share-open.png
new file mode 100644
index 0000000000..0d085d39ee
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-share.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-share.png
new file mode 100644
index 0000000000..225d230552
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox.png b/comm/suite/themes/classic/messenger/icons/folder-inbox.png
new file mode 100644
index 0000000000..65f85a88dd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-junk-open.png b/comm/suite/themes/classic/messenger/icons/folder-junk-open.png
new file mode 100644
index 0000000000..9adb3245b9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-junk-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-junk.png b/comm/suite/themes/classic/messenger/icons/folder-junk.png
new file mode 100644
index 0000000000..da74962834
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-junk.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-new-open.png b/comm/suite/themes/classic/messenger/icons/folder-new-open.png
new file mode 100644
index 0000000000..e2ea13cdcf
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-new-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-new.png b/comm/suite/themes/classic/messenger/icons/folder-new.png
new file mode 100644
index 0000000000..5ae36cae47
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-newsgroup-new.png b/comm/suite/themes/classic/messenger/icons/folder-newsgroup-new.png
new file mode 100644
index 0000000000..367431db38
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-newsgroup-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-newsgroup.png b/comm/suite/themes/classic/messenger/icons/folder-newsgroup.png
new file mode 100644
index 0000000000..6e72ede3ee
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-newsgroup.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-open.png b/comm/suite/themes/classic/messenger/icons/folder-open.png
new file mode 100644
index 0000000000..b1da23a5a5
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-outbox-open.png b/comm/suite/themes/classic/messenger/icons/folder-outbox-open.png
new file mode 100644
index 0000000000..c7f5f10f22
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-outbox-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-outbox.png b/comm/suite/themes/classic/messenger/icons/folder-outbox.png
new file mode 100644
index 0000000000..6e2963f028
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-outbox.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-search.png b/comm/suite/themes/classic/messenger/icons/folder-search.png
new file mode 100644
index 0000000000..ff887dc2a9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-search.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent-open.png b/comm/suite/themes/classic/messenger/icons/folder-sent-open.png
new file mode 100644
index 0000000000..398d836048
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-sent-share-open.png
new file mode 100644
index 0000000000..50b0f1bd87
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent-share.png b/comm/suite/themes/classic/messenger/icons/folder-sent-share.png
new file mode 100644
index 0000000000..123cb06821
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent.png b/comm/suite/themes/classic/messenger/icons/folder-sent.png
new file mode 100644
index 0000000000..d082a0fd4c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-share-open.png
new file mode 100644
index 0000000000..173b94c2d2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-share.png b/comm/suite/themes/classic/messenger/icons/folder-share.png
new file mode 100644
index 0000000000..76a646b8da
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template-open.png b/comm/suite/themes/classic/messenger/icons/folder-template-open.png
new file mode 100644
index 0000000000..4c7d854ba4
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-template-share-open.png
new file mode 100644
index 0000000000..d5a107e64a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template-share.png b/comm/suite/themes/classic/messenger/icons/folder-template-share.png
new file mode 100644
index 0000000000..da18662eef
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template.png b/comm/suite/themes/classic/messenger/icons/folder-template.png
new file mode 100644
index 0000000000..341773ff90
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash-open.png b/comm/suite/themes/classic/messenger/icons/folder-trash-open.png
new file mode 100644
index 0000000000..ca3a814029
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-trash-share-open.png
new file mode 100644
index 0000000000..dbf554e13c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash-share.png b/comm/suite/themes/classic/messenger/icons/folder-trash-share.png
new file mode 100644
index 0000000000..cc9f9e1390
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash.png b/comm/suite/themes/classic/messenger/icons/folder-trash.png
new file mode 100644
index 0000000000..167ecbb08c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash.png
diff --git a/comm/suite/themes/classic/messenger/icons/info.png b/comm/suite/themes/classic/messenger/icons/info.png
new file mode 100644
index 0000000000..3ce14ddc1a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/info.png
diff --git a/comm/suite/themes/classic/messenger/icons/insecure.png b/comm/suite/themes/classic/messenger/icons/insecure.png
new file mode 100644
index 0000000000..efda0de255
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/insecure.png
diff --git a/comm/suite/themes/classic/messenger/icons/junk.png b/comm/suite/themes/classic/messenger/icons/junk.png
new file mode 100644
index 0000000000..0ae15cd390
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/junk.png
diff --git a/comm/suite/themes/classic/messenger/icons/junkBar.png b/comm/suite/themes/classic/messenger/icons/junkBar.png
new file mode 100644
index 0000000000..e57cedf0b1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/junkBar.png
diff --git a/comm/suite/themes/classic/messenger/icons/junkcol.png b/comm/suite/themes/classic/messenger/icons/junkcol.png
new file mode 100644
index 0000000000..cac03787a8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/junkcol.png
diff --git a/comm/suite/themes/classic/messenger/icons/loading.png b/comm/suite/themes/classic/messenger/icons/loading.png
new file mode 100644
index 0000000000..201d014c1f
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/loading.png
diff --git a/comm/suite/themes/classic/messenger/icons/local-mailhost.png b/comm/suite/themes/classic/messenger/icons/local-mailhost.png
new file mode 100644
index 0000000000..c00da149cb
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/local-mailhost.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-del.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-del.png
new file mode 100644
index 0000000000..00c82a34c2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-del.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png
new file mode 100644
index 0000000000..8e5d289d2e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl.png
new file mode 100644
index 0000000000..a3cd9604c6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-reply.png
new file mode 100644
index 0000000000..c1d6e8f874
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd.png
new file mode 100644
index 0000000000..16b52dc18a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl-reply.png
new file mode 100644
index 0000000000..8b855e20b2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl.png
new file mode 100644
index 0000000000..74aeadaced
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-reply.png
new file mode 100644
index 0000000000..daa3d091f7
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach.png
new file mode 100644
index 0000000000..282da48f9d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-delete-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-delete-offl.png
new file mode 100644
index 0000000000..3c9b999148
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-delete-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl-reply.png
new file mode 100644
index 0000000000..2f21f3d151
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl.png
new file mode 100644
index 0000000000..44b4f81987
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-reply.png
new file mode 100644
index 0000000000..b1d8963076
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd.png
new file mode 100644
index 0000000000..9cbeabb42e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-imapdelete.png b/comm/suite/themes/classic/messenger/icons/message-mail-imapdelete.png
new file mode 100644
index 0000000000..78307c838a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-imapdelete.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-new-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-new-offl.png
new file mode 100644
index 0000000000..822a8a262d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-new-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-new.png b/comm/suite/themes/classic/messenger/icons/message-mail-new.png
new file mode 100644
index 0000000000..9407265785
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-offl-reply.png
new file mode 100644
index 0000000000..a0ebeb9ea8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-offl.png
new file mode 100644
index 0000000000..bf62b12ce2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-reply.png
new file mode 100644
index 0000000000..44c5f29dee
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail.png b/comm/suite/themes/classic/messenger/icons/message-mail.png
new file mode 100644
index 0000000000..e74d08a096
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach-kill-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill-offl.png
new file mode 100644
index 0000000000..8e36e243e5
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach-kill.png b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill.png
new file mode 100644
index 0000000000..110e943507
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-attach-offl.png
new file mode 100644
index 0000000000..d387f75cec
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach.png b/comm/suite/themes/classic/messenger/icons/message-news-attach.png
new file mode 100644
index 0000000000..f5d9d34327
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-kill-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-kill-offl.png
new file mode 100644
index 0000000000..0caac52c20
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-kill-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-kill.png b/comm/suite/themes/classic/messenger/icons/message-news-kill.png
new file mode 100644
index 0000000000..509b52ce86
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new-attach-off.png b/comm/suite/themes/classic/messenger/icons/message-news-new-attach-off.png
new file mode 100644
index 0000000000..9c8a63c70d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new-attach-off.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new-attach.png b/comm/suite/themes/classic/messenger/icons/message-news-new-attach.png
new file mode 100644
index 0000000000..80d814cbbd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new-attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-new-offl.png
new file mode 100644
index 0000000000..0112ed9ce6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new.png b/comm/suite/themes/classic/messenger/icons/message-news-new.png
new file mode 100644
index 0000000000..af2b900a9b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-offl.png
new file mode 100644
index 0000000000..49021f9d1b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news.png b/comm/suite/themes/classic/messenger/icons/message-news.png
new file mode 100644
index 0000000000..b612266e75
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news.png
diff --git a/comm/suite/themes/classic/messenger/icons/messengericons-small.png b/comm/suite/themes/classic/messenger/icons/messengericons-small.png
new file mode 100644
index 0000000000..21fc19fed6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/messengericons-small.png
diff --git a/comm/suite/themes/classic/messenger/icons/messengericons.png b/comm/suite/themes/classic/messenger/icons/messengericons.png
new file mode 100644
index 0000000000..bbb957baab
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/messengericons.png
diff --git a/comm/suite/themes/classic/messenger/icons/new-mail-alert.png b/comm/suite/themes/classic/messenger/icons/new-mail-alert.png
new file mode 100644
index 0000000000..7d3364336c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/new-mail-alert.png
diff --git a/comm/suite/themes/classic/messenger/icons/phishing.png b/comm/suite/themes/classic/messenger/icons/phishing.png
new file mode 100644
index 0000000000..d99a9ea6d4
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/phishing.png
diff --git a/comm/suite/themes/classic/messenger/icons/readcol.png b/comm/suite/themes/classic/messenger/icons/readcol.png
new file mode 100644
index 0000000000..d8dd852326
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/readcol.png
diff --git a/comm/suite/themes/classic/messenger/icons/remote-blocked.png b/comm/suite/themes/classic/messenger/icons/remote-blocked.png
new file mode 100755
index 0000000000..552c93f7a2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/remote-blocked.png
diff --git a/comm/suite/themes/classic/messenger/icons/secure.png b/comm/suite/themes/classic/messenger/icons/secure.png
new file mode 100644
index 0000000000..bcca43a917
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/secure.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-local-new.png b/comm/suite/themes/classic/messenger/icons/server-local-new.png
new file mode 100644
index 0000000000..51e5fd3078
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-local-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-local.png b/comm/suite/themes/classic/messenger/icons/server-local.png
new file mode 100644
index 0000000000..fd8d90dc4b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-local.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-mail-new.png b/comm/suite/themes/classic/messenger/icons/server-mail-new.png
new file mode 100644
index 0000000000..caf9b7896b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-mail-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-mail.png b/comm/suite/themes/classic/messenger/icons/server-mail.png
new file mode 100644
index 0000000000..13e3558d1f
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-mail.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-news-lock.png b/comm/suite/themes/classic/messenger/icons/server-news-lock.png
new file mode 100644
index 0000000000..3822ad4144
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-news-lock.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-news-new.png b/comm/suite/themes/classic/messenger/icons/server-news-new.png
new file mode 100644
index 0000000000..000d538624
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-news-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-news.png b/comm/suite/themes/classic/messenger/icons/server-news.png
new file mode 100644
index 0000000000..ee0a6ddae9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-news.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-remote-lock-new.png b/comm/suite/themes/classic/messenger/icons/server-remote-lock-new.png
new file mode 100644
index 0000000000..0e53edfbf6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-remote-lock-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-remote-lock.png b/comm/suite/themes/classic/messenger/icons/server-remote-lock.png
new file mode 100644
index 0000000000..c7f33db676
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-remote-lock.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-eye.png b/comm/suite/themes/classic/messenger/icons/thread-closed-eye.png
new file mode 100644
index 0000000000..dbe9dd7efc
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-kill.png b/comm/suite/themes/classic/messenger/icons/thread-closed-kill.png
new file mode 100644
index 0000000000..57c530751e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-offl-eye.png b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-eye.png
new file mode 100644
index 0000000000..51a3774223
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-offl-kill.png b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-kill.png
new file mode 100644
index 0000000000..8ab8acaef1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed.png b/comm/suite/themes/classic/messenger/icons/thread-closed.png
new file mode 100644
index 0000000000..bd4cdc117c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-eye.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-eye.png
new file mode 100644
index 0000000000..75630b9545
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-kill.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-kill.png
new file mode 100644
index 0000000000..0e2ae7047a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-eye.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-eye.png
new file mode 100644
index 0000000000..980b55ef67
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-kill.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-kill.png
new file mode 100644
index 0000000000..c74c2d2ea7
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed.png
new file mode 100644
index 0000000000..cf992f5aa1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed.png
diff --git a/comm/suite/themes/classic/messenger/icons/threadcol-threaded.png b/comm/suite/themes/classic/messenger/icons/threadcol-threaded.png
new file mode 100644
index 0000000000..5d3ce7898f
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/threadcol-threaded.png
diff --git a/comm/suite/themes/classic/messenger/icons/threadcol-unthreaded.png b/comm/suite/themes/classic/messenger/icons/threadcol-unthreaded.png
new file mode 100644
index 0000000000..3d1cac5edd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/threadcol-unthreaded.png
diff --git a/comm/suite/themes/classic/messenger/icons/twisty-clsd.png b/comm/suite/themes/classic/messenger/icons/twisty-clsd.png
new file mode 100644
index 0000000000..7d178c3df8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/twisty-clsd.png
diff --git a/comm/suite/themes/classic/messenger/icons/twisty-open.png b/comm/suite/themes/classic/messenger/icons/twisty-open.png
new file mode 100644
index 0000000000..3cfe9ae414
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/twisty-open.png
diff --git a/comm/suite/themes/classic/messenger/mailWindow1.css b/comm/suite/themes/classic/messenger/mailWindow1.css
new file mode 100644
index 0000000000..99b97a8053
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/mailWindow1.css
@@ -0,0 +1,156 @@
+/* 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/messenger.css");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+@import url("chrome://messenger/skin/folderMenus.css");
+@import url("chrome://messenger/skin/folderPane.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
+   ::::: */
+
+#messagepanebox {
+  min-height: 10px;
+  height: 0px;
+}
+
+/* ..... folder pane adjustments ..... */
+
+.folderview-cycler > .toolbarbutton-text {
+  display: none;
+}
+
+.folderview-cycler > .toolbarbutton-icon {
+  margin: 0px;
+}
+
+.folderview-cycler[dir="prev"],
+.folderview-cycler[dir="next"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
+}
+
+.folderview-cycler[dir="next"],
+.folderview-cycler[dir="prev"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
+}
+
+/* ::::: border adjustments for focus ring and joined splitters ::::: */
+
+/* ..... splitter adjustments ..... */
+
+#folderpane-splitter {
+  border-right: none;
+  border-bottom: none;
+  border-left: none;
+  min-width: 5px;
+}
+
+#threadpane-splitter {
+  border: none;
+  min-height: 5px;
+}
+
+#threadpane-splitter[state="collapsed"] {
+  border-bottom: 2px solid;
+}
+
+/* ..... tree adjustments ..... */
+
+#folderTree {
+  border-right: 1px solid;
+  border-right-color: ThreeDShadow;
+  min-width: 1px;
+}
+
+#threadTree {
+  border-bottom: 1px solid;
+  border-bottom-color: ThreeDLightShadow;
+  min-width: 1px;
+}
+
+#threadTree,
+#accountCentralBox {
+  border-left: 1px solid;
+  border-left-color: ThreeDDarkShadow;
+}
+
+#locationIcon {
+  list-style-image: none;
+}
+
+/* ::::: tree focusring ::::: */
+
+.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox {
+  border: 1px dotted ThreeDDarkShadow;
+}
+
+/* ..... message pane adjustments ..... */
+
+#messagepanebox {
+ border-top: 1px solid;
+ border-left: 1px solid;
+ border-top-color: ThreeDDarkShadow;
+ border-left-color: ThreeDDarkShadow;
+}
+
+#msgHeaderView {
+  border-left: none !important;
+}
+
+#messagepane {
+  border: 1px solid -moz-Field;
+  border-right: none;
+}
+
+#messagepanebox[focusring="true"] > #messagepanewrapper > #messagepane {
+  border-color: #000000;
+}
+
+/* ..... tabmail ..... */
+
+tabpanels {
+  /* don't draw tabpanel borders; see also tabbrowser.css */
+  -moz-appearance: none;
+}
+
+.tab-close-button {
+  margin: 0;
+}
+
+.tabmail-tab[type="message"] .tab-icon {
+  margin-top: -2px;
+}
+
+.tabmail-tab[type="folder"][NewMessages="true"],
+.tabmail-tab[type="folder"][IsServer="true"],
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.tabmail-tab:-moz-lwtheme:not([selected="true"]) {
+  opacity: .8;
+}
+
+.tabmail-tab:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+#tabbar-toolbar {
+  -moz-appearance: none;
+  border-top-style: none;
+  border-bottom-style: none;
+  min-height: 0;
+}
diff --git a/comm/suite/themes/classic/messenger/messageBody.css b/comm/suite/themes/classic/messenger/messageBody.css
new file mode 100644
index 0000000000..1e3f73d836
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageBody.css
@@ -0,0 +1,186 @@
+/* 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/. */
+
+/* ===== messageBody.css =================================================
+  == Styles for the body of a mail message.
+  ======================================================================= */
+
+@import url(chrome://communicator/skin/smileys.css);
+@import url(chrome://messenger/skin/messageQuotes.css);
+
+@namespace url("http://www.w3.org/1999/xhtml");
+
+/* :::: message header ::::: */
+
+.header-part1 {
+  background-color: #EFEFEF;
+}
+
+.header-part2,
+.header-part3 {
+  background-color: #DEDEDE;
+}
+
+.headerdisplayname {
+  display: inline;
+  font-weight: bold;
+  white-space: pre;
+}
+
+/* ::::: message text, incl. quotes ::::: */
+
+.moz-text-flowed blockquote,
+.moz-text-plain blockquote {
+  margin: 0;
+}
+
+.moz-text-plain pre {
+  margin: 0;
+  font-family: inherit;
+}
+
+.moz-text-plain[wrap="true"] {
+  white-space: pre-wrap;
+}
+
+.moz-text-plain[wrap="false"] {
+  white-space: pre;
+}
+
+.moz-text-plain[wrap="flow"] .moz-txt-sig {
+  white-space: pre-wrap;
+}
+
+.moz-text-plain[graphical-quote="false"] blockquote {
+  border-style: none;
+  padding: 0;
+}
+
+.moz-text-plain[graphical-quote="true"] .moz-txt-citetags {
+  display: none;
+}
+
+.moz-txt-underscore {
+  text-decoration: underline;
+}
+
+.moz-txt-formfeed {
+  display: block;
+  height: 100%;
+}
+
+/* ::::: signature ::::: */
+
+@media not print {
+  .moz-txt-sig,
+  .moz-signature {
+    opacity: 0.5;
+  }
+
+  .moz-txt-sig .moz-txt-sig,
+  .moz-signature .moz-signature {
+    opacity: 1.0;
+  }
+}
+
+/* ::::: vcard ::::: */
+
+.moz-vcard-table {
+  border-radius: 8px;
+  border: thin solid gray;
+  margin-top: 10px;
+}
+
+.moz-vcard-property {
+  font-size: 80%;
+  color: gray;
+}
+
+.moz-vcard-title-property {
+}
+
+.moz-vcard-badge {
+  height: 30px;
+  width: 30px;
+  display: block;
+  background-image: url("chrome://messenger/skin/icons/messengericons.png");
+  background-position: 0px -270px;
+}
+
+.moz-vcard-badge:hover {
+  background-position: -30px -270px;
+  outline: 1px dotted;
+}
+
+.moz-vcard-badge:hover:active {
+  background-position: -60px -270px;
+}
+
+/* ::::: attached images ::::: */
+.moz-attached-image-container {
+  text-align: center;
+}
+
+.moz-attached-image {
+  image-orientation: from-image;
+}
+
+.moz-attached-image[overflowing="true"] {
+  cursor: zoom-out;
+}
+
+.moz-attached-image[isshrunk="true"] {
+  cursor: zoom-in;
+  max-width: 100%;
+}
+
+/* Old style feeds. */
+#_mailrssiframe {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: none;
+}
+
+/* Attachment display styling (for inline attachments and printing) */
+.mimeAttachmentHeader {
+  border-style: none;
+  border-top: 1px solid gray;
+}
+
+.mimeAttachmentHeaderName {
+  color: gray;
+  font-size: 80%;
+}
+
+.mimeAttachmentWrap {
+  padding: 0 1em;
+}
+
+.mimeAttachmentTable {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+}
+
+.mimeAttachmentTable tr + tr > td {
+  border-top: 1px solid gray;
+}
+
+.mimeAttachmentFile {
+  word-wrap: break-word;
+}
+
+.mimeAttachmentSize {
+  vertical-align: top;
+  width: 10ch;
+  text-align: right;
+}
+
+.mimeAttachmentFile,
+.mimeAttachmentSize {
+  padding: 0.25em 0;
+}
diff --git a/comm/suite/themes/classic/messenger/messageHeader.css b/comm/suite/themes/classic/messenger/messageHeader.css
new file mode 100644
index 0000000000..1d8bcd854d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageHeader.css
@@ -0,0 +1,185 @@
+/* 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/. */
+
+/* ===== messageHeader.css ==============================================
+  == Styles for the header toolbars of a mail message.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: msg header toolbars ::::: */
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  min-width: 1px;
+}
+
+/* ::::: msg header buttons ::::: */
+
+#expandedAttachmentBox {
+  width: 20em;
+  height: 0;
+  list-style-image: url("chrome://messenger/skin/icons/attach.png");
+}
+
+#attachmentText {
+  font-weight: bold;
+}
+
+/* ::::: msg header captions ::::: */
+
+#msgHeaderView {
+  border-right: 1px solid ThreeDShadow;
+  border-left: 1px solid ThreeDShadow;
+}
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  border-bottom: 1px solid ThreeDDarkShadow;
+  min-width: 1px;
+}
+
+.headerNameBox {
+  width: 7.7em;
+}
+
+.headerName {
+  margin-top: 0px;
+  margin-bottom: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: .5em;
+  font-weight: bold;
+  text-align: right;
+}
+
+.headerValue {
+  margin: 0;
+  min-width: 50px;
+  white-space: normal;
+}
+
+.headerValueBox {
+  margin: 0 0 5px;
+}
+
+.headerValueBox[singleline="true"] {
+  overflow: hidden;
+}
+
+.subjectvalue {
+  font-weight: bold;
+}
+
+.tagvalue {
+  margin-top: 0;
+  margin-inline-start: 0;
+}
+
+/* ::::: msg header message ids ::::: */
+
+.messageIdDisplayButton {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.messageIdDisplayButton:hover {
+  color: #FF0000;
+}
+
+.messageIdDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+/* ::::: msg header email addresses ::::: */
+
+.emailDisplayButton {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.emailDisplayButton:hover {
+  color: #FF0000;
+}
+
+.emailDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+mail-emailaddress:-moz-focusring {
+  outline: 1px dotted;
+  outline-offset: -1px;
+}
+
+/* ::::: email address twisty ::::: */
+
+.addresstwisty {
+  margin: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+.addresstwisty[open] {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-open.png");
+}
+
+/* ::::: view expand and collapse twisties  ::::: */
+
+.expandHeaderViewButton,
+.collapsedHeaderViewButton  {
+  margin: 2px .5em 0;
+}
+
+.expandHeaderViewButton {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-open.png");
+}
+
+.collapsedHeaderViewButton  {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+/* ::::: collapsed view styles ::::: */
+
+#collapsedAttachmentBox {
+  -moz-box-pack: center;
+}
+
+#collapseddateValue {
+  margin: 0 .5em;
+  text-align: right;
+}
+
+#collapseddateValue > .textbox-input-box menupopup {
+  text-align: left;
+}
+
+#collapsedfromBox {
+  width: 18em;
+}
+
+#collapseddateBox {
+  width: 12em;
+}
+
+.collapsedHeaderDisplayName {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: .55em;
+  margin-inline-end: .5em;
+  min-height: 16px;
+  font-weight: bold;
+}
+
+.collapsedHeaderValue {
+  margin: 0;
+}
+
+.collapsedAttachmentButton {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
+  margin-inline-end: .5em;
+}
diff --git a/comm/suite/themes/classic/messenger/messageKeywords.css b/comm/suite/themes/classic/messenger/messageKeywords.css
new file mode 100644
index 0000000000..751eb1eb83
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageKeywords.css
@@ -0,0 +1,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/. */
+
+/* distributors / ISPs can use this
+ * to add or override icons and colors to the message pane.
+ * see http://www.mozilla.org/mailnews/arch/messagekeywords.html
+ */
diff --git a/comm/suite/themes/classic/messenger/messageQuotes.css b/comm/suite/themes/classic/messenger/messageQuotes.css
new file mode 100644
index 0000000000..2cbf8f5ba7
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageQuotes.css
@@ -0,0 +1,59 @@
+/* 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/. */
+
+/* Because this sheet is loaded synchronously while the user is waiting for the
+   compose window to appear, it must not @import a ton of other things, and
+   especially must not trigger network access. */
+
+/* ===== messageQuotes.css =================================================
+  == Shared styles such as block quote colors and signature style
+  == between the message body during
+  == message display and the mail editor instance for mail compose.
+  ======================================================================= */
+
+/* workaround for MS Outlook mails where the line-height is set to 0 */
+body {
+  line-height: initial !important;
+}
+
+/* ::::: signature ::::: */
+
+@media not print {
+  div.moz-text-flowed > div.moz-txt-sig,
+  div.moz-text-plain > pre > div.moz-txt-sig,
+  pre.moz-signature {
+    opacity: 0.6;
+  }
+}
+
+/* ::::: Turn on borders and padding for quotes. ::::: */
+blockquote[type=cite] {
+  padding: 0.4ex 1ex;
+  margin: 1ex;
+  border-width: 0px 0px 0px 2px;
+  border-style: none none none solid;
+  border-radius: 2px;
+}
+
+/* ::::: Colorize block quote borders. We only go 5 levels deep. ::::: */
+blockquote[type=cite] {
+  border-color: rgb(114,159,207); /* Sky Blue 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(173,127,168); /* Plum 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(138,226,52); /* Chameleon 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(252,175,62); /* Orange 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(233,185,110); /* Chocolate 1 */
+}
+
diff --git a/comm/suite/themes/classic/messenger/messageWindow.css b/comm/suite/themes/classic/messenger/messageWindow.css
new file mode 100644
index 0000000000..cddd5b4e2e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageWindow.css
@@ -0,0 +1,19 @@
+/* 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/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 {
+  border: 1px outset ThreeDFace !important;
+}
diff --git a/comm/suite/themes/classic/messenger/messenger.css b/comm/suite/themes/classic/messenger/messenger.css
new file mode 100644
index 0000000000..51b99bb76e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messenger.css
@@ -0,0 +1,20 @@
+/* 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/. */
+
+/* ===== messenger.css ==================================================
+  == Styles shared throughout the Messenger application.
+  ======================================================================= */
+
+@import url("chrome://communicator/skin/");
+@import url("chrome://messenger/content/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: lightweight themes ::::: */
+
+#msgHeaderView:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
diff --git a/comm/suite/themes/classic/messenger/messengercompose/messengercompose.css b/comm/suite/themes/classic/messenger/messengercompose/messengercompose.css
new file mode 100644
index 0000000000..762472e2b2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messengercompose/messengercompose.css
@@ -0,0 +1,333 @@
+/* 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/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);
+}
+
+#button-send:hover {
+  -moz-image-region: rect(330px 59px 359px 30px);
+}
+
+#button-send:hover:active {
+  -moz-image-region: rect(330px 89px 359px 60px);
+}
+
+#button-send[disabled="true"] {
+  -moz-image-region: rect(330px 119px 359px 90px) !important;
+}
+
+#button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(270px 29px 299px 0);
+}
+
+#button-address:hover {
+  -moz-image-region: rect(270px 59px 299px 30px);
+}
+
+#button-address:hover:active {
+  -moz-image-region: rect(270px 89px 299px 60px);
+}
+
+#button-address[disabled="true"] {
+  -moz-image-region: rect(270px 119px 299px 90px) !important;
+}
+
+#button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(300px 29px 329px 0);
+}
+
+#button-attach:hover {
+  -moz-image-region: rect(300px 59px 329px 30px);
+}
+
+#button-attach:hover:active {
+  -moz-image-region: rect(300px 89px 329px 60px);
+}
+
+#button-attach[disabled="true"] {
+  -moz-image-region: rect(300px 119px 329px 90px) !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#spellingButton:hover {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#spellingButton:hover:active {
+  -moz-image-region: rect(240px 89px 269px 60px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(240px 119px 269px 90px) !important;
+}
+
+#button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-save:hover {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#button-save:hover:active {
+  -moz-image-region: rect(210px 89px 239px 60px);
+}
+
+#button-save[disabled="true"] {
+  -moz-image-region: rect(210px 119px 239px 90px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-send,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-send {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(220px 19px 239px 0);
+}
+
+toolbar[iconsize="small"] > #button-send:hover {
+  -moz-image-region: rect(220px 39px 239px 20px);
+}
+
+toolbar[iconsize="small"] > #button-send:hover:active {
+  -moz-image-region: rect(220px 59px 239px 40px);
+}
+
+toolbar[iconsize="small"] > #button-send[disabled="true"] {
+  -moz-image-region: rect(220px 79px 239px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-address,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(180px 19px 199px 0);
+}
+
+toolbar[iconsize="small"] > #button-address:hover {
+  -moz-image-region: rect(180px 39px 199px 20px);
+}
+
+toolbar[iconsize="small"] > #button-address:hover:active {
+  -moz-image-region: rect(180px 59px 199px 40px);
+}
+
+toolbar[iconsize="small"] > #button-address[disabled="true"] {
+  -moz-image-region: rect(180px 79px 199px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-attach,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(200px 19px 219px 0);
+}
+
+toolbar[iconsize="small"] > #button-attach:hover {
+  -moz-image-region: rect(200px 39px 219px 20px);
+}
+
+toolbar[iconsize="small"] > #button-attach:hover:active {
+  -moz-image-region: rect(200px 59px 219px 40px);
+}
+
+toolbar[iconsize="small"] > #button-attach[disabled="true"] {
+  -moz-image-region: rect(200px 79px 219px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #spellingButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover:active {
+  -moz-image-region: rect(160px 59px 179px 40px);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(160px 79px 179px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-save,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #button-save:hover {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-save:hover:active {
+  -moz-image-region: rect(140px 59px 159px 40px);
+}
+
+toolbar[iconsize="small"] > #button-save[disabled="true"] {
+  -moz-image-region: rect(140px 79px 159px 60px) !important;
+}
+
+/* ::::: special toolbar colors ::::: */
+
+#content-frame {
+  border-left: 1px solid ThreeDDarkShadow;
+  border-right: 1px solid ThreeDLightShadow;
+}
+
+#appcontent {
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+}
+
+#attachmentbucket-sizer {
+  border-top: none;
+  border-bottom: none;
+}
+
+#compose-toolbar-sizer {
+  border-top-width: 1px;
+  border-left: none;
+  border-right: none;
+  border-top-color: ThreeDHighlight;
+}
+
+#msgSubject {
+  margin-top: 0px;
+  margin-bottom: 4px;
+}
+
+#MsgHeadersToolbar {
+  min-height: 0px; /* this undoes the min-height in toolbar.css */
+}
+
+/* ::::: autocomplete icons ::::: */
+
+treechildren::-moz-tree-cell-text(default-match) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 15px;
+  margin-inline-end: -3px;
+  border: none;
+}
+
+treechildren::-moz-tree-image(local-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -1px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+}
+
+treechildren::-moz-tree-image(remote-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+}
+
+treechildren::-moz-tree-image(remote-err) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
+}
+
+treechildren::-moz-tree-image(subscribed-news) {
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+/* ::::: compact menulists ::::: */
+
+.menulist-compact {
+  -moz-binding: url("chrome://messenger/content/messengercompose/menulistCompactBindings.xml#menulist-compact");
+  -moz-appearance: none;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0;
+  border: 1px solid;
+  border-top-color: ThreeDLightShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDLightShadow;
+  background-color: ThreeDFace;
+  color: ButtonText;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+.menulist-compact[open="true"] {
+  border-top-color: ThreeDDarkShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDDarkShadow;
+}
+
+.menulist-compact[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+.menulist-compact > .menulist-label-box > .menulist-label {
+  margin: 0 3px !important;
+  text-align: end;
+}
+
+.menulist-compact > .menulist-label-box > .menulist-icon {
+  margin-inline-start: 2px;
+}
+
+.menulist-compact > .menulist-label-box,
+.menulist-compact[open="true"]:focus > .menulist-label-box {
+  -moz-appearance: none;
+  border: 1px solid transparent;
+  background: transparent;
+  color: inherit;
+}
+
+.menulist-compact:-moz-focusring > .menulist-label-box {
+  border: 1px dotted;
+}
+
+#FontFaceSelect {
+  max-width: 35ch;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#MsgHeadersToolbar:-moz-lwtheme,
+#FormatToolbar:-moz-lwtheme,
+#compose-toolbar-sizer:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
+
+#MsgHeadersToolbar textbox:-moz-lwtheme,
+#MsgHeadersToolbar menulist:-moz-lwtheme,
+.formatting-button > menulist:-moz-lwtheme {
+  opacity: 1;
+}
diff --git a/comm/suite/themes/classic/messenger/msgSelectOffline.css b/comm/suite/themes/classic/messenger/msgSelectOffline.css
new file mode 100644
index 0000000000..bc24e7b606
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/msgSelectOffline.css
@@ -0,0 +1,32 @@
+/* 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/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/dot.png");
+}
+
+treechildren::-moz-tree-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+treechildren::-moz-tree-image(syncCol, isServer-true) {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}
diff --git a/comm/suite/themes/classic/messenger/newmailalert.css b/comm/suite/themes/classic/messenger/newmailalert.css
new file mode 100644
index 0000000000..e1d7a0fa26
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/newmailalert.css
@@ -0,0 +1,67 @@
+/* -*- 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/. */
+
+/* ===== alert.css =====================================================
+  == Styles specific to the alerts dialog.
+  ======================================================================= */
+
+@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;
+}
+
+#alertImage {
+  list-style-image: url("chrome://branding/content/icon64.png");
+}
+
+#alertImageBox {
+  padding: 4px;
+}
+
+#alertTitle {
+  font-weight: bold;
+}
+
+#alertTextBox {
+  padding: 4px;
+  padding-inline-end: 16px;
+}
+
+.folderSummary-message-row
+{
+  /* This max width ends up dictating the overall width of the alert window
+     because it controls how large the preview, subject and sender text can be
+     before cropping kicks in */
+  max-width: 450px;
+  padding: 0px 5px;
+}
+
+.folderSummary-subject {
+  font-weight: bold;
+}
+
+.folderSummary-sender, .folderSummary-subject {
+  cursor: inherit;
+}
+
+.folderSummary-previewText {
+  color: grey;
+}
+
+.folderSummaryMessage:hover > .folderSummary-message-row {
+  cursor: pointer;
+  color: blue;
+}
+
+#closeButton {
+  list-style-image: url("chrome://navigator/skin/icons/close.png");
+  -moz-appearance: none;
+  border: none !important;
+  padding: 2px 0px 0px;
+}
diff --git a/comm/suite/themes/classic/messenger/newsblog/feed-subscriptions.css b/comm/suite/themes/classic/messenger/newsblog/feed-subscriptions.css
new file mode 100644
index 0000000000..12d91ab08e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/newsblog/feed-subscriptions.css
@@ -0,0 +1,30 @@
+/* -*- 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/. */
+
+/* ::::: Feed Subscription styling :::::: */
+
+#subscriptionsDialog {
+  width: 40em;
+  height: 30em;
+}
+
+#contentPane {
+  padding: 14px;
+}
+
+#rssFeedInfoBox {
+  border: 1px solid ThreeDShadow;
+  margin: 4px;
+  padding-top: 4px;
+  background-color: ThreeDLightShadow;
+}
+
+#statusContainerBox {
+  height: 24px;
+}
+
+#autotagPrefix {
+  width: 35ch;
+}
diff --git a/comm/suite/themes/classic/messenger/newsblog/rss-feed.png b/comm/suite/themes/classic/messenger/newsblog/rss-feed.png
new file mode 100644
index 0000000000..aef600bf35
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/newsblog/rss-feed.png
diff --git a/comm/suite/themes/classic/messenger/prefPanels.css b/comm/suite/themes/classic/messenger/prefPanels.css
new file mode 100644
index 0000000000..f01b406d98
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/prefPanels.css
@@ -0,0 +1,21 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Tags ::::: */
+
+#tagList > listhead {
+  text-align: center;
+}
+
+#tagList > listitem > listcell {
+  padding: 0 16px;
+}
diff --git a/comm/suite/themes/classic/messenger/primaryToolbar.css b/comm/suite/themes/classic/messenger/primaryToolbar.css
new file mode 100644
index 0000000000..baae8199db
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/primaryToolbar.css
@@ -0,0 +1,572 @@
+/* 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/. */
+
+/* ===== primaryToolbar.css =============================================
+  == Images for the Mail primary toolbar.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-getmsg:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+} 
+
+#button-getmsg:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+} 
+
+#button-getmsg[disabled] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+} 
+
+#button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmsg:hover {
+  -moz-image-region: rect(150px 59px 179px 30px);
+} 
+
+#button-newmsg:hover:active {
+  -moz-image-region: rect(150px 89px 179px 60px);
+} 
+
+#button-newmsg[disabled] {
+  -moz-image-region: rect(150px 119px 179px 90px) !important;
+} 
+
+#button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-reply:hover {
+  -moz-image-region: rect(210px 59px 239px 30px);
+} 
+
+#button-reply:hover:active {
+  -moz-image-region: rect(210px 89px 239px 60px);
+} 
+
+#button-reply[disabled] {
+  -moz-image-region: rect(210px 119px 239px 90px) !important;
+} 
+
+#button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#button-replyall:hover {
+  -moz-image-region: rect(240px 59px 269px 30px);
+} 
+
+#button-replyall:hover:active {
+  -moz-image-region: rect(240px 89px 269px 60px);
+} 
+
+#button-replyall[disabled] {
+  -moz-image-region: rect(240px 119px 269px 90px) !important;
+} 
+
+#button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-forward:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+} 
+
+#button-forward:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+} 
+
+#button-forward[disabled] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+} 
+
+#button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-file:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-file:hover:active,
+#button-file[open] {
+  -moz-image-region: rect(30px 89px 59px 60px);
+} 
+
+#button-file[disabled] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+} 
+
+#button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-goback:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#button-goback:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#button-goback[disabled="true"] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+}
+
+#button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-goforward:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#button-goforward:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#button-goforward[disabled="true"] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+}
+
+#button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(180px 29px 209px 0);
+}
+
+#button-next:hover {
+  -moz-image-region: rect(180px 59px 209px 30px);
+} 
+
+#button-next:hover:active {
+  -moz-image-region: rect(180px 89px 209px 60px);
+} 
+
+#button-next[disabled] {
+  -moz-image-region: rect(180px 119px 209px 90px) !important;
+} 
+
+#button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#button-delete:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-delete:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#button-delete[disabled] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+toolbarpaletteitem > #button-delete {
+  display: -moz-box;
+}
+
+#button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#button-mark:hover {
+  -moz-image-region: rect(120px 59px 149px 30px);
+} 
+
+#button-mark:hover:active {
+  -moz-image-region: rect(120px 89px 149px 60px);
+} 
+
+#button-mark[disabled] {
+  -moz-image-region: rect(120px 119px 149px 90px) !important;
+} 
+
+#button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(360px 29px 389px 0);
+}
+
+#button-junk:hover {
+  -moz-image-region: rect(360px 59px 389px 30px);
+}
+
+#button-junk:hover:active {
+  -moz-image-region: rect(360px 89px 389px 60px);
+}
+
+#button-junk[disabled="true"] {
+  -moz-image-region: rect(360px 119px 389px 90px) !important;
+}
+
+#button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-stop:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-stop:hover:active {
+  -moz-image-region: rect(30px 89px 59px 60px);
+}
+
+#button-stop[disabled="true"] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+#locationFolders {
+  width: 22em;
+}
+
+/* Force the folder location and mail view items to fit in the available width
+   in the Customize Toolbar dialog. */
+#palette-box #locationFolders,
+#palette-box #folder-location-container,
+#palette-box #searchInput,
+#palette-box #button-search-container,
+#palette-box #button-search,
+#palette-box #mailviews-container,
+#palette-box #viewPicker {
+  -moz-box-flex: 1;
+}
+
+#viewPickerPopup > menuitem > .menu-iconic-left,
+#viewPickerPopup > menu > menupopup > menuitem > .menu-iconic-left {
+  display: -moz-box !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-getmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-getmsg:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-getmsg:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #button-getmsg[disabled] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #button-newmsg:hover {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmsg:hover:active {
+  -moz-image-region: rect(100px 59px 119px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newmsg[disabled] {
+  -moz-image-region: rect(100px 79px 119px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-reply,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #button-reply:hover {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-reply:hover:active {
+  -moz-image-region: rect(140px 59px 159px 40px);
+}
+
+toolbar[iconsize="small"] > #button-reply[disabled] {
+  -moz-image-region: rect(140px 79px 159px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-replyall,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #button-replyall:hover {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #button-replyall:hover:active {
+  -moz-image-region: rect(160px 59px 179px 40px);
+}
+
+toolbar[iconsize="small"] > #button-replyall[disabled] {
+  -moz-image-region: rect(160px 79px 179px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-forward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-forward:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-forward:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #button-forward[disabled] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-file,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-file:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-file:hover:active,
+toolbar[iconsize="small"] > #button-file[open] {
+  -moz-image-region: rect(20px 59px 39px 40px);
+} 
+
+toolbar[iconsize="small"] > #button-file[disabled] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-goback,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-goback:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goback:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #button-goback[disabled="true"] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-goforward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-goforward:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goforward:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-next,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(120px 19px 139px 0);
+}
+
+toolbar[iconsize="small"] > #button-next:hover {
+  -moz-image-region: rect(120px 39px 139px 20px);
+}
+
+toolbar[iconsize="small"] > #button-next:hover:active {
+  -moz-image-region: rect(120px 59px 139px 40px);
+}
+
+toolbar[iconsize="small"] > #button-next[disabled] {
+  -moz-image-region: rect(120px 79px 139px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-delete,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #button-delete:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-delete:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #button-delete[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete[disabled] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-mark,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #button-mark:hover {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #button-mark:hover:active {
+  -moz-image-region: rect(80px 59px 99px 40px);
+}
+
+toolbar[iconsize="small"] > #button-mark[disabled] {
+  -moz-image-region: rect(80px 79px 99px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-junk,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(240px 19px 259px 0);
+}
+
+toolbar[iconsize="small"] > #button-junk:hover {
+  -moz-image-region: rect(240px 39px 259px 20px);
+}
+
+toolbar[iconsize="small"] > #button-junk:hover:active {
+  -moz-image-region: rect(240px 59px 259px 40px);
+}
+
+toolbar[iconsize="small"] > #button-junk[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
+  -moz-image-region: rect(240px 79px 259px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-stop,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-stop:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-stop:hover:active {
+  -moz-image-region: rect(20px 59px 39px 40px);
+}
+
+toolbar[iconsize="small"] > #button-stop[disabled="true"] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+/* ::::: Lightning icon sizes ::::: */
+
+#lightning-button-calendar > .toolbarbutton-icon,
+#lightning-button-tasks > .toolbarbutton-icon,
+#extractEventButton > .toolbarbutton-icon,
+#extractTaskButton > .toolbarbutton-icon,
+#extractEventButton > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 29px;
+  height: 29px;
+}
+
+toolbar[iconsize="small"] > #lightning-button-calendar > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #lightning-button-tasks > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractEventButton > .box-inherit > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 19px;
+  height: 19px;
+}
+
+#lightning-button-calendar[disabled="true"] > .toolbarbutton-icon,
+#lightning-button-tasks[disabled="true"] > .toolbarbutton-icon,
+#extractEventButton[disabled="true"] > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton[disabled="true"] > .box-inherit > .toolbarbutton-icon {
+  opacity: 0.3;
+}
+
+/* ::::: message notification bar style rules ::::: */
+
+.msgNotificationBar {
+  border-bottom: 1px solid;
+  border-bottom-color: #000000;
+  -moz-appearance: toolbox;
+  background-color: #C7BC8F;
+  color: black;
+}
+
+.msgNotificationBar:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.messageImage[value="remoteContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/remote-blocked.png");
+}
+
+.messageImage[value="junkContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/junk.png");
+}
+
+.messageImage[value="phishingContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/phishing.png");
+}
+
+.messageImage[value="mdnContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/info.png");
+}
diff --git a/comm/suite/themes/classic/messenger/searchDialog.css b/comm/suite/themes/classic/messenger/searchDialog.css
new file mode 100644
index 0000000000..49774465b6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/searchDialog.css
@@ -0,0 +1,57 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: box sizes ::::: */
+
+#searchTermTree {
+  min-height: 50px;
+}
+
+#searchTermListBox {
+  height: 100px;
+}
+
+#searchResultListBox {
+  margin: 5px;
+  height: 100px;
+}
+
+#searchAddressBookWindow,
+#searchMailWindow {
+  padding: 0px;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+menulist:not(#menuSearchLocalSystem) {
+  width: 12em;
+}
+
+menulist:not(#menuSearchLocalSystem) > menupopup > menuitem {
+  padding-inline-end: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+.filler {
+  padding-inline-end: 22px;
+}
+
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
diff --git a/comm/suite/themes/classic/messenger/smime/certFetchingStatus.css b/comm/suite/themes/classic/messenger/smime/certFetchingStatus.css
new file mode 100644
index 0000000000..9638e0879d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/certFetchingStatus.css
@@ -0,0 +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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoNotOk.png
new file mode 100644
index 0000000000..32e871e0f8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoOk.png
new file mode 100644
index 0000000000..5fa57bdb10
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrSignNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrSignNotOk.png
new file mode 100644
index 0000000000..8db53b65c2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrSignNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrSignOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrSignOk.png
new file mode 100644
index 0000000000..232b7e6f34
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrSignOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrSignUnknown.png b/comm/suite/themes/classic/messenger/smime/icons/hdrSignUnknown.png
new file mode 100644
index 0000000000..d4befb2256
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrSignUnknown.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbCryptoNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoNotOk.png
new file mode 100644
index 0000000000..1a69247ad6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbCryptoOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoOk.png
new file mode 100644
index 0000000000..1c80d511d3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbSignNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbSignNotOk.png
new file mode 100644
index 0000000000..d34feafdb3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbSignNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbSignOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbSignOk.png
new file mode 100644
index 0000000000..addaf488e3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbSignOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbSignUnknown.png b/comm/suite/themes/classic/messenger/smime/icons/sbSignUnknown.png
new file mode 100644
index 0000000000..0127c147ec
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbSignUnknown.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/smimeicons-small.png b/comm/suite/themes/classic/messenger/smime/icons/smimeicons-small.png
new file mode 100644
index 0000000000..a0b4e9841e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/smimeicons-small.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/smimeicons.png b/comm/suite/themes/classic/messenger/smime/icons/smimeicons.png
new file mode 100644
index 0000000000..e850adc565
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/smimeicons.png
diff --git a/comm/suite/themes/classic/messenger/smime/msgCompSMIMEOverlay.css b/comm/suite/themes/classic/messenger/smime/msgCompSMIMEOverlay.css
new file mode 100644
index 0000000000..76569981b1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgCompSMIMEOverlay.css
@@ -0,0 +1,75 @@
+/* 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/. */
+
+/* ===== msgCompSMIMEOverlay.css ========================================
+  == Styles for the S/Mime in composer window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons.png");
+  -moz-image-region: rect(0 29px 29px 0px);
+}
+
+#button-security:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-security:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+} 
+
+#button-security[disabled] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+toolbar[iconsize="small"] > #button-security,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons-small.png");
+  -moz-image-region: rect(0 19px 19px 0px);
+}
+
+toolbar[iconsize="small"] > #button-security:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-security:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #button-security[disabled] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+#msgcomposeWindow #signing-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[signing="ok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[signing="notok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+  visibility: visible;
+}
+
+
+#msgcomposeWindow #encryption-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[crypto="ok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[crypto="notok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+  visibility: visible;
+}
diff --git a/comm/suite/themes/classic/messenger/smime/msgCompSecurityInfo.css b/comm/suite/themes/classic/messenger/smime/msgCompSecurityInfo.css
new file mode 100644
index 0000000000..170c162340
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgCompSecurityInfo.css
@@ -0,0 +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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/classic/messenger/smime/msgHdrViewSMIMEOverlay.css b/comm/suite/themes/classic/messenger/smime/msgHdrViewSMIMEOverlay.css
new file mode 100644
index 0000000000..9e4cdd72af
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgHdrViewSMIMEOverlay.css
@@ -0,0 +1,45 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#signedHdrIcon {
+  list-style-image: none;
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="ok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignOk.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="unknown"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignUnknown.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="mismatch"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignUnknown.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="notok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignNotOk.png");
+  visibility: visible;
+}
+
+#encryptedHdrIcon {
+  list-style-image: none;
+  visibility: visible;
+}
+
+#encryptedHdrIcon[encrypted="ok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrCryptoOk.png");
+  visibility: visible;
+}
+
+#encryptedHdrIcon[encrypted="notok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrCryptoNotOk.png");
+  visibility: visible;
+}
diff --git a/comm/suite/themes/classic/messenger/smime/msgReadSMIMEOverlay.css b/comm/suite/themes/classic/messenger/smime/msgReadSMIMEOverlay.css
new file mode 100644
index 0000000000..8633a4c09d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgReadSMIMEOverlay.css
@@ -0,0 +1,37 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status-bar #signed-status {
+  list-style-image: none;
+}
+
+#status-bar[signed="ok"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+}
+
+#status-bar[signed="unknown"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#status-bar[signed="mismatch"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#status-bar[signed="notok"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+}
+
+#status-bar #encrypted-status {
+  list-style-image: none;
+}
+
+#status-bar[encrypted="ok"] #encrypted-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+}
+
+#status-bar[encrypted="notok"] #encrypted-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+}
diff --git a/comm/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css b/comm/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css
new file mode 100644
index 0000000000..7ca95f7b04
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css
@@ -0,0 +1,27 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#signatureLabel {
+  font-weight: bold;
+}
+
+#signatureCert {
+  margin: 5px;
+}
+
+#encryptionLabel {
+  font-weight: bold;
+}
+
+#encryptionCert {
+  margin: 5px;
+}
diff --git a/comm/suite/themes/classic/messenger/start.css b/comm/suite/themes/classic/messenger/start.css
new file mode 100644
index 0000000000..059a488a2e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/start.css
@@ -0,0 +1,40 @@
+/* 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/. */
+
+/* ===== start.css =====================================================
+   == Styles used by the mailnews start page.
+   ======================================================================= */
+
+body {
+  margin: 0;
+  padding: 0;
+  background: url("chrome://branding/content/messenger-start-bg.png") no-repeat fixed center 3em;
+  background-size: auto 85%;
+}
+
+h1 {
+  background: url("chrome://branding/content/messenger-start-hdr.png") repeat-x bottom;
+  border-bottom: 2px solid #26269A;
+  font-size: 1.5em;
+  padding: 0.25em 0.67em; /* 0.67*1.5=1, so fit with 1em below */
+  margin: 0;
+}
+
+#main {
+  margin: 0 1em;
+}
+
+p {
+  margin: 0.5em 0;
+}
+
+h2 {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+ul {
+  margin: 0.5em 0;
+}
+
diff --git a/comm/suite/themes/classic/messenger/subscribe.css b/comm/suite/themes/classic/messenger/subscribe.css
new file mode 100644
index 0000000000..f7ff21f403
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/subscribe.css
@@ -0,0 +1,70 @@
+/* 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/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;
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(subscribedColumn, subscribed-true),
+treechildren::-moz-tree-image(subscribedColumn2, subscribed-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+treechildren::-moz-tree-image(subscribedColumn, subscribable-false) {
+  list-style-image: none;
+}
+
+treechildren::-moz-tree-cell-text(nameColumn, subscribable-false) {
+  color: gray;
+  font-style: italic;
+}
+
+/* ::::: folder icons :::::: */
+
+treechildren::-moz-tree-image(nameColumn) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+treechildren::-moz-tree-image(nameColumn, serverType-nntp),
+treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+/* ::::: server icons :::::: */
+
+.subscribeMenuItem {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.subscribeMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+/* ::::: statusbar adjustments :::::: */
+
+#statusContainerBox {
+  margin: 0px 4px;
+}
diff --git a/comm/suite/themes/classic/messenger/threadPane.css b/comm/suite/themes/classic/messenger/threadPane.css
new file mode 100644
index 0000000000..6eb11439cd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/threadPane.css
@@ -0,0 +1,352 @@
+/* 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/. */
+
+/* ===== threadPane.css ==============================================
+  == Styles for the thread pane in the Messenger 3-pane window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: thread decoration ::::: */
+
+treechildren::-moz-tree-cell-text(read) {
+  font-weight: normal;
+}
+
+treechildren::-moz-tree-cell-text(unread) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(imapdeleted) {
+  text-decoration: line-through;
+}
+
+/* on a collapsed thread, if the top level message is read, but the thread has
+ * unread children, underline the text.  4.x mac did this, very slick 
+ */
+treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
+  text-decoration: underline;
+}
+
+/* ::::: priority colors ::::: */
+/****
+ ****  Priority colors currently not being used at the moment.  It has been
+ ****  disabled so as to not conflict with the labels color feature.
+ ****
+treechildren::-moz-tree-cell-text(priorityCol, priority-highest) {
+  color: red;
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-high) {
+  color: rgb(128, 0, 0);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-lowest) {
+  color: rgb(170, 170, 170);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-low) {
+  color: rgb(85, 85, 85);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, selected) {
+  color: -moz-DialogText;
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, selected, focus) {
+  color: HighlightText;
+}
+ ****/
+
+/* ::::: message icons ::::: */
+
+/* ::::: message column icons ::::: */
+
+/* ..... thread column ..... */
+
+.threadColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-unthreaded.png");
+}
+
+.threadColumnHeader[sortDirection="ascending"]  {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-threaded.png");
+}
+
+.threadColumnHeader[sortDirection="descending"] {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-threaded.png");
+}
+
+treechildren::-moz-tree-image(threadCol, container) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed.png");
+}
+
+treechildren::-moz-tree-image(threadCol, container, hasUnread) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed.png");
+}
+
+/* ..... read column ..... */
+
+.readColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/readcol.png");
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
+  list-style-image: url("chrome://messenger/skin/icons/readcol.png");
+}
+
+/* ..... attachment column ..... */
+
+.attachmentColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment.png");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach, focus, selected) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-selected.png");
+}
+
+/* ..... flag column ..... */
+
+.flagColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/flagcol.png");
+}
+
+treechildren::-moz-tree-image(flaggedCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(flaggedCol, flagged) {
+  list-style-image: url("chrome://messenger/skin/icons/flagcol.png");
+}
+
+/* ..... junkStatus column ..... */
+
+.junkStatusHeader {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+/* "unknown" now looks like "not junk".  see bug #182386 */
+treechildren::-moz-tree-image(junkStatusCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+treechildren::-moz-tree-image(junkStatusCol, junk) {
+  list-style-image: url("chrome://messenger/skin/icons/junkcol.png");
+}
+
+treechildren::-moz-tree-image(junkStatusCol, notjunk) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+/* ..... subject column, tab and menuitem icons ..... */
+
+.icon-holder[type="message"],
+treechildren::-moz-tree-image(subjectCol) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail.png");
+}
+
+treechildren::-moz-tree-image(subjectCol) {
+  margin-inline-end: 2px;
+}
+
+treechildren::-moz-tree-image(subjectCol, new) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-reply.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-reply.png");
+}
+
+.icon-holder[type="message"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-reply.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-reply.png");
+}
+
+.icon-holder[type="message"][IMAPDeleted="true"],
+treechildren::-moz-tree-image(subjectCol, imapdeleted) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.png");
+}
+
+.icon-holder[type="message"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, new, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offl-reply.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-offl-reply.png");
+}
+
+.icon-holder[type="message"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl-reply.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-offl-reply.png");
+}
+
+.icon-holder[type="message"][IMAPDeleted="true"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, imapdeleted, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-delete-offl.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"],
+.icon-holder[type="message"][MessageType="nntp"],
+treechildren::-moz-tree-image(subjectCol, rss),
+treechildren::-moz-tree-image(subjectCol, news) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, new),
+treechildren::-moz-tree-image(subjectCol, news, new) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach-off.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, news, new, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-offl.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, rss, offline),
+treechildren::-moz-tree-image(subjectCol, news, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offl.png");
+}
+
+/* ..... new thread icons for watch and ignore ..... */
+
+treechildren::-moz-tree-image(news, threadCol, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-kill.png");
+}
+
+#sizeCol,
+#unreadCol,
+#totalCol {
+  text-align: right;
+}
diff --git a/comm/suite/themes/classic/messenger/threadPaneExtras.css b/comm/suite/themes/classic/messenger/threadPaneExtras.css
new file mode 100644
index 0000000000..7ac07445a1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/threadPaneExtras.css
@@ -0,0 +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/. */
+
+/* distributors / ISPs can override this to override thread pane icons.
+ * see http://www.mozilla.org/mailnews/arch/threadpaneextras.html
+ */
diff --git a/comm/suite/themes/classic/messenger/threadPaneLabels.css b/comm/suite/themes/classic/messenger/threadPaneLabels.css
new file mode 100644
index 0000000000..21060b4a2c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/threadPaneLabels.css
@@ -0,0 +1,527 @@
+/* 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/. */
+
+/* ===== threadPaneLabels.css ===========================================
+   == Styles for the thread pane in the Messenger 3-pane window.
+   ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: thread labels decoration ::::: */
+
+/* There are 10x7 color definitions (size of the color picker used)
+   times 2 (2 style definitions for each color) +  2 general black
+   and white color definitions.
+   The color definitions can be in the following formats:
+     color: red;
+     color: #FF0000;
+     color: rgb(128, 0, 0);
+*/
+treechildren::-moz-tree-cell-text(lc-FFFFFF), .lc-FFFFFF:not([_moz-menuactive]) {
+  color: #FFFFFF
+}
+treechildren::-moz-tree-row(lc-FFFFFF, selected, focus), .lc-FFFFFF[_moz-menuactive] {
+  background-color: #FFFFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-CCCCCC), .lc-CCCCCC:not([_moz-menuactive]) {
+  color: #CCCCCC
+}
+treechildren::-moz-tree-row(lc-CCCCCC, selected, focus), .lc-CCCCCC[_moz-menuactive] {
+  background-color: #CCCCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-C0C0C0), .lc-C0C0C0:not([_moz-menuactive]) {
+  color: #C0C0C0
+}
+treechildren::-moz-tree-row(lc-C0C0C0, selected, focus), .lc-C0C0C0[_moz-menuactive] {
+  background-color: #C0C0C0;
+}
+
+treechildren::-moz-tree-cell-text(lc-999999), .lc-999999:not([_moz-menuactive]) {
+  color: #999999
+}
+treechildren::-moz-tree-row(lc-999999, selected, focus), .lc-999999[_moz-menuactive] {
+  background-color: #999999;
+}
+
+treechildren::-moz-tree-cell-text(lc-666666), .lc-666666:not([_moz-menuactive]) {
+  color: #666666
+}
+treechildren::-moz-tree-row(lc-666666, selected, focus), .lc-666666[_moz-menuactive] {
+  background-color: #666666;
+}
+
+treechildren::-moz-tree-cell-text(lc-333333), .lc-333333:not([_moz-menuactive]) {
+  color: #333333
+}
+treechildren::-moz-tree-row(lc-333333, selected, focus), .lc-333333[_moz-menuactive] {
+  background-color: #333333;
+}
+
+treechildren::-moz-tree-cell-text(lc-000000), .lc-000000:not([_moz-menuactive]) {
+  color: #000000
+}
+treechildren::-moz-tree-row(lc-000000, selected, focus), .lc-000000[_moz-menuactive] {
+  background-color: #000000;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCCCC), .lc-FFCCCC:not([_moz-menuactive]) {
+  color: #FFCCCC
+}
+treechildren::-moz-tree-row(lc-FFCCCC, selected, focus), .lc-FFCCCC[_moz-menuactive] {
+  background-color: #FFCCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF6666), .lc-FF6666:not([_moz-menuactive]) {
+  color: #FF6666
+}
+treechildren::-moz-tree-row(lc-FF6666, selected, focus), .lc-FF6666[_moz-menuactive] {
+  background-color: #FF6666;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF0000), .lc-FF0000:not([_moz-menuactive]) {
+  color: #FF0000
+}
+treechildren::-moz-tree-row(lc-FF0000, selected, focus), .lc-FF0000[_moz-menuactive] {
+  background-color: #FF0000;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC0000), .lc-CC0000:not([_moz-menuactive]) {
+  color: #CC0000
+}
+treechildren::-moz-tree-row(lc-CC0000, selected, focus), .lc-CC0000[_moz-menuactive] {
+  background-color: #CC0000;
+}
+
+treechildren::-moz-tree-cell-text(lc-990000), .lc-990000:not([_moz-menuactive]) {
+  color: #990000
+}
+treechildren::-moz-tree-row(lc-990000, selected, focus), .lc-990000[_moz-menuactive] {
+  background-color: #990000;
+}
+
+treechildren::-moz-tree-cell-text(lc-660000), .lc-660000:not([_moz-menuactive]) {
+  color: #660000
+}
+treechildren::-moz-tree-row(lc-660000, selected, focus), .lc-660000[_moz-menuactive] {
+  background-color: #660000;
+}
+
+treechildren::-moz-tree-cell-text(lc-330000), .lc-330000:not([_moz-menuactive]) {
+  color: #330000
+}
+treechildren::-moz-tree-row(lc-330000, selected, focus), .lc-330000[_moz-menuactive] {
+  background-color: #330000;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCC99), .lc-FFCC99:not([_moz-menuactive]) {
+  color: #FFCC99
+}
+treechildren::-moz-tree-row(lc-FFCC99, selected, focus), .lc-FFCC99[_moz-menuactive] {
+  background-color: #FFCC99;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF9966), .lc-FF9966:not([_moz-menuactive]) {
+  color: #FF9966
+}
+treechildren::-moz-tree-row(lc-FF9966, selected, focus), .lc-FF9966[_moz-menuactive] {
+  background-color: #FF9966;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF9900), .lc-FF9900:not([_moz-menuactive]) {
+  color: #FF9900
+}
+treechildren::-moz-tree-row(lc-FF9900, selected, focus), .lc-FF9900[_moz-menuactive] {
+  background-color: #FF9900;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF6600), .lc-FF6600:not([_moz-menuactive]) {
+  color: #FF6600
+}
+treechildren::-moz-tree-row(lc-FF6600, selected, focus), .lc-FF6600[_moz-menuactive] {
+  background-color: #FF6600;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC6600), .lc-CC6600:not([_moz-menuactive]) {
+  color: #CC6600
+}
+treechildren::-moz-tree-row(lc-CC6600, selected, focus), .lc-CC6600[_moz-menuactive] {
+  background-color: #CC6600;
+}
+
+treechildren::-moz-tree-cell-text(lc-993300), .lc-993300:not([_moz-menuactive]) {
+  color: #993300
+}
+treechildren::-moz-tree-row(lc-993300, selected, focus), .lc-993300[_moz-menuactive] {
+  background-color: #993300;
+}
+
+treechildren::-moz-tree-cell-text(lc-663300), .lc-663300:not([_moz-menuactive]) {
+  color: #663300
+}
+treechildren::-moz-tree-row(lc-663300, selected, focus), .lc-663300[_moz-menuactive] {
+  background-color: #663300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFFF99), .lc-FFFF99:not([_moz-menuactive]) {
+  color: #FFFF99
+}
+treechildren::-moz-tree-row(lc-FFFF99, selected, focus), .lc-FFFF99[_moz-menuactive] {
+  background-color: #FFFF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF66), .lc-FFFF66:not([_moz-menuactive]) {
+  color: #FFFF66
+}
+treechildren::-moz-tree-row(lc-FFFF66, selected, focus), .lc-FFFF66[_moz-menuactive] {
+  background-color: #FFFF66;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC66), .lc-FFCC66:not([_moz-menuactive]) {
+  color: #FFCC66
+}
+treechildren::-moz-tree-row(lc-FFCC66, selected, focus), .lc-FFCC66[_moz-menuactive] {
+  background-color: #FFCC66;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC33), .lc-FFCC33:not([_moz-menuactive]) {
+  color: #FFCC33
+}
+treechildren::-moz-tree-row(lc-FFCC33, selected, focus), .lc-FFCC33[_moz-menuactive] {
+  background-color: #FFCC33;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC9933), .lc-CC9933:not([_moz-menuactive]) {
+  color: #CC9933
+}
+treechildren::-moz-tree-row(lc-CC9933, selected, focus), .lc-CC9933[_moz-menuactive] {
+  background-color: #CC9933;
+}
+
+treechildren::-moz-tree-cell-text(lc-996633), .lc-996633:not([_moz-menuactive]) {
+  color: #996633
+}
+treechildren::-moz-tree-row(lc-996633, selected, focus), .lc-996633[_moz-menuactive] {
+  background-color: #996633;
+}
+
+treechildren::-moz-tree-cell-text(lc-663333), .lc-663333:not([_moz-menuactive]) {
+  color: #663333
+}
+treechildren::-moz-tree-row(lc-663333, selected, focus), .lc-663333[_moz-menuactive] {
+  background-color: #663333;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFFFCC), .lc-FFFFCC:not([_moz-menuactive]) {
+  color: #FFFFCC
+}
+treechildren::-moz-tree-row(lc-FFFFCC, selected, focus), .lc-FFFFCC[_moz-menuactive] {
+  background-color: #FFFFCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF33), .lc-FFFF33:not([_moz-menuactive]) {
+  color: #FFFF33
+}
+treechildren::-moz-tree-row(lc-FFFF33, selected, focus), .lc-FFFF33[_moz-menuactive] {
+  background-color: #FFFF33;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF00), .lc-FFFF00:not([_moz-menuactive]) {
+  color: #FFFF00
+}
+treechildren::-moz-tree-row(lc-FFFF00, selected, focus), .lc-FFFF00[_moz-menuactive] {
+  background-color: #FFFF00;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC00), .lc-FFCC00:not([_moz-menuactive]) {
+  color: #FFCC00
+}
+treechildren::-moz-tree-row(lc-FFCC00, selected, focus), .lc-FFCC00[_moz-menuactive] {
+  background-color: #FFCC00;
+}
+
+treechildren::-moz-tree-cell-text(lc-999900), .lc-999900:not([_moz-menuactive]) {
+  color: #999900
+}
+treechildren::-moz-tree-row(lc-999900, selected, focus), .lc-999900[_moz-menuactive] {
+  background-color: #999900;
+}
+
+treechildren::-moz-tree-cell-text(lc-666600), .lc-666600:not([_moz-menuactive]) {
+  color: #666600
+}
+treechildren::-moz-tree-row(lc-666600, selected, focus), .lc-666600[_moz-menuactive] {
+  background-color: #666600;
+}
+
+treechildren::-moz-tree-cell-text(lc-333300), .lc-333300:not([_moz-menuactive]) {
+  color: #333300
+}
+treechildren::-moz-tree-row(lc-333300, selected, focus), .lc-333300[_moz-menuactive] {
+  background-color: #333300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-99FF99), .lc-99FF99:not([_moz-menuactive]) {
+  color: #99FF99
+}
+treechildren::-moz-tree-row(lc-99FF99, selected, focus), .lc-99FF99[_moz-menuactive] {
+  background-color: #99FF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-66FF99), .lc-66FF99:not([_moz-menuactive]) {
+  color: #66FF99
+}
+treechildren::-moz-tree-row(lc-66FF99, selected, focus), .lc-66FF99[_moz-menuactive] {
+  background-color: #66FF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-33FF33), .lc-33FF33:not([_moz-menuactive]) {
+  color: #33FF33
+}
+treechildren::-moz-tree-row(lc-33FF33, selected, focus), .lc-33FF33[_moz-menuactive] {
+  background-color: #33FF33;
+}
+
+treechildren::-moz-tree-cell-text(lc-33CC00), .lc-33CC00:not([_moz-menuactive]) {
+  color: #33CC00
+}
+treechildren::-moz-tree-row(lc-33CC00, selected, focus), .lc-33CC00[_moz-menuactive] {
+  background-color: #33CC00;
+}
+
+treechildren::-moz-tree-cell-text(lc-009900), .lc-009900:not([_moz-menuactive]) {
+  color: #009900
+}
+treechildren::-moz-tree-row(lc-009900, selected, focus), .lc-009900[_moz-menuactive] {
+  background-color: #009900;
+}
+
+treechildren::-moz-tree-cell-text(lc-006600), .lc-006600:not([_moz-menuactive]) {
+  color: #006600
+}
+treechildren::-moz-tree-row(lc-006600, selected, focus), .lc-006600[_moz-menuactive] {
+  background-color: #006600;
+}
+
+treechildren::-moz-tree-cell-text(lc-003300), .lc-003300:not([_moz-menuactive]) {
+  color: #003300
+}
+treechildren::-moz-tree-row(lc-003300, selected, focus), .lc-003300[_moz-menuactive] {
+  background-color: #003300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-99FFFF), .lc-99FFFF:not([_moz-menuactive]) {
+  color: #99FFFF
+}
+treechildren::-moz-tree-row(lc-99FFFF, selected, focus), .lc-99FFFF[_moz-menuactive] {
+  background-color: #99FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-33FFFF), .lc-33FFFF:not([_moz-menuactive]) {
+  color: #33FFFF
+}
+treechildren::-moz-tree-row(lc-33FFFF, selected, focus), .lc-33FFFF[_moz-menuactive] {
+  background-color: #33FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-66CCCC), .lc-66CCCC:not([_moz-menuactive]) {
+  color: #66CCCC
+}
+treechildren::-moz-tree-row(lc-66CCCC, selected, focus), .lc-66CCCC[_moz-menuactive] {
+  background-color: #66CCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-00CCCC), .lc-00CCCC:not([_moz-menuactive]) {
+  color: #00CCCC
+}
+treechildren::-moz-tree-row(lc-00CCCC, selected, focus), .lc-00CCCC[_moz-menuactive] {
+  background-color: #00CCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-339999), .lc-339999:not([_moz-menuactive]) {
+  color: #339999
+}
+treechildren::-moz-tree-row(lc-339999, selected, focus), .lc-339999[_moz-menuactive] {
+  background-color: #339999;
+}
+
+treechildren::-moz-tree-cell-text(lc-336666), .lc-336666:not([_moz-menuactive]) {
+  color: #336666
+}
+treechildren::-moz-tree-row(lc-336666, selected, focus), .lc-336666[_moz-menuactive] {
+  background-color: #336666;
+}
+
+treechildren::-moz-tree-cell-text(lc-003333), .lc-003333:not([_moz-menuactive]) {
+  color: #003333
+}
+treechildren::-moz-tree-row(lc-003333, selected, focus), .lc-003333[_moz-menuactive] {
+  background-color: #003333;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-CCFFFF), .lc-CCFFFF:not([_moz-menuactive]) {
+  color: #CCFFFF
+}
+treechildren::-moz-tree-row(lc-CCFFFF, selected, focus), .lc-CCFFFF[_moz-menuactive] {
+  background-color: #CCFFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-66FFFF), .lc-66FFFF:not([_moz-menuactive]) {
+  color: #66FFFF
+}
+treechildren::-moz-tree-row(lc-66FFFF, selected, focus), .lc-66FFFF[_moz-menuactive] {
+  background-color: #66FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-33CCFF), .lc-33CCFF:not([_moz-menuactive]) {
+  color: #33CCFF
+}
+treechildren::-moz-tree-row(lc-33CCFF, selected, focus), .lc-33CCFF[_moz-menuactive] {
+  background-color: #33CCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-3366FF), .lc-3366FF:not([_moz-menuactive]) {
+  color: #3366FF
+}
+treechildren::-moz-tree-row(lc-3366FF, selected, focus), .lc-3366FF[_moz-menuactive] {
+  background-color: #3366FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-3333FF), .lc-3333FF:not([_moz-menuactive]) {
+  color: #3333FF
+}
+treechildren::-moz-tree-row(lc-3333FF, selected, focus), .lc-3333FF[_moz-menuactive] {
+  background-color: #3333FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-000099), .lc-000099:not([_moz-menuactive]) {
+  color: #000099
+}
+treechildren::-moz-tree-row(lc-000099, selected, focus), .lc-000099[_moz-menuactive] {
+  background-color: #000099;
+}
+
+treechildren::-moz-tree-cell-text(lc-000066), .lc-000066:not([_moz-menuactive]) {
+  color: #000066
+}
+treechildren::-moz-tree-row(lc-000066, selected, focus), .lc-000066[_moz-menuactive] {
+  background-color: #000066;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-CCCCFF), .lc-CCCCFF:not([_moz-menuactive]) {
+  color: #CCCCFF
+}
+treechildren::-moz-tree-row(lc-CCCCFF, selected, focus), .lc-CCCCFF[_moz-menuactive] {
+  background-color: #CCCCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-9999FF), .lc-9999FF:not([_moz-menuactive]) {
+  color: #9999FF
+}
+treechildren::-moz-tree-row(lc-9999FF, selected, focus), .lc-9999FF[_moz-menuactive] {
+  background-color: #9999FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-6666CC), .lc-6666CC:not([_moz-menuactive]) {
+  color: #6666CC
+}
+treechildren::-moz-tree-row(lc-6666CC, selected, focus), .lc-6666CC[_moz-menuactive] {
+  background-color: #6666CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-6633FF), .lc-6633FF:not([_moz-menuactive]) {
+  color: #6633FF
+}
+treechildren::-moz-tree-row(lc-6633FF, selected, focus), .lc-6633FF[_moz-menuactive] {
+  background-color: #6633FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-6600CC), .lc-6600CC:not([_moz-menuactive]) {
+  color: #6600CC
+}
+treechildren::-moz-tree-row(lc-6600CC, selected, focus), .lc-6600CC[_moz-menuactive] {
+  background-color: #6600CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-333399), .lc-333399:not([_moz-menuactive]) {
+  color: #333399
+}
+treechildren::-moz-tree-row(lc-333399, selected, focus), .lc-333399[_moz-menuactive] {
+  background-color: #333399;
+}
+
+treechildren::-moz-tree-cell-text(lc-330099), .lc-330099:not([_moz-menuactive]) {
+  color: #330099
+}
+treechildren::-moz-tree-row(lc-330099, selected, focus), .lc-330099[_moz-menuactive] {
+  background-color: #330099;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCCFF), .lc-FFCCFF:not([_moz-menuactive]) {
+  color: #FFCCFF
+}
+treechildren::-moz-tree-row(lc-FFCCFF, selected, focus), .lc-FFCCFF[_moz-menuactive] {
+  background-color: #FFCCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF99FF), .lc-FF99FF:not([_moz-menuactive]) {
+  color: #FF99FF
+}
+treechildren::-moz-tree-row(lc-FF99FF, selected, focus), .lc-FF99FF[_moz-menuactive] {
+  background-color: #FF99FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC66CC), .lc-CC66CC:not([_moz-menuactive]) {
+  color: #CC66CC
+}
+treechildren::-moz-tree-row(lc-CC66CC, selected, focus), .lc-CC66CC[_moz-menuactive] {
+  background-color: #CC66CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC33CC), .lc-CC33CC:not([_moz-menuactive]) {
+  color: #CC33CC
+}
+treechildren::-moz-tree-row(lc-CC33CC, selected, focus), .lc-CC33CC[_moz-menuactive] {
+  background-color: #CC33CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-993399), .lc-993399:not([_moz-menuactive]) {
+  color: #993399
+}
+treechildren::-moz-tree-row(lc-993399, selected, focus), .lc-993399[_moz-menuactive] {
+  background-color: #993399;
+}
+
+treechildren::-moz-tree-cell-text(lc-663366), .lc-663366:not([_moz-menuactive]) {
+  color: #663366
+}
+treechildren::-moz-tree-row(lc-663366, selected, focus), .lc-663366[_moz-menuactive] {
+  background-color: #663366;
+}
+
+treechildren::-moz-tree-cell-text(lc-330033), .lc-330033:not([_moz-menuactive]) {
+  color: #330033
+}
+treechildren::-moz-tree-row(lc-330033, selected, focus), .lc-330033[_moz-menuactive] {
+  background-color: #330033;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
+  color: #FFFFFF
+}
+treechildren::-moz-tree-cell-text(lc-black, selected, focus) {
+  color: #000000
+}
+