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

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

88 files changed, 3296 insertions, 0 deletions

diff --git a/comm/mail/themes/windows/editor/EditorDialog.css b/comm/mail/themes/windows/editor/EditorDialog.css
new file mode 100644
index 0000000000..549f47e0f3
--- /dev/null
+++ b/comm/mail/themes/windows/editor/EditorDialog.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/. */
+
+@import url("chrome://messenger/skin/shared/EditorDialog.css");
+
+@media (-moz-windows-non-native-menus) {
+  menulist > menupopup > menuitem,
+  menulist > menupopup > menu {
+    padding-block: 0.2em;
+  }
+}
diff --git a/comm/mail/themes/windows/editor/img-align-bottom.gif b/comm/mail/themes/windows/editor/img-align-bottom.gif
new file mode 100644
index 0000000000..a8ba157970
--- /dev/null
+++ b/comm/mail/themes/windows/editor/img-align-bottom.gif
diff --git a/comm/mail/themes/windows/editor/img-align-left.gif b/comm/mail/themes/windows/editor/img-align-left.gif
new file mode 100644
index 0000000000..117b93fcaf
--- /dev/null
+++ b/comm/mail/themes/windows/editor/img-align-left.gif
diff --git a/comm/mail/themes/windows/editor/img-align-middle.gif b/comm/mail/themes/windows/editor/img-align-middle.gif
new file mode 100644
index 0000000000..4189f7ac33
--- /dev/null
+++ b/comm/mail/themes/windows/editor/img-align-middle.gif
diff --git a/comm/mail/themes/windows/editor/img-align-right.gif b/comm/mail/themes/windows/editor/img-align-right.gif
new file mode 100644
index 0000000000..8e679f50a4
--- /dev/null
+++ b/comm/mail/themes/windows/editor/img-align-right.gif
diff --git a/comm/mail/themes/windows/editor/img-align-top.gif b/comm/mail/themes/windows/editor/img-align-top.gif
new file mode 100644
index 0000000000..d871945929
--- /dev/null
+++ b/comm/mail/themes/windows/editor/img-align-top.gif
diff --git a/comm/mail/themes/windows/jar.mn b/comm/mail/themes/windows/jar.mn
new file mode 100644
index 0000000000..fa66268a96
--- /dev/null
+++ b/comm/mail/themes/windows/jar.mn
@@ -0,0 +1,94 @@
+# 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/.
+
+classic.jar:
+% skin messenger classic/1.0 %skin/classic/messenger/
+#include ../shared/jar.inc.mn
+  skin/classic/messenger/primaryToolbar.css                   (mail/primaryToolbar.css)
+  skin/classic/messenger/accountCentral.css                   (mail/accountCentral.css)
+  skin/classic/messenger/accountManage.css                    (mail/accountManage.css)
+  skin/classic/messenger/chat.css                             (mail/chat.css)
+  skin/classic/messenger/common.css                           (mail/common.css)
+  skin/classic/messenger/contextMenu.css                      (mail/contextMenu.css)
+  skin/classic/messenger/imAccounts.css                       (mail/imAccounts.css)
+  skin/classic/messenger/compacttheme.css                     (mail/compacttheme.css)
+  skin/classic/messenger/customizeToolbar.css                 (mail/customizeToolbar.css)
+  skin/classic/messenger/menulist.css                         (mail/menulist.css)
+  skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
+  skin/classic/messenger/message-bar.css                      (mail/message-bar.css)
+  skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
+  skin/classic/messenger/messageIcons.css                     (mail/messageIcons.css)
+  skin/classic/messenger/messenger.css                        (mail/messenger.css)
+  skin/classic/messenger/attachmentList.css                   (mail/attachmentList.css)
+  skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
+  skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
+  skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
+  skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
+  skin/classic/messenger/input-fields.css                     (mail/input-fields.css)
+  skin/classic/messenger/folderMenus.css                      (mail/folderMenus.css)
+  skin/classic/messenger/folderPane.css                       (mail/folderPane.css)
+  skin/classic/messenger/searchDialog.css                     (mail/searchDialog.css)
+  skin/classic/messenger/spacesToolbar.css                    (mail/spacesToolbar.css)
+  skin/classic/messenger/filterDialog.css                     (mail/filterDialog.css)
+  skin/classic/messenger/multimessageview.css                 (mail/multimessageview.css)
+  skin/classic/messenger/glodaFacetView.css                   (mail/glodaFacetView.css)
+  skin/classic/messenger/panelUI.css                          (mail/panelUI.css)
+  skin/classic/messenger/tabmail.css                          (mail/tabmail.css)
+  skin/classic/messenger/themeableDialog.css                  (mail/themeableDialog.css)
+  skin/classic/messenger/popupPanel.css                       (mail/popupPanel.css)
+  skin/classic/messenger/variables.css                        (mail/variables.css)
+  skin/classic/messenger/activity/activity.css                (mail/activity/activity.css)
+  skin/classic/messenger/activity/addItemIcon.png             (mail/activity/addItemIcon.png)
+  skin/classic/messenger/activity/compactMailIcon.png         (mail/activity/compactMailIcon.png)
+  skin/classic/messenger/activity/copyMailIcon.png            (mail/activity/copyMailIcon.png)
+  skin/classic/messenger/activity/defaultEventIcon.png        (mail/activity/defaultEventIcon.png)
+  skin/classic/messenger/activity/defaultProcessIcon.png      (mail/activity/defaultProcessIcon.png)
+  skin/classic/messenger/activity/deleteMailIcon.png          (mail/activity/deleteMailIcon.png)
+  skin/classic/messenger/activity/indexMailIcon.png           (mail/activity/indexMailIcon.png)
+  skin/classic/messenger/activity/moveMailIcon.png            (mail/activity/moveMailIcon.png)
+  skin/classic/messenger/activity/removeItemIcon.png          (mail/activity/removeItemIcon.png)
+  skin/classic/messenger/activity/sendMailIcon.png            (mail/activity/sendMailIcon.png)
+  skin/classic/messenger/activity/syncMailIcon.png            (mail/activity/syncMailIcon.png)
+  skin/classic/messenger/activity/undoIcon.png                (mail/activity/undoIcon.png)
+  skin/classic/messenger/activity/warning.png                 (mail/activity/warning.png)
+  skin/classic/messenger/addressbook/abContactsPanel.css      (mail/addrbook/abContactsPanel.css)
+  skin/classic/messenger/addressbook/cardDialog.css           (mail/addrbook/cardDialog.css)
+  skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
+  skin/classic/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads.css)
+  skin/classic/messenger/preferences/alwaysAsk.png            (mail/preferences/alwaysAsk.png)
+  skin/classic/messenger/preferences/application.png          (mail/preferences/application.png)
+  skin/classic/messenger/preferences/applications.css         (mail/preferences/applications.css)
+  skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
+  skin/classic/messenger/preferences/saveFile.png             (mail/preferences/saveFile.png)
+  skin/classic/messenger/icons/multicolor.png                 (mail/icons/multicolor.png)
+  skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
+  skin/classic/messenger/icons/error.png                      (mail/icons/error.png)
+  skin/classic/messenger/window-controls/close.svg                 (mail/window-controls/close.svg)
+  skin/classic/messenger/window-controls/close-highcontrast.svg    (mail/window-controls/close-highcontrast.svg)
+  skin/classic/messenger/window-controls/close-themes.svg          (mail/window-controls/close-themes.svg)
+  skin/classic/messenger/window-controls/maximize.svg              (mail/window-controls/maximize.svg)
+  skin/classic/messenger/window-controls/maximize-highcontrast.svg (mail/window-controls/maximize-highcontrast.svg)
+  skin/classic/messenger/window-controls/maximize-themes.svg       (mail/window-controls/maximize-themes.svg)
+  skin/classic/messenger/window-controls/minimize.svg              (mail/window-controls/minimize.svg)
+  skin/classic/messenger/window-controls/minimize-highcontrast.svg (mail/window-controls/minimize-highcontrast.svg)
+  skin/classic/messenger/window-controls/minimize-themes.svg       (mail/window-controls/minimize-themes.svg)
+  skin/classic/messenger/window-controls/restore.svg               (mail/window-controls/restore.svg)
+  skin/classic/messenger/window-controls/restore-highcontrast.svg  (mail/window-controls/restore-highcontrast.svg)
+  skin/classic/messenger/window-controls/restore-themes.svg        (mail/window-controls/restore-themes.svg)
+  skin/classic/messenger/icons/connecting.png                 (mail/icons/connecting.png)
+  skin/classic/messenger/icons/arrow/arrow-left.png           (mail/icons/arrow/arrow-left.png)
+  skin/classic/messenger/icons/arrow/arrow-right.png          (mail/icons/arrow/arrow-right.png)
+  skin/classic/messenger/icons/arrow/arrow-up.png             (mail/icons/arrow/arrow-up.png)
+  skin/classic/messenger/icons/arrow/arrow-down.png           (mail/icons/arrow/arrow-down.png)
+  skin/classic/messenger/icons/arrow/arrow-right-dim.png      (mail/icons/arrow/arrow-right-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-down-dim.png       (mail/icons/arrow/arrow-down-dim.png)
+% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
+  skin/classic/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
+% skin editor classic/1.0 %skin/classic/editor/
+  skin/classic/editor/EditorDialog.css                        (editor/EditorDialog.css)
+  skin/classic/editor/icons/img-align-bottom.gif              (editor/img-align-bottom.gif)
+  skin/classic/editor/icons/img-align-left.gif                (editor/img-align-left.gif)
+  skin/classic/editor/icons/img-align-middle.gif              (editor/img-align-middle.gif)
+  skin/classic/editor/icons/img-align-right.gif               (editor/img-align-right.gif)
+  skin/classic/editor/icons/img-align-top.gif                 (editor/img-align-top.gif)
diff --git a/comm/mail/themes/windows/mail/accountCentral.css b/comm/mail/themes/windows/mail/accountCentral.css
new file mode 100644
index 0000000000..3654030241
--- /dev/null
+++ b/comm/mail/themes/windows/mail/accountCentral.css
@@ -0,0 +1,29 @@
+/* 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/shared/accountCentral.css");
+
+@media (-moz-windows-default-theme: 0) {
+  :root:not(:-moz-lwtheme) {
+    --bg-color: Window;
+    --text-color: WindowText;
+    --title-color: -moz-DialogText;
+    --primary-color: SelectedItem;
+    --primary-color-hover: SelectedItem;
+    --btn-color: -moz-DialogText;
+    --btn-color-hover: SelectedItemText;
+    --btn-bg: Dialog;
+    --btn-bg-hover: SelectedItem;
+    --btn-shadow-hover: transparent;
+    --popup-bg: Window;
+  }
+
+  :root:not(:-moz-lwtheme) .btn-hub {
+    border: 1px solid -moz-DialogText;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/accountManage.css b/comm/mail/themes/windows/mail/accountManage.css
new file mode 100644
index 0000000000..1e90c9dd0f
--- /dev/null
+++ b/comm/mail/themes/windows/mail/accountManage.css
@@ -0,0 +1,5 @@
+/* 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/shared/accountManage.css");
diff --git a/comm/mail/themes/windows/mail/activity/activity.css b/comm/mail/themes/windows/mail/activity/activity.css
new file mode 100644
index 0000000000..3c8f2726bf
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/activity.css
@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://messenger/skin/shared/activity/activity.css");
+
+@media (-moz-windows-glass) {
+  :root:not(:-moz-lwtheme) .activityview {
+    border: 1px solid hsla(240, 5%, 5%, .3);
+    background-clip: padding-box;
+  }
+
+  :root:not(:-moz-lwtheme) #clearListButton {
+    margin-inline-start: 0;
+    margin-bottom: 0;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/activity/addItemIcon.png b/comm/mail/themes/windows/mail/activity/addItemIcon.png
new file mode 100644
index 0000000000..fc5e505885
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/addItemIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/compactMailIcon.png b/comm/mail/themes/windows/mail/activity/compactMailIcon.png
new file mode 100644
index 0000000000..d3b3ce6ece
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/compactMailIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/copyMailIcon.png b/comm/mail/themes/windows/mail/activity/copyMailIcon.png
new file mode 100644
index 0000000000..5671b521f7
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/copyMailIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/defaultEventIcon.png b/comm/mail/themes/windows/mail/activity/defaultEventIcon.png
new file mode 100644
index 0000000000..033e7ec1b3
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/defaultEventIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/defaultProcessIcon.png b/comm/mail/themes/windows/mail/activity/defaultProcessIcon.png
new file mode 100644
index 0000000000..7f823711d2
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/defaultProcessIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/deleteMailIcon.png b/comm/mail/themes/windows/mail/activity/deleteMailIcon.png
new file mode 100644
index 0000000000..191a0fd7d3
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/deleteMailIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/indexMailIcon.png b/comm/mail/themes/windows/mail/activity/indexMailIcon.png
new file mode 100644
index 0000000000..7dffa4e186
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/indexMailIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/moveMailIcon.png b/comm/mail/themes/windows/mail/activity/moveMailIcon.png
new file mode 100644
index 0000000000..6da75d0331
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/moveMailIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/removeItemIcon.png b/comm/mail/themes/windows/mail/activity/removeItemIcon.png
new file mode 100644
index 0000000000..6723d12b98
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/removeItemIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/sendMailIcon.png b/comm/mail/themes/windows/mail/activity/sendMailIcon.png
new file mode 100644
index 0000000000..e9a77d5ee9
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/sendMailIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/syncMailIcon.png b/comm/mail/themes/windows/mail/activity/syncMailIcon.png
new file mode 100644
index 0000000000..530a95e90b
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/syncMailIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/undoIcon.png b/comm/mail/themes/windows/mail/activity/undoIcon.png
new file mode 100644
index 0000000000..50d36c8772
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/undoIcon.png
diff --git a/comm/mail/themes/windows/mail/activity/warning.png b/comm/mail/themes/windows/mail/activity/warning.png
new file mode 100644
index 0000000000..7daab9c788
--- /dev/null
+++ b/comm/mail/themes/windows/mail/activity/warning.png
diff --git a/comm/mail/themes/windows/mail/addrbook/abContactsPanel.css b/comm/mail/themes/windows/mail/addrbook/abContactsPanel.css
new file mode 100644
index 0000000000..b5b6e3f7b1
--- /dev/null
+++ b/comm/mail/themes/windows/mail/addrbook/abContactsPanel.css
@@ -0,0 +1,35 @@
+/* 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/shared/abContactsPanel.css");
+
+#peopleSearchInput {
+  min-height: 24px;
+}
+
+#AbPickerHeader > label {
+  margin-block: 3px 0;
+}
+
+#abContextMenuButton {
+  margin-block: -4px 2px;
+  padding-inline: 5px;
+}
+
+#abContextMenuButton > .toolbarbutton-icon {
+  margin-inline-end: 0;
+}
+
+:root:not([lwt-tree]) #abResultsTree {
+  border-top: 1px solid #a9b1b8;
+  border-bottom: 1px solid #a9b1b8;
+}
+
+#GeneratedName {
+  padding-inline-start: 28px;
+}
diff --git a/comm/mail/themes/windows/mail/addrbook/cardDialog.css b/comm/mail/themes/windows/mail/addrbook/cardDialog.css
new file mode 100644
index 0000000000..07379b327c
--- /dev/null
+++ b/comm/mail/themes/windows/mail/addrbook/cardDialog.css
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* ===== cardViewOverlay.css ============================================
+  == Styles for Address Book dialogs.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/cardDialog.css");
+
+menulist::part(icon) {
+  margin-inline-end: 4px;
+}
diff --git a/comm/mail/themes/windows/mail/attachmentList.css b/comm/mail/themes/windows/mail/attachmentList.css
new file mode 100644
index 0000000000..45b16ed099
--- /dev/null
+++ b/comm/mail/themes/windows/mail/attachmentList.css
@@ -0,0 +1,22 @@
+/* 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/shared/attachmentList.css");
+
+/* styles for the attachment list */
+
+.attachmentItem:where(:hover) {
+  background-color: hsla(0, 0%, 50%, 0.15);
+}
+
+@media (prefers-color-scheme: dark) {
+  :root:-moz-lwtheme .attachmentList .attachmentItem[selected="true"] {
+    color: var(--lwt-text-color);
+    background: rgba(249, 249, 250, .1);
+  }
+
+  :root:-moz-lwtheme .attachmentList:focus .attachmentItem[selected="true"] {
+    background: var(--dark-lwt-highlight-color);
+  }
+}
diff --git a/comm/mail/themes/windows/mail/chat.css b/comm/mail/themes/windows/mail/chat.css
new file mode 100644
index 0000000000..7ba0dba0ad
--- /dev/null
+++ b/comm/mail/themes/windows/mail/chat.css
@@ -0,0 +1,146 @@
+/* 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/shared/chat.css");
+
+.convUnreadTargetedCount {
+  padding: 0 7px;
+}
+
+/* Adaptation from #folderTree */
+:root:not([lwt-tree]) #listPaneBox {
+  appearance: none;
+  background-color: Field;
+  color: FieldText;
+}
+
+#listPaneBox > * {
+  background: transparent !important;
+  appearance: none !important;
+  border: none;
+}
+
+#conversationsBox {
+  background: var(--imbox-selected-background-color);
+}
+
+.conv-textbox > .textbox-input-box {
+  background: inherit;
+}
+
+.conv-counter {
+  padding-bottom: 0;
+  padding-inline-end: 5px;
+  margin-inline-end: 2px;
+  margin-bottom: 2px !important; /* override 4px from description */
+}
+
+.conv-counter[value^="-"] {
+  margin-inline-end: 2px;
+  padding-inline-end: 4px;
+}
+
+.splitter.conv-chat {
+  border-left: 1px solid rgba(0, 0, 0, 0.25);
+}
+
+#contextPane {
+  background-color: Field;
+  color: FieldText;
+}
+
+.userIcon {
+  border-width: 0;
+}
+
+#logTree,
+.conv-nicklist {
+  appearance: none;
+  border-style: none;
+  margin: 0;
+}
+
+.conv-nicklist-header,
+.conv-logs-header-label {
+  appearance: none;
+  margin: 0;
+  padding-block: 2px;
+  border-bottom: 1px solid ThreeDShadow;
+  background-color: -moz-Dialog;
+}
+
+.conv-nicklist-header-label {
+  font-weight: bold;
+  margin-inline: 0 2px !important;
+}
+
+.statusMessageToolbarItem {
+  margin: 0 1px;
+  margin-inline-start: -2px;
+  padding: 3px 3px 4px;
+}
+
+#listSplitter,
+#contextSplitter {
+  background-color: transparent;
+  min-width: 0;
+}
+
+#listSplitter {
+  border-inline-end-width: 0;
+}
+
+#contextSplitter {
+  border-inline-start-width: 0;
+}
+
+#nicklist > richlistitem[inactive][selected] > label {
+  color: -moz-cellhighlighttext !important;
+}
+
+richlistitem[is="chat-group-richlistitem"] .twisty {
+  margin-inline-end: 2px;
+}
+
+@media (-moz-windows-default-theme) {
+  .conv-status-container {
+    border-bottom-color: var(--color-gray-30);
+  }
+
+  #statusTypeIcon > .toolbarbutton-menu-dropmarker {
+    padding: 1px 3px;
+  }
+
+  #chat-status-selector > vbox > .statusMessageToolbarItem[editing] {
+    appearance: none;
+    padding-inline: 2px;
+  }
+}
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme) {
+  :root:not([lwt-tree]) #listPaneBox {
+    background-color: rgb(238, 243, 250);
+  }
+
+  #conversationsBox {
+    background-color: rgb(233, 239, 245);
+  }
+
+  .conv-nicklist-header,
+  .conv-logs-header-label {
+    background-color: rgb(233, 239, 245);
+  }
+}
+
+@media (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  :root:not([lwt-tree]) #listPaneBox {
+    background-color: -moz-Dialog;
+  }
+}
+
+@media (-moz-platform: windows-win10) and (-moz-windows-default-theme) {
+  :root:not([lwt-tree],:-moz-lwtheme) #listPaneBox {
+    background-color: #fafafa;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/common.css b/comm/mail/themes/windows/mail/common.css
new file mode 100644
index 0000000000..0811e25822
--- /dev/null
+++ b/comm/mail/themes/windows/mail/common.css
@@ -0,0 +1,35 @@
+/* - 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/shared/common.css");
+
+@namespace html "http://www.w3.org/1999/xhtml";
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+xul|checkbox,
+xul|radio {
+  padding-inline-start: 0;
+}
+
+/* Override menulist.css */
+xul|menulist[disabled="true"] {
+  background-color: var(--in-content-button-background);
+}
+
+html|button {
+  /* XUL button min-width */
+  min-width: 6.3em;
+}
+
+xul|tab {
+  min-height: 2.5em;
+}
+
+:host(dialog[subdialog]) .dialog-button-box > button {
+  min-height: var(--in-content-button-height);
+  padding-block: initial;
+  padding-inline: 15px;
+  border-color: transparent;
+  border-radius: var(--in-content-button-border-radius);
+}
diff --git a/comm/mail/themes/windows/mail/compacttheme.css b/comm/mail/themes/windows/mail/compacttheme.css
new file mode 100644
index 0000000000..0841693499
--- /dev/null
+++ b/comm/mail/themes/windows/mail/compacttheme.css
@@ -0,0 +1,138 @@
+/* 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/shared/compacttheme.css");
+
+/* The window background is white due to no accentcolor in the lightweight
+   theme. It can't be changed to transparent when there is no compositor
+   (Win 7 in classic / basic theme), or else dragging and focus become
+   broken. So instead just show the normal titlebar in that case, and override
+   the window color as transparent when the compositor is available. */
+@media (-moz-windows-compositor: 0) {
+  /* Prevent accent color overriding the window background for
+   * light and dark theme on Aero Basic. This is copied from browser-aero.css. */
+  @media (-moz-windows-default-theme) {
+    #messengerWindow {
+      background-color: rgb(185,209,234) !important;
+    }
+    #messengerWindow:-moz-window-inactive {
+      background-color: rgb(215,228,242) !important;
+    }
+  }
+}
+
+@media (-moz-platform: windows-win7) {
+  @media (-moz-windows-default-theme) {
+    /* Always show light toolbar elements on aero surface. */
+    #tabs-toolbar {
+      color: hsl(240,9%,98%);
+    }
+
+    /* Keep showing the correct color inside the tabs. */
+    .tabmail-tab {
+      color: var(--lwt-text-color) !important;
+    }
+
+    #messengerWindow[tabsintitlebar] #mail-menubar > menu {
+      color: inherit;
+    }
+
+    :root[tabsintitlebar] #tabs-toolbar .toolbarbutton-1,
+    :root[tabsintitlebar] #tabmail-arrowscrollbox::part(scrollbutton-up),
+    :root[tabsintitlebar] #tabmail-arrowscrollbox::part(scrollbutton-down) {
+      fill: CaptionText;
+    }
+  }
+}
+
+@media (-moz-windows-glass) {
+  /* Use opaque white icons on Aero Glass. */
+  #tabs-toolbar {
+    --toolbarbutton-icon-fill: white;
+  }
+
+  :root[tabsintitlebar] #mail-menubar,
+  :root[tabsintitlebar]:not([inFullscreen]) #mail-menubar:-moz-window-inactive {
+    color: inherit;
+  }
+}
+
+@media (-moz-platform: windows-win7),
+       (-moz-platform: windows-win8) {
+  #messengerWindow .statusbar {
+    background-color: var(--lwt-accent-color);
+  }
+
+  @media (-moz-windows-compositor) {
+    #messengerWindow[windowtype="mail:3pane"] {
+      background: transparent !important;
+    }
+  }
+
+  /* Show border on tabs with background colors and
+   * show the tabs toolbar background color inside tabs. */
+  .tabmail-tab {
+    background-color: var(--lwt-accent-color) !important;
+    border-top: 1px solid var(--lwt-tabs-border-color);
+    background-clip: padding-box;
+  }
+
+  /* The top border on top of the tab background is replaced
+   * by the slightly transparent outside tabs-border-color. */
+  .tab-background {
+    border-top-style: none !important;
+  }
+
+  /* The border at the start of the tab strip is replaced
+   * by the slightly transparent outside tabs-border-color. */
+  .tabmail-tab:first-child {
+    margin-inline-start: 0 !important;
+    border-inline-start: 1px solid var(--lwt-tabs-border-color);
+  }
+
+  /* The border at the end of the tab strip is replaced
+   * by the slightly transparent outside tabs-border-color. */
+  .tabmail-tab:last-child {
+    border-inline-end: 1px solid var(--lwt-tabs-border-color);
+  }
+
+  .tabmail-tab:first-child::before,
+  .tabmail-tab:last-child::after {
+    display: none !important;
+  }
+
+  /* Use proper menu text styling in Win7 classic mode (copied from browser.css) */
+  @media (-moz-windows-default-theme: 0) {
+    :root[tabsintitlebar]:not([inFullscreen]) #mail-menubar,
+    :root[tabsintitlebar]:not([inFullscreen]) unified-toolbar {
+      color: CaptionText;
+    }
+
+    :root[tabsintitlebar]:not([inFullscreen]) #mail-menubar:-moz-window-inactive,
+    :root[tabsintitlebar]:not([inFullscreen]) unified-toolbar:-moz-window-inactive {
+      color: InactiveCaptionText;
+    }
+
+    #messengerWindow[tabsintitlebar] #mail-menubar > menu {
+      color: inherit;
+    }
+
+    #tabs-toolbar .toolbarbutton-1,
+    #tabmail-arrowscrollbox::part(scrollbutton-up),
+    #tabmail-arrowscrollbox::part(scrollbutton-down) {
+      fill: CaptionText;
+    }
+  }
+}
+
+/* Restored windows get an artificial border on windows, because the lwtheme background
+ * overlaps the regular window border. That isn't the case for us, so we avoid painting
+ * over the native border with our custom borders: */
+#navigation-toolbox {
+  /* These are !important to avoid specificity-wars with the selectors that add borders here. */
+  background-image: none !important;
+  border-top: none !important;
+  box-shadow: none !important;
+  padding-top: 0 !important;
+}
diff --git a/comm/mail/themes/windows/mail/compose/messengercompose.css b/comm/mail/themes/windows/mail/compose/messengercompose.css
new file mode 100644
index 0000000000..f4765d53b2
--- /dev/null
+++ b/comm/mail/themes/windows/mail/compose/messengercompose.css
@@ -0,0 +1,210 @@
+/* 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");
+@import url("chrome://messenger/skin/shared/messengercompose.css");
+
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* ::::: special toolbar colors ::::: */
+
+@media (-moz-platform: windows-win10) and (-moz-windows-default-theme) {
+  #menubar-items > #mail-menubar > menu[disabled="true"] {
+    background-color: transparent;
+  }
+
+  #menubar-items > #mail-menubar >
+    menu:not([disabled="true"])[_moz-menuactive="true"] {
+    background-color: hsla(0, 0%, 0%, .12);
+  }
+
+  @media (prefers-color-scheme: dark) {
+    #menubar-items > #mail-menubar >
+      menu:not([disabled="true"])[_moz-menuactive="true"] {
+      background-color: hsla(0, 0%, 100%, .2);
+    }
+  }
+}
+
+#composeContentBox {
+  appearance: none;
+  color: -moz-dialogtext;
+  background-color: -moz-Dialog;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2) inset;
+  border-top-width: 0;
+}
+
+#composeContentBox:-moz-window-inactive {
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1) inset;
+}
+
+#MsgHeadersToolbar {
+  color: -moz-DialogText;
+  text-shadow: none;
+  padding-block: 4px 2px;
+}
+
+#subjectLabel {
+  margin-bottom: 0;
+}
+
+@media (-moz-windows-classic) {
+  :root:not(:-moz-lwtheme) .autocomplete-richlistitem {
+    --arrowpanel-dimmed: Highlight;
+  }
+}
+
+@media (prefers-contrast) {
+  #msgSubject:not(:-moz-lwtheme),
+  #msgIdentity:not(:-moz-lwtheme),
+  .address-container:not(:-moz-lwtheme) {
+    --toolbarbutton-hover-bordercolor: ThreeDShadow;
+  }
+
+  #msgSubject:not(:-moz-lwtheme):hover,
+  #msgIdentity:not(:-moz-lwtheme):hover,
+  .address-container:not(:-moz-lwtheme):hover {
+    --toolbarbutton-hover-bordercolor: ThreeDDarkShadow;
+  }
+
+  #MsgHeadersToolbar:not(:-moz-lwtheme) .address-pill {
+    box-shadow: inset 0 0 0 1px ThreeDShadow;
+  }
+
+  #MsgHeadersToolbar:not(:-moz-lwtheme) .address-pill:hover:not(.editing),
+  #MsgHeadersToolbar:not(:-moz-lwtheme) .address-pill:focus:not(.editing) {
+    box-shadow: inset 0 0 0 1px SelectedItem;
+  }
+
+  #MsgHeadersToolbar:not(:-moz-lwtheme) .address-pill[selected] {
+    color: SelectedItemText;
+    background-color: SelectedItem;
+    box-shadow: inset 0 0 0 1px SelectedItem, inset 0 0 0 2em SelectedItem;
+  }
+
+  #MsgHeadersToolbar:not(:-moz-lwtheme) .address-pill[selected]:hover:not(.editing),
+  #MsgHeadersToolbar:not(:-moz-lwtheme) .address-pill[selected]:focus:not(.editing) {
+    box-shadow: inset 0 0 0 1px SelectedItemText, inset 0 0 0 2em SelectedItem;
+    text-shadow: none;
+  }
+
+  #MsgHeadersToolbar:not(:-moz-lwtheme) .address-pill:not([selected]) .pill-indicator {
+    fill: ThreeDShadow;
+  }
+
+  #MsgHeadersToolbar:not(:-moz-lwtheme)
+    .address-pill:not([selected],.editing):hover .pill-indicator {
+    fill: SelectedItem;
+  }
+}
+
+#identityLabel-box {
+  margin-top: 1px;
+}
+
+#msgIdentity {
+  box-shadow: none;
+}
+
+#msgIdentity:-moz-focusring:not([open="true"])::part(label-box) {
+  outline: none;
+}
+
+@media (prefers-contrast) {
+  #msgIdentity::part(label-box) {
+    background-color: transparent !important;
+    color: inherit !important;
+  }
+}
+
+#msgIdentity::part(text-input) {
+  background-color: inherit;
+  color: inherit;
+  margin-block: 2px;
+}
+
+.address-label-container {
+  padding-top: 5px;
+}
+
+.address-container {
+  padding: 0 4px;
+}
+
+#msgIdentity,
+.address-container {
+  min-height: 28px;
+}
+
+#msgSubject {
+  min-height: 26px;
+  margin-top: 0;
+  padding-inline-start: 5px;
+}
+
+/* ::::: format toolbar ::::: */
+
+#FormatToolbar {
+  margin-block-end: 2px;
+}
+
+#FontFaceSelect {
+  max-width: 35ch;
+}
+
+toolbarbutton.formatting-button {
+  margin: 1px;
+}
+
+/* ::::: address book sidebar ::::: */
+
+#compose-toolbox {
+  appearance: none;
+  border-bottom: 1px solid var(--chrome-content-separator-color);
+}
+
+@media (-moz-windows-default-theme) {
+  @media (-moz-platform: windows-win8),
+         (-moz-platform: windows-win10) {
+    #compose-toolbox:not(:-moz-lwtheme) {
+      --chrome-content-separator-color: #c2c2c2;
+    }
+  }
+}
+
+toolbar:not(:-moz-lwtheme) {
+  appearance: none;
+}
+
+#compose-toolbox > toolbar:not([type="menubar"]) {
+  padding: 2px 1px;
+}
+
+#compose-toolbox > toolbar:not([type="menubar"]):-moz-lwtheme {
+  text-shadow: none;
+}
+
+/* ::::: autocomplete icons ::::: */
+
+.ac-site-icon {
+  display: flex;
+  margin: 1px 5px;
+}
+
+/* ::::: address book sidebar ::::: */
+
+#contactsBrowser {
+  background-color: -moz-Dialog;
+}
+
+@media (-moz-windows-glass) {
+  #compose-toolbox:not(:-moz-lwtheme) {
+    color: black;
+    text-shadow: 0 0 .7em white, 0 0 .7em white, 0 1px 0 rgba(255, 255, 255, .4);
+  }
+}
diff --git a/comm/mail/themes/windows/mail/contextMenu.css b/comm/mail/themes/windows/mail/contextMenu.css
new file mode 100644
index 0000000000..efec4e8ec9
--- /dev/null
+++ b/comm/mail/themes/windows/mail/contextMenu.css
@@ -0,0 +1,74 @@
+/* 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/shared/contextMenu.css");
+
+/* Disabled empty item looks too small otherwise, because it has no icon. */
+menuitem[disabled="true"]:not(.menuitem-iconic) {
+  /* This is 16px for an icon + 3px for its margins + 1px for its padding +
+   * 2px for its border. */
+  min-height: 22px;
+}
+
+menupopup:not([type="arrow"]) {
+  margin: -4px;
+}
+
+@media (prefers-contrast) {
+  menupopup:not(:-moz-lwtheme) > :is(menu, menuitem):not([disabled="true"])[_moz-menuactive] {
+    color: SelectedItemText;
+  }
+}
+
+@media (-moz-windows-non-native-menus) {
+  menupopup[needsgutter] menu:not([icon], .menu-iconic),
+  menupopup[needsgutter] menuitem:not([checked="true"], [icon], .menuitem-iconic) {
+    padding-inline-start: 32px;
+  }
+
+  menupopup > :is(menu, menuitem):not([needsgutter]) >
+    menuitem:not([icon], .menuitem-iconic) {
+    padding-inline-start: 1em;
+  }
+
+  menuitem[checked="true"] {
+    padding-inline-start: 8px;
+  }
+}
+
+@media (-moz-windows-non-native-menus: 0) {
+  menupopup {
+    appearance: none;
+    background-color: transparent;
+    border: none;
+    /* Somehow the double border radius is needed to look correct. */
+    border-radius: calc(2 * var(--arrowpanel-border-radius));
+  }
+
+  menupopup:not([type="arrow"])::part(content) {
+    --panel-shadow-margin: 4px;
+    --panel-shadow: 0 0 4px hsla(0, 0%, 0%, 0.2);
+  }
+
+  /* Override popup.css */
+  menulist > menupopup {
+    --panel-background: var(--arrowpanel-background);
+    --panel-border-color: var(--arrowpanel-border-color);
+  }
+
+  :is(.menuitem-iconic, .menu-iconic) > .menu-iconic-left,
+  menupopup > menuitem:is([type="checkbox"],[type="radio"]) > .menu-iconic-left,
+  menupopup > menuitem > .menu-text {
+    appearance: none;
+  }
+
+  menuitem[checked="true"] > .menu-iconic-left > .menu-iconic-icon {
+    display: block;
+  }
+
+  .menu-text, .menu-iconic-text,
+  menupopup > :is(menu, menuitem) > .menu-text {
+    margin-inline-start: 8px !important;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/customizeToolbar.css b/comm/mail/themes/windows/mail/customizeToolbar.css
new file mode 100644
index 0000000000..cfe4305016
--- /dev/null
+++ b/comm/mail/themes/windows/mail/customizeToolbar.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/. */
+
+@import url("chrome://messenger/skin/shared/customizeToolbar.css");
+
+#palette-box {
+  margin: 0 4px 10px;
+}
+
+@media (-moz-windows-default-theme: 0) {
+  :root:not(:-moz-lwtheme) #palette-box {
+    background-color: transparent;
+    border-color: ThreeDShadow;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/downloads/aboutDownloads.css b/comm/mail/themes/windows/mail/downloads/aboutDownloads.css
new file mode 100644
index 0000000000..8351498da9
--- /dev/null
+++ b/comm/mail/themes/windows/mail/downloads/aboutDownloads.css
@@ -0,0 +1,47 @@
+/* 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/shared/aboutDownloads.css");
+
+@media (-moz-windows-glass) {
+  #downloadTopBox:not(:-moz-lwtheme) {
+    --chrome-content-separator-color: #aabccf;
+  }
+}
+
+@media (-moz-windows-default-theme) {
+  #downloadTopBox:not(:-moz-lwtheme) {
+    --chrome-content-separator-color: #c2c2c2;
+  }
+
+  /*
+  -moz-default-appearance: menuitem is almost right, but the hover effect is
+  not transparent and is lighter than desired.
+
+  Copied from the autocomplete richlistbox styling in
+  toolkit/themes/windows/global/autocomplete.css
+
+  This styling should be kept in sync with the style from the above file.
+  */
+  :root:not([lwt-tree]) #msgDownloadsRichListBox > .download[selected] {
+    color: inherit;
+    background-color: transparent;
+    /* four gradients for the bevel highlights on each edge, one for blue background */
+    background-image:
+      linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px),
+      linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px),
+      linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px),
+      linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px),
+      linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3));
+    background-clip: content-box;
+    border-radius: 6px;
+    outline: 1px solid rgb(124,163,206);
+    outline-offset: -2px;
+    --in-content-button-text-color-hover: inherit;
+  }
+}
+
+.downloadButton > .button-box > .button-icon {
+  list-style-image: url("chrome://global/skin/icons/folder.svg");
+}
diff --git a/comm/mail/themes/windows/mail/filterDialog.css b/comm/mail/themes/windows/mail/filterDialog.css
new file mode 100644
index 0000000000..fc934ffe23
--- /dev/null
+++ b/comm/mail/themes/windows/mail/filterDialog.css
@@ -0,0 +1,46 @@
+/* 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/shared/filterDialog.css");
+
+/* ::::: columns :::::: */
+
+#gray_horizontal_splitter {
+  margin-inline: -6px;
+}
+
+#filterHeader,
+#filterListGrid {
+  margin: 8px 6px 0;
+}
+
+#FilterEditor {
+  padding-inline: 4px;
+}
+
+.search-menulist,
+.search-value-menulist {
+  width: 11em;
+}
+
+.input-inline.search-value-input {
+  padding-block: 3px;
+}
+
+.small-button {
+  min-width: 3em;
+  margin: 1px 2px;
+}
+
+.small-button + .small-button {
+  margin-inline: 0 4px;
+}
+
+toolbarbutton[is="toolbarbutton-menu-button"] > toolbarbutton {
+  min-height: 22px;
+}
diff --git a/comm/mail/themes/windows/mail/folderMenus.css b/comm/mail/themes/windows/mail/folderMenus.css
new file mode 100644
index 0000000000..a347ba2898
--- /dev/null
+++ b/comm/mail/themes/windows/mail/folderMenus.css
@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* ===== folderMenus.css ================================================
+  == Icons for menus which represent mail folder.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/folderMenus.css");
+
+.folderMenuItem .menu-iconic-left {
+  display: flex;
+}
+
+.menulist-menupopup[is="folder-menupopup"] {
+  list-style-image: none;
+}
diff --git a/comm/mail/themes/windows/mail/folderPane.css b/comm/mail/themes/windows/mail/folderPane.css
new file mode 100644
index 0000000000..2303ce2b5c
--- /dev/null
+++ b/comm/mail/themes/windows/mail/folderPane.css
@@ -0,0 +1,52 @@
+/* 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/shared/folderPane.css");
+
+/* ::::: All Servers ::::: */
+
+treechildren::-moz-tree-image(folderNameCol) {
+  margin-top: 2px;
+}
+
+@media (-moz-windows-default-theme: 0) {
+  #folderTree treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true) {
+    padding-inline-start: 23px !important;
+  }
+
+  treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
+    fill: color-mix(in srgb, SelectedItemText 20%, transparent) !important;
+    stroke: SelectedItemText !important;
+  }
+
+  :root:not(:-moz-lwtheme) treechildren::-moz-tree-image(folderNameCol) {
+    --default: FieldText;
+    --primary: SelectedItem;
+  }
+}
+
+@media (prefers-contrast) {
+  treechildren::-moz-tree-image(folderNameCol, newMessages-true, selected, focus) {
+    fill: color-mix(in srgb, SelectedItemText 20%, transparent) !important;
+    stroke: SelectedItemText !important;
+  }
+}
+
+#folderTree treechildren::-moz-tree-indentation {
+  width: 8px;
+}
+
+/* UI Density customization */
+
+#folderTree > treechildren::-moz-tree-row {
+  min-height: 1.8rem;
+}
+
+:root[uidensity="compact"] #folderTree > treechildren::-moz-tree-row {
+  min-height: 1.6rem;
+}
+
+:root[uidensity="touch"] #folderTree > treechildren::-moz-tree-row {
+  min-height: 2.4rem;
+}
diff --git a/comm/mail/themes/windows/mail/glodaFacetView.css b/comm/mail/themes/windows/mail/glodaFacetView.css
new file mode 100644
index 0000000000..dd4ddfaa01
--- /dev/null
+++ b/comm/mail/themes/windows/mail/glodaFacetView.css
@@ -0,0 +1,5 @@
+/* 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/shared/glodaFacetView.css");
diff --git a/comm/mail/themes/windows/mail/icons/arrow/arrow-down-dim.png b/comm/mail/themes/windows/mail/icons/arrow/arrow-down-dim.png
new file mode 100644
index 0000000000..4f7fcd5784
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/arrow/arrow-down-dim.png
diff --git a/comm/mail/themes/windows/mail/icons/arrow/arrow-down.png b/comm/mail/themes/windows/mail/icons/arrow/arrow-down.png
new file mode 100644
index 0000000000..d2df341a58
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/arrow/arrow-down.png
diff --git a/comm/mail/themes/windows/mail/icons/arrow/arrow-left.png b/comm/mail/themes/windows/mail/icons/arrow/arrow-left.png
new file mode 100644
index 0000000000..6607869ad0
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/arrow/arrow-left.png
diff --git a/comm/mail/themes/windows/mail/icons/arrow/arrow-right-dim.png b/comm/mail/themes/windows/mail/icons/arrow/arrow-right-dim.png
new file mode 100644
index 0000000000..49dc2d55e4
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/arrow/arrow-right-dim.png
diff --git a/comm/mail/themes/windows/mail/icons/arrow/arrow-right.png b/comm/mail/themes/windows/mail/icons/arrow/arrow-right.png
new file mode 100644
index 0000000000..f9e33978e7
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/arrow/arrow-right.png
diff --git a/comm/mail/themes/windows/mail/icons/arrow/arrow-up.png b/comm/mail/themes/windows/mail/icons/arrow/arrow-up.png
new file mode 100644
index 0000000000..1eb4d4ceb2
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/arrow/arrow-up.png
diff --git a/comm/mail/themes/windows/mail/icons/connecting.png b/comm/mail/themes/windows/mail/icons/connecting.png
new file mode 100644
index 0000000000..3c8e71f5db
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/connecting.png
diff --git a/comm/mail/themes/windows/mail/icons/error.png b/comm/mail/themes/windows/mail/icons/error.png
new file mode 100644
index 0000000000..628cf2dae3
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/error.png
diff --git a/comm/mail/themes/windows/mail/icons/identity.png b/comm/mail/themes/windows/mail/icons/identity.png
new file mode 100644
index 0000000000..8d4f3bc327
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/identity.png
diff --git a/comm/mail/themes/windows/mail/icons/jumplist.png b/comm/mail/themes/windows/mail/icons/jumplist.png
new file mode 100644
index 0000000000..d070cd1671
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/jumplist.png
diff --git a/comm/mail/themes/windows/mail/icons/multicolor.png b/comm/mail/themes/windows/mail/icons/multicolor.png
new file mode 100644
index 0000000000..b96853cf37
--- /dev/null
+++ b/comm/mail/themes/windows/mail/icons/multicolor.png
diff --git a/comm/mail/themes/windows/mail/imAccounts.css b/comm/mail/themes/windows/mail/imAccounts.css
new file mode 100644
index 0000000000..3608daf7dd
--- /dev/null
+++ b/comm/mail/themes/windows/mail/imAccounts.css
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://messenger/skin/shared/imAccounts.css");
+
+richlistitem .account-buttons {
+  margin-inline-start: 32px;
+}
+
+#statusTypeIcon .button-box {
+  border-style: none;
+}
diff --git a/comm/mail/themes/windows/mail/input-fields.css b/comm/mail/themes/windows/mail/input-fields.css
new file mode 100644
index 0000000000..42b639a462
--- /dev/null
+++ b/comm/mail/themes/windows/mail/input-fields.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/. */
+
+@import url("chrome://messenger/skin/shared/input-fields.css");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+html|input.input-inline {
+  padding: 1px;
+  padding-inline-start: 4px;
+}
+
+html|input.input-filefield {
+  background: center left 2px / 16px no-repeat;
+}
+
+html|input[type="number"]::-moz-number-spin-up,
+html|input[type="number"]::-moz-number-spin-down {
+  min-height: .7em;
+}
diff --git a/comm/mail/themes/windows/mail/junkMail.css b/comm/mail/themes/windows/mail/junkMail.css
new file mode 100644
index 0000000000..8cd3f7aa48
--- /dev/null
+++ b/comm/mail/themes/windows/mail/junkMail.css
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*===== junkMail=======.css ==============================================
+  == Styles for the junk mail dialog
+ ======================================================================== */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+/* ::::: account manager :::::: */
+
+.specialFolderPickerGrid {
+  margin-inline-start: 20px;
+}
diff --git a/comm/mail/themes/windows/mail/mailWindow1.css b/comm/mail/themes/windows/mail/mailWindow1.css
new file mode 100644
index 0000000000..903a120078
--- /dev/null
+++ b/comm/mail/themes/windows/mail/mailWindow1.css
@@ -0,0 +1,461 @@
+/* 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/folderPane.css");
+@import url("chrome://messenger/skin/messageIcons.css");
+@import url("chrome://messenger/skin/shared/mailWindow1.css");
+
+#messengerBox {
+  background-color: -moz-Dialog;
+}
+
+/* ::::: thread decoration ::::: */
+
+/* ::::: group rows ::::: */
+treechildren::-moz-tree-row(dummy, hover),
+treechildren::-moz-tree-row(dummy, selected, focus) {
+  background-color: var(--row-grouped-header-bg-color-selected) !important;
+  color: inherit;
+}
+
+/* ..... tabs ..... */
+
+#tabpanelcontainer {
+  appearance: none;
+  color-scheme: light dark;
+}
+
+/* ..... Draw in titlebar ..... */
+
+:root[tabsintitlebar][sizemode="normal"] #titlebar {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-titlebar;
+}
+
+:root[tabsintitlebar][sizemode="maximized"] #titlebar {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-titlebar-maximized;
+}
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme),
+       (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  :root[tabsintitlebar][sizemode="normal"] #titlebar {
+    appearance: none;
+  }
+}
+
+@media (-moz-windows-classic) {
+  :root[tabsintitlebar] #navigation-toolbox > #toolbar-menubar {
+    border-bottom: none;
+  }
+
+  :root[tabsintitlebar][sizemode="normal"] #navigation-toolbox > #toolbar-menubar {
+    margin-top: 4px;
+  }
+}
+
+/* The button box must appear on top of the navigation-toolbox in order for
+ * click and hover mouse events to work properly for the button in the restored
+ * window state. Otherwise, elements in the navigation-toolbox, like the menubar,
+ * can swallow those events. It will also place the buttons above the fog on
+ * themes with Aero Glass.
+ */
+.titlebar-buttonbox {
+  z-index: 1;
+}
+
+.titlebar-buttonbox {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-button-box;
+  position: relative;
+}
+
+@media (-moz-windows-classic) {
+  .titlebar-buttonbox {
+    appearance: none;
+  }
+}
+
+:root[sizemode="maximized"] .titlebar-buttonbox {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-button-box-maximized;
+}
+
+.titlebar-min {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-button-minimize;
+}
+
+@media (-moz-windows-classic: 0) {
+  .titlebar-min {
+    margin-inline-end: 2px;
+  }
+}
+
+.titlebar-max {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-button-maximize;
+}
+
+.titlebar-restore {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-button-restore;
+}
+
+.titlebar-close {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-button-close;
+}
+
+@media (-moz-windows-compositor) {
+  @media (-moz-platform: windows-win7),
+         (-moz-platform: windows-win8) {
+    :root {
+      appearance: auto;
+      -moz-default-appearance: -moz-win-borderless-glass;
+      background-color: transparent;
+    }
+
+    /* These should be hidden w/ glass enabled. Windows draws its own buttons. */
+    .titlebar-button {
+      display: none;
+    }
+
+    :root[sizemode="normal"] .titlebar-buttonbox:-moz-lwtheme {
+      margin-top: -2px;
+    }
+
+    :root[sizemode="maximized"] .titlebar-buttonbox {
+      margin-inline-end: 3px;
+    }
+  }
+
+  @media (-moz-platform: windows-win10) {
+    @media (-moz-windows-default-theme) {
+      :root:not(:-moz-lwtheme) {
+        background-color: var(--color-gray-10);
+      }
+
+      :root[tabsintitlebar]:-moz-lwtheme {
+        background-color: var(--lwt-accent-color);
+      }
+
+      :root[tabsintitlebar]:-moz-lwtheme:-moz-window-inactive {
+        background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
+      }
+
+      :root[tabsintitlebar] #navigation-toolbox {
+        margin-top: -1px;
+      }
+
+      :root[tabsintitlebar] #toolbar-menubar:not([inactive="true"]) {
+        margin-top: 1px;
+      }
+
+      @media (-moz-windows-accent-color-in-titlebar: 0) {
+        :root[sizemode=normal][tabsintitlebar] {
+          border-top: 1px solid rgba(0, 0, 0, 0.7);
+        }
+        :root[sizemode=normal][tabsintitlebar][always-use-accent-color-for-window-border]:not(:-moz-window-inactive) {
+          border-top-color: AccentColor;
+        }
+        :root[tabsintitlebar]:not(:-moz-window-inactive,:-moz-lwtheme) {
+          background-color: var(--color-gray-30);
+        }
+      }
+
+      @media (-moz-windows-accent-color-in-titlebar) {
+        :root[sizemode=normal][tabsintitlebar] {
+          border-top: 1px solid AccentColor;
+        }
+        :root[tabsintitlebar]:not(:-moz-window-inactive,:-moz-lwtheme) {
+          background-color: AccentColor;
+        }
+
+        :root[tabsintitlebar] #navigation-toolbox:not(:-moz-window-inactive,:-moz-lwtheme) {
+          color: AccentColorText;
+        }
+      }
+
+      :root[sizemode=normal][tabsintitlebar]:-moz-window-inactive {
+        border-top-color: rgba(0, 0, 0, 0.3);
+      }
+    }
+
+    @media (prefers-contrast) {
+      #tabmail-container {
+        appearance: auto;
+        -moz-default-appearance: -moz-win-exclude-glass;
+      }
+    }
+
+    .titlebar-buttonbox,
+    .titlebar-button {
+      appearance: none !important;
+    }
+
+    .titlebar-button {
+      border: none;
+      margin: 0 !important;
+      padding: 9px 17px;
+      -moz-context-properties: stroke;
+      stroke: currentColor;
+    }
+
+    @media (-moz-windows-default-theme) {
+      @media (-moz-windows-accent-color-in-titlebar) {
+        .titlebar-button:not(:-moz-window-inactive,:-moz-lwtheme) {
+          stroke: AccentColorText;
+        }
+      }
+    }
+
+    .titlebar-buttonbox > .titlebar-button > .toolbarbutton-icon {
+      display: inline-flex;
+      width: 12px;
+      height: 12px;
+    }
+
+    .titlebar-min {
+      list-style-image: url("chrome://messenger/skin/window-controls/minimize.svg");
+    }
+
+    .titlebar-max {
+      list-style-image: url("chrome://messenger/skin/window-controls/maximize.svg");
+    }
+
+    .titlebar-restore {
+      list-style-image: url("chrome://messenger/skin/window-controls/restore.svg");
+    }
+
+    .titlebar-restore:-moz-locale-dir(rtl) {
+      transform: scaleX(-1);
+    }
+
+    .titlebar-close {
+      list-style-image: url("chrome://messenger/skin/window-controls/close.svg");
+    }
+
+    :root[lwtheme-image] .titlebar-button {
+      -moz-context-properties: unset;
+    }
+    :root[lwtheme-image] .titlebar-min {
+      list-style-image: url("chrome://messenger/skin/window-controls/minimize-themes.svg");
+    }
+    :root[lwtheme-image] .titlebar-max {
+      list-style-image: url("chrome://messenger/skin/window-controls/maximize-themes.svg");
+    }
+    :root[lwtheme-image] .titlebar-restore {
+      list-style-image: url("chrome://messenger/skin/window-controls/restore-themes.svg");
+    }
+    :root[lwtheme-image] .titlebar-close {
+      list-style-image: url("chrome://messenger/skin/window-controls/close-themes.svg");
+    }
+
+    /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which
+     * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */
+    @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) {
+      .titlebar-button > .toolbarbutton-icon {
+        width: 11.5px;
+        height: 11.5px;
+      }
+    }
+
+    /* 175% dpi should result in the same device pixel sizes as 150% dpi. */
+    @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) {
+      .titlebar-button {
+        padding-left: 14.1px;
+        padding-right: 14.1px;
+      }
+
+      .titlebar-button > .toolbarbutton-icon {
+        width: 10.8px;
+        height: 10.8px;
+      }
+    }
+
+    /* 225% dpi should result in the same device pixel sizes as 200% dpi. */
+    @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) {
+      .titlebar-button {
+        padding-left: 15.3333px;
+        padding-right: 15.3333px;
+      }
+
+      .titlebar-button > .toolbarbutton-icon {
+        width: 10.8px;
+        height: 10.8px;
+      }
+    }
+
+    /* 275% dpi should result in the same device pixel sizes as 250% dpi. */
+    @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) {
+      /* NB: todo: this should also change padding on the buttons
+       * themselves, but without a device to test this on, it's
+       * impossible to know by how much. */
+      .titlebar-button > .toolbarbutton-icon {
+        width: 10.8px;
+        height: 10.8px;
+      }
+    }
+
+    @media (-moz-windows-default-theme) {
+      .titlebar-button:hover {
+        background-color: hsla(0, 0%, 0%, .12);
+      }
+
+      .titlebar-button:hover:active {
+        background-color: hsla(0, 0%, 0%, .22);
+      }
+
+      .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive {
+        opacity: 0.5;
+      }
+
+      .titlebar-close:hover {
+        stroke: white;
+        background-color: var(--color-red-60);
+      }
+
+      .titlebar-close:hover:active {
+        background-color: var(--color-red-50);
+      }
+
+      @media (prefers-color-scheme: dark) {
+        .titlebar-button:hover {
+          background-color: hsla(0, 0%, 100%, .12);
+        }
+
+        .titlebar-button:hover:active {
+          background-color: hsla(0, 0%, 100%, .22);
+        }
+
+        .titlebar-close:hover {
+          background-color: var(--color-red-70);
+        }
+
+        .titlebar-close:hover:active {
+          background-color: var(--color-red-60);
+        }
+      }
+    }
+    @media (prefers-contrast) {
+      .titlebar-button {
+        stroke: ButtonText;
+        background-color: Field;
+      }
+      .titlebar-button:hover {
+        stroke: SelectedItemText;
+        background-color: SelectedItem;
+      }
+
+      .titlebar-min {
+        list-style-image: url("chrome://messenger/skin/window-controls/minimize-highcontrast.svg");
+      }
+
+      .titlebar-max {
+        list-style-image: url("chrome://messenger/skin/window-controls/maximize-highcontrast.svg");
+      }
+
+      .titlebar-restore {
+        list-style-image: url("chrome://messenger/skin/window-controls/restore-highcontrast.svg");
+      }
+
+      .titlebar-close {
+        list-style-image: url("chrome://messenger/skin/window-controls/close-highcontrast.svg");
+      }
+    }
+  }
+}
+
+#messagepanebox {
+  border-top-width: 0;
+  border-inline-start: none;
+}
+
+@media (prefers-contrast) {
+  :root:not(:-moz-lwtheme)
+    treechildren::-moz-tree-image(selected) {
+    color: inherit;
+  }
+}
+
+@media (-moz-windows-default-theme) {
+  :root:not([lwt-tree],:-moz-lwtheme) #folderTree {
+    background-color: #fafafa;
+  }
+}
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme) {
+  @media (-moz-windows-glass: 0) {
+    #messengerWindow:not([tabsintitlebar]) #navigation-toolbox:not(:-moz-lwtheme) {
+      background-color: var(--color-gray-30);
+    }
+  }
+}
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme),
+       (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  @media (-moz-windows-compositor) {
+    :root:not(:-moz-lwtheme) {
+      --lwt-tabs-border-color: var(--glassShadowColor);
+    }
+
+    #messengerWindow[sizemode=normal] #tabpanelcontainer {
+      border: 1px solid var(--glassShadowColor);
+      border-top: none;
+      background-clip: padding-box;
+    }
+
+    #messengerWindow[sizemode=normal] #toolbar-menubar {
+      border-right: 1px solid var(--glassShadowColor);
+      border-left: 1px solid var(--glassShadowColor);
+      background-clip: padding-box;
+    }
+
+    #messengerWindow[sizemode=normal] .statusbar {
+      margin-top: -1px;
+      border: 1px solid var(--glassShadowColor);
+      border-top-color: threedshadow;
+      border-radius: 1px 1px 0 0;
+      background-clip: padding-box;
+    }
+  }
+}
+
+@media (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  #messengerWindow:not([tabsintitlebar]) #navigation-toolbox:not(:-moz-lwtheme) {
+    background-color: var(--color-gray-30);
+  }
+}
+
+@media not (-moz-windows-non-native-menus) {
+  #viewPickerPopup > menu > .menu-text {
+    padding-inline-start: 0 !important;
+  }
+}
+
+@media (-moz-windows-compositor: 0) {
+  @media (-moz-windows-default-theme) {
+    #messengerWindow:not(:-moz-lwtheme) {
+      background-color: rgb(185, 209, 234);
+    }
+    #messengerWindow:not(:-moz-lwtheme):-moz-window-inactive {
+      background-color: rgb(215, 228, 242);
+    }
+  }
+}
+
+/* Global notification popup */
+
+#notification-popup {
+  appearance: none;
+  background: transparent;
+  border: none;
+}
diff --git a/comm/mail/themes/windows/mail/menulist.css b/comm/mail/themes/windows/mail/menulist.css
new file mode 100644
index 0000000000..72bc07956a
--- /dev/null
+++ b/comm/mail/themes/windows/mail/menulist.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/. */
+
+@import url("chrome://messenger/skin/shared/menulist.css");
+
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+menulist[is="menulist-editable"][editable="true"] {
+  padding: 0;
+}
+
+menulist::part(text-input) {
+  appearance: none;
+  border-style: none;
+  margin-top: -2px;
+  margin-bottom: -2px;
+  margin-inline-start: -2px;
+  margin-inline-end: 3px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 3px;
+  padding-inline-end: 0;
+}
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme: 0) {
+  menulist::part(text-input) {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-inline-start: 0;
+  }
+}
+
+@media (-moz-platform: windows-win10) and (-moz-windows-default-theme: 0) {
+  menulist::part(text-input) {
+    margin-top: -1px;
+    margin-bottom: -1px;
+    margin-inline-start: 0;
+  }
+}
+
+menulist[is="menulist-editable"][editable="true"]::part(dropmarker) {
+  display: flex;
+}
+
+@media (-moz-windows-default-theme) {
+  menulist[is="menulist-editable"][editable="true"]::part(dropmarker) {
+    margin-inline-end: 0;
+    margin-inline-start: 0;
+  }
+}
+
+menulist[is="menulist-editable"][editable="true"]::part(text-input) {
+  background-color: Field;
+  color: FieldText;
+  padding-inline-end: 3px;
+}
diff --git a/comm/mail/themes/windows/mail/message-bar.css b/comm/mail/themes/windows/mail/message-bar.css
new file mode 100644
index 0000000000..8a494a0d90
--- /dev/null
+++ b/comm/mail/themes/windows/mail/message-bar.css
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://messenger/skin/shared/message-bar.css");
+
+.notification-button.small-button {
+  padding-block: 3px;
+}
+
+@media (-moz-windows-non-native-menus) {
+  #reminderBarPopup {
+    margin-top: -4px;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/messageBody.css b/comm/mail/themes/windows/mail/messageBody.css
new file mode 100644
index 0000000000..a8c696fd37
--- /dev/null
+++ b/comm/mail/themes/windows/mail/messageBody.css
@@ -0,0 +1,10 @@
+/* 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/shared/messageBody.css");
+
+.moz-txt-formfeed {
+  display: block;
+  height: 100%;
+}
diff --git a/comm/mail/themes/windows/mail/messageHeader.css b/comm/mail/themes/windows/mail/messageHeader.css
new file mode 100644
index 0000000000..5bbd87c58e
--- /dev/null
+++ b/comm/mail/themes/windows/mail/messageHeader.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/. */
+
+/* ===== messageHeader.css ==============================================
+  == Styles for the header toolbars of a mail message.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/messageHeader.css");
+
+.inline-toolbox {
+  padding-inline-end: 2px;
+}
+
+/* Customization options */
+
+.message-header-buttons-only-icons .toolbarbutton-menu-dropmarker {
+  padding-inline-start: 0 !important;
+}
diff --git a/comm/mail/themes/windows/mail/messageIcons.css b/comm/mail/themes/windows/mail/messageIcons.css
new file mode 100644
index 0000000000..d84f36f8b8
--- /dev/null
+++ b/comm/mail/themes/windows/mail/messageIcons.css
@@ -0,0 +1,49 @@
+/* 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/shared/messageIcons.css");
+
+/* ..... junkStatus column ..... */
+
+.junkStatusHeader {
+  padding-inline-end: 3px;
+}
+
+/* ..... correspondent column ..... */
+
+#correspondentCol {
+  padding-inline-start: 20px;
+}
+
+/* ..... subject column ..... */
+
+#subjectCol {
+  padding-inline-start: 20px;
+}
+
+#subjectCol[primary="true"] {
+  padding-inline-start: 40px;
+}
+
+/* ..... attachment column ..... */
+
+treechildren::-moz-tree-image(attachmentCol) {
+  margin-inline-start: 1px;
+}
+
+/* ..... junkStatus column ..... */
+
+treechildren::-moz-tree-image(junkStatusCol) {
+  margin-inline-start: 1px;
+}
+
+@media (-moz-windows-default-theme: 0) {
+  #subjectCol {
+    padding-inline-start: 23px;
+  }
+
+  #subjectCol[primary="true"] {
+    padding-inline-start: 43px;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/messageWindow.css b/comm/mail/themes/windows/mail/messageWindow.css
new file mode 100644
index 0000000000..83a0cc6ef1
--- /dev/null
+++ b/comm/mail/themes/windows/mail/messageWindow.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/. */
+
+/* ===== messageWindow.css ==============================================
+  == Styles for the message window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+
+#messengerWindow {
+  appearance: auto;
+  -moz-default-appearance: window;
+  background-color: -moz-Dialog;
+}
+
+#messagepanebox {
+  flex: 3 3;
+  text-shadow: none;
+}
+
+#messagepaneboxwrapper {
+  overflow: hidden;
+  min-height: 0;
+}
+
+#mail-toolbox:-moz-lwtheme {
+  text-shadow: none;
+}
+
+@media (-moz-platform: windows-win10) and (-moz-windows-default-theme) {
+  #menubar-items > #mail-menubar > menu {
+    appearance: auto;
+    -moz-default-appearance: menuitem;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/messenger.css b/comm/mail/themes/windows/mail/messenger.css
new file mode 100644
index 0000000000..520a108fa7
--- /dev/null
+++ b/comm/mail/themes/windows/mail/messenger.css
@@ -0,0 +1,573 @@
+/* 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://messenger/skin/shared/messenger.css");
+
+@media not (-moz-windows-non-native-menus) {
+  .menu-iconic > .menu-iconic-left,
+  .menuitem-iconic > .menu-iconic-left {
+    display: flex;
+    padding-top: 0;
+  }
+}
+
+@media (-moz-windows-non-native-menus) {
+  /* UI Density customization */
+  :root {
+    --menuitem-vertical-padding: 3px;
+  }
+  :root[uidensity="compact"] {
+    --menuitem-vertical-padding: 1px;
+  }
+
+  :root[uidensity="touch"] {
+    --menuitem-vertical-padding: 8px;
+  }
+
+  menupopup > menu,
+  menupopup > menuitem {
+    padding-block: var(--menuitem-vertical-padding);
+  }
+
+  menulist > menupopup > menu,
+  menulist > menupopup > menuitem {
+    padding-inline-end: 5px;
+  }
+
+  menulist > menupopup:not([needsgutter]) > menu:not([icon], .menu-iconic),
+  menulist > menupopup:not([needsgutter]) > menuitem:not([icon], .menuitem-iconic) {
+    padding-inline-start: 1em;
+  }
+
+  menupopup:not([needsgutter]) > menu:not([icon], .menu-iconic),
+  menupopup:not([needsgutter]) > menuitem:not([checked="true"], [icon], .menuitem-iconic) {
+    padding-inline-start: 32px;
+  }
+
+  .folderMenuItem > .menu-iconic-left,
+  .menuitem-iconic > .menu-iconic-left {
+    display: flex;
+  }
+}
+
+@media (-moz-windows-default-theme: 0),
+       (-moz-platform: windows-win10) and (-moz-windows-default-theme) {
+  #menubar-items > #mail-menubar > menu {
+    appearance: none;
+  }
+
+  #menubar-items > #mail-menubar > menu:not([disabled="true"]) {
+    color: inherit;
+  }
+}
+
+@media (-moz-windows-default-theme: 0) {
+  #menubar-items > #mail-menubar > menu[_moz-menuactive="true"] {
+    color: -moz-MenuHoverText;
+  }
+}
+
+.titlebar-buttonbox-container {
+  align-items: stretch;
+}
+
+@media (-moz-platform: windows-win7),
+       (-moz-platform: windows-win8) {
+  /* Preserve window control buttons position at the top of the button box. */
+  .titlebar-buttonbox-container {
+    align-items: flex-start;
+  }
+}
+
+@media (-moz-platform: windows-win7) {
+  @media (-moz-windows-default-theme) and (-moz-windows-glass: 0) {
+    #messengerWindow[sizemode="normal"] .titlebar-buttonbox-container {
+      padding-top: 4px;
+    }
+  }
+}
+
+@media (-moz-platform: windows-win8) {
+  #messengerWindow[sizemode="normal"] .titlebar-buttonbox-container {
+    padding-top: 3px;
+  }
+
+  @media (-moz-windows-default-theme: 0) {
+    menu {
+      appearance: none;
+    }
+  }
+}
+
+@media (-moz-windows-classic) {
+  #messengerWindow[sizemode="normal"] .titlebar-buttonbox-container {
+    padding-top: 3px;
+  }
+
+  :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar {
+    margin-top: 4px;
+  }
+}
+
+.inline-toolbar {
+  appearance: none;
+}
+
+.inline-toolbar toolbarpaletteitem toolbarseparator,
+.inline-toolbar > toolbarseparator {
+  height: 24px;
+}
+
+/* ::::: menubar ::::: */
+
+#menubar-items {
+  flex-direction: column; /* for flex hack */
+  margin-bottom: 1px;
+}
+
+#menubar-items > menubar {
+  flex: 1; /* make menu items expand to fill toolbar height */
+}
+
+menubar > menu[disabled="true"]:-moz-lwtheme {
+  color: inherit;
+  opacity: .4;
+}
+
+/* ::::: Toolbar customization ::::: */
+
+toolbarpaletteitem[place="toolbar"] > toolbarspacer {
+  width: 11px;
+}
+
+/* ::::: toolbarbutton menu-button ::::: */
+
+toolbarbutton[is="toolbarbutton-menu-button"] {
+  align-items: stretch;
+  flex-direction: row !important;
+  padding: 0 !important;
+}
+
+/* .......... dropmarker .......... */
+
+.toolbarbutton-menubutton-dropmarker {
+  appearance: none;
+  padding: 3px 7px;
+  width: auto;
+}
+
+.toolbarbutton-icon {
+  margin-inline-end: 0;
+}
+
+/* Has to be !important to overrule toolkit's dropmarker.css for the
+   dropmarker[disabled="true"] case. */
+.toolbarbutton-menu-dropmarker {
+  padding-inline-start: 3px !important;
+}
+
+.sidebar-header .toolbarbutton-text:not([value]) {
+  display: none;
+}
+
+menulist.folderMenuItem menu:not(.folderMenuItem) {
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
+treecol[sortDirection="ascending"]:not([hideheader="true"]) > .treecol-sortdirection {
+  list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+}
+
+treecol[sortDirection="descending"]:not([hideheader="true"]) > .treecol-sortdirection {
+  list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
+}
+
+.thread-tree-col-picker image,
+.thread-tree-icon-header img {
+  padding-inline-start: 1px;
+  padding-inline-end: 2px;
+  padding-bottom: 2px;
+}
+
+treechildren::-moz-tree-row(multicol, odd) {
+  background-color: transparent;
+}
+
+treechildren::-moz-tree-cell-text {
+  padding-inline-start: 2px;
+  padding-bottom: 2px;
+}
+
+@media (prefers-color-scheme: dark) {
+  /* Override the toolkit color. */
+  :root:-moz-lwtheme tree > treechildren::-moz-tree-row(selected) {
+    background-color:  rgba(249, 249, 250, .1);
+  }
+
+  :root:-moz-lwtheme tree > treechildren::-moz-tree-row(selected, focus) {
+    background-color: var(--dark-lwt-highlight-color);
+  }
+
+  :root:-moz-lwtheme treechildren::-moz-tree-twisty(selected),
+  :root:-moz-lwtheme tree:not(:focus) treechildren::-moz-tree-image(selected),
+  :root:-moz-lwtheme #threadTree:not(:focus) treechildren::-moz-tree-cell-text(untagged, selected),
+  :root:-moz-lwtheme tree:not(#threadTree,:focus) treechildren::-moz-tree-cell-text(selected) {
+    color: FieldText;
+  }
+
+  :root:-moz-lwtheme tree:not(#threadTree) treechildren::-moz-tree-image(selected, focus),
+  :root:-moz-lwtheme #threadTree treechildren::-moz-tree-image(untagged, selected, focus) {
+    color: FieldText;
+    fill: color-mix(in srgb, currentColor 20%, transparent);
+    stroke: currentColor;
+  }
+
+  :root:-moz-lwtheme #threadTree treechildren::-moz-tree-cell-text(untagged, selected),
+  :root:-moz-lwtheme tree:not(#threadTree) treechildren::-moz-tree-cell-text(selected) {
+    color: FieldText;
+    fill: currentColor;
+    stroke: currentColor;
+  }
+
+  :root:-moz-lwtheme tree:not(#threadTree) treechildren::-moz-tree-twisty(selected),
+  :root:-moz-lwtheme #threadTree treechildren::-moz-tree-twisty(untagged, selected) {
+    fill: FieldText !important;
+  }
+
+  :root:-moz-lwtheme treechildren::-moz-tree-image(folderNameCol, selected, focus) {
+    fill: color-mix(in srgb, currentColor 20%, transparent) !important;
+    stroke: currentColor;
+  }
+}
+
+@media (prefers-contrast) {
+  #threadTree > treechildren::-moz-tree-row(tagged, selected),
+  #threadTree > treechildren::-moz-tree-row(untagged, selected),
+  tree:not(#threadTree) > treechildren::-moz-tree-row(selected) {
+    border-color: SelectedItem;
+    background-color: transparent;
+  }
+}
+
+@media (-moz-windows-default-theme: 0) {
+  tree > treechildren::-moz-tree-row(hover) {
+    border-color: SelectedItemText !important;
+    border-style: solid;
+    background-color: transparent;
+  }
+
+  #threadTree > treechildren::-moz-tree-cell-text(untagged, selected),
+  tree:not(#threadTree) > treechildren::-moz-tree-cell-text(selected) {
+    color: WindowText;
+  }
+
+  #threadTree > treechildren::-moz-tree-row(untagged, selected, focus),
+  tree:not(#threadTree) > treechildren::-moz-tree-row(selected, focus) {
+    border-color: SelectedItemText;
+    background-color: SelectedItem;
+  }
+
+  tree > treechildren::-moz-tree-twisty {
+    color: WindowText;
+  }
+
+  #threadTree > treechildren::-moz-tree-twisty(untagged, selected, focus),
+  tree:not(#threadTree) > treechildren::-moz-tree-twisty(selected, focus),
+  #threadTree > treechildren::-moz-tree-image(untagged, selected, focus),
+  tree:not(#threadTree) > treechildren::-moz-tree-image(selected, focus),
+  #threadTree > treechildren::-moz-tree-cell-text(untagged, selected, focus),
+  tree:not(#threadTree) > treechildren::-moz-tree-cell-text(selected, focus) {
+    color: SelectedItemText;
+    fill: currentColor;
+  }
+
+  treechildren::-moz-tree-cell-text {
+    padding-inline-start: 4px !important;
+  }
+
+  .autocomplete-richlistitem:hover {
+    color: SelectedItemText;
+  }
+}
+
+treechildren::-moz-tree-indentation {
+  width: 12px;
+}
+
+@media (-moz-windows-classic) {
+  treecol[hideheader="true"],
+  .tree-columnpicker-button[hideheader="true"] {
+    border-width: 0;
+  }
+
+  :root[lwt-tree] treecol:not([hideheader="true"]),
+  :root[lwt-tree] .tree-columnpicker-button:not([hideheader="true"]) {
+    border-top-width: 0;
+    border-inline-start-width: 0;
+  }
+
+  :root:not(:-moz-lwtheme) treechildren::-moz-tree-row(hover) {
+    border-color: transparent;
+    background-color: transparent;
+  }
+
+  :root:not(:-moz-lwtheme) treechildren::-moz-tree-row(selected) {
+    border-color: transparent;
+    background-color: -moz-cellhighlight;
+  }
+
+  :root:not(:-moz-lwtheme) tree:not(#threadTree) > treechildren::-moz-tree-row(selected, focus),
+  :root:not(:-moz-lwtheme) #threadTree > treechildren::-moz-tree-row(untagged, selected, focus) {
+    border-color: SelectedItemText;
+    background-color: SelectedItem;
+  }
+
+  /* Add a window top border for webextension themes */
+  :root[tabsintitlebar][sizemode="normal"] #navigation-toolbox:-moz-lwtheme {
+    background-image: linear-gradient(to bottom,
+          ThreeDLightShadow 0, ThreeDLightShadow 1px,
+          ThreeDHighlight 1px, ThreeDHighlight 2px,
+          ActiveBorder 2px, ActiveBorder 4px, transparent 4px),
+          var(--lwt-header-image), var(--lwt-additional-images);
+  }
+}
+
+:root[lwt-tree] treechildren::-moz-tree-row(hover) {
+  background-color: hsla(0,0%,50%,.15);
+  border-color: transparent;
+  background-image: none;
+}
+
+menulist {
+  padding: 0 5px 1px !important;
+}
+
+menulist.folderMenuItem::part(label) {
+  margin-inline-start: 2px !important;
+}
+
+button[is="toolbarbutton-menu-button"] > .button-box > button {
+  margin-block: -1px;
+}
+
+button.notification-button[is="toolbarbutton-menu-button"] {
+  padding-inline-end: 1px;
+}
+
+.messageCloseButton > .toolbarbutton-icon {
+  margin-inline-end: 12px;
+}
+
+.toolbarbutton-menu-dropmarker {
+  margin-top: 0;
+}
+
+@media (-moz-windows-default-theme: 0) {
+  #tabmail:not(:-moz-lwtheme) {
+    background-color: ActiveCaption;
+  }
+
+  #tabmail:not(:-moz-lwtheme):-moz-window-inactive {
+    background-color: InactiveCaption;
+  }
+}
+
+@media (-moz-windows-compositor: 0) {
+  #print-preview-toolbar:not(:-moz-lwtheme) {
+    appearance: auto;
+    -moz-default-appearance: -moz-win-browsertabbar-toolbox;
+  }
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarbutton-1[disabled=true] .toolbarbutton-icon,
+.toolbarbutton-1[disabled=true] .toolbarbutton-text,
+.toolbarbutton-1[disabled=true] .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker {
+  opacity: .4;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  margin: 0 !important;
+  padding-inline: 2px !important;
+}
+
+toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1
+.toolbarbutton-text {
+  padding-inline-end: 2px;
+}
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  appearance: none;
+}
+
+@media (-moz-windows-compositor) {
+  #unifinder-searchBox,
+  #task-addition-box {
+    border-top: none;
+    background-color: -moz-dialog;
+  }
+
+  @media (-moz-platform: windows-win10) {
+    /* See bug 1715990 about why we do this ourselves on HCM */
+    @media (prefers-contrast) {
+      :root[tabsintitlebar]:not(:-moz-lwtheme) {
+        background-color: ActiveCaption;
+      }
+
+      :root[tabsintitlebar]:not(:-moz-lwtheme):-moz-window-inactive {
+        background-color: InactiveCaption;
+      }
+    }
+  }
+}
+
+.statusbarpanel {
+  border-inline-end: 1px solid ThreeDLightShadow;
+}
+
+.statusbarpanel:-moz-lwtheme {
+  border-inline-end-color: var(--lwt-tabs-border-color);
+}
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme),
+       (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  #status-bar:not(:-moz-lwtheme) {
+    appearance: none;
+    border-style: none;
+    border-top: 1px solid ThreeDShadow;
+    background-color: var(--toolbar-bgcolor);
+  }
+}
+
+@media (-moz-windows-classic) {
+  label.statusbarpanel {
+    margin: 1px;
+    padding-block: 2px;
+  }
+}
+
+/* Status panel */
+
+.statuspanel-label {
+  margin: 0;
+  padding: 2px 4px;
+  background-color: -moz-dialog;
+  border: 1px none ThreeDLightShadow;
+  border-top-style: solid;
+  color: -moz-dialogText;
+  text-shadow: none;
+}
+
+@media (-moz-windows-default-theme) {
+  .statuspanel-label {
+    background-color: #f9f9fa;
+    color: #444;
+  }
+}
+
+.statuspanel-label:-moz-locale-dir(ltr):not([mirror]),
+.statuspanel-label:-moz-locale-dir(rtl)[mirror] {
+  border-right-style: solid;
+  /* disabled for triggering grayscale AA (bug 659213)
+  border-top-right-radius: .3em;
+  */
+  margin-right: 1em;
+}
+
+.statuspanel-label:-moz-locale-dir(rtl):not([mirror]),
+.statuspanel-label:-moz-locale-dir(ltr)[mirror] {
+  border-left-style: solid;
+  /* disabled for triggering grayscale AA (bug 659213)
+  border-top-left-radius: .3em;
+  */
+  margin-left: 1em;
+}
+
+.contentTabInstance {
+  background-color: -moz-dialog;
+}
+
+.contentTabInstance:-moz-lwtheme {
+  background-color: transparent;
+  background-image: linear-gradient(transparent 40px, -moz-dialog 40px);
+}
+
+/* ::::: groupbox ::::: */
+
+fieldset {
+  border: 0.5px groove ThreeDLightShadow;
+  border-radius: 3px;
+  margin: 1em 3px 3px 3px;
+  padding: 3px 0 6px;
+}
+
+legend {
+  margin-top: -1em;
+  margin-inline-start: 3px;
+  padding-inline: 3px;
+  background-color: -moz-dialog;
+  font-weight: bold;
+}
+
+fieldset > hbox,
+fieldset > vbox,
+fieldset > radiogroup {
+  width: -moz-available;
+}
+
+#navigation-toolbox {
+  appearance: none;
+}
+
+@media (-moz-platform: windows-win7) {
+  @media (-moz-windows-default-theme) and (-moz-windows-glass: 0) {
+    /* Add a window top border behind the titlebar */
+    :root[tabsintitlebar][sizemode="normal"] #navigation-toolbox-background {
+      background-image: linear-gradient(to bottom, ThreeDDarkShadow 0,
+                                        ThreeDDarkShadow 1px, ThreeDHighlight 1px,
+                                        ThreeDHighlight 2px, transparent 2px);
+    }
+  }
+  @media (-moz-windows-classic) {
+    /* Add a window top border behind the titlebar */
+    :root[tabsintitlebar][sizemode="normal"] #navigation-toolbox-background {
+      background-image: linear-gradient(to bottom, ThreeDLightShadow 0,
+                                        ThreeDLightShadow 1px, ThreeDHighlight 1px,
+                                        ThreeDHighlight 2px, ActiveBorder 2px,
+                                        ActiveBorder 4px, transparent 4px);
+    }
+  }
+
+  @media (prefers-contrast) {
+    /* Add a window top border behind the titlebar */
+    :root[tabsintitlebar][sizemode="normal"] #navigation-toolbox-background {
+      background-image: linear-gradient(to bottom, ThreeDLightShadow 0,
+                                        ThreeDLightShadow 1px, ThreeDHighlight 1px,
+                                        ThreeDHighlight 2px, transparent 2px);
+    }
+  }
+}
+
+/* UI Density customization */
+
+treechildren::-moz-tree-row {
+  height: 1.8rem;
+}
+
+:root[uidensity="compact"] treechildren::-moz-tree-row {
+  height: 1.6rem;
+}
+
+:root[uidensity="touch"] treechildren::-moz-tree-row {
+  height: 2.4rem;
+}
diff --git a/comm/mail/themes/windows/mail/multimessageview.css b/comm/mail/themes/windows/mail/multimessageview.css
new file mode 100644
index 0000000000..e019522855
--- /dev/null
+++ b/comm/mail/themes/windows/mail/multimessageview.css
@@ -0,0 +1,25 @@
+/* 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/shared/multimessageview.css");
+
+/* windows-specific overrides for multimessageview.css*/
+
+@media not (prefers-color-scheme: dark) {
+  @media (-moz-windows-compositor) and (-moz-windows-default-theme) {
+    :root {
+      --header-background-color: #f8f8f8;
+    }
+  }
+
+  @media (-moz-platform: windows-win7) and (-moz-windows-default-theme) {
+    :root {
+      --header-background-color: rgb(233, 239, 245);
+    }
+  }
+}
+
+.star {
+  top: 0.6em;
+}
diff --git a/comm/mail/themes/windows/mail/newsblog/feed-subscriptions.css b/comm/mail/themes/windows/mail/newsblog/feed-subscriptions.css
new file mode 100644
index 0000000000..482b11b8da
--- /dev/null
+++ b/comm/mail/themes/windows/mail/newsblog/feed-subscriptions.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/. */
+
+/* ::::: Feed Subscription styling :::::: */
+
+@import url("chrome://messenger/skin/shared/feedSubscribe.css");
diff --git a/comm/mail/themes/windows/mail/panelUI.css b/comm/mail/themes/windows/mail/panelUI.css
new file mode 100644
index 0000000000..25eebb949d
--- /dev/null
+++ b/comm/mail/themes/windows/mail/panelUI.css
@@ -0,0 +1,79 @@
+/* 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/shared/panelUI.css");
+
+#appMenu-popup {
+  margin-top: -1px;
+}
+
+#appMenu-popup {
+  margin-inline: 0 -14px;
+}
+
+/* Disabled empty item looks too small otherwise, because it has no icon. */
+menuitem.subviewbutton[disabled]:not(.menuitem-iconic) {
+  /* This is 16px for an icon + 3px for its margins + 1px for its padding +
+   * 2px for its border, see above */
+  min-height: 22px;
+}
+
+@media (prefers-contrast) {
+  panelview .toolbarbutton-1:not([disabled],[open],:active):is(:hover,:focus-visible),
+  toolbarbutton.subviewbutton:not([disabled],[open],:active):is(:hover,:focus-visible),
+  menu.subviewbutton:not([disabled],:active)[_moz-menuactive],
+  menuitem.subviewbutton:not([disabled],:active)[_moz-menuactive],
+  .widget-overflow-list .toolbarbutton-1:not([disabled],[open],:active):is(:hover,:focus-visible),
+  .toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) >
+    toolbarbutton:not([disabled],[open],:active):is(:hover,:focus-visible) {
+    color: SelectedItemText;
+  }
+
+  panelview .toolbarbutton-1:not([disabled]):is([open],:hover:active),
+  toolbarbutton.subviewbutton:not([disabled]):is([open],:hover:active),
+  menu.subviewbutton:not([disabled])[_moz-menuactive]:active,
+  menuitem.subviewbutton:not([disabled])[_moz-menuactive]:active,
+  .widget-overflow-list .toolbarbutton-1:not([disabled]):is([open],:hover:active),
+  .toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) >
+    toolbarbutton:not([disabled]):is([open],:hover:active) {
+    color: SelectedItemText;
+  }
+}
+
+@media (-moz-windows-non-native-menus) {
+  menu.subviewbutton > .menu-right {
+    margin-inline-end: 0;
+  }
+}
+
+@media (-moz-windows-non-native-menus: 0) {
+  menupopup[type="arrow"] {
+    appearance: none;
+    background-color: transparent;
+    border: none;
+    border-radius: 4px;
+  }
+
+  menuitem.subviewbutton[type="checkbox"] > .menu-iconic-left {
+    appearance: none;
+  }
+
+  menuitem.subviewbutton > .menu-text {
+    appearance: none;
+  }
+
+  menuitem.subviewbutton-iconic > .menu-iconic-left > .menu-iconic-icon {
+    display: block;
+  }
+
+  menupopup[type="arrow"]::part(content) {
+    /* Prevent contained items from drawing over the border-radius. */
+    overflow: clip;
+    padding: 8px 0;
+    color: var(--arrowpanel-color);
+    background: var(--arrowpanel-background);
+    border-radius: var(--arrowpanel-border-radius);
+    border: 1px solid var(--arrowpanel-border-color);
+  }
+}
diff --git a/comm/mail/themes/windows/mail/popupPanel.css b/comm/mail/themes/windows/mail/popupPanel.css
new file mode 100644
index 0000000000..faa4df3872
--- /dev/null
+++ b/comm/mail/themes/windows/mail/popupPanel.css
@@ -0,0 +1,22 @@
+/* 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/shared/popupPanel.css");
+
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+html|input.editContactTextbox {
+  padding: 3px 6px;
+}
+
+/* Swap the primary and secondary action, because Windows
+* platform conventions put the primary action on the left. */
+.popup-panel-buttons-container > button.primary {
+  order: -1;
+}
+
+#messageHeaderCustomizationPanel {
+  margin-top: -10px;
+  margin-inline-end: 2px;
+}
diff --git a/comm/mail/themes/windows/mail/preferences/alwaysAsk.png b/comm/mail/themes/windows/mail/preferences/alwaysAsk.png
new file mode 100644
index 0000000000..ddd4cb2130
--- /dev/null
+++ b/comm/mail/themes/windows/mail/preferences/alwaysAsk.png
diff --git a/comm/mail/themes/windows/mail/preferences/application.png b/comm/mail/themes/windows/mail/preferences/application.png
new file mode 100644
index 0000000000..ff2ecc2f35
--- /dev/null
+++ b/comm/mail/themes/windows/mail/preferences/application.png
diff --git a/comm/mail/themes/windows/mail/preferences/applications.css b/comm/mail/themes/windows/mail/preferences/applications.css
new file mode 100644
index 0000000000..f8985b5b5f
--- /dev/null
+++ b/comm/mail/themes/windows/mail/preferences/applications.css
@@ -0,0 +1,24 @@
+/* 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/shared/preferences/applications.css");
+
+/**
+ * Used by the cloudFile manager
+ */
+
+.cloudfileAccount > label {
+  margin-block: initial;
+}
+
+.cloudfileAccount > input {
+  min-height: unset !important;
+  margin: 0 !important;
+  padding-block: 2px 3px !important;
+  padding-inline: 4px 3px !important;
+}
+
+.actionsMenu > menupopup > menuitem {
+  padding-inline-start: 10px;
+}
diff --git a/comm/mail/themes/windows/mail/preferences/preferences.css b/comm/mail/themes/windows/mail/preferences/preferences.css
new file mode 100644
index 0000000000..a35cae7621
--- /dev/null
+++ b/comm/mail/themes/windows/mail/preferences/preferences.css
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://messenger/skin/shared/preferences/preferences.css");
+@namespace html "http://www.w3.org/1999/xhtml";
+
+html|legend {
+  padding-inline: 0;
+  background-color: transparent;
+}
+
+html|h2 {
+  background-color: transparent;
+}
diff --git a/comm/mail/themes/windows/mail/preferences/saveFile.png b/comm/mail/themes/windows/mail/preferences/saveFile.png
new file mode 100644
index 0000000000..c210e8473f
--- /dev/null
+++ b/comm/mail/themes/windows/mail/preferences/saveFile.png
diff --git a/comm/mail/themes/windows/mail/primaryToolbar.css b/comm/mail/themes/windows/mail/primaryToolbar.css
new file mode 100644
index 0000000000..01bd68aa88
--- /dev/null
+++ b/comm/mail/themes/windows/mail/primaryToolbar.css
@@ -0,0 +1,244 @@
+/* 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/shared/primaryToolbar.css");
+
+@media (-moz-windows-compositor: 0),
+       (-moz-windows-default-theme: 0) {
+/* We want a 4px gap between the tabs-toolbar and the toolbar-menubar
+   when the toolbar-menu is displayed. 1px is taken care of by the (light)
+   outer shadow of the tab, the remaining 3 is these margins. */
+  #toolbar-menubar:not([autohide="true"]) ~ #tabs-toolbar,
+  #toolbar-menubar[autohide="true"]:not([inactive]) ~ #tabs-toolbar {
+    margin-top: 3px;
+  }
+
+  :root[tabsintitlebar] #navigation-toolbox:not(:-moz-lwtheme) {
+    color: CaptionText;
+  }
+
+  :root[tabsintitlebar] #navigation-toolbox:not(:-moz-lwtheme):-moz-window-inactive {
+    color: InactiveCaptionText;
+  }
+}
+
+#navigation-toolbox,
+#toolbar-menubar {
+  appearance: none;
+}
+
+@media (-moz-platform: windows-win10) and (-moz-windows-default-theme) {
+  #menubar-items > #mail-menubar > menu[disabled="true"] {
+    background-color: transparent;
+  }
+
+  #menubar-items > #mail-menubar >
+    menu:not([disabled="true"])[_moz-menuactive="true"] {
+    background-color: hsla(0, 0%, 0%, .12);
+  }
+
+  @media (prefers-color-scheme: dark) {
+    #menubar-items > #mail-menubar >
+      menu:not([disabled="true"])[_moz-menuactive="true"] {
+      background-color: hsla(0, 0%, 100%, .2);
+    }
+  }
+}
+
+@media (-moz-windows-classic) {
+  /**
+   * In the classic themes, the titlebar has a horizontal gradient, which is
+   * problematic for reading the text of background tabs when they're in the
+   * titlebar. We side-step this issue by layering our own background underneath
+   * the tabs.
+   */
+  :root[tabsintitlebar] #tabs-toolbar:not(:-moz-lwtheme) {
+    background-image: linear-gradient(transparent, ActiveCaption);
+    background-size: auto 200%;
+  }
+
+  :root[tabsintitlebar] #tabs-toolbar:not(:-moz-lwtheme):-moz-window-inactive {
+    background-image: linear-gradient(transparent, InactiveCaption);
+  }
+
+  /**
+   * With the tabmail-tabs element z-index'd above the nav-bar, we now get the
+   * scrollbox button borders leaking over the nav-bar highlight. This transparent bottom
+   * border forces the scrollbox button borders to terminate a pixel early, working
+   * around the issue.
+   */
+  :root[tabsintitlebar] #tabmail-arrowscrollbox:not(:-moz-lwtheme)::part(scrollbutton-up),
+  :root[tabsintitlebar] #tabmail-arrowscrollbox:not(:-moz-lwtheme)::part(scrollbutton-down) {
+    border-bottom: 1px solid transparent;
+  }
+
+  :root[tabsintitlebar] .mail-toolbox:not(:-moz-lwtheme),
+  :root[tabsintitlebar] .contentTabToolbox:not(:-moz-lwtheme) {
+    box-shadow: none;
+  }
+
+  /* End classic titlebar gradient */
+
+  :root[tabsintitlebar] :is(#tabs-toolbar,#toolbar-menubar)
+  toolbarbutton:not(:-moz-lwtheme) {
+    color: inherit;
+  }
+}
+
+.mail-toolbox::after,
+.contentTabToolbox::after {
+  content: "";
+  display: flex;
+  height: 1px;
+  border-bottom: 1px solid var(--chrome-content-separator-color);
+}
+
+.mail-toolbox > toolbar:not([type="menubar"]) {
+  padding: 1px;
+}
+
+/* ::::: toolbar buttons on tabbar toolbar ::::: */
+
+@media (-moz-windows-compositor: 0) {
+  #toolbar-menubar {
+    background-color: transparent !important
+  }
+
+  :root[tabsintitlebar]:not([lwt-tree]) #titlebar:-moz-lwtheme {
+    appearance: none !important;
+  }
+
+  :root[tabsintitlebar][sizemode="maximized"]:not([lwt-tree]) #titlebar:-moz-lwtheme {
+    margin-top: 4px;
+  }
+
+  #print-preview-toolbar:not(:-moz-lwtheme) {
+    appearance: auto;
+    -moz-default-appearance: -moz-win-browsertabbar-toolbox;
+  }
+
+  @media (-moz-windows-default-theme) {
+    #messengerWindow {
+      background-color: rgb(185, 209, 234);
+    }
+    #messengerWindow:-moz-window-inactive {
+      background-color: rgb(215, 228, 242);
+    }
+
+    #toolbar-menubar:not([autohide=true],:-moz-lwtheme),
+    #tabs-toolbar:not(:-moz-lwtheme) {
+      background-color: transparent;
+    }
+    #toolbar-menubar[autohide=true] {
+      background-color: transparent !important;
+    }
+  }
+}
+
+@media (-moz-windows-compositor) and (-moz-windows-default-theme) {
+  #navigation-toolbox:not(:-moz-lwtheme),
+  #tabs-toolbar {
+    background-color: transparent;
+  }
+
+  #mail-toolbox:not(:-moz-lwtheme),
+  .glodaTabToolbar {
+    color: black;
+  }
+
+  #mail-menubar > menu:not(:-moz-lwtheme) {
+    color: inherit;
+  }
+
+  /* Use a different color only on Windows 8 and higher for inactive windows.
+   * On Win 7, the menubar fog disappears for inactive windows, and renders gray
+   * illegible.
+   */
+  @media not all and (-moz-platform: windows-win7) {
+    #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
+      color: ThreeDShadow;
+    }
+  }
+}
+
+@media (-moz-windows-glass) {
+  .mail-toolbox:not(:-moz-lwtheme)::after,
+  .contentTabToolbox:not(:-moz-lwtheme)::after {
+    --chrome-content-separator-color: #aabccf;
+  }
+
+  #tabs-toolbar {
+    order: 10;
+  }
+
+  #toolbar-menubar {
+    order: 20;
+    -moz-window-dragging: no-drag;
+    box-shadow: 0 1px 0 rgba(253, 253, 253, 0.45) inset;
+    background-color: var(--toolbar-bgcolor);
+    padding-bottom: 1px !important;
+    padding-top: 2px;
+  }
+
+  /* Don't apply the full negative margin for the Spaces Toolbar. */
+  :root[spacestoolbar="true"] #toolbar-menubar {
+    margin-inline-start: -1px !important;
+  }
+
+  #toolbar-menubar:-moz-lwtheme {
+    background-color: var(--toolbar-bgcolor);
+    color: var(--toolbar-color, inherit);
+    box-shadow: none;
+  }
+
+  #navigation-toolbox > #toolbar-menubar:not(:-moz-lwtheme) {
+    appearance: none;
+    border-bottom: 1px solid #aabccf;
+  }
+
+  #tabs-toolbar:not(:-moz-lwtheme) {
+    position: relative;
+  }
+
+  #navigation-toolbox:not(:-moz-lwtheme)::before {
+    box-shadow: 0 30px 30px 30px rgba(174, 189, 204, 0.85);
+    content: "";
+    display: flex;
+    margin: 0 60px; /* (30px + 30px) from box-shadow */
+    pointer-events: none;
+    width: -moz-available;
+    z-index: -1;
+  }
+}
+
+@media (-moz-platform: windows-win8) {
+  @media (-moz-windows-default-theme) {
+    #messengerWindow[darkwindowframe="true"]:not(:-moz-lwtheme,:-moz-window-inactive) #navigation-toolbox {
+      color: white;
+    }
+  }
+  @media (-moz-windows-default-theme: 0) {
+    #messengerWindow #navigation-toolbox:not(:-moz-lwtheme) {
+      color: CaptionText;
+    }
+
+    #messengerWindow #navigation-toolbox:not(:-moz-lwtheme):-moz-window-inactive {
+      color: InactiveCaptionText;
+    }
+  }
+}
+
+@media (-moz-platform: windows-win8) and (-moz-windows-default-theme),
+       (-moz-platform: windows-win10) and (-moz-windows-default-theme) {
+  #navigation-toolbox > #toolbar-menubar {
+    background-color: transparent;
+    padding-top: 0;
+    padding-bottom: 0 !important;
+  }
+
+  .mail-toolbox:not(:-moz-lwtheme)::after,
+  .contentTabToolbox:not(:-moz-lwtheme)::after {
+    --chrome-content-separator-color: #c2c2c2;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/searchBox.css b/comm/mail/themes/windows/mail/searchBox.css
new file mode 100644
index 0000000000..9589acbf4a
--- /dev/null
+++ b/comm/mail/themes/windows/mail/searchBox.css
@@ -0,0 +1,44 @@
+/* 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/shared/searchBox.css");
+
+/*
+ * The emptytext style would appear to use italics.  This is causing
+ * problems for the search box because it has no minwidth and is flexy, so
+ * removing the emptytext causes the size of the box to change and this is silly
+ * and undesirable.  This change is being made to maintain the generally
+ * accepted status quo while reducing breakage.  This will cause visual
+ * inconsistency with the quick filter bar unless it gets a change like this
+ * too.
+ */
+.gloda-search {
+  font-style: normal !important;
+}
+
+.search-icon {
+  margin-inline-start: 8px;
+}
+
+.remote-gloda-search-container {
+  padding-block: 1px;
+}
+
+.searchBox,
+.themeableSearchBox {
+  padding-block: 0;
+  padding-inline: 4px 2px;
+  margin-block: 2px;
+}
+
+@media (prefers-contrast) {
+  .searchBox,
+  .themeableSearchBox {
+    border-color: ThreeDDarkShadow;
+  }
+}
+
+.autocomplete-richlistitem[type^="gloda-"] {
+  padding-inline-start: 12px;
+}
diff --git a/comm/mail/themes/windows/mail/searchDialog.css b/comm/mail/themes/windows/mail/searchDialog.css
new file mode 100644
index 0000000000..7732f7b59f
--- /dev/null
+++ b/comm/mail/themes/windows/mail/searchDialog.css
@@ -0,0 +1,34 @@
+/* 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/shared/searchDialog.css");
+
+:root:not([lwt-tree]) #threadTree,
+:root:not([lwt-tree]) #abResultsTree {
+  appearance: auto;
+  -moz-default-appearance: listbox;
+}
+
+.search-menulist,
+.search-value-menulist {
+  width: 11em;
+}
+
+.input-inline.search-value-input {
+  padding-block: 3px;
+}
+
+.small-button {
+  min-width: 3em;
+  margin: 2px;
+}
+
+.small-button + .small-button {
+  margin-inline-start: 0;
+  margin-inline-end: 4px;
+}
diff --git a/comm/mail/themes/windows/mail/spacesToolbar.css b/comm/mail/themes/windows/mail/spacesToolbar.css
new file mode 100644
index 0000000000..e8a262be74
--- /dev/null
+++ b/comm/mail/themes/windows/mail/spacesToolbar.css
@@ -0,0 +1,77 @@
+/* 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/shared/spacesToolbar.css");
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme),
+       (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  @media (-moz-windows-compositor) {
+    #messengerWindow[sizemode="normal"][spacestoolbar="true"] #tabpanelcontainer,
+    #messengerWindow[sizemode="normal"][spacestoolbar="true"] .statusbar {
+      border-inline-start-width: 0;
+    }
+
+    #messengerWindow[sizemode="normal"] .spaces-toolbar:not([hidden]) {
+      border-inline-start: 1px solid var(--glassShadowColor);
+      border-bottom: 1px solid var(--glassShadowColor);
+    }
+  }
+}
+
+@media (-moz-platform: windows-win7) {
+  @media (-moz-windows-default-theme) {
+    #messengerWindow[sizemode="maximized"] .spaces-toolbar:not([hidden]) {
+      margin-top: 8px;
+    }
+  }
+
+  @media (-moz-windows-glass) {
+    #messengerWindow[sizemode="normal"] .spaces-toolbar:not([hidden], :-moz-lwtheme) {
+      margin-top: 2px;
+    }
+  }
+
+  @media (-moz-windows-default-theme) and (-moz-windows-glass: 0) {
+    #messengerWindow[sizemode="normal"] .spaces-toolbar:not([hidden], :-moz-lwtheme) {
+      background-image: linear-gradient(to bottom, ThreeDDarkShadow 0,
+                                        ThreeDDarkShadow 1px, ThreeDHighlight 1px,
+                                        ThreeDHighlight 2px, transparent 2px);
+    }
+  }
+
+  @media (-moz-windows-classic) {
+    /* Add a window top border behind the titlebar */
+    #messengerWindow[sizemode="normal"] .spaces-toolbar:not([hidden], :-moz-lwtheme) {
+      background-image: linear-gradient(to bottom, ThreeDLightShadow 0,
+                                        ThreeDLightShadow 1px, ThreeDHighlight 1px,
+                                        ThreeDHighlight 2px, ActiveBorder 2px,
+                                        ActiveBorder 4px, transparent 4px);
+    }
+  }
+
+  @media (-moz-windows-default-theme: 0) {
+    #messengerWindow[sizemode="maximized"] .spaces-toolbar:not([hidden]) {
+      margin-top: 8px;
+    }
+  }
+
+  @media (prefers-contrast) {
+    /* Add a window top border behind the titlebar */
+    #messengerWindow[sizemode="normal"] .spaces-toolbar:not([hidden], :-moz-lwtheme) {
+      background-image: linear-gradient(to bottom, ThreeDLightShadow 0,
+                                        ThreeDLightShadow 1px, ThreeDHighlight 1px,
+                                        ThreeDHighlight 2px, transparent 2px);
+    }
+  }
+}
+
+@media (-moz-platform: windows-win8) {
+  #messengerWindow[sizemode="normal"] .spaces-toolbar:not([hidden], :-moz-lwtheme) {
+    margin-top: 1px;
+  }
+
+  #messengerWindow[sizemode="maximized"] .spaces-toolbar:not([hidden]) {
+    margin-top: 8px;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/tabmail.css b/comm/mail/themes/windows/mail/tabmail.css
new file mode 100644
index 0000000000..eaec2bd922
--- /dev/null
+++ b/comm/mail/themes/windows/mail/tabmail.css
@@ -0,0 +1,177 @@
+/* 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/shared/tabmail.css");
+
+/* Make sure the drop indicator stays inside the parent boundaries */
+#tabmail-tabs {
+  position: relative;
+}
+
+/**
+ * Tabmail Tabs
+ */
+
+#tabpanelcontainer:-moz-lwtheme {
+  color: inherit;
+}
+
+/**
+ * Tab
+ */
+
+tabpanels {
+  appearance: none;
+  background-color: transparent;
+}
+
+/* tabmail-tab focus ring */
+.tabmail-tab .tab-label-container {
+  border: 1px dotted transparent;
+}
+
+.tabmail-tab:focus .tab-label-container {
+  border-color: -moz-DialogText;
+}
+
+#tabmail-arrowscrollbox[overflow="true"] > .tabmail-tab:first-child::before {
+  content: '';
+  display: flex;
+  margin-inline-start: 0;
+}
+
+/**
+ * Tab Scrollbox Arrow Buttons
+ */
+
+#tabmail-arrowscrollbox::part(scrollbutton-up),
+#tabmail-arrowscrollbox::part(scrollbutton-down) {
+  appearance: none;
+  border-style: none !important;
+  padding: 0 3px !important;
+  margin: 0 !important;
+  margin-inline-end: 1px !important;
+}
+
+#tabmail-arrowscrollbox[scrolledtostart=true]::part(scrollbutton-up),
+#tabmail-arrowscrollbox[scrolledtoend=true]::part(scrollbutton-down) {
+  --toolbarbutton-icon-fill-opacity: .4;
+}
+
+#tabmail-arrowscrollbox:-moz-locale-dir(rtl)::part(scrollbutton-up),
+#tabmail-arrowscrollbox:-moz-locale-dir(ltr)::part(scrollbutton-down) {
+  margin-inline-start: 1px !important;
+  margin-inline-end: 0 !important;
+}
+
+/**
+ * All Tabs Button
+ */
+
+#tabmail-arrowscrollbox:not([scrolledtostart=true])::part(scrollbutton-up):hover,
+#tabmail-arrowscrollbox:not([scrolledtoend=true])::part(scrollbutton-down):hover {
+  background: var(--toolbarbutton-active-background);
+}
+
+@media (-moz-windows-glass) {
+  /* Set to full fill-opacity to improve visibility of toolbar buttons on aero glass. */
+  :root[tabsintitlebar] #tabs-toolbar {
+    --toolbarbutton-icon-fill-opacity: 1;
+  }
+
+  :root[tabsintitlebar][sizemode=normal] #tabs-toolbar {
+    margin-top: 6px;
+  }
+
+  #alltabs-button:not(:-moz-lwtheme,[disabled]) {
+    border-color: transparent;
+    margin-top: 0;
+    margin-bottom: -1px;
+  }
+
+  #alltabs-button:not(:-moz-lwtheme,[disabled]):hover,
+  #tabmail-arrowscrollbox:not(:-moz-lwtheme,[scrolledtostart=true])::part(scrollbutton-up):hover,
+  #tabmail-arrowscrollbox:not(:-moz-lwtheme,[scrolledtoend=true])::part(scrollbutton-down):hover {
+    background-color: transparent;
+    background-image: linear-gradient(rgba(255, 255, 255, 0),
+                      rgba(255, 255, 255, .5)),
+                      linear-gradient(transparent, rgba(0, 0, 0, .25) 30%),
+                      linear-gradient(transparent, rgba(0, 0, 0, .25) 30%);
+    background-position: 1px -1px, 0 -1px, 100% -1px;
+    background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%;
+    background-repeat: no-repeat;
+  }
+
+  #tabs-toolbar[brighttext]
+    #tabmail-arrowscrollbox:not(:-moz-lwtheme,[scrolledtostart=true])::part(scrollbutton-up):hover,
+  #tabs-toolbar[brighttext]
+    #tabmail-arrowscrollbox:not(:-moz-lwtheme,[scrolledtoend=true])::part(scrollbutton-down):hover {
+    background-image: linear-gradient(rgba(255, 255, 255, 0),
+                      rgba(255, 255, 255, .5)),
+                      linear-gradient(transparent, rgba(255, 255, 355, .25) 30%),
+                      linear-gradient(transparent, rgba(255, 255, 255, .25) 30%);
+  }
+}
+
+#alltabs-button {
+  padding-right: 3px !important;
+  padding-left: 3px !important;
+}
+
+.tabs-alltabs-button > hbox > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+/* Content Tabs */
+.contentTabAddress {
+  height: 34px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+@media (-moz-platform: windows-win7) and (-moz-windows-default-theme) {
+  @media (-moz-windows-glass: 0) {
+    :root[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide=true][inactive] ~
+      #tabs-toolbar > * {
+      margin-top: 6px;
+    }
+  }
+}
+
+@media (-moz-windows-glass) {
+  /* draw always a top border with Glass */
+  #tabs-toolbar {
+    --tabs-top-border-width: 1px;
+  }
+
+  .tab-background {
+    border-top-style: solid;
+  }
+}
+
+@media (-moz-windows-glass),
+       (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  :root[sizemode=normal]:not([spacestoolbar]) .tabmail-tab[visuallyselected]:first-child::before {
+    content: '';
+    display: flex;
+    --lwt-tabs-border-color: var(--glassShadowColor);
+  }
+
+  :root[sizemode=normal] .tabmail-tab:not([visuallyselected]):first-child {
+    margin-inline-start: 1px;
+  }
+
+  :root[sizemode=normal] .tabmail-tab:first-child::before {
+    margin-inline-start: 0;
+  }
+}
+
+@media (-moz-platform: windows-win8) and (-moz-windows-default-theme) {
+  #messengerWindow[darkwindowframe="true"]
+  #tabs-toolbar:not(:-moz-lwtheme,:-moz-window-inactive),
+  #messengerWindow[darkwindowframe="true"]
+  .tabmail-tab:not([selected="true"],:-moz-lwtheme,:-moz-window-inactive) {
+    color: white;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/themeableDialog.css b/comm/mail/themes/windows/mail/themeableDialog.css
new file mode 100644
index 0000000000..e98a891779
--- /dev/null
+++ b/comm/mail/themes/windows/mail/themeableDialog.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/. */
+
+@import url("chrome://messenger/skin/shared/themeableDialog.css");
+
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+html|input {
+  padding: 2px 4px;
+}
+
+html|input[type="number"]::-moz-number-spin-up,
+html|input[type="number"]::-moz-number-spin-down {
+  min-height: 0.55em;
+}
+
+menulist[is="menulist-editable"][editable="true"]::part(text-input) {
+  padding: 2px 4px;
+  margin-block: -1px -2px;
+  margin-inline: -6px 4px;
+}
+
+@media not (-moz-windows-non-native-menus) {
+  menulist > menupopup {
+    --panel-background: var(--box-background-color);
+    --panel-border-radius: var(--arrowpanel-border-radius);
+    --panel-padding: var(--arrowpanel-padding);
+  }
+
+  button menupopup menu,
+  button menupopup menuitem,
+  menulist menupopup menu,
+  menulist menupopup menuitem {
+    appearance: none;
+    color: var(--box-text-color);
+  }
+
+  button menupopup > menu:not([disabled="true"])[_moz-menuactive="true"],
+  button menupopup > menuitem:not([disabled="true"])[_moz-menuactive="true"],
+  menulist menupopup > menu:not([disabled="true"])[_moz-menuactive="true"],
+  menulist menupopup > menuitem:not([disabled="true"])[_moz-menuactive="true"] {
+    color: var(--box-text-color);
+    background-color: color-mix(in srgb, currentColor 9%, transparent);
+  }
+
+  button menupopup > menu[disabled="true"],
+  button menupopup > menuitem[disabled="true"],
+  menulist menupopup > menu[disabled="true"],
+  menulist menupopup > menuitem[disabled="true"] {
+    color: #999;
+    /* override the [_moz-menuactive="true"] background color from
+       global/menu.css */
+    background-color: transparent;
+  }
+
+  menulist menupopup menu,
+  menulist menupopup menuitem,
+  button menupopup menu,
+  button menupopup menuitem {
+    padding-block: 2px;
+  }
+
+  menulist > menupopup > menuitem > .menu-iconic-left,
+  menulist > menupopup > menu > .menu-iconic-left {
+    display: flex;
+  }
+}
+
+menu > menupopup > menuitem,
+menu > menupopup > menu {
+  padding-inline: 5px;
+}
+
+.menu-right {
+  height: 12px;
+}
+
+.menu-right:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.radio-label-box {
+  margin-inline-start: 0;
+  padding-inline-start: 0;
+}
+
+tabpanels {
+  color-scheme: light dark;
+}
diff --git a/comm/mail/themes/windows/mail/variables.css b/comm/mail/themes/windows/mail/variables.css
new file mode 100644
index 0000000000..aec12c7305
--- /dev/null
+++ b/comm/mail/themes/windows/mail/variables.css
@@ -0,0 +1,91 @@
+/* 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/shared/variables.css");
+
+:root {
+  --autocomplete-popup-url-color: -moz-nativehyperlinktext;
+  --tabline-color: var(--selected-item-color);
+  --glassShadowColor: hsla(240, 5%, 5%, 0.3);
+  --toolbar-non-lwt-bgcolor: color-mix(in srgb, -moz-dialog 85%, white);
+  --toolbar-non-lwt-textcolor: -moz-dialogText;
+  --toolbar-non-lwt-bgimage: linear-gradient(rgba(255, 255, 255, 0.15),
+                                             rgba(255, 255, 255, 0.15));
+  --chrome-content-separator-color: ThreeDShadow;
+  --row-grouped-header-bg-color: -moz-dialog;
+  --row-grouped-header-bg-color-selected: var(--selected-item-color);
+  --panel-separator-color: ThreeDLightShadow;
+}
+
+@media (-moz-windows-default-theme) {
+  :root {
+    --tabline-color: #0a84ff;
+    --toolbar-non-lwt-bgcolor: #f9f9fa;
+    --toolbar-non-lwt-textcolor: #0c0c0d;
+    --toolbar-non-lwt-bgimage: none;
+    --panel-separator-color: hsla(210, 4%, 10%, 0.14);
+    --autocomplete-popup-url-color: hsl(210, 77%, 47%);
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  :root:-moz-lwtheme {
+    --autocomplete-popup-highlight-color: var(--lwt-text-color);
+    --dark-lwt-highlight-color: #0a84ff;
+  }
+
+  @media (-moz-windows-non-native-menus) {
+    :root:not([lwt-tree]):-moz-lwtheme menupopup {
+      --panel-background: var(--arrowpanel-background) !important;
+      --panel-color: var(--arrowpanel-color) !important;
+      --panel-border-color: var(--arrowpanel-border-color) !important;
+      --menu-color: var(--arrowpanel-color) !important;
+      --menu-disabled-color: color-mix(in srgb, var(--arrowpanel-color) 35%, transparent) !important;
+      --menuitem-hover-background-color: color-mix(in srgb, var(--arrowpanel-color) 13%, transparent) !important;
+    }
+  }
+}
+
+@media (prefers-contrast) {
+  :root:not(:-moz-lwtheme) {
+    --lwt-tabs-border-color: ThreeDShadow;
+    --tabline-color: SelectedItem;
+    --item-focus-selected-border-color: SelectedItemText;
+    --new-folder-color: Highlight;
+    --menuitem-vertical-padding: 3px;
+    --arrowpanel-dimmed: SelectedItem;
+    --arrowpanel-dimmed-further: SelectedItem;
+    --toolbar-field-focus-border-color: SelectedItem;
+  }
+
+  :root:not(:-moz-lwtheme) .themeable-full,
+  :root:not(:-moz-lwtheme) .themeable-brighttext,
+  :root:not(:-moz-lwtheme) #navigation-toolbox > toolbar,
+  :root:not(:-moz-lwtheme) #todaypane-new-event-button,
+  :root:not(:-moz-lwtheme) #CardViewBox {
+    --toolbarbutton-hover-background: SelectedItem;
+    --toolbarbutton-hover-bordercolor: SelectedItemText !important;
+    --toolbarbutton-active-background: SelectedItem;
+    --toolbarbutton-active-bordercolor: SelectedItemText;
+    --toolbarbutton-checked-background: SelectedItem;
+    --toolbarbutton-icon-fill-attention: SelectedItem;
+  }
+
+  :root:not(:-moz-lwtheme) .toolbarbutton-1.message-header-view-button {
+    --toolbarbutton-header-bordercolor: WindowText;
+    --toolbarbutton-active-bordercolor: WindowText;
+  }
+
+  :root:not(:-moz-lwtheme) .toolbarbutton-1:not(.qfb-tag-button):hover,
+  :root:not(:-moz-lwtheme) #calendar-add-task-button:hover,
+  :root:not(:-moz-lwtheme) #todaypane-new-event-button:hover,
+  :root:not(:-moz-lwtheme) .toolbarbutton-1[checked="true"],
+  :root:not(:-moz-lwtheme) .toolbarbutton-menubutton-button:hover {
+    color: SelectedItemText !important;
+  }
+
+  menulist:not(:-moz-lwtheme) {
+    --toolbarbutton-hover-background: ButtonFace;
+  }
+}
diff --git a/comm/mail/themes/windows/mail/window-controls/close-highcontrast.svg b/comm/mail/themes/windows/mail/window-controls/close-highcontrast.svg
new file mode 100644
index 0000000000..b37b28a28b
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/close-highcontrast.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg">
+  <path stroke="context-stroke" stroke-width="1.9" fill="none" d="M1,1 l 10,10 M1,11 l 10,-10"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/close-themes.svg b/comm/mail/themes/windows/mail/window-controls/close-themes.svg
new file mode 100644
index 0000000000..e6eac2fc55
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/close-themes.svg
@@ -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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg">
+  <path stroke="black" stroke-width="3.6" stroke-opacity=".75" d="M1,1 l 10,10 M1,11 l 10,-10"/>
+  <path stroke="white" stroke-width="1.9" d="M1.75,1.75 l 8.5,8.5 M1.75,10.25 l 8.5,-8.5"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/close.svg b/comm/mail/themes/windows/mail/window-controls/close.svg
new file mode 100644
index 0000000000..9d0a252357
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/close.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg">
+  <path stroke="context-stroke" stroke-width=".9" fill="none" d="M1,1 l 10,10 M1,11 l 10,-10"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/maximize-highcontrast.svg b/comm/mail/themes/windows/mail/window-controls/maximize-highcontrast.svg
new file mode 100644
index 0000000000..48ea6166f3
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/maximize-highcontrast.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges">
+  <rect stroke="context-stroke" stroke-width="1.9" fill="none" x="2" y="2" width="8" height="8"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/maximize-themes.svg b/comm/mail/themes/windows/mail/window-controls/maximize-themes.svg
new file mode 100644
index 0000000000..5740a992ae
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/maximize-themes.svg
@@ -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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges" fill="none">
+  <rect stroke="black" stroke-width="3.6" stroke-opacity=".75" x="2" y="2" width="8" height="8"/>
+  <rect stroke="white" stroke-width="1.9" x="2" y="2" width="8" height="8"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/maximize.svg b/comm/mail/themes/windows/mail/window-controls/maximize.svg
new file mode 100644
index 0000000000..e9cc939af3
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/maximize.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges">
+  <rect stroke="context-stroke" stroke-width=".9" fill="none" x="1.5" y="1.5" width="9" height="9"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/minimize-highcontrast.svg b/comm/mail/themes/windows/mail/window-controls/minimize-highcontrast.svg
new file mode 100644
index 0000000000..2ba29a839d
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/minimize-highcontrast.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg">
+  <line stroke="context-stroke" stroke-width="1.9" fill="none" shape-rendering="crispEdges" x1="1" y1="6" x2="11" y2="6"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/minimize-themes.svg b/comm/mail/themes/windows/mail/window-controls/minimize-themes.svg
new file mode 100644
index 0000000000..d74f16bdbc
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/minimize-themes.svg
@@ -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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges">
+  <line stroke="black" stroke-width="3.6" stroke-opacity=".75" x1="0" y1="6" x2="12" y2="6"/>
+  <line stroke="white" stroke-width="1.9" x1="1" y1="6" x2="11" y2="6"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/minimize.svg b/comm/mail/themes/windows/mail/window-controls/minimize.svg
new file mode 100644
index 0000000000..7ffa1fecbb
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/minimize.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg">
+  <line stroke="context-stroke" stroke-width=".9" fill="none" shape-rendering="crispEdges" x1="1" y1="5.5" x2="11" y2="5.5"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/restore-highcontrast.svg b/comm/mail/themes/windows/mail/window-controls/restore-highcontrast.svg
new file mode 100644
index 0000000000..f2cdfa8a9c
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/restore-highcontrast.svg
@@ -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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" stroke="context-stroke" stroke-width="1.9" fill="none" shape-rendering="crispEdges">
+  <rect x="2" y="4" width="6" height="6"/>
+  <polyline points="3.5,1.5 10.5,1.5 10.5,8.5" stroke-width=".9"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/restore-themes.svg b/comm/mail/themes/windows/mail/window-controls/restore-themes.svg
new file mode 100644
index 0000000000..e3c92f58a2
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/restore-themes.svg
@@ -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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges" fill="none" stroke="white">
+  <path stroke="black" stroke-width="3.6" stroke-opacity=".75" d="M2,4 l 6,0 l 0,6 l -6,0z M2.5,1.5 l 8,0 l 0,8"/>
+  <rect stroke-width="1.9" x="2" y="4" width="6" height="6"/>
+  <polyline stroke-width=".9" points="3.5,1.5 10.5,1.5 10.5,8.5"/>
+</svg>
diff --git a/comm/mail/themes/windows/mail/window-controls/restore.svg b/comm/mail/themes/windows/mail/window-controls/restore.svg
new file mode 100644
index 0000000000..80b71b178d
--- /dev/null
+++ b/comm/mail/themes/windows/mail/window-controls/restore.svg
@@ -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/. -->
+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" stroke="context-stroke" stroke-width=".9" fill="none" shape-rendering="crispEdges">
+  <rect x="1.5" y="3.5" width="7" height="7"/>
+  <polyline points="3.5,3.5 3.5,1.5 10.5,1.5 10.5,8.5 8.5,8.5"/>
+</svg>
diff --git a/comm/mail/themes/windows/moz.build b/comm/mail/themes/windows/moz.build
new file mode 100644
index 0000000000..de5cd1bf81
--- /dev/null
+++ b/comm/mail/themes/windows/moz.build
@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]