diff --git a/mail/base/content/mailWindowOverlay.js b/mail/base/content/mailWindowOverlay.js
index 130227a141..4f35588a93 100644
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -1758,6 +1758,17 @@ function MsgJunk()
   JunkSelectedMessages(!SelectedMessagesAreJunk());
 }
 
+
+function UpdateJunkButton()
+{
+  var hdr = gDBView.hdrForFirstSelectedMessage;
+  var junkScore = hdr.getStringProperty("junkscore");
+  var isJunk = ((junkScore != "") && (junkScore != "0"));
+  if (isNewsURI(hdr.folder.URI))
+    isJunk = true;
+  document.getElementById('junkButton').disabled = isJunk;
+}
+
 function MsgMarkMsgAsRead(markRead)
 {
     if (!markRead) {
diff --git a/mail/base/content/msgHdrViewOverlay.js b/mail/base/content/msgHdrViewOverlay.js
index d460359320..3f29ee1249 100644
--- a/mail/base/content/msgHdrViewOverlay.js
+++ b/mail/base/content/msgHdrViewOverlay.js
@@ -23,6 +23,7 @@
 # Contributor(s):
 #   Markus Hossner <markushossner@gmx.de>
 #   Mark Banner <bugzilla@standard8.plus.com>
+#   David Ascher <dascher@mozillamessaging.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -263,6 +264,14 @@ function OnLoadMsgHeaderPane()
 
   var deckHeaderView = document.getElementById("msgHeaderViewDeck");
   gCollapsedHeaderViewMode = deckHeaderView.selectedIndex == 0;
+  
+  // work around XUL deck bug where collapsed header view, if it's the persisted
+  // default, wouldn't be sized properly because of the larger expanded
+  // view "stretches" the deck.
+  if (gCollapsedHeaderViewMode)
+    document.getElementById('expandedHeaderView').collapsed = true;
+  else
+    document.getElementById('collapsedHeaderView').collapsed = true;
 
   // dispatch an event letting any listeners know that we have loaded the message pane
   var event = document.createEvent('Events');
@@ -394,6 +403,7 @@ var messageHeaderSink = {
       ShowMessageHeaderPane();
       UpdateMessageHeaders();
       ShowEditMessageBox();
+      UpdateJunkButton();
 
       for (index in gMessageListeners)
         gMessageListeners[index].onEndHeaders();
@@ -785,7 +795,11 @@ function updateHeaderValue(headerEntry, headerValue)
 
 function updateHeaderValueInTextNode(headerEntry, headerValue)
 {
-  headerEntry.textNode.value = headerValue;
+  try {
+      headerEntry.textNode.value = headerValue;
+  } catch (e) {
+    dump("headerEntry = " + headerEntry + " and headerValue = " + headerValue + '\n')
+  }
 }
 
 function createNewHeaderView(headerName, label)
@@ -795,6 +809,7 @@ function createNewHeaderView(headerName, label)
 
   newHeader.setAttribute('id', idName);
   newHeader.setAttribute('label', label);
+  newHeader.setAttribute('flex', '1');
   newHeader.collapsed = true;
 
   // this new element needs to be inserted into the view...
diff --git a/mail/base/content/msgHdrViewOverlay.xul b/mail/base/content/msgHdrViewOverlay.xul
index 574859d561..a291f75300 100644
--- a/mail/base/content/msgHdrViewOverlay.xul
+++ b/mail/base/content/msgHdrViewOverlay.xul
@@ -102,41 +102,38 @@
 <hbox id="msgHeaderView" collapsed="true" class="main-header-area">
   <deck id="msgHeaderViewDeck" persist="selectedIndex" selectedIndex="1" flex="1">
     <!-- the message pane consists of 4 'boxes'. Box #1 is a grid, showing a brief view of the headers -->
-    <grid id="collapsedHeaderView" class="header-part1 headerContainer" flex="1">
-      <rows>
-        <row flex="1"/>
-      </rows>
-      <columns>
-        <column class="collapsedToggleHdrBox">
-          <hbox align="baseline">
-            <image id="toggleHeaderView" class="collapsedHeaderViewButton"
-              onclick="ToggleHeaderView();"/>
-          </hbox>
-        </column>
-
-        <column id="collapsedsubjectBox" collapsed="true" flex="1">
-          <hbox align="baseline">
-            <label class="headerName" value="&subjectField2.label;" control="collapsedsubjectValue"/>
-            <textbox id="collapsedsubjectValue" class="collapsedHeaderValue plain" readonly="true" crop="right" appendoriginalclass="true" flex="1"/>
-          </hbox>
-        </column>
-
-        <column id="collapsedfromBox" flex="1">
-          <hbox align="baseline">
+    <vbox id="collapsedHeaderView" class="header-part1 headerContainer" flex="1" pack="start">
+      <hbox flex="1">
+        <hbox id="collapsedfromBox" align="baseline">
+          <hbox>
             <mail-multi-emailHeaderField id="collapsedfromValue"
+                                         pack="start"
                                          class="collapsedHeaderDisplayName"
-                                         label="&fromField2.label;" 
-                                         collapsed="true" flex="1"/>
+                                         label="&fromField2.label;"/>
           </hbox>
-        </column>
-
-        <column id = "collapseddateBox" collapsed="true">
-          <hbox align="baseline">
+        </hbox>
+        <spacer flex="1"/>
+        <hbox id="collapseddateBox">
+          <hbox>
             <textbox id="collapseddateValue" class="collapsedHeaderValue plain" readonly="true"/>
           </hbox>
-        </column>
-      </columns>
-    </grid>
+        </hbox>
+      </hbox>
+      <hbox align="baseline" flex="1">
+        <hbox id="collapsedsubjectBox" flex="1">
+          <hbox flex="1" align="center">
+            <textbox flex="1" id="collapsedsubjectValue"
+                     class="collapsedHeaderValue plain" readonly="true"/>
+          </hbox>
+          <vbox>
+            <button align="center"
+                    id="showDetailsButton" label="&showDetailsButton.label;"
+                    onclick="ToggleHeaderView();"
+                    class="msgHeaderView-button"/>
+          </vbox>
+        </hbox>
+      </hbox>
+    </vbox>
 
     <!-- the message pane consists of 3 'boxes'. Box #2 is the expanded headers view (the default view) -->
     <hbox id="expandedHeaderView" flex="1">
@@ -146,17 +143,17 @@
             name positioning -->
       <vbox id="expandedHeaders" flex="1">
 
-        <hbox id="expandedHeadersTopBox" align="end" pack="end">
-
-          <mail-multi-emailHeaderField id="expandedfromBox"
-                                       label="&fromField2.label;"
-                                       collapsed="true"/>
-
-          <spacer id="fromAndToolbarSpacer" flex="1"/>
+        <hbox id="expandedHeadersTopBox" flex="1">
 
+          <hbox flex="1" align="end">
+            <mail-multi-emailHeaderField id="expandedfromBox"
+                                         label="&fromField2.label;"
+                                         collapsed="false"
+                                         flex="1"/>
+          </hbox>
           <!-- This might want to become a customizable toolbar at some
                point -->
-          <hbox id="expandedHeadersButtonBox">
+          <hbox id="expandedHeadersButtonBox" align="start">
 
             <!-- XXXdmose need to move these commands to a controller, either
                  on the header view, the message pane, or the default
@@ -181,11 +178,10 @@
            </hbox>
         </hbox>
 
-        <mail-headerfield id="expandedsubjectBox" label="&subjectField2.label;"
-                          collapsed="true"/>
-
-        <hbox id="otherHeadersAndButtonsBox"> 
-          <vbox id="variousHeadersBox">
+        <hbox id="otherHeadersAndButtonsBox" flex="1">
+          <vbox id="variousHeadersBox" flex="1">
+            <mail-headerfield id="expandedsubjectBox" label="&subjectField2.label;"
+                              collapsed="false"/>
             <mail-headerfield id="expandedorganizationBox"
                               label="&organizationField2.label;"
                               collapsed="true"/>
@@ -230,8 +226,6 @@
                               collapsed="true"/>
           </vbox>
 
-          <spacer flex="1"/>
-
           <!-- perhaps this should be a customizable toolbar too -->
           <vbox id="hideDetailsBox" align="end">
             <button type="menu" id="otherActionsButton"
diff --git a/mail/base/jar.mn b/mail/base/jar.mn
index 8fa5b6a96f..4a31dda45f 100644
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -79,7 +79,7 @@ messenger.jar:
     content/messenger/virtualFolderListDialog.js    (/mailnews/base/resources/content/virtualFolderListDialog.js)
     content/messenger/messengerdnd.js               (/mailnews/base/resources/content/messengerdnd.js)
     content/messenger/msgPrintEngine.js             (/mailnews/base/resources/content/msgPrintEngine.js)
-    content/messenger/mailWidgets.xml               (/mailnews/base/resources/content/mailWidgets.xml)
+*   content/messenger/mailWidgets.xml               (/mailnews/base/resources/content/mailWidgets.xml)
 *   content/messenger/junkMailInfo.xul              (/mailnews/base/resources/content/junkMailInfo.xul)
     content/messenger/junkCommands.js               (/mailnews/base/resources/content/junkCommands.js)
     content/messenger/SearchDialog.js               (/mailnews/base/search/resources/content/SearchDialog.js)
diff --git a/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd b/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
index b3d1c0d6d6..df2feb7104 100644
--- a/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
@@ -70,6 +70,7 @@
 <!ENTITY viewSourceMenuItem.accesskey "V">
 
 <!ENTITY hideDetailsButton.label "hide details">
+<!ENTITY showDetailsButton.label "show details">
 
 <!ENTITY openAttachmentCmd.label    "Open">
 <!ENTITY openAttachmentCmd.accesskey    "O">
diff --git a/mail/themes/pinstripe/mail/bump.png b/mail/themes/pinstripe/mail/bump.png
new file mode 100644
index 0000000000..62a438c958
Binary files /dev/null and b/mail/themes/pinstripe/mail/bump.png differ
diff --git a/mail/themes/pinstripe/mail/gradient.png b/mail/themes/pinstripe/mail/gradient.png
new file mode 100644
index 0000000000..66a1f9c133
Binary files /dev/null and b/mail/themes/pinstripe/mail/gradient.png differ
diff --git a/mail/themes/pinstripe/mail/icons/arrow-dn-black.png b/mail/themes/pinstripe/mail/icons/arrow-dn-black.png
new file mode 100644
index 0000000000..e24596de80
Binary files /dev/null and b/mail/themes/pinstripe/mail/icons/arrow-dn-black.png differ
diff --git a/mail/themes/pinstripe/mail/icons/arrow-dn-blue.png b/mail/themes/pinstripe/mail/icons/arrow-dn-blue.png
new file mode 100644
index 0000000000..cdba745b1c
Binary files /dev/null and b/mail/themes/pinstripe/mail/icons/arrow-dn-blue.png differ
diff --git a/mail/themes/pinstripe/mail/icons/arrow-dn-grey.png b/mail/themes/pinstripe/mail/icons/arrow-dn-grey.png
new file mode 100644
index 0000000000..4e9d594f0a
Binary files /dev/null and b/mail/themes/pinstripe/mail/icons/arrow-dn-grey.png differ
diff --git a/mail/themes/pinstripe/mail/icons/arrow-dn-sepia.png b/mail/themes/pinstripe/mail/icons/arrow-dn-sepia.png
new file mode 100644
index 0000000000..d463fdad26
Binary files /dev/null and b/mail/themes/pinstripe/mail/icons/arrow-dn-sepia.png differ
diff --git a/mail/themes/pinstripe/mail/icons/arrow-dn-white.png b/mail/themes/pinstripe/mail/icons/arrow-dn-white.png
new file mode 100644
index 0000000000..003ec4e4e7
Binary files /dev/null and b/mail/themes/pinstripe/mail/icons/arrow-dn-white.png differ
diff --git a/mail/themes/pinstripe/mail/jar.mn b/mail/themes/pinstripe/mail/jar.mn
index b59f73c936..b3c2cce23a 100644
--- a/mail/themes/pinstripe/mail/jar.mn
+++ b/mail/themes/pinstripe/mail/jar.mn
@@ -257,5 +257,9 @@ classic.jar:
      skin/classic/communicator/icons/smileys/smiley-sealed.png      (icons/smiley-sealed.png)
 +    skin/classic/global/icons/find.png                             (icons/find.png)
 +    skin/classic/mozapps/extensions/viewButtons.png                (icons/viewButtons.png)
+     skin/classic/messenger/icons/arrow-dn-grey.png                 (icons/arrow-dn-grey.png)
+     skin/classic/messenger/icons/arrow-dn-black.png                (icons/arrow-dn-black.png)
+     skin/classic/messenger/icons/arrow-dn-blue.png                 (icons/arrow-dn-blue.png)
+     skin/classic/messenger/tagbg.png                               (tagbg.png)
      preview.png
      icon.png
diff --git a/mail/themes/pinstripe/mail/messageHeader.css b/mail/themes/pinstripe/mail/messageHeader.css
index 273868cd4e..798a43c4fa 100644
--- a/mail/themes/pinstripe/mail/messageHeader.css
+++ b/mail/themes/pinstripe/mail/messageHeader.css
@@ -43,16 +43,30 @@
 
 /* ::::: for the entire area ::::: */
 .main-header-area {
-  background-color: #6d84a2;
-  color: #ffffff; 
-  font-size: 12px;
-  overflow: hidden;
+  background-color: #eeeeec;
 }
 
 /* ::::: msg header toolbars ::::: */
-#collapsedHeaderView,
-#expandedHeaderView {
+#collapsedHeaderView {
+  padding: .5em;
   min-width: 1px;
+  color: black;
+  font-size: 120%;
+}
+
+#expandedHeaderView {
+  color: #2e3436;
+  /*padding-top: .5em;*/
+  font-size: 12px;
+  overflow: visible;
+}
+
+#variousHeadersBox{
+  padding-bottom: 1em;
+}
+
+#collapsedHeaderDisplayName {
+  text-align: left;
 }
 
 /* ::::: msg header buttons ::::: */
@@ -62,7 +76,58 @@
 }
 
 #otherActionsButton {
-  margin-bottom: .1em;   
+  margin-bottom: .1em;
+  background: none;
+  font-weight: normal;
+  color: #41413F; /* higher contrast */
+  border: 2px solid transparent;
+  font-size: 100%;
+  padding-top: 0px;
+}
+
+#otherActionsButton:hover {
+  color: black;
+  background-color: rgb(230,231,227);
+  border: 2px solid #C0C3C6;
+}
+
+#otherActionsButton > .button-box > .button-menu-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-grey.png");
+}
+
+#otherActionsButton:hover > .button-box > .button-menu-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-black.png");
+}
+
+#hideDetailsButton {
+  font-weight: normal;
+  font-size: 100%;
+  background: none;
+  color: #41413F; /* higher contrast */
+  border: 2px solid transparent;
+  font-size: 100%;
+}
+
+#hideDetailsButton:hover {
+  color: black;
+  background-color: rgb(230,231,227);
+  border: 2px solid #C0C3C6;
+}
+
+
+#collapsedsubjectValue {
+  -moz-box-align: stretch;
+  font-weight: bold;
+}
+
+#showDetailsButton {
+  font-size: 9pt !important;
+}
+
+#showDetailsButton:hover {
+  color: black;
+  background-color: rgb(230,231,227);
+  border: 2px solid #C0C3C6;
 }
 
 #trashButton {
@@ -73,13 +138,13 @@
 /* ::::: expanded header pane ::::: */
 
 #expandedHeadersButtonBox {
-  padding-bottom: .3em;
+  padding-bottom: 0;
 }
 
-#variousHeadersBox {
-  padding-bottom: 1.3em;
+#expandedfromBox {
+  padding-top: .5em;
 }
-  
+
 /* ::::: edit message bar ::::: */
 
 #editMessageBox
@@ -176,12 +241,8 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 /* ::::: msg header captions ::::: */
 
 #msgHeaderView {
-  border-left: 2px solid #8597b0;
-  border-right: 2px solid #8597b0;
   font-family: Arial;
   font-size: 12px;
-  -moz-border-radius-bottomleft: 0.2em;
-  -moz-border-radius-bottomright: 0.2em;
 }
 
 #msgHeaderViewDeck {
@@ -192,7 +253,31 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 
 .msgHeaderView-button {
   min-width: 1px;
-  /* XXX need to pick a good outline-color here */
+  -moz-appearance: none;
+  font-size: 90%;
+  color: black;
+  margin-left: 0px;
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  background-color: rgb(211,215,207);
+  border: 2px solid #C0C3C6;
+  -moz-border-radius: 4px;
+}
+
+.msgHeaderView-button[secondary="true"] {
+  background: none;
+}
+
+.msgHeaderView-button > .toolbarbutton-text {
+  margin: 0;
+  padding: 0;
+}
+
+.msgHeaderView-button:hover {
+  background-color: rgb(230,231,227);
+  border: 2px solid #B0B3B6;
 }
 
 #msgHeaderView textbox {
@@ -207,7 +292,7 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 }
 
 .headerName {
-  color: #bbbbbb;
+  color: #888a85; /* lower contrast */
   text-align: right;
   background-color: transparent;
   padding: 0px;
@@ -218,6 +303,7 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   margin: 0;
   min-width: 50px;
   white-space: normal;
+  color: black !important;
   background-color: transparent;
   padding: 0px;
 }
@@ -236,22 +322,35 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   color: red;
 }
 
-.headerValueBox[singleline="true"] {
-  overflow: hidden;
-}
-
 .headerField {
   color: inherit;
 }
 
 #collapsedsubjectBox {
-  margin-top: 0;
-  -moz-margin-start: 8px;
+  margin: 0px;
+  padding: 0px;
+}
+
+#collapsedfromValue > .headerNameBox {
+  display: none;
+  /*width: auto !important;*/
+}
+
+#junkButton[disabled="true"] {
+  background: none;
+  opacity: 0;
+  /*border-color: transparent;*/
 }
 
 .tagvalue {
-  font-weight: bold;
   margin-left: 0px;
+  background-image: url("chrome://messenger/skin/tagbg.png");
+  color: black;
+  -moz-border-radius: 2px;
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 1px;
+  padding-bottom: 1px;
 }
 
 /* ::::: msg header message ids ::::: */
@@ -260,13 +359,14 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   margin: 0;
   padding: 0 10px 0 0 !important;
   background-color: transparent;
-  background: url("chrome://messenger/skin/icons/arrow-dn-7.png") no-repeat center right;
+  background: url("chrome://messenger/skin/icons/arrow-dn-grey.png") no-repeat center right;
 }
 
 .messageIdDisplayButton:hover {
   cursor: pointer;
   text-decoration: underline;
   color: blue;
+  background: url("chrome://messenger/skin/icons/arrow-dn-black.png") no-repeat center right;
 }
 
 /* ::::: msg header email addresses ::::: */
@@ -275,13 +375,14 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   margin: 0;
   padding: 0 10px 0 0 !important;
   background-color: transparent;
-  background: url("chrome://messenger/skin/icons/arrow-dn-7.png") no-repeat center right;
+  background: url("chrome://messenger/skin/icons/arrow-dn-grey.png") no-repeat center right;
 }
 
 .emailDisplayButton:hover {
   cursor: pointer;
   text-decoration: underline;
-  color: blue;
+  color: #2A46C7;
+  background: url("chrome://messenger/skin/icons/arrow-dn-blue.png") no-repeat center right;
 }
  
 /* ::::: email address twisty ::::: */
@@ -313,6 +414,20 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 
 #collapseddateValue {
   text-align: right;
+  padding-right: .5em !important;
+}
+
+.showdetails-button {
+  -moz-appearance: none !important;
+  min-width: 1px;
+  font-size: 90% !important;
+  background-color: rgb(211,215,207);
+  border: 2px solid #C0C3C6;
+  -moz-border-radius: 4px;
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
 }
 
 mail-multi-emailHeaderField,
diff --git a/mail/themes/pinstripe/mail/tagColors.css b/mail/themes/pinstripe/mail/tagColors.css
index 902290814e..f51e417750 100644
--- a/mail/themes/pinstripe/mail/tagColors.css
+++ b/mail/themes/pinstripe/mail/tagColors.css
@@ -48,505 +48,496 @@
 treechildren::-moz-tree-cell-text(lc-FFFFFF), .lc-FFFFFF:not([_moz-menuactive]) {
   color: #FFFFFF
 }
-treechildren::-moz-tree-row(lc-FFFFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFFFF, selected, focus), .blc-FFFFFF {
   background-color: #FFFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCCCCC), .lc-CCCCCC:not([_moz-menuactive]) {
   color: #CCCCCC
 }
-treechildren::-moz-tree-row(lc-CCCCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-CCCCCC, selected, focus), .blc-CCCCCC {
   background-color: #CCCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-C0C0C0), .lc-C0C0C0:not([_moz-menuactive]) {
   color: #C0C0C0
 }
-treechildren::-moz-tree-row(lc-C0C0C0, selected, focus) {
+treechildren::-moz-tree-row(lc-C0C0C0, selected, focus), .blc-C0C0C0 {
   background-color: #C0C0C0;
 }
 
 treechildren::-moz-tree-cell-text(lc-999999), .lc-999999:not([_moz-menuactive]) {
   color: #999999
 }
-treechildren::-moz-tree-row(lc-999999, selected, focus) {
+treechildren::-moz-tree-row(lc-999999, selected, focus), .blc-999999 {
   background-color: #999999;
 }
 
 treechildren::-moz-tree-cell-text(lc-666666), .lc-666666:not([_moz-menuactive]) {
   color: #666666
 }
-treechildren::-moz-tree-row(lc-666666, selected, focus) {
+treechildren::-moz-tree-row(lc-666666, selected, focus), .blc-666666 {
   background-color: #666666;
 }
 
 treechildren::-moz-tree-cell-text(lc-333333), .lc-333333:not([_moz-menuactive]) {
   color: #333333
 }
-treechildren::-moz-tree-row(lc-333333, selected, focus) {
+treechildren::-moz-tree-row(lc-333333, selected, focus), .blc-333333 {
   background-color: #333333;
 }
 
 treechildren::-moz-tree-cell-text(lc-000000), .lc-000000:not([_moz-menuactive]) {
   color: #000000
 }
-treechildren::-moz-tree-row(lc-000000, selected, focus) {
+treechildren::-moz-tree-row(lc-000000, selected, focus), .blc-000000 {
   background-color: #000000;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFCCCC), .lc-FFCCCC:not([_moz-menuactive]) {
   color: #FFCCCC
 }
-treechildren::-moz-tree-row(lc-FFCCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCCCC, selected, focus), .blc-FFCCCC {
   background-color: #FFCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6666), .lc-FF6666:not([_moz-menuactive]) {
   color: #FF6666
 }
-treechildren::-moz-tree-row(lc-FF6666, selected, focus) {
+treechildren::-moz-tree-row(lc-FF6666, selected, focus), .blc-FF6666 {
   background-color: #FF6666;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF0000), .lc-FF0000:not([_moz-menuactive]) {
   color: #FF0000
 }
-treechildren::-moz-tree-row(lc-FF0000, selected, focus) {
+treechildren::-moz-tree-row(lc-FF0000, selected, focus), .blc-FF0000 {
   background-color: #FF0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC0000), .lc-CC0000:not([_moz-menuactive]) {
   color: #CC0000
 }
-treechildren::-moz-tree-row(lc-CC0000, selected, focus) {
+treechildren::-moz-tree-row(lc-CC0000, selected, focus), .blc-CC0000 {
   background-color: #CC0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-990000), .lc-990000:not([_moz-menuactive]) {
   color: #990000
 }
-treechildren::-moz-tree-row(lc-990000, selected, focus) {
+treechildren::-moz-tree-row(lc-990000, selected, focus), .blc-990000 {
   background-color: #990000;
 }
 
 treechildren::-moz-tree-cell-text(lc-660000), .lc-660000:not([_moz-menuactive]) {
   color: #660000
 }
-treechildren::-moz-tree-row(lc-660000, selected, focus) {
+treechildren::-moz-tree-row(lc-660000, selected, focus), .blc-660000 {
   background-color: #660000;
 }
 
 treechildren::-moz-tree-cell-text(lc-330000), .lc-330000:not([_moz-menuactive]) {
   color: #330000
 }
-treechildren::-moz-tree-row(lc-330000, selected, focus) {
+treechildren::-moz-tree-row(lc-330000, selected, focus), .blc-330000 {
   background-color: #330000;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFCC99), .lc-FFCC99:not([_moz-menuactive]) {
   color: #FFCC99
 }
-treechildren::-moz-tree-row(lc-FFCC99, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC99, selected, focus), .blc-FFCC99 {
   background-color: #FFCC99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9966), .lc-FF9966:not([_moz-menuactive]) {
   color: #FF9966
 }
-treechildren::-moz-tree-row(lc-FF9966, selected, focus) {
+treechildren::-moz-tree-row(lc-FF9966, selected, focus), .blc-FF9966 {
   background-color: #FF9966;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9900), .lc-FF9900:not([_moz-menuactive]) {
   color: #FF9900
 }
-treechildren::-moz-tree-row(lc-FF9900, selected, focus) {
+treechildren::-moz-tree-row(lc-FF9900, selected, focus), .blc-FF9900 {
   background-color: #FF9900;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6600), .lc-FF6600:not([_moz-menuactive]) {
   color: #FF6600
 }
-treechildren::-moz-tree-row(lc-FF6600, selected, focus) {
+treechildren::-moz-tree-row(lc-FF6600, selected, focus), .blc-FF6600 {
   background-color: #FF6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC6600), .lc-CC6600:not([_moz-menuactive]) {
   color: #CC6600
 }
-treechildren::-moz-tree-row(lc-CC6600, selected, focus) {
+treechildren::-moz-tree-row(lc-CC6600, selected, focus), .blc-CC6600 {
   background-color: #CC6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-993300), .lc-993300:not([_moz-menuactive]) {
   color: #993300
 }
-treechildren::-moz-tree-row(lc-993300, selected, focus) {
+treechildren::-moz-tree-row(lc-993300, selected, focus), .blc-993300 {
   background-color: #993300;
 }
 
 treechildren::-moz-tree-cell-text(lc-663300), .lc-663300:not([_moz-menuactive]) {
   color: #663300
 }
-treechildren::-moz-tree-row(lc-663300, selected, focus) {
+treechildren::-moz-tree-row(lc-663300, selected, focus), .blc-663300 {
   background-color: #663300;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFFF99), .lc-FFFF99:not([_moz-menuactive]) {
   color: #FFFF99
 }
-treechildren::-moz-tree-row(lc-FFFF99, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF99, selected, focus), .blc-FFFF99 {
   background-color: #FFFF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF66), .lc-FFFF66:not([_moz-menuactive]) {
   color: #FFFF66
 }
-treechildren::-moz-tree-row(lc-FFFF66, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF66, selected, focus), .blc-FFFF66 {
   background-color: #FFFF66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC66), .lc-FFCC66:not([_moz-menuactive]) {
   color: #FFCC66
 }
-treechildren::-moz-tree-row(lc-FFCC66, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC66, selected, focus), .blc-FFCC66 {
   background-color: #FFCC66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC33), .lc-FFCC33:not([_moz-menuactive]) {
   color: #FFCC33
 }
-treechildren::-moz-tree-row(lc-FFCC33, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC33, selected, focus), .blc-FFCC33 {
   background-color: #FFCC33;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC9933), .lc-CC9933:not([_moz-menuactive]) {
   color: #CC9933
 }
-treechildren::-moz-tree-row(lc-CC9933, selected, focus) {
+treechildren::-moz-tree-row(lc-CC9933, selected, focus), .blc-CC9933 {
   background-color: #CC9933;
 }
 
 treechildren::-moz-tree-cell-text(lc-996633), .lc-996633:not([_moz-menuactive]) {
   color: #996633
 }
-treechildren::-moz-tree-row(lc-996633, selected, focus) {
+treechildren::-moz-tree-row(lc-996633, selected, focus), .blc-996633 {
   background-color: #996633;
 }
 
 treechildren::-moz-tree-cell-text(lc-663333), .lc-663333:not([_moz-menuactive]) {
   color: #663333
 }
-treechildren::-moz-tree-row(lc-663333, selected, focus) {
+treechildren::-moz-tree-row(lc-663333, selected, focus), .blc-663333 {
   background-color: #663333;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFFFCC), .lc-FFFFCC:not([_moz-menuactive]) {
   color: #FFFFCC
 }
-treechildren::-moz-tree-row(lc-FFFFCC, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFFCC, selected, focus), .blc-FFFFCC {
   background-color: #FFFFCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF33), .lc-FFFF33:not([_moz-menuactive]) {
   color: #FFFF33
 }
-treechildren::-moz-tree-row(lc-FFFF33, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF33, selected, focus), .blc-FFFF33 {
   background-color: #FFFF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF00), .lc-FFFF00:not([_moz-menuactive]) {
   color: #FFFF00
 }
-treechildren::-moz-tree-row(lc-FFFF00, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF00, selected, focus), .blc-FFFF00 {
   background-color: #FFFF00;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC00), .lc-FFCC00:not([_moz-menuactive]) {
   color: #FFCC00
 }
-treechildren::-moz-tree-row(lc-FFCC00, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC00, selected, focus), .blc-FFCC00 {
   background-color: #FFCC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-999900), .lc-999900:not([_moz-menuactive]) {
   color: #999900
 }
-treechildren::-moz-tree-row(lc-999900, selected, focus) {
+treechildren::-moz-tree-row(lc-999900, selected, focus), .blc-999900 {
   background-color: #999900;
 }
 
 treechildren::-moz-tree-cell-text(lc-666600), .lc-666600:not([_moz-menuactive]) {
   color: #666600
 }
-treechildren::-moz-tree-row(lc-666600, selected, focus) {
+treechildren::-moz-tree-row(lc-666600, selected, focus), .blc-666600 {
   background-color: #666600;
 }
 
 treechildren::-moz-tree-cell-text(lc-333300), .lc-333300:not([_moz-menuactive]) {
   color: #333300
 }
-treechildren::-moz-tree-row(lc-333300, selected, focus) {
+treechildren::-moz-tree-row(lc-333300, selected, focus), .blc-333300 {
   background-color: #333300;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-99FF99), .lc-99FF99:not([_moz-menuactive]) {
   color: #99FF99
 }
-treechildren::-moz-tree-row(lc-99FF99, selected, focus) {
+treechildren::-moz-tree-row(lc-99FF99, selected, focus), .blc-99FF99 {
   background-color: #99FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FF99), .lc-66FF99:not([_moz-menuactive]) {
   color: #66FF99
 }
-treechildren::-moz-tree-row(lc-66FF99, selected, focus) {
+treechildren::-moz-tree-row(lc-66FF99, selected, focus), .blc-66FF99 {
   background-color: #66FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FF33), .lc-33FF33:not([_moz-menuactive]) {
   color: #33FF33
 }
-treechildren::-moz-tree-row(lc-33FF33, selected, focus) {
+treechildren::-moz-tree-row(lc-33FF33, selected, focus), .blc-33FF33 {
   background-color: #33FF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CC00), .lc-33CC00:not([_moz-menuactive]) {
   color: #33CC00
 }
-treechildren::-moz-tree-row(lc-33CC00, selected, focus) {
+treechildren::-moz-tree-row(lc-33CC00, selected, focus), .blc-33CC00 {
   background-color: #33CC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-009900), .lc-009900:not([_moz-menuactive]) {
   color: #009900
 }
-treechildren::-moz-tree-row(lc-009900, selected, focus) {
+treechildren::-moz-tree-row(lc-009900, selected, focus), .blc-009900 {
   background-color: #009900;
 }
 
 treechildren::-moz-tree-cell-text(lc-006600), .lc-006600:not([_moz-menuactive]) {
   color: #006600
 }
-treechildren::-moz-tree-row(lc-006600, selected, focus) {
+treechildren::-moz-tree-row(lc-006600, selected, focus), .blc-006600 {
   background-color: #006600;
 }
 
 treechildren::-moz-tree-cell-text(lc-003300), .lc-003300:not([_moz-menuactive]) {
   color: #003300
 }
-treechildren::-moz-tree-row(lc-003300, selected, focus) {
+treechildren::-moz-tree-row(lc-003300, selected, focus), .blc-003300 {
   background-color: #003300;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-99FFFF), .lc-99FFFF:not([_moz-menuactive]) {
   color: #99FFFF
 }
-treechildren::-moz-tree-row(lc-99FFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-99FFFF, selected, focus), .blc-99FFFF {
   background-color: #99FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FFFF), .lc-33FFFF:not([_moz-menuactive]) {
   color: #33FFFF
 }
-treechildren::-moz-tree-row(lc-33FFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-33FFFF, selected, focus), .blc-33FFFF {
   background-color: #33FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66CCCC), .lc-66CCCC:not([_moz-menuactive]) {
   color: #66CCCC
 }
-treechildren::-moz-tree-row(lc-66CCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-66CCCC, selected, focus), .blc-66CCCC {
   background-color: #66CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-00CCCC), .lc-00CCCC:not([_moz-menuactive]) {
   color: #00CCCC
 }
-treechildren::-moz-tree-row(lc-00CCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-00CCCC, selected, focus), .blc-00CCCC {
   background-color: #00CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-339999), .lc-339999:not([_moz-menuactive]) {
   color: #339999
 }
-treechildren::-moz-tree-row(lc-339999, selected, focus) {
+treechildren::-moz-tree-row(lc-339999, selected, focus), .blc-339999 {
   background-color: #339999;
 }
 
 treechildren::-moz-tree-cell-text(lc-336666), .lc-336666:not([_moz-menuactive]) {
   color: #336666
 }
-treechildren::-moz-tree-row(lc-336666, selected, focus) {
+treechildren::-moz-tree-row(lc-336666, selected, focus), .blc-336666 {
   background-color: #336666;
 }
 
 treechildren::-moz-tree-cell-text(lc-003333), .lc-003333:not([_moz-menuactive]) {
   color: #003333
 }
-treechildren::-moz-tree-row(lc-003333, selected, focus) {
+treechildren::-moz-tree-row(lc-003333, selected, focus), .blc-003333 {
   background-color: #003333;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-CCFFFF), .lc-CCFFFF:not([_moz-menuactive]) {
   color: #CCFFFF
 }
-treechildren::-moz-tree-row(lc-CCFFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-CCFFFF, selected, focus), .blc-CCFFFF {
   background-color: #CCFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FFFF), .lc-66FFFF:not([_moz-menuactive]) {
   color: #66FFFF
 }
-treechildren::-moz-tree-row(lc-66FFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-66FFFF, selected, focus), .blc-66FFFF {
   background-color: #66FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CCFF), .lc-33CCFF:not([_moz-menuactive]) {
   color: #33CCFF
 }
-treechildren::-moz-tree-row(lc-33CCFF, selected, focus) {
+treechildren::-moz-tree-row(lc-33CCFF, selected, focus), .blc-33CCFF {
   background-color: #33CCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3366FF), .lc-3366FF:not([_moz-menuactive]) {
   color: #3366FF
 }
-treechildren::-moz-tree-row(lc-3366FF, selected, focus) {
+treechildren::-moz-tree-row(lc-3366FF, selected, focus), .blc-3366FF {
   background-color: #3366FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3333FF), .lc-3333FF:not([_moz-menuactive]) {
   color: #3333FF
 }
-treechildren::-moz-tree-row(lc-3333FF, selected, focus), .lc-3333FF[_moz-menuactive] {
+treechildren::-moz-tree-row(lc-3333FF, selected, focus), .blc-3333FF {
   background-color: #3333FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-000099), .lc-000099:not([_moz-menuactive]) {
   color: #000099
 }
-treechildren::-moz-tree-row(lc-000099, selected, focus) {
+treechildren::-moz-tree-row(lc-000099, selected, focus), .blc-000099 {
   background-color: #000099;
 }
 
 treechildren::-moz-tree-cell-text(lc-000066), .lc-000066:not([_moz-menuactive]) {
   color: #000066
 }
-treechildren::-moz-tree-row(lc-000066, selected, focus) {
+treechildren::-moz-tree-row(lc-000066, selected, focus), .blc-000066 {
   background-color: #000066;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-CCCCFF), .lc-CCCCFF:not([_moz-menuactive]) {
   color: #CCCCFF
 }
-treechildren::-moz-tree-row(lc-CCCCFF, selected, focus) {
+treechildren::-moz-tree-row(lc-CCCCFF, selected, focus), .blc-CCCCFF {
   background-color: #CCCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-9999FF), .lc-9999FF:not([_moz-menuactive]) {
   color: #9999FF
 }
-treechildren::-moz-tree-row(lc-9999FF, selected, focus) {
+treechildren::-moz-tree-row(lc-9999FF, selected, focus), .blc-9999FF {
   background-color: #9999FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6666CC), .lc-6666CC:not([_moz-menuactive]) {
   color: #6666CC
 }
-treechildren::-moz-tree-row(lc-6666CC, selected, focus) {
+treechildren::-moz-tree-row(lc-6666CC, selected, focus), .blc-6666CC {
   background-color: #6666CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-6633FF), .lc-6633FF:not([_moz-menuactive]) {
   color: #6633FF
 }
-treechildren::-moz-tree-row(lc-6633FF, selected, focus) {
+treechildren::-moz-tree-row(lc-6633FF, selected, focus), .blc-6633FF {
   background-color: #6633FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6600CC), .lc-6600CC:not([_moz-menuactive]) {
   color: #6600CC
 }
-treechildren::-moz-tree-row(lc-6600CC, selected, focus) {
+treechildren::-moz-tree-row(lc-6600CC, selected, focus), .blc-6600CC {
   background-color: #6600CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-333399), .lc-333399:not([_moz-menuactive]) {
   color: #333399
 }
-treechildren::-moz-tree-row(lc-333399, selected, focus) {
+treechildren::-moz-tree-row(lc-333399, selected, focus), .blc-333399 {
   background-color: #333399;
 }
 
 treechildren::-moz-tree-cell-text(lc-330099), .lc-330099:not([_moz-menuactive]) {
   color: #330099
 }
-treechildren::-moz-tree-row(lc-330099, selected, focus) {
+treechildren::-moz-tree-row(lc-330099, selected, focus), .blc-330099 {
   background-color: #330099;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFCCFF), .lc-FFCCFF:not([_moz-menuactive]) {
   color: #FFCCFF
 }
-treechildren::-moz-tree-row(lc-FFCCFF, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCCFF, selected, focus), .blc-FFCCFF {
   background-color: #FFCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF99FF), .lc-FF99FF:not([_moz-menuactive]) {
   color: #FF99FF
 }
-treechildren::-moz-tree-row(lc-FF99FF, selected, focus) {
+treechildren::-moz-tree-row(lc-FF99FF, selected, focus), .blc-FF99FF {
   background-color: #FF99FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC66CC), .lc-CC66CC:not([_moz-menuactive]) {
   color: #CC66CC
 }
-treechildren::-moz-tree-row(lc-CC66CC, selected, focus) {
+treechildren::-moz-tree-row(lc-CC66CC, selected, focus), .blc-CC66CC {
   background-color: #CC66CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC33CC), .lc-CC33CC:not([_moz-menuactive]) {
   color: #CC33CC
 }
-treechildren::-moz-tree-row(lc-CC33CC, selected, focus) {
+treechildren::-moz-tree-row(lc-CC33CC, selected, focus), .blc-CC33CC {
   background-color: #CC33CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-993399), .lc-993399:not([_moz-menuactive]) {
   color: #993399
 }
-treechildren::-moz-tree-row(lc-993399, selected, focus) {
+treechildren::-moz-tree-row(lc-993399, selected, focus), .blc-993399 {
   background-color: #993399;
 }
 
 treechildren::-moz-tree-cell-text(lc-663366), .lc-663366:not([_moz-menuactive]) {
   color: #663366
 }
-treechildren::-moz-tree-row(lc-663366, selected, focus) {
+treechildren::-moz-tree-row(lc-663366, selected, focus), .blc-663366 {
   background-color: #663366;
 }
 
 treechildren::-moz-tree-cell-text(lc-330033), .lc-330033:not([_moz-menuactive]) {
   color: #330033
 }
-treechildren::-moz-tree-row(lc-330033, selected, focus) {
+treechildren::-moz-tree-row(lc-330033, selected, focus), .blc-330033 {
   background-color: #330033;
 }
 
 treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
   color: #FFFFFF
 }
-treechildren::-moz-tree-cell-text(lc-black, selected, focus) {
+treechildren::-moz-tree-cell-text(lc-black, selected, focus), .blc-black {
   color: #000000
 }
diff --git a/mail/themes/pinstripe/mail/tagbg.png b/mail/themes/pinstripe/mail/tagbg.png
new file mode 100644
index 0000000000..2929c640fe
Binary files /dev/null and b/mail/themes/pinstripe/mail/tagbg.png differ
diff --git a/mail/themes/qute/mail/icons/arrow-dn-black.png b/mail/themes/qute/mail/icons/arrow-dn-black.png
new file mode 100644
index 0000000000..e24596de80
Binary files /dev/null and b/mail/themes/qute/mail/icons/arrow-dn-black.png differ
diff --git a/mail/themes/qute/mail/icons/arrow-dn-blue.png b/mail/themes/qute/mail/icons/arrow-dn-blue.png
new file mode 100644
index 0000000000..cdba745b1c
Binary files /dev/null and b/mail/themes/qute/mail/icons/arrow-dn-blue.png differ
diff --git a/mail/themes/qute/mail/icons/arrow-dn-grey.png b/mail/themes/qute/mail/icons/arrow-dn-grey.png
new file mode 100644
index 0000000000..4e9d594f0a
Binary files /dev/null and b/mail/themes/qute/mail/icons/arrow-dn-grey.png differ
diff --git a/mail/themes/qute/mail/jar.mn b/mail/themes/qute/mail/jar.mn
index 97f361939c..ed9c0750f2 100644
--- a/mail/themes/qute/mail/jar.mn
+++ b/mail/themes/qute/mail/jar.mn
@@ -166,5 +166,9 @@ classic.jar:
     skin/classic/messenger/accountcentral/manage-imap.png       (accountcentral/manage-imap.png)
     skin/classic/messenger/accountcentral/manage-newsgroups.png (accountcentral/manage-newsgroups.png)
     skin/classic/messenger/accountcentral/manage-rss.png        (accountcentral/manage-rss.png)
+    skin/classic/messenger/icons/arrow-dn-grey.png              (icons/arrow-dn-grey.png)
+    skin/classic/messenger/icons/arrow-dn-black.png             (icons/arrow-dn-black.png)
+    skin/classic/messenger/icons/arrow-dn-blue.png              (icons/arrow-dn-blue.png)
+    skin/classic/messenger/tagbg.png                            (tagbg.png)
     icon.png
     preview.png
diff --git a/mail/themes/qute/mail/messageHeader.css b/mail/themes/qute/mail/messageHeader.css
index 684d8e6c27..cd3061ed85 100644
--- a/mail/themes/qute/mail/messageHeader.css
+++ b/mail/themes/qute/mail/messageHeader.css
@@ -43,17 +43,30 @@
 
 /* ::::: for the entire area ::::: */
 .main-header-area {
-  background-color: #6d84a2;
-  color: #ffffff; 
-  font-size: 12px;
-  overflow: hidden;
+  background-color: #eeeeec;
 }
 
 /* ::::: msg header toolbars ::::: */
 
-#collapsedHeaderView,
-#expandedHeaderView {
+#collapsedHeaderView {
+  padding: .5em;
   min-width: 1px;
+  color: black;
+  font-size: 120%;
+}
+
+#expandedHeaderView {
+  color: #2e3436;
+  font-size: 12px;
+  overflow: visible;
+}
+
+#variousHeadersBox{
+  padding-bottom: 1em;
+}
+
+#collapsedHeaderDisplayName {
+  text-align: left;
 }
 
 /* ::::: msg header buttons ::::: */
@@ -64,7 +77,58 @@
 }
 
 #otherActionsButton {
-  margin-bottom: .1em;   
+  margin-bottom: .1em;
+  background: none;
+  font-weight: normal;
+  color: #41413F; /* higher contrast */
+  border: 2px solid transparent;
+  font-size: 100%;
+  padding-top: 0px;
+}
+
+#otherActionsButton:hover {
+  color: black;
+  background-color: rgb(230,231,227);
+  border: 2px solid #C0C3C6;
+}
+
+#otherActionsButton > .button-box > .button-menu-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-grey.png");
+}
+
+#otherActionsButton:hover > .button-box > .button-menu-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-black.png");
+}
+
+#hideDetailsButton {
+  font-weight: normal;
+  font-size: 100%;
+  background: none;
+  color: #41413F; /* higher contrast */
+  border: 2px solid transparent;
+  font-size: 100%;
+}
+
+#hideDetailsButton:hover {
+  color: black;
+  background-color: rgb(230,231,227);
+  border: 2px solid #C0C3C6;
+}
+
+
+#collapsedsubjectValue {
+  -moz-box-align: stretch;
+  font-weight: bold;
+}
+
+#showDetailsButton {
+  font-size: 9pt !important;
+}
+
+#showDetailsButton:hover {
+  color: black;
+  background-color: rgb(230,231,227);
+  border: 2px solid #C0C3C6;
 }
 
 #trashButton {
@@ -76,13 +140,12 @@
 /* ::::: expanded header pane ::::: */
 
 #expandedHeadersButtonBox {
-  padding-bottom: .3em;
+  padding-bottom: 0;
 }
 
-#variousHeadersBox {
-  padding-bottom: 1.3em;
+#expandedfromBox {
+  padding-top: .5em;
 }
-  
 /* ::::: edit message bar ::::: */
 
 #editMessageBox
@@ -164,13 +227,42 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 /* ::::: msg header captions ::::: */
 
 #msgHeaderView {
-  border-left: 2px solid #8597b0;
-  border-right: 2px solid #8597b0;
   font-family: Arial;
   font-size: 12px;
-  -moz-border-radius-bottomleft: 0.2em;
-  -moz-border-radius-bottomright: 0.2em;
-  
+}
+
+#msgHeaderViewDeck {
+  margin: 0;
+  padding: 0;
+}
+
+.msgHeaderView-button {
+  min-width: 1px;
+  -moz-appearance: none;
+  font-size: 90%;
+  color: black;
+  margin-left: 0px;
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  background-color: rgb(211,215,207);
+  border: 2px solid #C0C3C6;
+  -moz-border-radius: 4px;
+}
+
+.msgHeaderView-button[secondary="true"] {
+  background: none;
+}
+
+.msgHeaderView-button > .toolbarbutton-text {
+  margin: 0;
+  padding: 0;
+}
+
+.msgHeaderView-button:hover {
+  background-color: rgb(230,231,227);
+  border: 2px solid #B0B3B6;
 }
 
 .msgHeaderView-button {
@@ -185,7 +277,7 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 .headerName {
   margin: 0 .5em 5px 0;
   text-align: right;
-  color: #bbbbbb;
+  color: #888a85; /* lower contrast */
   background-color: transparent;
 }
 
@@ -194,11 +286,11 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   min-width: 50px;
   white-space: normal;
   background-color: transparent;
-  color: inherit;
+  color: black !important;
 }
 
 .headerValueBox {
-  margin: 0 0 5px 0; 
+  margin: 0 0 5px 0; // XXX needed?
 }
 
 .headerValueUrl {
@@ -207,13 +299,31 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   text-decoration: underline;
 }
 
-.headerValueBox[singleline="true"] {
-  overflow: hidden;
+#collapsedsubjectBox {
+  margin: 0px;
+  padding: 0px;
+}
+
+#collapsedfromValue > .headerNameBox {
+  display: none;
+  /*width: auto !important;*/
+}
+
+#junkButton[disabled="true"] {
+  background: none;
+  opacity: 0;
+  /*border-color: transparent;*/
 }
 
 .tagvalue {
   margin-left: 0px;
-  margin-top: 0px;
+  background-image: url("chrome://messenger/skin/tagbg.png");
+  color: black;
+  -moz-border-radius: 2px;
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 1px;
+  padding-bottom: 1px;
 }
 /* ::::: msg header message ids ::::: */
 
@@ -241,11 +351,13 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   cursor: pointer;
   margin: 0;
   background-color: transparent;
+  background: url("chrome://messenger/skin/icons/arrow-dn-grey.png") no-repeat center right;
 }
 
 .headerValueUrl:hover,
 .emailDisplayButton:hover {
-  color: blue;
+  color: #2A46C7;
+  background: url("chrome://messenger/skin/icons/arrow-dn-blue.png") no-repeat center right;
 }
 
 .emailDisplayImage {
@@ -287,6 +399,7 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   text-align: right;
   background-color: transparent;
   color: inherit;
+  padding-right: .5em !important;
 }
 
 #collapseddateValue > .textbox-input-box menupopup { 
@@ -314,3 +427,16 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   color: inherit;
   background-color: transparent;
 }
+
+.showdetails-button {
+  -moz-appearance: none !important;
+  min-width: 1px;
+  font-size: 90% !important;
+  background-color: rgb(211,215,207);
+  border: 2px solid #C0C3C6;
+  -moz-border-radius: 4px;
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+}
diff --git a/mail/themes/qute/mail/tagColors.css b/mail/themes/qute/mail/tagColors.css
index 4825e14d7c..f51e417750 100644
--- a/mail/themes/qute/mail/tagColors.css
+++ b/mail/themes/qute/mail/tagColors.css
@@ -48,505 +48,496 @@
 treechildren::-moz-tree-cell-text(lc-FFFFFF), .lc-FFFFFF:not([_moz-menuactive]) {
   color: #FFFFFF
 }
-treechildren::-moz-tree-row(lc-FFFFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFFFF, selected, focus), .blc-FFFFFF {
   background-color: #FFFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCCCCC), .lc-CCCCCC:not([_moz-menuactive]) {
   color: #CCCCCC
 }
-treechildren::-moz-tree-row(lc-CCCCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-CCCCCC, selected, focus), .blc-CCCCCC {
   background-color: #CCCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-C0C0C0), .lc-C0C0C0:not([_moz-menuactive]) {
   color: #C0C0C0
 }
-treechildren::-moz-tree-row(lc-C0C0C0, selected, focus) {
+treechildren::-moz-tree-row(lc-C0C0C0, selected, focus), .blc-C0C0C0 {
   background-color: #C0C0C0;
 }
 
 treechildren::-moz-tree-cell-text(lc-999999), .lc-999999:not([_moz-menuactive]) {
   color: #999999
 }
-treechildren::-moz-tree-row(lc-999999, selected, focus) {
+treechildren::-moz-tree-row(lc-999999, selected, focus), .blc-999999 {
   background-color: #999999;
 }
 
 treechildren::-moz-tree-cell-text(lc-666666), .lc-666666:not([_moz-menuactive]) {
   color: #666666
 }
-treechildren::-moz-tree-row(lc-666666, selected, focus) {
+treechildren::-moz-tree-row(lc-666666, selected, focus), .blc-666666 {
   background-color: #666666;
 }
 
 treechildren::-moz-tree-cell-text(lc-333333), .lc-333333:not([_moz-menuactive]) {
   color: #333333
 }
-treechildren::-moz-tree-row(lc-333333, selected, focus) {
+treechildren::-moz-tree-row(lc-333333, selected, focus), .blc-333333 {
   background-color: #333333;
 }
 
 treechildren::-moz-tree-cell-text(lc-000000), .lc-000000:not([_moz-menuactive]) {
   color: #000000
 }
-treechildren::-moz-tree-row(lc-000000, selected, focus) {
+treechildren::-moz-tree-row(lc-000000, selected, focus), .blc-000000 {
   background-color: #000000;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFCCCC), .lc-FFCCCC:not([_moz-menuactive]) {
   color: #FFCCCC
 }
-treechildren::-moz-tree-row(lc-FFCCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCCCC, selected, focus), .blc-FFCCCC {
   background-color: #FFCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6666), .lc-FF6666:not([_moz-menuactive]) {
   color: #FF6666
 }
-treechildren::-moz-tree-row(lc-FF6666, selected, focus) {
+treechildren::-moz-tree-row(lc-FF6666, selected, focus), .blc-FF6666 {
   background-color: #FF6666;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF0000), .lc-FF0000:not([_moz-menuactive]) {
   color: #FF0000
 }
-treechildren::-moz-tree-row(lc-FF0000, selected, focus) {
+treechildren::-moz-tree-row(lc-FF0000, selected, focus), .blc-FF0000 {
   background-color: #FF0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC0000), .lc-CC0000:not([_moz-menuactive]) {
   color: #CC0000
 }
-treechildren::-moz-tree-row(lc-CC0000, selected, focus) {
+treechildren::-moz-tree-row(lc-CC0000, selected, focus), .blc-CC0000 {
   background-color: #CC0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-990000), .lc-990000:not([_moz-menuactive]) {
   color: #990000
 }
-treechildren::-moz-tree-row(lc-990000, selected, focus) {
+treechildren::-moz-tree-row(lc-990000, selected, focus), .blc-990000 {
   background-color: #990000;
 }
 
 treechildren::-moz-tree-cell-text(lc-660000), .lc-660000:not([_moz-menuactive]) {
   color: #660000
 }
-treechildren::-moz-tree-row(lc-660000, selected, focus) {
+treechildren::-moz-tree-row(lc-660000, selected, focus), .blc-660000 {
   background-color: #660000;
 }
 
 treechildren::-moz-tree-cell-text(lc-330000), .lc-330000:not([_moz-menuactive]) {
   color: #330000
 }
-treechildren::-moz-tree-row(lc-330000, selected, focus) {
+treechildren::-moz-tree-row(lc-330000, selected, focus), .blc-330000 {
   background-color: #330000;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFCC99), .lc-FFCC99:not([_moz-menuactive]) {
   color: #FFCC99
 }
-treechildren::-moz-tree-row(lc-FFCC99, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC99, selected, focus), .blc-FFCC99 {
   background-color: #FFCC99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9966), .lc-FF9966:not([_moz-menuactive]) {
   color: #FF9966
 }
-treechildren::-moz-tree-row(lc-FF9966, selected, focus) {
+treechildren::-moz-tree-row(lc-FF9966, selected, focus), .blc-FF9966 {
   background-color: #FF9966;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9900), .lc-FF9900:not([_moz-menuactive]) {
   color: #FF9900
 }
-treechildren::-moz-tree-row(lc-FF9900, selected, focus) {
+treechildren::-moz-tree-row(lc-FF9900, selected, focus), .blc-FF9900 {
   background-color: #FF9900;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6600), .lc-FF6600:not([_moz-menuactive]) {
   color: #FF6600
 }
-treechildren::-moz-tree-row(lc-FF6600, selected, focus) {
+treechildren::-moz-tree-row(lc-FF6600, selected, focus), .blc-FF6600 {
   background-color: #FF6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC6600), .lc-CC6600:not([_moz-menuactive]) {
   color: #CC6600
 }
-treechildren::-moz-tree-row(lc-CC6600, selected, focus) {
+treechildren::-moz-tree-row(lc-CC6600, selected, focus), .blc-CC6600 {
   background-color: #CC6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-993300), .lc-993300:not([_moz-menuactive]) {
   color: #993300
 }
-treechildren::-moz-tree-row(lc-993300, selected, focus) {
+treechildren::-moz-tree-row(lc-993300, selected, focus), .blc-993300 {
   background-color: #993300;
 }
 
 treechildren::-moz-tree-cell-text(lc-663300), .lc-663300:not([_moz-menuactive]) {
   color: #663300
 }
-treechildren::-moz-tree-row(lc-663300, selected, focus) {
+treechildren::-moz-tree-row(lc-663300, selected, focus), .blc-663300 {
   background-color: #663300;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFFF99), .lc-FFFF99:not([_moz-menuactive]) {
   color: #FFFF99
 }
-treechildren::-moz-tree-row(lc-FFFF99, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF99, selected, focus), .blc-FFFF99 {
   background-color: #FFFF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF66), .lc-FFFF66:not([_moz-menuactive]) {
   color: #FFFF66
 }
-treechildren::-moz-tree-row(lc-FFFF66, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF66, selected, focus), .blc-FFFF66 {
   background-color: #FFFF66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC66), .lc-FFCC66:not([_moz-menuactive]) {
   color: #FFCC66
 }
-treechildren::-moz-tree-row(lc-FFCC66, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC66, selected, focus), .blc-FFCC66 {
   background-color: #FFCC66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC33), .lc-FFCC33:not([_moz-menuactive]) {
   color: #FFCC33
 }
-treechildren::-moz-tree-row(lc-FFCC33, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC33, selected, focus), .blc-FFCC33 {
   background-color: #FFCC33;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC9933), .lc-CC9933:not([_moz-menuactive]) {
   color: #CC9933
 }
-treechildren::-moz-tree-row(lc-CC9933, selected, focus) {
+treechildren::-moz-tree-row(lc-CC9933, selected, focus), .blc-CC9933 {
   background-color: #CC9933;
 }
 
 treechildren::-moz-tree-cell-text(lc-996633), .lc-996633:not([_moz-menuactive]) {
   color: #996633
 }
-treechildren::-moz-tree-row(lc-996633, selected, focus) {
+treechildren::-moz-tree-row(lc-996633, selected, focus), .blc-996633 {
   background-color: #996633;
 }
 
 treechildren::-moz-tree-cell-text(lc-663333), .lc-663333:not([_moz-menuactive]) {
   color: #663333
 }
-treechildren::-moz-tree-row(lc-663333, selected, focus) {
+treechildren::-moz-tree-row(lc-663333, selected, focus), .blc-663333 {
   background-color: #663333;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFFFCC), .lc-FFFFCC:not([_moz-menuactive]) {
   color: #FFFFCC
 }
-treechildren::-moz-tree-row(lc-FFFFCC, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFFCC, selected, focus), .blc-FFFFCC {
   background-color: #FFFFCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF33), .lc-FFFF33:not([_moz-menuactive]) {
   color: #FFFF33
 }
-treechildren::-moz-tree-row(lc-FFFF33, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF33, selected, focus), .blc-FFFF33 {
   background-color: #FFFF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF00), .lc-FFFF00:not([_moz-menuactive]) {
   color: #FFFF00
 }
-treechildren::-moz-tree-row(lc-FFFF00, selected, focus) {
+treechildren::-moz-tree-row(lc-FFFF00, selected, focus), .blc-FFFF00 {
   background-color: #FFFF00;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC00), .lc-FFCC00:not([_moz-menuactive]) {
   color: #FFCC00
 }
-treechildren::-moz-tree-row(lc-FFCC00, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCC00, selected, focus), .blc-FFCC00 {
   background-color: #FFCC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-999900), .lc-999900:not([_moz-menuactive]) {
   color: #999900
 }
-treechildren::-moz-tree-row(lc-999900, selected, focus) {
+treechildren::-moz-tree-row(lc-999900, selected, focus), .blc-999900 {
   background-color: #999900;
 }
 
 treechildren::-moz-tree-cell-text(lc-666600), .lc-666600:not([_moz-menuactive]) {
   color: #666600
 }
-treechildren::-moz-tree-row(lc-666600, selected, focus) {
+treechildren::-moz-tree-row(lc-666600, selected, focus), .blc-666600 {
   background-color: #666600;
 }
 
 treechildren::-moz-tree-cell-text(lc-333300), .lc-333300:not([_moz-menuactive]) {
   color: #333300
 }
-treechildren::-moz-tree-row(lc-333300, selected, focus) {
+treechildren::-moz-tree-row(lc-333300, selected, focus), .blc-333300 {
   background-color: #333300;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-99FF99), .lc-99FF99:not([_moz-menuactive]) {
   color: #99FF99
 }
-treechildren::-moz-tree-row(lc-99FF99, selected, focus) {
+treechildren::-moz-tree-row(lc-99FF99, selected, focus), .blc-99FF99 {
   background-color: #99FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FF99), .lc-66FF99:not([_moz-menuactive]) {
   color: #66FF99
 }
-treechildren::-moz-tree-row(lc-66FF99, selected, focus) {
+treechildren::-moz-tree-row(lc-66FF99, selected, focus), .blc-66FF99 {
   background-color: #66FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FF33), .lc-33FF33:not([_moz-menuactive]) {
   color: #33FF33
 }
-treechildren::-moz-tree-row(lc-33FF33, selected, focus) {
+treechildren::-moz-tree-row(lc-33FF33, selected, focus), .blc-33FF33 {
   background-color: #33FF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CC00), .lc-33CC00:not([_moz-menuactive]) {
   color: #33CC00
 }
-treechildren::-moz-tree-row(lc-33CC00, selected, focus) {
+treechildren::-moz-tree-row(lc-33CC00, selected, focus), .blc-33CC00 {
   background-color: #33CC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-009900), .lc-009900:not([_moz-menuactive]) {
   color: #009900
 }
-treechildren::-moz-tree-row(lc-009900, selected, focus) {
+treechildren::-moz-tree-row(lc-009900, selected, focus), .blc-009900 {
   background-color: #009900;
 }
 
 treechildren::-moz-tree-cell-text(lc-006600), .lc-006600:not([_moz-menuactive]) {
   color: #006600
 }
-treechildren::-moz-tree-row(lc-006600, selected, focus) {
+treechildren::-moz-tree-row(lc-006600, selected, focus), .blc-006600 {
   background-color: #006600;
 }
 
 treechildren::-moz-tree-cell-text(lc-003300), .lc-003300:not([_moz-menuactive]) {
   color: #003300
 }
-treechildren::-moz-tree-row(lc-003300, selected, focus) {
+treechildren::-moz-tree-row(lc-003300, selected, focus), .blc-003300 {
   background-color: #003300;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-99FFFF), .lc-99FFFF:not([_moz-menuactive]) {
   color: #99FFFF
 }
-treechildren::-moz-tree-row(lc-99FFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-99FFFF, selected, focus), .blc-99FFFF {
   background-color: #99FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FFFF), .lc-33FFFF:not([_moz-menuactive]) {
   color: #33FFFF
 }
-treechildren::-moz-tree-row(lc-33FFFF, selected, focus){
+treechildren::-moz-tree-row(lc-33FFFF, selected, focus), .blc-33FFFF {
   background-color: #33FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66CCCC), .lc-66CCCC:not([_moz-menuactive]) {
   color: #66CCCC
 }
-treechildren::-moz-tree-row(lc-66CCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-66CCCC, selected, focus), .blc-66CCCC {
   background-color: #66CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-00CCCC), .lc-00CCCC:not([_moz-menuactive]) {
   color: #00CCCC
 }
-treechildren::-moz-tree-row(lc-00CCCC, selected, focus) {
+treechildren::-moz-tree-row(lc-00CCCC, selected, focus), .blc-00CCCC {
   background-color: #00CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-339999), .lc-339999:not([_moz-menuactive]) {
   color: #339999
 }
-treechildren::-moz-tree-row(lc-339999, selected, focus) {
+treechildren::-moz-tree-row(lc-339999, selected, focus), .blc-339999 {
   background-color: #339999;
 }
 
 treechildren::-moz-tree-cell-text(lc-336666), .lc-336666:not([_moz-menuactive]) {
   color: #336666
 }
-treechildren::-moz-tree-row(lc-336666, selected, focus) {
+treechildren::-moz-tree-row(lc-336666, selected, focus), .blc-336666 {
   background-color: #336666;
 }
 
 treechildren::-moz-tree-cell-text(lc-003333), .lc-003333:not([_moz-menuactive]) {
   color: #003333
 }
-treechildren::-moz-tree-row(lc-003333, selected, focus) {
+treechildren::-moz-tree-row(lc-003333, selected, focus), .blc-003333 {
   background-color: #003333;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-CCFFFF), .lc-CCFFFF:not([_moz-menuactive]) {
   color: #CCFFFF
 }
-treechildren::-moz-tree-row(lc-CCFFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-CCFFFF, selected, focus), .blc-CCFFFF {
   background-color: #CCFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FFFF), .lc-66FFFF:not([_moz-menuactive]) {
   color: #66FFFF
 }
-treechildren::-moz-tree-row(lc-66FFFF, selected, focus) {
+treechildren::-moz-tree-row(lc-66FFFF, selected, focus), .blc-66FFFF {
   background-color: #66FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CCFF), .lc-33CCFF:not([_moz-menuactive]) {
   color: #33CCFF
 }
-treechildren::-moz-tree-row(lc-33CCFF, selected, focus){
+treechildren::-moz-tree-row(lc-33CCFF, selected, focus), .blc-33CCFF {
   background-color: #33CCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3366FF), .lc-3366FF:not([_moz-menuactive]) {
   color: #3366FF
 }
-treechildren::-moz-tree-row(lc-3366FF, selected, focus) {
+treechildren::-moz-tree-row(lc-3366FF, selected, focus), .blc-3366FF {
   background-color: #3366FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3333FF), .lc-3333FF:not([_moz-menuactive]) {
   color: #3333FF
 }
-treechildren::-moz-tree-row(lc-3333FF, selected, focus) {
+treechildren::-moz-tree-row(lc-3333FF, selected, focus), .blc-3333FF {
   background-color: #3333FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-000099), .lc-000099:not([_moz-menuactive]) {
   color: #000099
 }
-treechildren::-moz-tree-row(lc-000099, selected, focus) {
+treechildren::-moz-tree-row(lc-000099, selected, focus), .blc-000099 {
   background-color: #000099;
 }
 
 treechildren::-moz-tree-cell-text(lc-000066), .lc-000066:not([_moz-menuactive]) {
   color: #000066
 }
-treechildren::-moz-tree-row(lc-000066, selected, focus) {
+treechildren::-moz-tree-row(lc-000066, selected, focus), .blc-000066 {
   background-color: #000066;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-CCCCFF), .lc-CCCCFF:not([_moz-menuactive]) {
   color: #CCCCFF
 }
-treechildren::-moz-tree-row(lc-CCCCFF, selected, focus) {
+treechildren::-moz-tree-row(lc-CCCCFF, selected, focus), .blc-CCCCFF {
   background-color: #CCCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-9999FF), .lc-9999FF:not([_moz-menuactive]) {
   color: #9999FF
 }
-treechildren::-moz-tree-row(lc-9999FF, selected, focus) {
+treechildren::-moz-tree-row(lc-9999FF, selected, focus), .blc-9999FF {
   background-color: #9999FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6666CC), .lc-6666CC:not([_moz-menuactive]) {
   color: #6666CC
 }
-treechildren::-moz-tree-row(lc-6666CC, selected, focus) {
+treechildren::-moz-tree-row(lc-6666CC, selected, focus), .blc-6666CC {
   background-color: #6666CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-6633FF), .lc-6633FF:not([_moz-menuactive]) {
   color: #6633FF
 }
-treechildren::-moz-tree-row(lc-6633FF, selected, focus) {
+treechildren::-moz-tree-row(lc-6633FF, selected, focus), .blc-6633FF {
   background-color: #6633FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6600CC), .lc-6600CC:not([_moz-menuactive]) {
   color: #6600CC
 }
-treechildren::-moz-tree-row(lc-6600CC, selected, focus) {
+treechildren::-moz-tree-row(lc-6600CC, selected, focus), .blc-6600CC {
   background-color: #6600CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-333399), .lc-333399:not([_moz-menuactive]) {
   color: #333399
 }
-treechildren::-moz-tree-row(lc-333399, selected, focus) {
+treechildren::-moz-tree-row(lc-333399, selected, focus), .blc-333399 {
   background-color: #333399;
 }
 
 treechildren::-moz-tree-cell-text(lc-330099), .lc-330099:not([_moz-menuactive]) {
   color: #330099
 }
-treechildren::-moz-tree-row(lc-330099, selected, focus) {
+treechildren::-moz-tree-row(lc-330099, selected, focus), .blc-330099 {
   background-color: #330099;
 }
 
-
 treechildren::-moz-tree-cell-text(lc-FFCCFF), .lc-FFCCFF:not([_moz-menuactive]) {
   color: #FFCCFF
 }
-treechildren::-moz-tree-row(lc-FFCCFF, selected, focus) {
+treechildren::-moz-tree-row(lc-FFCCFF, selected, focus), .blc-FFCCFF {
   background-color: #FFCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF99FF), .lc-FF99FF:not([_moz-menuactive]) {
   color: #FF99FF
 }
-treechildren::-moz-tree-row(lc-FF99FF, selected, focus) {
+treechildren::-moz-tree-row(lc-FF99FF, selected, focus), .blc-FF99FF {
   background-color: #FF99FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC66CC), .lc-CC66CC:not([_moz-menuactive]) {
   color: #CC66CC
 }
-treechildren::-moz-tree-row(lc-CC66CC, selected, focus) {
+treechildren::-moz-tree-row(lc-CC66CC, selected, focus), .blc-CC66CC {
   background-color: #CC66CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC33CC), .lc-CC33CC:not([_moz-menuactive]) {
   color: #CC33CC
 }
-treechildren::-moz-tree-row(lc-CC33CC, selected, focus) {
+treechildren::-moz-tree-row(lc-CC33CC, selected, focus), .blc-CC33CC {
   background-color: #CC33CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-993399), .lc-993399:not([_moz-menuactive]) {
   color: #993399
 }
-treechildren::-moz-tree-row(lc-993399, selected, focus) {
+treechildren::-moz-tree-row(lc-993399, selected, focus), .blc-993399 {
   background-color: #993399;
 }
 
 treechildren::-moz-tree-cell-text(lc-663366), .lc-663366:not([_moz-menuactive]) {
   color: #663366
 }
-treechildren::-moz-tree-row(lc-663366, selected, focus){
+treechildren::-moz-tree-row(lc-663366, selected, focus), .blc-663366 {
   background-color: #663366;
 }
 
 treechildren::-moz-tree-cell-text(lc-330033), .lc-330033:not([_moz-menuactive]) {
   color: #330033
 }
-treechildren::-moz-tree-row(lc-330033, selected, focus) {
+treechildren::-moz-tree-row(lc-330033, selected, focus), .blc-330033 {
   background-color: #330033;
 }
 
 treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
   color: #FFFFFF
 }
-treechildren::-moz-tree-cell-text(lc-black, selected, focus) {
+treechildren::-moz-tree-cell-text(lc-black, selected, focus), .blc-black {
   color: #000000
 }
diff --git a/mail/themes/qute/mail/tagbg.png b/mail/themes/qute/mail/tagbg.png
new file mode 100644
index 0000000000..2929c640fe
Binary files /dev/null and b/mail/themes/qute/mail/tagbg.png differ
diff --git a/mailnews/base/resources/content/mailWidgets.xml b/mailnews/base/resources/content/mailWidgets.xml
index 4039a6da86..eeb64138fa 100644
--- a/mailnews/base/resources/content/mailWidgets.xml
+++ b/mailnews/base/resources/content/mailWidgets.xml
@@ -226,7 +226,7 @@
       <xul:hbox class="headerValueBox" anonid="longEmailAddresses" flex="1"
                 onoverflow="if (event.detail != 1) this.parentNode.toggleIcon.collapsed = false;"
                 onunderflow="if (event.detail != 1) this.parentNode.toggleIcon.collapsed = true;">
-        <xul:label class="headerValue" anonid="emailAddresses" flex="1"/>
+        <xul:description class="headerValue" anonid="emailAddresses" flex="1"/>
       </xul:hbox>
     </content>
 
@@ -464,8 +464,8 @@
 
   <binding id="mail-emailaddress">
     <content popup="emailAddressPopup" context="emailAddressPopup">
-      <xul:label anonid="emailValue" class="emailDisplayButton plain"
-                 xbl:inherits="value=label,crop"/>
+      <xul:description anonid="emailValue" class="emailDisplayButton plain"
+                 xbl:inherits="xbl:text=label,crop" flex="1"/>
       <xul:image class="emailDisplayImage" anonid="emailImage"
                  xbl:inherits="src=image"/>
     </content>
@@ -699,8 +699,10 @@
               // now create a label for the tag name, and set the color
               var label = document.createElement("label");
               label.setAttribute('value', tagName);
+#ifndef MOZ_THUNDERBIRD
               label.style.color = color;
-              label.className = "tagvalue";
+#endif
+              label.className = "tagvalue blc-" + color.substr(1);
               headerValueNode.appendChild(label);
             }
         ]]>
diff --git a/mailnews/jar.mn b/mailnews/jar.mn
index 96a6dddb12..26aade864f 100644
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -162,7 +162,7 @@ messenger.jar:
     content/messenger/mailMessengerOverlay.xul                                 (base/resources/content/mailMessengerOverlay.xul)
     content/messenger/mailMessengerComposeOverlay.xul                          (base/resources/content/mailMessengerComposeOverlay.xul)
     content/messenger/mailOverlay.xul                                          (base/resources/content/mailOverlay.xul)
-    content/messenger/mailWidgets.xml                                          (base/resources/content/mailWidgets.xml)
+*   content/messenger/mailWidgets.xml                                          (base/resources/content/mailWidgets.xml)
 *   content/messenger/junkMailInfo.xul                                         (base/resources/content/junkMailInfo.xul)
     content/messenger/phishingDetector.js                                      (base/resources/content/phishingDetector.js)
     content/messenger/junkCommands.js                                          (base/resources/content/junkCommands.js)