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

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

25 files changed, 1942 insertions, 0 deletions

diff --git a/comm/suite/themes/classic/mac/messenger/accountManage.css b/comm/suite/themes/classic/mac/messenger/accountManage.css
new file mode 100644
index 0000000000..45fecb5922
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/accountManage.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/. */
+
+/* ===== 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;
+}
+
+.signatureBox {
+  font-family: -moz-fixed;
+}
+
+#identitiesList > listitem:first-child,
+treechildren::-moz-tree-cell-text(isDefaultServer-true) {
+  font-weight: bold;
+}
+
+dialogheader {
+  display: none;
+}
+
+button:not(.spinbuttons-button):not(.dialog-button) {
+  min-height: 19px;
+}
+
+page > description,
+#smimeEditing > description {
+  margin: 1px 5px 2px 6px;
+}
+
+/* ::::: SMTP Server Panel :::::: */
+
+.smtpServerListItem {
+  padding-inline-start: 3px;
+}
+
+#backgroundBox {
+  background-color: ThreeDLightShadow;
+}
+
+#smtpServerInfoBox textbox {
+  background-color: transparent;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/addressbook/addressbook.css b/comm/suite/themes/classic/mac/messenger/addressbook/addressbook.css
new file mode 100644
index 0000000000..6d6a209451
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/addressbook/addressbook.css
@@ -0,0 +1,334 @@
+/* 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");
+
+#addressbookWindow {
+  -moz-appearance: none;
+  background-color: #EEEEEE;
+}
+
+/* ::::: 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:active  {
+  -moz-image-region: rect(60px 59px 89px 30px);
+} 
+
+#button-newcard[disabled]{
+  -moz-image-region: rect(60px 89px 89px 60px) !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:active {
+  -moz-image-region: rect(90px 59px 119px 30px);
+} 
+
+#button-newlist[disabled] {
+  -moz-image-region: rect(90px 89px 119px 60px) !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:active {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-editcard[disabled] {
+  -moz-image-region: rect(30px 89px 59px 60px) !important;
+}
+
+#button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmessage:hover:active {
+  -moz-image-region: rect(150px 59px 179px 30px);
+} 
+
+#button-newmessage[disabled]{
+  -moz-image-region: rect(150px 89px 179px 60px) !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:active  {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-abdelete[disabled] {
+  -moz-image-region: rect(0 89px 29px 60px) !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:active {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newcard[disabled] {
+  -moz-image-region: rect(40px 59px 59px 40px) !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:active {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newlist[disabled] {
+  -moz-image-region: rect(60px 59px 79px 40px) !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:active {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-editcard[disabled] {
+  -moz-image-region: rect(20px 59px 39px 40px) !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:active {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmessage[disabled] {
+  -moz-image-region: rect(100px 59px 119px 40px) !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:active {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-abdelete[disabled] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
+#results-splitter {
+  background-color: -moz-dialog;
+  border-top: 1px solid #A5A5A5;
+  border-bottom: 1px solid #A5A5A5;
+}
+
+#dirTree-splitter {
+  border: solid #B3B3B3;
+  border-width: 0 1px 0 0;
+  background-image: none;
+  min-width: 1px;
+}
+
+/* Make sure users find the splitter when it's collapsed... */
+
+#dirTree-splitter[state="collapsed"] {
+  min-width: 5px;
+  background-color: #D6DDE5;
+}
+
+#dirTree {
+  -moz-appearance: -moz-mac-source-list;
+  -moz-font-smoothing-background-color: -moz-mac-source-list;
+}
+
+.tree-stack > .tree-rows > .tree-bodybox {
+  border: none;
+}
+
+#dirTree > treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+#dirTree > treechildren::-moz-tree-row(selected) {
+  -moz-appearance: -moz-mac-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
+}
+
+#dirTree > treechildren::-moz-tree-row(selected, focus) {
+  -moz-appearance: -moz-mac-active-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
+}
+
+#dirTree > treechildren::-moz-tree-twisty(selected),
+#dirTree > treechildren::-moz-tree-cell-text(selected) {
+  color: #FFFFFF;
+  fill-opacity: 1;
+}
+
+#dirTree > treechildren::-moz-tree-twisty {
+  width: 16px;
+  padding-bottom: 1px;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #dirTree > treechildren::-moz-tree-twisty(selected),
+  #dirTree > treechildren::-moz-tree-cell-text(selected) {
+    color: -moz-dialogtext;
+    fill-opacity: 0.6;
+  }
+
+  #dirTree > treechildren::-moz-tree-twisty(selected, focus),
+  #dirTree > treechildren::-moz-tree-cell-text(selected, focus) {
+    color: #FFFFFF;
+    fill-opacity: 1;
+  }
+}
+
+#DirCol {
+  -moz-appearance: none;
+  border: none;
+  background-color: transparent;
+}
+
+#DirCol > .treecol-text {
+  padding: 6px 0 6px 8px;
+  font-weight: bold;
+  color: #738193;
+}
+
+#blankResultsPaneMessage {
+  font-style: italic;
+}
+
+#localResultsOnlyMessage {
+  font-style: italic;
+  text-align: center;
+}
+
+/* CardView styles - used in the Card View Pane */
+ 
+#CardViewBox {
+  -moz-user-focus: ignore;
+  overflow: auto;
+  min-width: 150px;
+  background-color: #FFFFFF;
+}
+
+#CardViewInnerBox {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 0 8px;
+}
+
+#CardTitle {
+  font-size: 150%;
+  font-weight: bold;
+  border-bottom: 2px solid black;
+  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: -moz-dialog;
+  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 {
+  color: blue;
+  text-decoration: underline;
+  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;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#CardViewOuterBox:-moz-lwtheme {
+  background-color: -moz-dialog;
+  color: -moz-dialogtext;
+  text-shadow: none
+}
diff --git a/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons-small.png b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons-small.png
new file mode 100644
index 0000000000..8024eb395f
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons-small.png
diff --git a/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons.png b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons.png
new file mode 100644
index 0000000000..f9ca42c789
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons.png
diff --git a/comm/suite/themes/classic/mac/messenger/browserRequest.css b/comm/suite/themes/classic/mac/messenger/browserRequest.css
new file mode 100644
index 0000000000..7ce21092c5
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/browserRequest.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/. */
+
+#security-button {
+  width: 20px;
+  margin-top: -1px;
+  margin-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 3px;
+}
+
+@media (min-resolution: 2ddpx) {
+  #security-button[loading="true"] {
+    background-image: url("chrome://messenger/skin/icons/loading@2x.png");
+  }
+}
+
+/*
+#header {
+  overflow: hidden;
+  padding: 5px;
+  border-bottom: 1px solid black;
+  font-weight: bold;
+  font-size: 1.2em;
+}
+*/
+
+
+#header {
+    border-bottom: 1px solid rgb(105, 105, 105);
+    overflow: hidden;
+}
+
+#addressbox {
+    font-weight: bold;
+    font-size: normal;
+    -moz-appearance: textfield;
+    overflow: hidden;
+    margin: 5px 5px;
+    font-weight: normal;
+}
+
+#headerMessage {
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/filterDialog.css b/comm/suite/themes/classic/mac/messenger/filterDialog.css
new file mode 100644
index 0000000000..3709323b36
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/filterDialog.css
@@ -0,0 +1,108 @@
+/* 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 {
+  -moz-appearance: none;
+  font: icon;
+  text-shadow: 0 1px #F2F2F2;
+  border: 1px solid #A8A8A8; 
+  background: linear-gradient(to top, #ECECEC, #ECECEC 50%, #F9F9F9 0%, #F9F9F9);
+  min-width: 22px;
+  height: 20px;
+  padding: 0 1px 1px 0;
+  margin: 0;
+}
+
+.small-button:first-child {
+  margin-left: 1px;
+}
+
+.small-button:not([disabled="true"]):hover:active {
+  background: linear-gradient(to top, #B0B0B0, #B4B4B4 50%, #BFBFBF 0%, #BABABA);
+  border: 1px solid #9C9C9C;
+}
+
+.small-button[disabled="true"] {
+  opacity: 0.6;
+}
+
+.small-button + .small-button,
+.small-button + .small-button:hover:active {
+  border-left-width: 0;
+  min-width: 21px;
+}
+
+
+.small-button:focus {
+  box-shadow:  inset 0 0 1px -moz-mac-focusring,
+               1px 0 2px 1px -moz-mac-focusring,
+               -1px 0 2px 1px -moz-mac-focusring;
+}
+
+.small-button:focus + .small-button {
+  box-shadow: inset 1px 0 -moz-mac-focusring;
+}
+
+listcell > hbox {
+  -moz-box-pack: end;
+}
+
+/* No '.filler' here, so add margin to make more room. */
+hbox > .small-button + .small-button {
+  margin-inline-end: 9px;
+}
+
+.search-menulist, .search-value-menulist {
+  width: 12em;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+#searchTermList > listitem[selected="true"] {
+  background-color: inherit;
+}
+
+#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/mac/messenger/icons/junk.png b/comm/suite/themes/classic/mac/messenger/icons/junk.png
new file mode 100644
index 0000000000..0ae15cd390
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/junk.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/messengericons-small.png b/comm/suite/themes/classic/mac/messenger/icons/messengericons-small.png
new file mode 100644
index 0000000000..b51ef83d27
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/messengericons-small.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/messengericons.png b/comm/suite/themes/classic/mac/messenger/icons/messengericons.png
new file mode 100644
index 0000000000..e450734a1b
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/messengericons.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/phishing.png b/comm/suite/themes/classic/mac/messenger/icons/phishing.png
new file mode 100644
index 0000000000..d99a9ea6d4
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/phishing.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/spin-buttons-active.png b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons-active.png
new file mode 100644
index 0000000000..5ff980eb98
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons-active.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/spin-buttons.png b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons.png
new file mode 100644
index 0000000000..010b170e8e
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-left.png b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-left.png
new file mode 100644
index 0000000000..ca55639992
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-left.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-right.png b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-right.png
new file mode 100644
index 0000000000..3374e2305c
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-right.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/twisty-clsd.png b/comm/suite/themes/classic/mac/messenger/icons/twisty-clsd.png
new file mode 100644
index 0000000000..ed46b222be
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/twisty-clsd.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/twisty-open.png b/comm/suite/themes/classic/mac/messenger/icons/twisty-open.png
new file mode 100644
index 0000000000..2aa35f80b1
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/twisty-open.png
diff --git a/comm/suite/themes/classic/mac/messenger/mailWindow1.css b/comm/suite/themes/classic/mac/messenger/mailWindow1.css
new file mode 100644
index 0000000000..6e40fff2f6
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/mailWindow1.css
@@ -0,0 +1,266 @@
+/* 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");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#messengerWindow {
+  -moz-appearance: none;
+  background-color: #EEEEEE;
+}
+
+#messengerBox {
+  border-top: 1px solid #A1A1A1;
+}
+
+/* :::::
+   :: Make sure the min height is small so we can
+   :: resize the pane vertically -EDV
+   ::::: */
+
+#messagepanebox {
+  min-height: 10px;
+  height: 0px;
+}
+
+#messagepanebox:-moz-lwtheme {
+  background-color: -moz-dialog;
+}
+
+#searchToolbar {
+  -moz-appearance: none;
+  background-color: #CDCDCD;
+  background-image: url("chrome://communicator/skin/toolbar/toolbar-gradient34.png");
+  background-repeat: repeat-x;
+  border-bottom: 1px solid #9F9F9F;
+}
+
+#searchToolbar:-moz-lwtheme {
+  background-image: none;
+  background-color: transparent;
+}
+
+/* Leopard-styled "zero-width" vertical splitter */
+
+#folderpane-splitter {
+  border: solid #B3B3B3;
+  border-width: 0 1px 0 0;
+  min-width: 1px;
+  background-image: none;
+}
+
+/* Make sure users find the splitter when it's collapsed... */
+
+#folderpane-splitter[state="collapsed"] {
+  min-width: 5px;
+  background-color: #D6DDE5;
+}
+
+/* Thick horisontal splitter */
+
+#threadpane-splitter {
+  background-color: -moz-dialog;
+  border: solid #B3B3B3;
+  border-width: 0 0 0 1px;
+}
+
+/* Thick vertical splitter */
+
+#threadpane-splitter[orient="vertical"] {
+  border: solid #A5A5A5;
+  border-width: 1px 0;
+}
+
+/* ..... tree adjustments ..... */
+
+#folderTree {
+  min-width: 1px;
+  -moz-appearance: -moz-mac-source-list;
+  -moz-font-smoothing-background-color: -moz-mac-source-list;
+}
+
+.tree-stack > .tree-rows > .tree-bodybox {
+  border: none;
+}
+
+#folderTree > treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+#folderTree > treechildren::-moz-tree-row(selected) {
+  -moz-appearance: -moz-mac-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
+}
+
+#folderTree > treechildren::-moz-tree-row(selected, focus) {
+  -moz-appearance: -moz-mac-active-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
+}
+
+#folderTree > treechildren::-moz-tree-twisty(selected),
+#folderTree > treechildren::-moz-tree-cell-text(selected) {
+  color: #FFFFFF;
+  fill-opacity: 1;
+}
+
+#folderTree > treechildren::-moz-tree-twisty {
+  width: 16px;
+  padding-bottom: 1px;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #folderTree > treechildren::-moz-tree-twisty(selected),
+  #folderTree > treechildren::-moz-tree-cell-text(selected) {
+    color: -moz-dialogtext;
+    fill-opacity: 0.6;
+  }
+
+  #folderTree > treechildren::-moz-tree-twisty(selected, focus),
+  #folderTree > treechildren::-moz-tree-cell-text(selected, focus) {
+    color: #FFFFFF;
+    fill-opacity: 1;
+  }
+}
+
+#threadTree {
+  min-width: 1px;
+}
+
+#locationIcon {
+  list-style-image: none;
+}
+
+/* ..... message pane adjustments ..... */
+
+#msgHeaderView {
+  border-left: none !important;
+}
+
+#messagepane {
+  border: 1px solid transparent;
+  border-right: none;
+}
+
+#messagepanebox[focusring="true"] > #messagepanewrapper > #messagepane {
+  border-color: -moz-mac-focusring;
+}
+
+/* ..... folder pane adjustments ..... */
+
+.folderview-cycler,
+.folderview-cycler > .toolbarbutton-icon {
+  padding: 0 !important;
+  margin: 0 !important;
+  border: none !important;
+}
+
+.folderview-cycler > .toolbarbutton-text {
+  display: none;
+}
+
+.folderview-cycler[dir="prev"],
+.folderview-cycler[dir="next"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://messenger/skin/icons/spin-buttons.png");
+  -moz-image-region: rect(0 15px 16px 0);
+}
+
+.folderview-cycler[dir="next"],
+.folderview-cycler[dir="prev"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://messenger/skin/icons/spin-buttons.png");
+  -moz-image-region: rect(0 31px 16px 15px);
+}
+
+.folderview-cycler:active {
+  list-style-image: url("chrome://messenger/skin/icons/spin-buttons-active.png") !important;
+}
+
+/* ..... tabmail ..... */
+
+.tabmail-strip {
+  padding-bottom: 3px;
+  background-color: #E8E8E8;
+}
+
+.tabmail-strip:-moz-lwtheme {
+  background-color: transparent;
+}
+
+.tab-close-button {
+  margin: 0;
+}
+
+.tab-scrollbutton-up,
+.tab-scrollbutton-down {
+  border: 0;
+  padding: 0 4px;
+  margin: 0;
+}
+
+.tab-scrollbutton-up:-moz-locale-dir(ltr),
+.tab-scrollbutton-down:-moz-locale-dir(rtl) {
+  border-right: 1px solid rgba(0, 0, 0, 0.19);
+  list-style-image: url("chrome://messenger/skin/icons/tab-arrow-left.png");
+  -moz-image-region: rect(0, 7px, 11px, 0);
+}
+
+.tab-scrollbutton-up[disabled="true"]:-moz-locale-dir(ltr),
+.tab-scrollbutton-down[disabled="true"]:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 14px, 11px, 7px);
+  border-right-color: transparent;
+}
+
+.tab-scrollbutton-down:-moz-locale-dir(ltr),
+.tab-scrollbutton-up:-moz-locale-dir(rtl) {
+  border-left: 1px solid rgba(0, 0, 0, 0.19);
+  list-style-image: url("chrome://messenger/skin/icons/tab-arrow-right.png");
+  -moz-image-region: rect(0, 7px, 11px, 0);
+}
+
+.tab-scrollbutton-down[disabled="true"]:-moz-locale-dir(ltr),
+.tab-scrollbutton-up[disabled="true"]:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 14px, 11px, 7px);
+  border-left-color: transparent;
+}
+
+.tab-scrollbutton-up:hover:not([disabled="true"]),
+.tab-scrollbutton-down:hover:not([disabled="true"]) {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.tab-scrollbutton-up:hover:active:not([disabled="true"]),
+.tab-scrollbutton-down:hover:active:not([disabled="true"]) {
+  background-color: rgba(0, 0, 0 , 0.2);
+}
+
+.tabmail-tab[type="message"] .tab-icon {
+  margin-top: -2px;
+}
+
+.tabmail-tab[type="folder"][NewMessages="true"],
+.tabmail-tab[type="folder"][IsServer="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+#tabbar-toolbar {
+  -moz-appearance: none;
+  min-height: 0;
+}
+
+#tabbar-toolbar > .toolbarbutton-1 {
+  margin-top: 1px;
+  margin-bottom: 1px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/messageHeader.css b/comm/suite/themes/classic/mac/messenger/messageHeader.css
new file mode 100644
index 0000000000..7a823a9860
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/messageHeader.css
@@ -0,0 +1,178 @@
+/* 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 buttons ::::: */
+
+#expandedAttachmentBox {
+  width: 20em;
+  height: 0;
+  list-style-image: url("chrome://messenger/skin/icons/attach.png");
+}
+
+#attachmentText {
+  font-weight: bold;
+}
+
+#attachmentList {
+  min-height: 58px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+/* ::::: msg header captions ::::: */
+
+#msgHeaderView {
+  border-right: 1px solid ThreeDShadow;
+  border-left: 1px solid ThreeDShadow;
+}
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  margin: 2px 4px 4px 4px;
+  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;
+}
+
+/* ::::: 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 {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-open.png");
+}
+
+.collapsedHeaderViewButton  {
+  margin: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+/* ::::: collapsed view styles ::::: */
+
+.collapsedHeaderDisplayName {
+  margin: 0 0.5em 0 0;
+  min-height: 16px;
+  font-weight: bold;
+}
+
+#expandedsubjectBox {
+  margin-top: 5px;
+}
+
+
+#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;
+}
+
+.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/mac/messenger/messageQuotes.css b/comm/suite/themes/classic/mac/messenger/messageQuotes.css
new file mode 100644
index 0000000000..62cb67d990
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/messageQuotes.css
@@ -0,0 +1,43 @@
+/* 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;
+  }
+}
+
+blockquote[type=cite] {
+  color: blue;
+  border-color: blue;
+}
+
+blockquote[type=cite] blockquote[type=cite] {
+  color: green;
+  border-color: green;
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  color: maroon;
+  border-color: maroon;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css b/comm/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
new file mode 100644
index 0000000000..e0e4578dfc
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
@@ -0,0 +1,249 @@
+/* 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:active {
+  -moz-image-region: rect(330px 59px 359px 30px);
+}
+
+#button-send[disabled="true"] {
+  -moz-image-region: rect(330px 89px 359px 60px) !important;
+}
+
+#button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(270px 29px 299px 0);
+}
+
+#button-address:hover:active {
+  -moz-image-region: rect(270px 59px 299px 30px);
+}
+
+#button-address[disabled="true"] {
+  -moz-image-region: rect(270px 89px 299px 60px) !important;
+}
+
+#button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(300px 29px 329px 0);
+}
+
+#button-attach:hover:active,
+#button-attach[open] {
+  -moz-image-region: rect(300px 59px 329px 30px);
+}
+
+#button-attach[disabled="true"] {
+  -moz-image-region: rect(300px 89px 329px 60px) !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#spellingButton:hover:active,
+#spellingButton[open] {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(240px 89px 269px 60px) !important;
+}
+
+#button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-save:hover:active,
+#button-save[open] {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#button-save[disabled="true"] {
+  -moz-image-region: rect(210px 89px 239px 60px) !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:active {
+  -moz-image-region: rect(220px 39px 239px 20px);
+}
+
+toolbar[iconsize="small"] > #button-send[disabled="true"] {
+  -moz-image-region: rect(220px 59px 239px 40px) !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:active {
+  -moz-image-region: rect(180px 39px 199px 20px);
+}
+
+toolbar[iconsize="small"] > #button-address[disabled="true"] {
+  -moz-image-region: rect(180px 59px 199px 40px) !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:active,
+toolbar[iconsize="small"] > #button-attach[open] {
+  -moz-image-region: rect(200px 39px 219px 20px);
+}
+
+toolbar[iconsize="small"] > #button-attach[disabled="true"] {
+  -moz-image-region: rect(200px 59px 219px 40px) !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:active,
+toolbar[iconsize="small"] > #spellingButton[open] {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(160px 59px 179px 40px) !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:active,
+toolbar[iconsize="small"] > #button-save[open] {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-save[disabled="true"] {
+  -moz-image-region: rect(140px 59px 159px 40px) !important;
+}
+
+#attachmentbucket-sizer {
+  border-top: none;
+  border-bottom: none;
+}
+
+#compose-toolbar-sizer {
+  height: 10px;
+  background-color: -moz-dialog;
+  border-top: 1px solid #A5A5A5;
+  border-bottom: 1px solid #A5A5A5;
+}
+
+#msgSubject {
+  margin-top: 0px;
+  margin-bottom: 4px;
+}
+
+#MsgHeadersToolbar {
+  min-height: 0px; /* this undoes the min-height in toolbar.css */
+  -moz-appearance: none;
+}
+
+#FormatToolbar {
+  border-bottom: none !important;
+}
+
+/* ::::: 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-box-align: center;
+  -moz-box-pack: center;
+  margin: 0;
+}
+
+.menulist-compact  > .menulist-label-box > .menulist-label {
+  text-align: end;
+}
+
+/* ::::: 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 {
+  opacity: 1;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/primaryToolbar.css b/comm/suite/themes/classic/mac/messenger/primaryToolbar.css
new file mode 100644
index 0000000000..372c6472d9
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/primaryToolbar.css
@@ -0,0 +1,490 @@
+/* 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");
+
+.mail-toolbox {
+  border-bottom: 1px solid #A1A1A1;
+  background-color: #E8E8E8;
+}
+
+/* ::::: 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:active,
+#button-getmsg[open] {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#button-getmsg[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px) !important;
+}
+
+#button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmsg:hover:active,
+#button-newmsg[open] {
+  -moz-image-region: rect(150px 59px 179px 30px);
+}
+
+#button-newmsg[disabled="true"] {
+  -moz-image-region: rect(150px 89px 179px 60px) !important;
+}
+
+#button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-reply:hover:active,
+#button-reply[open] {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#button-reply[disabled="true"] {
+  -moz-image-region: rect(210px 89px 239px 60px) !important;
+}
+
+#button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#button-replyall:hover:active,
+#button-replyall[open] {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#button-replyall[disabled="true"] {
+  -moz-image-region: rect(240px 89px 269px 60px) !important;
+}
+
+#button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-forward:hover:active,
+#button-forward[open] {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#button-forward[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px) !important;
+}
+
+#button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-file:hover:active,
+#button-file[open] {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#button-file[disabled="true"] {
+  -moz-image-region: rect(30px 89px 59px 60px) !important;
+}
+
+#button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-goback:hover:active,
+#button-goback[open] {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#button-goback[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px) !important;
+}
+
+#button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-goforward:hover:active,
+#button-goforward[open] {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#button-goforward[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px) !important;
+}
+
+#button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(180px 29px 209px 0);
+}
+
+#button-next:hover:active,
+#button-next[open] {
+  -moz-image-region: rect(180px 59px 209px 30px);
+}
+
+#button-next[disabled="true"] {
+  -moz-image-region: rect(180px 89px 209px 60px) !important;
+}
+
+#button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#button-delete:hover:active {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#button-delete[disabled] {
+  -moz-image-region: rect(0 89px 29px 60px) !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:active,
+#button-mark[open] {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#button-mark[disabled="true"] {
+  -moz-image-region: rect(120px 89px 149px 60px) !important;
+}
+
+#button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(360px 29px 389px 0);
+}
+
+#button-junk:hover:active {
+  -moz-image-region: rect(360px 59px 389px 30px);
+}
+
+#button-junk[disabled="true"] {
+  -moz-image-region: rect(360px 89px 389px 60px) !important;
+}
+
+#button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-stop:hover:active {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#button-stop[disabled="true"] {
+  -moz-image-region: rect(30px 89px 59px 60px) !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;
+}
+
+/* ::::: 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:active,
+toolbar[iconsize="small"] > #button-getmsg[open] {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-getmsg[disabled="true"] {
+  -moz-image-region: rect(60px 59px 79px 40px) !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:active,
+toolbar[iconsize="small"] > #button-newmsg[open] {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmsg[disabled="true"] {
+  -moz-image-region: rect(100px 59px 119px 40px) !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:active {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-reply[disabled="true"] {
+  -moz-image-region: rect(140px 59px 159px 40px) !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:active {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #button-replyall[disabled="true"] {
+  -moz-image-region: rect(160px 59px 179px 40px) !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:active,
+toolbar[iconsize="small"] > #button-forward[open] {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-forward[disabled="true"] {
+  -moz-image-region: rect(40px 59px 59px 40px) !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:active,
+toolbar[iconsize="small"] > #button-file[open] {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-file[disabled="true"] {
+  -moz-image-region: rect(20px 59px 39px 40px) !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:active,
+toolbar[iconsize="small"] > #button-goback[open] {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goback[disabled="true"] {
+  -moz-image-region: rect(40px 59px 59px 40px) !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:active,
+toolbar[iconsize="small"] > #button-goforward[open] {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
+  -moz-image-region: rect(60px 59px 79px 40px) !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:active,
+toolbar[iconsize="small"] > #button-next[open] {
+  -moz-image-region: rect(120px 39px 139px 20px);
+}
+
+toolbar[iconsize="small"] > #button-next[disabled="true"] {
+  -moz-image-region: rect(120px 59px 139px 40px) !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:active {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-delete[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete[disabled] {
+  -moz-image-region: rect(0 59px 19px 40px) !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:active,
+toolbar[iconsize="small"] > #button-mark[open] {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #button-mark[disabled="true"] {
+  -moz-image-region: rect(80px 59px 99px 40px) !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:active {
+  -moz-image-region: rect(240px 39px 259px 20px);
+}
+
+toolbar[iconsize="small"] > #button-junk[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
+  -moz-image-region: rect(240px 59px 259px 40px) !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:active {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-stop[disabled="true"] {
+  -moz-image-region: rect(20px 59px 39px 40px) !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 #A5A5A5;
+  background-color: #C7BC8F;
+  color: black;
+}
+
+.msgNotificationBar:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.msgNotificationBarText {
+  font-weight: bold;
+}
+
+.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");
+}
+
+.inline-toolbar {
+  -moz-appearance: none;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/searchDialog.css b/comm/suite/themes/classic/mac/messenger/searchDialog.css
new file mode 100644
index 0000000000..347375beaa
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/searchDialog.css
@@ -0,0 +1,90 @@
+/* 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;
+}
+
+#searchTermList > listitem[selected="true"] {
+  background-color: inherit;
+}
+
+listcell > hbox {
+  -moz-box-pack: end;
+}
+
+#searchResultListBox {
+  -moz-appearance: listbox;
+  margin-inline-start: 4px;
+  margin-inline-end: 4px;
+  height: 100px;
+}
+
+#searchAddressBookWindow,
+#searchMailWindow {
+  padding: 0px;
+}
+
+menulist:not(#menuSearchLocalSystem) {
+  width: 18em;
+}
+
+.search-menulist {
+  width: 12em;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+.small-button {
+  -moz-appearance: none;
+  font: icon;
+  text-shadow: 0 1px #F2F2F2;
+  border: 1px solid #A8A8A8;
+  background: linear-gradient(to top, #ECECEC, #ECECEC 50%, #F9F9F9 0%, #F9F9F9);
+  min-width: 22px;
+  height: 20px;
+  padding: 0 1px 1px 0;
+  margin: 0;
+}
+
+.small-button:not([disabled="true"]):hover:active {
+  background: linear-gradient(to top, #B0B0B0, #B4B4B4 50%, #BFBFBF 0%, #BABABA);
+  border: 1px solid #9C9C9C;
+}
+
+.small-button[disabled="true"] {
+  opacity: 0.6;
+}
+
+.small-button + .small-button,
+.small-button + .small-button:hover:active {
+  border-left-width: 0;
+  min-width: 21px;
+}
+
+.small-button:focus {
+  box-shadow:  inset 0 0 1px -moz-mac-focusring,
+               1px 0 2px 1px -moz-mac-focusring,
+               -1px 0 2px 1px -moz-mac-focusring;
+}
+
+.small-button:focus + .small-button {
+  box-shadow: inset 1px 0 -moz-mac-focusring;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons-small.png b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons-small.png
new file mode 100644
index 0000000000..4c6d42fff2
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons-small.png
diff --git a/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons.png b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons.png
new file mode 100644
index 0000000000..1434fa34ca
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons.png
diff --git a/comm/suite/themes/classic/mac/messenger/smime/msgCompSMIMEOverlay.css b/comm/suite/themes/classic/mac/messenger/smime/msgCompSMIMEOverlay.css
new file mode 100644
index 0000000000..3c68553bbd
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/smime/msgCompSMIMEOverlay.css
@@ -0,0 +1,68 @@
+/* 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:active,
+#button-security[open] {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#button-security[disabled] {
+  -moz-image-region: rect(0 89px 29px 60px) !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:active,
+toolbar[iconsize="small"] > #button-security[open] {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-security[disabled] {
+  -moz-image-region: rect(0 59px 19px 40px) !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;
+}