Bug 593944 - No icons in alltabs menuitems. r=Mnyromyr, sr=Neil, a=KaiRo.
authorstefanh@inbox.com
Wed, 06 Oct 2010 19:25:38 +0200
changeset 6508 8c523f3c00fb61f08e54a69c254269a3c282d519
parent 6507 fab718da09fd15749952f58a41c13f60578785e2
child 6509 b731a64e25049ea0a599914de2dc1de1aeb45041
push idunknown
push userunknown
push dateunknown
reviewersMnyromyr, Neil, KaiRo
bugs593944
Bug 593944 - No icons in alltabs menuitems. r=Mnyromyr, sr=Neil, a=KaiRo.
suite/mailnews/tabmail.xml
suite/themes/classic/mac/messenger/mailWindow1.css
suite/themes/classic/messenger/folderPane.css
suite/themes/classic/messenger/icons/message-mail-attach-offl.png
suite/themes/classic/messenger/icons/message-mail-attach.png
suite/themes/classic/messenger/icons/message-mail-delete-offl.png
suite/themes/classic/messenger/icons/message-mail-imapdelete.png
suite/themes/classic/messenger/icons/message-mail-new-offl.png
suite/themes/classic/messenger/icons/message-mail-new.png
suite/themes/classic/messenger/icons/message-mail-offl.png
suite/themes/classic/messenger/icons/message-mail.png
suite/themes/classic/messenger/icons/message-news-attach-offl.png
suite/themes/classic/messenger/icons/message-news-attach.png
suite/themes/classic/messenger/icons/message-news-new-attach-off.png
suite/themes/classic/messenger/icons/message-news-new-attach.png
suite/themes/classic/messenger/icons/message-news-new-offl.png
suite/themes/classic/messenger/icons/message-news-new.png
suite/themes/classic/messenger/icons/message-news-offl.png
suite/themes/classic/messenger/icons/message-news.png
suite/themes/classic/messenger/icons/server-local.png
suite/themes/classic/messenger/mailWindow1.css
suite/themes/classic/messenger/threadPane.css
suite/themes/modern/messenger/folderPane.css
suite/themes/modern/messenger/icons/message-mail-attach-offl.gif
suite/themes/modern/messenger/icons/message-mail-attach.gif
suite/themes/modern/messenger/icons/message-mail-delete-offl.gif
suite/themes/modern/messenger/icons/message-mail-imapdelete.gif
suite/themes/modern/messenger/icons/message-mail-new-offl.gif
suite/themes/modern/messenger/icons/message-mail-new.gif
suite/themes/modern/messenger/icons/message-mail-offl.gif
suite/themes/modern/messenger/icons/message-mail.gif
suite/themes/modern/messenger/icons/message-news-attach-offl.gif
suite/themes/modern/messenger/icons/message-news-attach.gif
suite/themes/modern/messenger/icons/message-news-new-attach-off.gif
suite/themes/modern/messenger/icons/message-news-new-attach.gif
suite/themes/modern/messenger/icons/message-news-new-offl.gif
suite/themes/modern/messenger/icons/message-news-new.gif
suite/themes/modern/messenger/icons/message-news.gif
suite/themes/modern/messenger/icons/server-local.gif
suite/themes/modern/messenger/mailWindow1.css
suite/themes/modern/messenger/threadPane.css
--- a/suite/mailnews/tabmail.xml
+++ b/suite/mailnews/tabmail.xml
@@ -230,17 +230,17 @@
                     onclick="this.parentNode.parentNode.parentNode.onTabClick(event);">
             <xul:tab selected="true"
                      validate="never"
                      type="3pane"
                      maxwidth="250"
                      width="0"
                      minwidth="100"
                      flex="100"
-                     class="tabbrowser-tab tabmail-tab"
+                     class="tabbrowser-tab tabmail-tab icon-holder"
                      crop="end"/>
             <children/>
           </xul:tabs>
         </xul:hbox>
         <!-- Remember, user of this binding, you need to provide tabpanels!  -->
         <children includes="tabpanels"/>
       </xul:tabbox>
     </content>
@@ -439,17 +439,17 @@
               "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
               "tab");
             t.setAttribute("crop", "end");
             t.maxWidth = this.tabContainer.mTabMaxWidth;
             t.minWidth = this.tabContainer.mTabMinWidth;
             t.width = 0;
             t.setAttribute("flex", "100");
             t.setAttribute("validate", "never");
-            t.className = "tabbrowser-tab tabmail-tab";
+            t.className = "tabbrowser-tab tabmail-tab icon-holder";
             // for styling purposes, apply the type to the tab
             // (this attribute may be overwritten by mode functions)
             t.setAttribute("type", tabInfo.mode.type);
             this.tabContainer.appendChild(t);
             if (!this.mStripVisible)
             {
               this.mStripVisible = true;
               this.tabContainer.adjustTabstrip();
@@ -1054,17 +1054,17 @@
               <xul:hbox flex="1" class="tabs-alltabs-box" anonid="alltabs-box"/>
               <xul:hbox flex="1"
                         class="tabs-alltabs-box-animate"
                         anonid="alltabs-box-animate"/>
               <xul:toolbarbutton class="tabs-alltabs-button"
                                  type="menu"
                                  anonid="alltabs-button"
                                  tooltipstring="&tabmailAllTabs.tooltip;">
-                <xul:menupopup class="menulist-menupopup tabs-alltabs-popup"
+                <xul:menupopup class="tabs-alltabs-popup"
                                anonid="alltabs-popup"
                                position="after_end"/>
               </xul:toolbarbutton>
             </xul:stack>
           </xul:hbox>
         </xul:stack>
       </xul:stack>
     </content>
@@ -1398,34 +1398,46 @@
 
       <method name="_createTabMenuItem">
         <parameter name="aTabNode"/>
         <body>
           <![CDATA[
             let menuItem = document.createElementNS(
               "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
               "menuitem");
-            menuItem.setAttribute("class", "menuitem-iconic alltabs-item");
+            menuItem.setAttribute("class", "menuitem-iconic alltabs-item icon-holder");
             menuItem.setAttribute("label", aTabNode.label);
             menuItem.setAttribute("crop",  aTabNode.getAttribute("crop"));
             menuItem.setAttribute("image", aTabNode.getAttribute("image"));
 
-            if (aTabNode.hasAttribute("busy"))
-              menuItem.setAttribute("busy", aTabNode.getAttribute("busy"));
-            if (aTabNode.selected)
-              menuItem.setAttribute("selected", "true");
+            let attributes = ["busy", "selected", "type", "NewMessages", "ServerType",
+                              "SpecialFolder", "ImapShared", "BiffState", "IsServer",
+                              "IsSecure", "Attachment", "IMAPDeleted", "Offline",
+                              "MessageType"];
+
+            attributes.forEach(
+              function(attribute)
+              {
+                if (aTabNode.hasAttribute(attribute))
+                {
+                  menuItem.setAttribute(attribute, aTabNode.getAttribute(attribute));
+                }
+              }
+            );
 
             // Keep some attributes of the menuitem in sync with its
             // corresponding tab (e.g. the tab label)
             aTabNode.mCorrespondingMenuitem = menuItem;
             document.addBroadcastListenerFor(aTabNode, menuItem, "label");
             document.addBroadcastListenerFor(aTabNode, menuItem, "crop");
             document.addBroadcastListenerFor(aTabNode, menuItem, "image");
             document.addBroadcastListenerFor(aTabNode, menuItem, "busy");
             document.addBroadcastListenerFor(aTabNode, menuItem, "selected");
+            document.addBroadcastListenerFor(aTabNode, menuItem, "NewMessages");
+            document.addBroadcastListenerFor(aTabNode, menuItem, "BiffState");
             aTabNode.addEventListener("TabClose", this, false);
             menuItem.tab = aTabNode;
             menuItem.addEventListener("command", this, false);
             this.appendChild(menuItem);
             return menuItem;
           ]]>
         </body>
       </method>
@@ -1459,16 +1471,18 @@
           while (this.hasChildNodes())
           {
             let menuItem = this.lastChild;
             document.removeBroadcastListenerFor(menuItem.tab, menuItem, "label");
             document.removeBroadcastListenerFor(menuItem.tab, menuItem, "crop");
             document.removeBroadcastListenerFor(menuItem.tab, menuItem, "image");
             document.removeBroadcastListenerFor(menuItem.tab, menuItem, "busy");
             document.removeBroadcastListenerFor(menuItem.tab, menuItem, "selected");
+            document.removeBroadcastListenerFor(menuItem.tab, menuItem, "NewMessages");
+            document.removeBroadcastListenerFor(menuItem.tab, menuItem, "BiffState");
             menuItem.removeEventListener("command", this, false);
             menuItem.tab.removeEventListener("TabClose", this, false);
             menuItem.tab.mCorrespondingMenuitem = null;
             this.removeChild(menuItem);
           }
           let tabcontainer = document.getBindingParent(this);
           tabcontainer.mTabstrip.removeEventListener("scroll", this, false);
           document.getBindingParent(tabcontainer).removeEventListener("TabOpen", this, false);
--- a/suite/themes/classic/mac/messenger/mailWindow1.css
+++ b/suite/themes/classic/mac/messenger/mailWindow1.css
@@ -186,8 +186,17 @@
   border-bottom: 1px solid #A1A1A1;
   padding-bottom: 3px;
   background-color: #E8E8E8;
 }
 
 .tab-close-button {
   margin: 0;
 }
+
+.tabmail-tab[type="message"] .tab-icon {
+  margin-top: -2px;
+}
+
+.tabmail-tab[type="folder"][NewMessages="true"],
+.tabmail-tab[type="folder"][IsServer="true"] {
+  font-weight: bold;
+}
--- a/suite/themes/classic/messenger/folderPane.css
+++ b/suite/themes/classic/messenger/folderPane.css
@@ -46,167 +46,161 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: mail folder ::::: */
 
 treechildren::-moz-tree-image(folderNameCol) {
   -moz-margin-end: 2px;
 }
 
-.tabmail-tab[type="folder"],
+.icon-holder[type="folder"],
 treechildren::-moz-tree-image(folderNameCol) {
   list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
 }
 
-.tabmail-tab[type="folder"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-new.png");
 }
 
 /* ..... News and Feeds ..... */
 
-.tabmail-tab[type="folder"][ServerType="nntp"],
-.tabmail-tab[type="folder"][ServerType="rss"],
+.icon-holder[type="folder"][ServerType="nntp"],
+.icon-holder[type="folder"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
 }
 
-.tabmail-tab[type="folder"][ServerType="nntp"][NewMessages="true"],
-.tabmail-tab[type="folder"][ServerType="rss"][NewMessages="true"],
+.icon-holder[type="folder"][ServerType="nntp"][NewMessages="true"],
+.icon-holder[type="folder"][ServerType="rss"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.png");
 }
 
 /* ..... Inbox ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Inbox"],
+.icon-holder[type="folder"][SpecialFolder="Inbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
 }
 
-.tabmail-tab[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
+.icon-holder[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
 }
 
 /* ..... Sent ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Sent"],
+.icon-holder[type="folder"][SpecialFolder="Sent"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
   list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
 }
 
 /* ..... Outbox ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
+.icon-holder[type="folder"][SpecialFolder="Outbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
 }
 
 /* ..... Drafts ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Drafts"],
+.icon-holder[type="folder"][SpecialFolder="Drafts"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
   list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
 }
 
 /* ..... Templates ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Templates"],
+.icon-holder[type="folder"][SpecialFolder="Templates"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
   list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
 }
 
 /* ..... Junk ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Junk"],
+.icon-holder[type="folder"][SpecialFolder="Junk"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
 }
 
 /* ..... Trash ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Trash"],
+.icon-holder[type="folder"][SpecialFolder="Trash"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
   list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
 }
 
 /* ..... Saved Searches ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
+.icon-holder[type="folder"][SpecialFolder="Virtual"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
   list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
 }
 
-.tabmail-tab[type="folder"][NewMessages="true"],
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true) {
   font-weight: bold;
 }
 
-.tabmail-tab[type="folder"][ImapShared="true"],
+.icon-holder[type="folder"][ImapShared="true"],
 treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
 }
 
 /* ..... Server Folders ..... */
 
-.tabmail-tab[type="folder"][IsServer="true"],
+.icon-holder[type="folder"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
 }
 
-.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"],
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
 }
 
-.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"][ServerType="imap"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.png");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="none"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+  list-style-image: url("chrome://messenger/skin/icons/local-mailhost.png");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
   list-style-image: url("chrome://messenger/skin/icons/server-news.png");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
   list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
 }
 
 /* ::::: All Servers ::::: */
 
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
-  font-weight: bold;
-}
-
-.tabmail-tab[type="folder"][IsServer="true"],
+treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
 treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
   font-weight: bold;
 }
 
 treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
   color: gray;
   font-style: italic;
index cd12ae68ca04662d8d3086eb95da9e28341ebd99..ef321ccd1e39fcfd36060e117536a5b2678feac6
GIT binary patch
literal 537
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zIlF7sn8b
z)5!@E`yAZdp6&1HIa9yMG&wn$x#xt8X|C*|oIRyqxnlIWccu81a5!(6uIzW#Ze^-Q
zjatcawrWcw6Ti3<3b_gA3w~b8ZL=<)Z)j8Xukqp6-S2sTs(2>aotwdS;>3wR^`D+_
z-m%{N>|C;kw_j31;?snL#KhzW3F(O*I_uMK7%b;L?CSG^=@Q#F9_cjy#0Sq((j&H}
z%QLfUOFIWu3OBEuXU2TGo~<qZ{{ICl(i0OB5-NZuE(W^xe{}eI1Dm}C6BeeQ<7#7Y
zw`Mcb(`%cuORR0`WGhJv3rPtnb^VkHLV^cnxp{J&{&QbGBspcN%0s9B68{YU{P^45
z2m}vrf4Aq6{w|kdQU6ONMqharzlWzq&taAG3=F$egKK)XDFp)Kjlt8^&t;ucLK6VG
C*2m-k
index 3366e45ca131a12532c920e396f9f022c4e65f04..9492c847d9361fd9d9d45ba111f8e3b3cebcb7c6
GIT binary patch
literal 541
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zJAV7sn8b
z)5!@E*B;o5OkOJ~EzNA8R9v<`?$>=&lUa%1UoGYNE`Kj|N6}-xFyGZ>a)}imf5<6^
z%`OM3`2TtJaf`w@uRHaek*YgZ&$wV>9C72e;T(&Kj>d4GX%8=cW#?Hx&nEfDhgZyp
zulw(pT(x?Y<Q-X=z?>APPwJ1K&9#>Fld(DSKuYSY!RqCmjZ?d4Hg?YJZJgOWcj4N_
zjSIJKo%!(p{{0cW4a_sr^wRj+nAyJ@Y}mNLu%u**!HbL)1_lO3hJSv3=XbT`4odhp
z-y~fyX7kd$w#?Gf;?C*y>dwi*%FNu{+=oB8ewJimZ7Dq7)ZKjeKTEwnTcKp;k_kVL
ze|UXezU}}2e@1`)eV&~7f8%70jSWc+vsOL(?{8lxG&P{W^|1g8!?LLzUVoZpF9G9@
N!PC{xWt~$(696e7)yMz<
index b356b5aa3eaf723ef2c13838aeb128aea4e97556..afa170bafd47bc9a98c90620dc319be41c87607b
GIT binary patch
literal 560
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zMce7sn8b
z(|0G^dN>72w9QvmdnTc`lTFV{L^0QOi`5p_)lWDN9zD8X;f{+z$-eh=ITkHAxbSR?
zHOpU~TlX)W4+!9OG)bND!}P`8JK7#wtJ;cx#8upTZ>|5_Azz30(K>F~uj@B7+)!f`
zxES?gap!#&Ru4uA=8I8_eI{q<_?b_>Jv%$2aP8T5Yi=JZzWVBx;mmWvmiDC)^O>{n
zO0gQasaaaCE-I}&{`WAq|9bg7d#`&e`+P=q`QE;F*6zuL8;u#4Y}u`R{3!FvDg3D>
zhI;+t({d!d=hf73FPM^PrMxyoS7gHJv>W<UIlr-b=&qY2(f3e%#dWEB0=JhJb??k+
zo4JycX`#U9)7fuw*9pI2PtKn0Ve!WBLjwz&%JOu{E*`6($!hWUOBw94dAr=Fsk>Yi
i-1O)1-<5Jd-R=2YN=juzKZXLMlfl!~&t;ucLK6U^&)41n
index e3907a2f1b6aec4f55e5927d8bc196e29e845971..4bb97e09a5388bff5de71d72d81d08a46ba06bbe
GIT binary patch
literal 586
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<==?xW7sn8b
z(|0HB_jU>tIc~4Nwyi@&Kq<?!D<d<5@7G2SQ<t-57I%);JIrd?5VdIS2VPda#^8`>
zU*4xeLM*m&9vxp5WY@?kWmZY~yvz*9mfdl9=ZC-Z&i|dq{eQ8@iR*UPF8$XKo6zRT
z<1$64F7wefM`jf^pGJ+P7fNJLn^@TTc^H-6R<qi<Lv6lq_Ld~?+Eo$D6wCB}zvX0Q
zekA+N^re+l($WxF){dUuWP9<Gcb1+^mD6~_B@*x5ayVP(%-KtJKR=(Hmf4Y|xO2Z}
zXR4GC7u%7#Qzrsz?t5;SbAItltA=gccRL?3xv*d&W9+-UMbUw3>TZs&9kN8zJL1-F
zmpqod&td&?_R}UBdqqC{o_^!Ty%gJBe#=iEP5jgF&#wRQfr(H4oY}HwosN-(!IeF$
zPg-9snp(vBWbKikp_7i>OfBZ-YZkn}<Hpld>;L)RminJp%aB*KWedyUTybDTGkCiC
KxvX<aXaWGC?&{kB
index 008afb3b8d5079ee7f326890dcfdcdda93aab274..da7cdba05d45ae7df605ef52cf6a1529ab5c705e
GIT binary patch
literal 608
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<==^j~7sn8b
z(|0HNYBU$h9JfDjQ*Bl}xqEI{mr12%Pjis}oF@uXWIAQ%?8xz(ab(AuZQTWt-k-u^
z!cKXgKDsAm^3)ZoTf?R-=KN`0x#{NZo6o=f{`&WCz5f0EE_}b#q>jA*p;UAB@Wu&7
zrAC!EX7v}GG*a(p)H`(3bXN`kACdd_j}>P<aa#QU*di|`k7(CZYHQw3bV*3(RLE^w
zVEywsU#8>Mt$wfLf`kvh%Vd4<&&=<_T$jpCOa<b*Pu|;eD@uJ&@nt1J&Q2E<m8@zN
z!(I7eVxgCce7A`)cFb{q^ERaL=bt(ATtAeo7bsDWEPwOq&!k1!M-DoKS0{>F&62*!
z?>_OX+qGlc45d=o<_5o6rze)ac+us+u&jj74>%UbC7!TsUVE=g=Yj3l$REnBiwt*N
zH4~ZK`S4_<*&c2Q?}JZ2C$C$fu$)`tY0{m0{!@1bdDnhCdi%IF!}^u}-}szk=C*IW
i<)h7VRQaR*54KXdR;v%DYg~cR&*16m=d#Wzp$Pzc_x+Cm
index 4f3ed4747b321790879da1fde2560107fd33bd32..3759fcff7eb6fd992bb063054e9ec31d036b4a34
GIT binary patch
literal 621
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<==>5-7sn8b
z(^n_?Ycv;19Jhb}EiZpkb8|+ZQmU7X%#--rGL}Ef1>0q1EOzK!pSf2&P_IakFYC1D
zTCuGGZX10rsZ5d$yQ8CfSWf-)jWbujf3vBrKfnLH|H6j07~M~%c9wR}^;Axk&p)OA
zsrtM{YHRavUcbK2)jaz}f7H~-?$&(~*xmatbZePw!<^75HEypPl%%6iGgu0<d^yr@
z{e<P*#fdrJ3r?Ls;-t=SePc9J6;pevM8n&^!E%qy?PpuNyQ{p2p8Ui)W)gqlMm`NA
z$t@mhV^2O?HYYhKFj$|p|3+f*hMoIPg{pMbTe&#+Z`d#L^rvR)X;bI<hvVirWfx0N
z?B-AlRo)`uXga&_{LYJeH!m@+Kadf|n=$KHTm}2)RSz%PZZR=!NOCY*f7Cwci;-7&
zHUF|nLC>D;-C>*O<EA|O_3A0pLxUzbtzR2`jQ#h<kkIsE$;!vJfBmeOKTS$9uW8AD
tZs4uB+#$AhvC8H3e_SgK|M}N4EajQ?yLXpQJTNUVc)I$ztaD0e0szf&_ly7l
index 3665b41a5b542e2adee7d770df06c8ec2bc16fac..7f3a8166fbc2e92920889029c17eb0197ca8f508
GIT binary patch
literal 494
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=$5aZE{-7<
zr;`&TSVfrKQu=0XJ6E4%a(7o1>$>Tzu}11vEs8fz3ocKaf5k||u8r|vTpv&GWO1V%
zvtJt*6c-p56crn9C@eHA*tFSLW!iOPmtPjfbL?w{*3ILbt*e*D#$)Xtmy(e9G$A1|
zG5JA4dZLHU`t%zH%ekF(!<cW(m?5#l@}^|i+ndJ^96WVwLdd-%39FW$J@9FM<HPIU
z?SJe&00ade9)-3sxLdQC>FKpi*(KICb+VPDg@vSql)8S(1R=qLvfMm5PXD<tACjE1
zROO-5e~EvFe}4S!ZUlmdx4+x-NPm}WX=PMi#>m6-|D-RIGcXEn2bxW1s!|pQ1^|Pn
LtDnm{r-UW|7P+*A
index 29c772e15e2ea653885e65c31b3801d0c2bf281f..19748fd497bbc7b0812975634c5662612116086b
GIT binary patch
literal 508
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zL~R7sn8b
z)5!@EtRl>ADSkc`7wVHta&J^OK0H0Ux`zh{bY4sf{8z`bP4AqAsrdBJMIUBf5WTU>
z!dPd9b^pU-KZ|+3ufLO0@$CWU;n~mgCG7V8KNJuXcJjf?jPCmkY(OB)%-kmYT+d*`
zh7E=W#v6?`6mBpu*|y!Nq<mY_ilbQ!+RDbv;?~lK?=Ai<dE>?nNvYe`k|kF|C1*&?
zl=%1ONAsd-tg{)#*T<%9*jSj5ko-I$<K^p=jO?t$gw*tu2!nFD<{1kF-bHNKxZ%%y
ziD$<ZR5e+}fB*k)fB5`;dr1i(sQdfl=!Wk<Jlj&E`wk{E9%ayEUHX6iJ^}In2Fz`Y
a3=Hfqy_@#u%~%bL8U{~SKbLh*2~7YPxxZ%s
index 798c6b292f87254238059275722cd15239627410..d49f21299b161b4475a5ebe06329a077556b468a
GIT binary patch
literal 435
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=$2icE{-7<
zr;`&F=q3F3U&W`Ulk|V%hyTL42io55p2++2{DA`pIFA1BG-{aL+NijE(^SU!Yg_gl
zc#xFNX4)c~C7_dIaJYlhlA-+ly+a?q@*kRTclUOOKOg_IU#X5Zh&k4BzS7`uLc;ll
z!4g>!8-V_sf8@dIr^hx_-qveMY`EI+>y!-}2q@R`wlz4<_B3Cxu~ukK>~+JLjT0wM
zOg#MU?vZN7XG~kRINo55|DV9GQPVKd!AQ;RJOeX>KdbfI><9dZfWBbxboFyt=akR{
E0OqQs$N&HU
index 799607cd109c27520091a2a3d3e82479f13ed1c0..4b80b4811ddd375688c10739cca9e3af2ed0468b
GIT binary patch
literal 457
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=#~qfE{-7<
zr_Tl%avgFIn8U64h2Jc!DIrx=DQ31^>Zy>*2~$Hia6Vz2#wh40z%8#Jb4c`eLj=n;
zHAmk^Per)dm)&?=R#q1AVETl4=jVU3=$(FVf!-n2w=7qle$hF^;NrPW=*4b_Nyl>i
zbix@7X8TQ8Vz}fvGeh`I3FArg&bu7(viES|X_z^aal@q}rRjYq<Kp&Q`~7(5$K$!#
zG3%~P=(gPS_T6rtMFs~dOk70R<}&5WhTKSD=TKZ=a&vva{52*wEl+fRTi_!gn||lW
eTdfb_JD3yLLJw6rs&WGT#^CAd=d#Wzp$PygtEX82
index 913dc80290826099146f8635fd03af1fa4e2ab6e..20abfa57323b91e4e70b4e5ecc9f8bda86b6c6af
GIT binary patch
literal 505
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zIoG7sn8b
z(?=(5%wlpBXxnewqWy`bY+9L9mUOqU5{Fo2*Mx}qzAldE{4ThEVC56x-_+Q!QYoyd
zH}sM94bJ4pujWSDuAP%sKJEYiv@(gKydU3)vn2f6{NTH{NW<hQJ0`JxY@Y7&F2W?~
z<k67-ar}%YrcQ}qOkDC<fKg<@wADu!RvkS*FZ+V%+O2!ctdg{jTc4ad<;%aWq*e1-
zTP8N{s6O%0#&q?P$}?%zHI*kCo>#i5CoWlOTgf@UIP+1V#DV7}-~1<Ul#F(qpSAQ%
z#;1w9q{AFG2eLodIAOV&>|MSL*1w1U?zLX<cE6{@%h&r8tSoN!e&I8V{=Go2)hqIG
dwoQ4T?3DK8*+>7qJqnB$22WQ%mvv4FO#oWN$S(i@
index ccaa0863e7c847b2e04dbc422f512c12ca638bc7..f1c2c9bad70e995bafebcfaf47adb84538da3e58
GIT binary patch
literal 525
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zI}R7sn8b
z(`P3cdNVtUwCuOl`6SNLy;+E5qX0{1qwn*ZRjFLvA>X;*$uF5=vT}`y?}1B)yqFa`
z7I6qlOP30+yCE;oePHv+qo?oA>YmFSZ8Kx;Ommx~@&d<hGkqv9fArT)q+z=13xz30
z6L*N7JsZ~;7<syzLt*9b19O-kT%T&edggX;m<t2zis{!cp80DKS9<)iqsFzUm$7lD
zLsVwF{n<5Xa(}Jo-MiWh)z;Bp^v+#y<WR^ouY20@?PEdMg3EVR?9WHd_El8dIO+X~
z=qo=ejO_2**@;_duj`+CS#MX^QhSMM_u7mdujFjlxzX=R&J?acvlNbo{-4LZS6gl4
y>Gc!J%{pWC4puzU%MuJZDJlN(>&hSDKiDpIm!+r)TrC2|6@#a%pUXO@geCwNc+D&T
index 6cc76461301b88804bb42710fd70d03023d1eb20..5805f335eabbff88e5f73c648a40d078585f9106
GIT binary patch
literal 544
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zMig7sn8b
z(?=&6dK`8TY1==!DfxMx-=if?%k$n&Xi`eKaP?*q`*FAFkEV1?Ztl)@-_5bq$;jnJ
zNQMKq(@KS<-p~7H&U5zkITZQ$3A_27-QVl}{eCZEX|eH}%1(LS<7a9D8CpY@YjJG~
zv6|@qdujta+h@MT56f$vFKb&hX8cJ0G;@{sre53Yk5}YzEZB5ya?aH$8L~NAJ9ZQ?
zEP1_W<@c8or|tZ|%0#I$r0vtVD{8Rn>C_G_uiE3!zU(-daIf?H?{i9gfvU`3?&vLC
za+l%DABOTG&$nx)Nd411G9w`D^onUab9a21%bIpHPG0H2*R!_I8V_FHEPnmgTD7#J
z&(57wypU(gc;o)vYc`*Z<~Mho@Kl+Vy0)2Pt?*n2jR$*K{;*DcF8$x=^Z6P^hHY6n
U&#oL&0Y)E#r>mdKI;Vst0Nv8zVgLXD
index 74f9772f43a4ed263e45f0eb3c8bd98d72a29153..41251a749451d64e9542af3313e63328066b334a
GIT binary patch
literal 569
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=zIrH7sn8b
z)5$3cOf4ZV{<}Y$Z&}&-@Zi7yJrZ1ZnHK$jZ1mti5S;%r|L6Yy3(wZGy1VVLQY$&S
z#)&I}*YdPM_rnj1kMeBKzvC>J?il{#!?8@ZO5V%=_uscoa4EMkYS_tinYD+9=d`$f
zLV{?}kNwLYD?Pp%JzYZU*5-gK6`>wLuNxTH-1t9#BIoRvVaslTRTgk}{JTGA&wNEQ
zi)N7d1wV6T&l@sd)K&QP|Mm6t|Lv<=53G-O{xEAT`@d{9!++;*X|@VAMC@(gsr%oa
zpdFmsw%0h$Fz0o}xeLLY<m*A<Yv40?^PGbx&vhl<Uzl95@y!&Ewt18O@@!5!ua@Ib
z=B2_61kKB4*|gpH=j`5D%*b;fhRIk&_CYBlPeL(g7<1kK^aP8tUs}wX4HIXi^dz0!
f&ECV)3``maj&!#_d7W?t7_SVTu6{1-oD!M<o8;t@
index 49587a7040b852673246708fc7d18e261f575835..925045ad384f898bc63d6039f4689084b84cef59
GIT binary patch
literal 402
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=$4tDE{-7<
zr;`&F=q3F3U&W`Ulk{KHDB<w8yDE}Ri45l4%+7wP+85grJ~K6U&y~C)@a_K$2~h(j
z_6P6oMoaAb=UB>X^y621qvC<fqOS7XcFz^1j~zI0V8inZnmncvycs$3k34w&^w@^V
z+j=`9YE$LHyf;WO1m`SS?`R-UxQl@;K~M2Ct3ktgRh<`&ZMq9SFuEB{GE_difQjM6
XNrS+x_di|)I+DTD)z4*}Q$iB}wY7}a
index 98a437096487128147c357d0cc729a6341ad6f2a..5f299d66e5cfd8382704c0124fac5ac15cebee7d
GIT binary patch
literal 414
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-U_*&(M2T~LZf<H`34?~Srh<`yftiADepO~p
zPNH6ZQ974nX-P(Yk(GjPVo^?ho`O?maYlXtmuE7N?UGuYnVx5*0OF)2CYR(FRdPA!
z=am#?CY1s?#a3JjKy7)YsW}QkshPQ{MG6`at{#Nzke*wimy)U(ZqKs<=$56PE{-7<
zr;`&Fs1<zR`RTt(PK`&9Z{~jy$qz67RZikLXwWdZwK4JOELRulLruOHE=5cSad<8-
z_d9Ix<iI!6o)a~0PZ(nMW>_8mZogukBisG|1_mcIrHl;zR2=HK&U!*>!oiQ5r+0on
zw8hd}LMCUeB%h2Om-uO~PDMMOgs!buL{D-b$t<3xAS8Z8HDxCQ+lQSkthN_6u!`6n
i@F+5J>pFChk-`0eS$ur?TrZ%589ZJ6T-G@yGywp7ij%AW
index feebd220711758ef2c055990e0d97642ccdeb8cf..b6c6ffa9204f8aa7fc155bd070819a16d5afe1fe
GIT binary patch
literal 255
zc%17D@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UA$8{iY-3Zz3r
zLye7%fsBrhj<mEh@7}#j15#(s7#pX}ocaIm-Mgz+tvYk&|Nk_Gp1Xa0AX7?${DK)A
zp4~_Tagw~<T^Kr8Wj%l#&H|6fVg?3oVGw3ym^DWNC>ZGJ;uyklJvre36H6n5i}AA5
z_wNK442{yy@dPp$J2_8pkhD(hxfZ&5U4x{qo}QipTl0iTlZ0HV-Q4>bJ0_O9dCH!#
mh>MHkOEQpTZe$c&&A94|NN~*>$45ZJ89ZJ6T-G@yGywp2z)%VR
--- a/suite/themes/classic/messenger/mailWindow1.css
+++ b/suite/themes/classic/messenger/mailWindow1.css
@@ -147,8 +147,18 @@
 tabpanels {
   /* don't draw tabpanel borders; see also tabbrowser.css */
   -moz-appearance: none;
 }
 
 .tab-close-button {
   margin: 0;
 }
+
+.tabmail-tab[type="message"] .tab-icon {
+  margin-top: -2px;
+}
+
+.tabmail-tab[type="folder"][NewMessages="true"],
+.tabmail-tab[type="folder"][IsServer="true"],
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
--- a/suite/themes/classic/messenger/threadPane.css
+++ b/suite/themes/classic/messenger/threadPane.css
@@ -185,86 +185,76 @@ treechildren::-moz-tree-image(junkStatus
 }
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
   list-style-image: url("chrome://messenger/skin/icons/dot.png");
   -moz-padding-start: 0px;
   -moz-padding-end: 4px;
 }
 
-/* ..... subject column and tab icons ..... */
+/* ..... subject column, tab and menuitem icons ..... */
 
-.tabmail-tab[type="message"] .tab-icon {
-  margin-top: -4px;
-}
-
-.tabmail-tab[type="message"],
+.icon-holder[type="message"],
 treechildren::-moz-tree-image(subjectCol) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail.png");
 }
 
 treechildren::-moz-tree-image(subjectCol) {
   -moz-margin-end: 2px;
 }
 
 treechildren::-moz-tree-image(subjectCol, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new.png");
 }
 
-.tabmail-tab[type="message"][Attachment="true"],
+.icon-holder[type="message"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
 }
 
-.tabmail-tab[type="message"][IMAPDeleted="true"],
+.icon-holder[type="message"][IMAPDeleted="true"],
 treechildren::-moz-tree-image(subjectCol, imapdeleted) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.png");
 }
 
-.tabmail-tab[type="message"][Offline="true"],
+.icon-holder[type="message"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-offl.png");
 }
 
 treechildren::-moz-tree-image(subjectCol, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offl.png");
 }
 
-.tabmail-tab[type="message"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl.png");
 }
 
-.tabmail-tab[type="message"][IMAPDeleted="true"][Offline="true"],
+.icon-holder[type="message"][IMAPDeleted="true"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, imapdeleted, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-delete-offl.png");
 }
 
-/* the news icons are only 14px high, unfortunately */
-.tabmail-tab[type="message"][MessageType="rss"] .tab-icon,
-.tabmail-tab[type="message"][MessageType="nntp"] .tab-icon {
-  height: 14px;
-}
-
-.tabmail-tab[type="message"][MessageType="rss"],
-.tabmail-tab[type="message"][MessageType="nntp"],
+.icon-holder[type="message"][MessageType="rss"],
+.icon-holder[type="message"][MessageType="nntp"],
 treechildren::-moz-tree-image(subjectCol, rss),
 treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.png");
 }
 
-.tabmail-tab[type="message"][MessageType="rss"][Attachment="true"],
-.tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"],
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach.png");
 }
 
-.tabmail-tab[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
-.tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.png");
 }
 
 treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.png");
@@ -277,18 +267,18 @@ tree[noattachcol="true"] > treechildren:
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach-off.png");
 }
 
 treechildren::-moz-tree-image(subjectCol, news, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-offl.png");
 }
 
-.tabmail-tab[type="message"][MessageType="rss"][Offline="true"],
-.tabmail-tab[type="message"][MessageType="nntp"][Offline="true"],
+.icon-holder[type="message"][MessageType="rss"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, rss, offline),
 treechildren::-moz-tree-image(subjectCol, news, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offl.png");
 }
 
 /* ..... new thread icons for watch and ignore ..... */
 
 treechildren::-moz-tree-image(news, threadCol, watch) {
@@ -323,9 +313,8 @@ treechildren::-moz-tree-image(news, thre
   list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-kill.png");
 }
 
 #sizeCol,
 #unreadCol,
 #totalCol {
   text-align: right;
 }
-
--- a/suite/themes/modern/messenger/folderPane.css
+++ b/suite/themes/modern/messenger/folderPane.css
@@ -44,164 +44,159 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: mail folder ::::: */
 
 treechildren::-moz-tree-image(folderNameCol) {
   -moz-margin-end: 2px;
 }
 
-.tabmail-tab[type="folder"],
+.icon-holder[type="folder"],
 treechildren::-moz-tree-image(folderNameCol) {
   list-style-image: url("chrome://messenger/skin/icons/folder-closed.gif");
 }
 
 treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-new.gif");
 }
 
 /* ..... News and Feeds ..... */
 
-.tabmail-tab[type="folder"][ServerType="nntp"],
-.tabmail-tab[type="folder"][ServerType="rss"],
+.icon-holder[type="folder"][ServerType="nntp"],
+.icon-holder[type="folder"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
 }
 
-.tabmail-tab[type="folder"][ServerType="nntp"][NewMessages="true"],
-.tabmail-tab[type="folder"][ServerType="rss"][NewMessages="true"],
+.icon-holder[type="folder"][ServerType="nntp"][NewMessages="true"],
+.icon-holder[type="folder"][ServerType="rss"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.gif");
 }
 
 /* ..... Inbox ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Inbox"],
+.icon-holder[type="folder"][SpecialFolder="Inbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox.gif");
 }
 
-.tabmail-tab[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
+.icon-holder[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.gif");
 }
 
 /* ..... Sent ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Sent"],
+.icon-holder[type="folder"][SpecialFolder="Sent"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
   list-style-image: url("chrome://messenger/skin/icons/folder-sent.gif");
 }
 
 /* ..... Drafts ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Drafts"],
+.icon-holder[type="folder"][SpecialFolder="Drafts"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
   list-style-image: url("chrome://messenger/skin/icons/folder-draft.gif");
 }
 
 /* ..... Templates ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Templates"],
+.icon-holder[type="folder"][SpecialFolder="Templates"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
   list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
 }
 
 /* ..... Outbox ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
+.icon-holder[type="folder"][SpecialFolder="Outbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
 }
 
 /* ..... Junk ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Junk"],
+.icon-holder[type="folder"][SpecialFolder="Junk"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
 }
 
 /* ..... Trash ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Trash"],
+.icon-holder[type="folder"][SpecialFolder="Trash"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
   list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
 }
 
 /* ..... Saved Searches ..... */
 
-.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
+.icon-holder[type="folder"][SpecialFolder="Virtual"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
   list-style-image: url("chrome://messenger/skin/icons/folder-search.gif");
 }
 
 /* ...... Shared ..... */
 
-.tabmail-tab[type="folder"][ImapShared="true"],
+.icon-holder[type="folder"][ImapShared="true"],
 treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-share.gif");
 }
 
 /* ..... Server Folders ..... */
 
-.tabmail-tab[type="folder"][IsServer="true"],
+.icon-holder[type="folder"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
 
-.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"],
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-mail-new.gif");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
-.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"][IsSecure="true"],
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.gif");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="none"]
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
   list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
   list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
 }
 
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
+.icon-holder[type="folder"][IsServer="true"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
   list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
 }
 
 /* ::::: All Servers ::::: */
 
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true)
-{
-  font-weight: bold;
-}
-
-.tabmail-tab[type="folder"][IsServer="true"],
+treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
 treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
   font-weight: bold;
 }
 
 treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
   color: gray;
   font-style: italic;
index cc7cd64e59c8ffe31f1df11765a4e2bbb49f239d..01418d807a32629192695b742488beb9b1d60609
GIT binary patch
literal 287
zc${<hbhEHb6krfwXpv$70ahUy85ub(6LnL^kd)&1-0GaFuAJ(w{F?5PmI*ao(`vhC
z&RDo+!Sc;Z*X&xgdEff&hd1pxwtdfuU58KYK78i*nak%cUp{{s1pZ?H#eXg~&i(<B
zc18vU1`2+uCB?~!1*yD_r6n2pMOF&FiA6d2c?wRM#Toepyq?KGwo7VpW_q5L0*I5A
zm|T)yRH>lAp!k!8k&8i|K?meuklPtpLmsI2rDV>_n8np(wN1W<uOyfG>4ub=`GPyH
zD+DuGC`{sV6zr*OYdECrq!=?}z50Sg4IhqHpGA_)DLfucticu&>=~Jp_XTJO91u!4
O|9*dLL!+i5gEau3K6m#3
index b46ac57f517031da9ddd50551e665e661f0048e5..2f35a96a110868716d5bb47f68208ffdf67e52ad
GIT binary patch
literal 288
zc${<hbhEHb6krfwXpv+90wEa<ITZs7N1xcV{HFeyJyRD>S-58U;<YoEY?!lR^So8t
z7H`<KWW(-*C$65jc;oct+vl#`zjEu*)!R>QJa~TV!OO?5UcY<|0{^iA#eXg~&i(<B
zc18vU1`2+uCB?~!1*yD_r6n2pMOF&FiA6d2c?wRM#Toepyq?KGwo7VpW_q5L0*I5A
zm|T)yRH>lAp!k!8k&8i|K?mewklPtpLm#O3rDV>_n8nm!wN1Xq%pq8yLT-xbv;Pu@
z-d#O#K}Nu{b%Vq)JC>-2f(r%oxYD~BG$go$ofsz<9NX2Va<EBL=FI%Yg^uYuA{>dH
Q0xy35*K2HQR%EaS01gF&kpKVy
index 028e2e6d1c02d8b1fcd9ce2d492509b1002bf541..292347650892a1a1414f926ec2d1eb58945b3895
GIT binary patch
literal 293
zc${<hbhEHb6krfwXpv<A0al?j28Njo402i~>ZXqW85lxRisN&ubE>*>s=M-Qx=UIn
z{7*}(>6%vCJ#*^(l?#?{Ub<%2s?Gb>Z$G?g&#~=$PV72-YWLwY$Io0oclq-9%OLO{
z1{D9f*f{$KMA{h{7#Jw{rIr*YCl;jgI+m7X<QG{f_$C(R<mV|kWfo`T7w~!}1KBRA
z#hK}ORtg|aT4HiZeo>`@0)ygD7Dg@xc?KPjgF$X*V2yg9-j|X&Z>a&_3Jr-@7Z~1t
zKgF={J<DDxhQ5Lmnm_C;Bvg!6CUEh{_kCdU(3sw&X0=Grg5k))Ad3Pq_lx2ebyCdQ
eU498W*u3Lob57J@{MXP}Y}(S=)-JEeU=08lL3W-1
index 5f139263b0e0557cbc45682562efdf236ac11cf8..b7a7c23f53c4a0d67c8c93d8aea56cc3bdb76522
GIT binary patch
literal 293
zc${<hbhEHb6krfwXpv_Cf;0vO0crJ_3=GoB`u`ai%pE*~V^gD3ax;so|EHxj_0Q~_
zzF^9NRnr%)ow0PotmRwgt=hV9{f;FYb{{-``Sit`=dRtqbo1fWTTiave|GD^^G7dV
zzkL1r)oT#=|Np<@KNlNk|A0t4BLf2i1;5mi;^f4FR9?r@l8pQ!D+S-gqMZCZ1*gp7
zjQj##&txFmCABy+J<m!3#7Rp`F3B&dR8U}0{K>+|#URh119CCQ?F_6@57hfoGUsJ@
zu{~bE#%ir`Ao`5MHW?fJ3C&LDoOP7ylwx$8SH_rha0pFre5xbK!rt`diqOnEOwAD$
nawjexoLs16HrG{I*T_Jv!jt8Z#WW74#-?Vi*0y#PMFwjCi-CA;
index eebeaff47e78751ca8ceaec388f86537c3e8c4e7..7be18687a0547939483913686800175428957b71
GIT binary patch
literal 410
zc${<hbhEHb6krfwSgObX0<1!ES|;kIjtY*9nn8>qDaG-*)gcx7IaOUb)m`~D-6bs(
zYPzP?cF&wNcV*U2sj2f<&RDo+!Sc;Z*X&xgdEff&hd1pxwtdfuU58KYK76MCq0R9#
zm(N|keEu>BocTZVKP`dcKNlNk|A0t4BLf2i1;5mi;^f4FR9?r@l8pQ!D+S-gqMZCZ
z1*gp7jQj##&txFmCABy+J<m!3#7Rp`F3B&dR8U}0{K>+|#bD2%0}2pO*f6l=ADCaz
zp`pZaI7LX1DR+XG>LJcXw|Y0N#OlAI4p&}<I_Tw?g&H|%X4KfVzN+5f$7R=cqNU&>
zk3^|+IX|0-m?X1oLyo)<JDUVEn>=@;Q#re+IJ1l#8|O58Ms~iXygWQyC0-0`*R5X|
MyJ_>5a7PAf0IP1$`~Uy|
index 378fa7bcd6883c15cb0654a5c0e31402185af0c0..8ac6ec0ff25e4e0083c30f718305adb472d3b02a
GIT binary patch
literal 410
zc${<hbhEHb6krfwSgOn*AgwN~tgqn6Xzt*t8N?VIn;M;x8&aX))IYOx`hu*TQd8!y
zpT2PIjHMf9E#ES4)z*dUcP!bkd+YvF+xMT`edtX8Lz{!gFCRO7<MhRw=dRtqbo1fW
zTTiave|GD^^G7dVzkL1r)oTzq^MB@l+5p9WE;i2o0g-k_1_lNSeyJtJ$%zH2ypE+M
z8Tmz43ciU&Ir(`CPMO6S`31b5$w0PCYH?<Io|OWKla`oVl3!G*punK`lZBCs!Ja{f
z0SG{0!@!n*V17Y`h8)Y`lurgip%c8G9$eYrR`0edq57|&%avDK9n?a!LX8|E8(N%N
zUftf{C+5`A>AK*hgj}g}xe$lAqzs!pU!zmG2q%X$8;2rqk9|3(gcO^c0tfeWW=_GS
Y0{nbDC0>jS>(+0G-L!ejR!0VF00@=a_y7O^
index 8640b79c6da5be7586e79ddda26a57caf9e99ef7..59a9257476a2b1b9b088f9c19982a91e6e4c111d
GIT binary patch
literal 280
zc${<hbhEHb6krfwXpv?B0ahV7EfaN9$B>lb_}uE8s;->suKb$rl9mZIUDIm2XHJ^C
za_an*GZwB{uzd5<HM>@A-nV}H;Z1vvZQpZZ*WpvU51%=H=JL7Am(O1Yf&ZvL@t=#0
zvwuLOosofofr4LZNpW&wK`O6fX-P(Yk(GjPVo^?ho`O?maYlXtuV*rl?UGuYnVx5*
z0OF)2CYR(FRVpYjDE?$&<YJI#&;dCZ<aP#D-v{b_DVg&!R;`==V4pz%S6ABoTMCn#
z+)VmU95M2E<7UgosI-#D;MmM#feHa^EWD32UWv9ed$%P#sAFnvjhg5oQ=-~X<7dA4
L-H$(-EDY8Fx7T{d
index 1527559d2bb66adede4b75b21bb4dd9177d26990..41ad671102ad3f2b5e7195a43b260b945c75f828
GIT binary patch
literal 279
zc${<hbhEHb6krfwXpv#y6jBwD*Dx@5_KipgP0Xq3n%*{P-o&}9C(c_vW&WBO%Qnnk
zy=}po9h>$X+q(DI_WdXK9XWsa<kjQnZ=Ak#_uTdSm##m&diU|QyH6iHef{k9>*udQ
z;6D;j{O4lh>>m(mXJlYtpx~EUQk<Mvkjm>=T9T1pWToJnSd^2Wr{I)XoRMF^>zNE>
zyQCIprsr8HfH-N1$tC$kl?n<Bia%KxxftXbbQpjD<aP#Dp9kuFDVg&!R;|mi+*81_
z<8<16X~W5f!z=_ipE?D+aog*rXtYtl$nE;GM2!%RR^LY&uOwSodX^PDsAFMkt6CVK
SP_mRE!EgQccNHNV4AuapT7g3V
index 3dd2043b735a9360b7ea8742a7db83b0a48b3e8f..df3912416fb8d94e08acc80ac0cc4262af942322
GIT binary patch
literal 227
zc${<hbhEHb6krfwc+AcK2JD7*zB!exbsdv8Y~Kw8|8WDwe=au8{sED8Mg|533Vx|2
z#mR{Usl1M*B^mieRtmm}MLGF-3Qn2D8Tkdgp2<MAOKNdudY+X6h?AC>T#{c@si451
z_>+Z^i-Chd2V_6UEetFk0w+DSdCg8UsJ(~^C{f5@J@&yftyPR!eZE_w^Z~}6yxe}P
t(De!m97PNdkET0osp~gR*-)J~!#;vrQL1A9J>5sndfDe*6tgf`0{~?FTSEW<
index cb21e81bd35c1a149001f468bd9e4f0c15cc95b1..c0ae64bb94b4421a1f86e6d77df99ed20ed8eed5
GIT binary patch
literal 229
zc${<hbhEHb6krfwc+9~70vs|9o*@;@{VTWZ+i~F3qvx-I;6Dza_|L`0**_rC&d9*P
zK*2Ayq&PXTAeGm#v?L?H$V$OCu_z}$Pr)g(I3vG+*E1Q&c1bPHOwY4Y0CCb1lS}f8
zDistM6o0ZXaxw5T=ztsmati~C*N2my+M;IOf@%!6lqF<;%$Qan(AXKa%8`Si_h9=%
zc?PBl7IW9JC$O@&GG44W$vJ)QvP1{nKQkuJ2<W(bg5yC!xRA!|vkSM}5@KYq1^{H*
BUw{Ar
index b8a1a99de4ddf01b324d178b59434a41ba3c91d6..7068fbb0cf613f720433aa2741c334f5adf6ff7a
GIT binary patch
literal 239
zc${<hbhEHb6krfwc+ATH2J8xsjD~i;nn8>q75X`qt#uufvvx{t*uEPG`XAby`9JeN
z3@H9{v2pefh_o{@FfdT?OD!o*PAo{}bu2B($S<-|@J%er$<I@8$}G;vFW~h|2C`jJ
zi!;;ntQ0_;w8Z3+{Gv()1qQ{RER0+X{0urE`$2ADU<vtf(lcIjQJWU`=@14Vh5}tC
z4c3zub}X9}UI}ZsX)-dc(&TK;h}g_1%-Op7tFuz<&Swt{8uqD~s|yS8GO|BlR;Y-T
Y-J0Ti;Xq!w=F%N=oY&vB6lAal0Qe45c>n+a
index 42e37196ccc46d79f002de92a6cf03276008babb..4360d91549423739bfb68a1ef10d2dcf150f47c7
GIT binary patch
literal 243
zc${<hbhEHb6krfwc+AHD0vs|5j*OZ?j1Hb5Ar<-+&HY(BrB-g)x8uO6{)aY?p1%fy
zGyiA)2Lr`_E;i2o0g-k_1_lNSeyJtJ$%zH2ypE+M8Tmz43ciU&Ir(`CPMO6S`31b5
z$w0PCYH?<Io|OWKla`oVl3!G*punK`lZBCsfuBJK<N%Oc7+4}cob-&>Tr^3``?QFl
z4?}?_lZN1F4iD$WGOwHsJU-YpG-UO#HZdp&Wo>(qbg+Uk>cG=WGrOgP*j{NYne%DY
ioz}!T6;0~qD}U_~Qo2{LO~qmTb;}=n<_R-0SOWl4!d%+`
index 6c8f05b4ca520fe3bfb399058e98de2ff4973354..6213396f1bdfe49938f1855e23bb4915e70e4017
GIT binary patch
literal 239
zc${<hbhEHb6krfwc+ATH0*w3$j*O<x0h&RKAr<=hRUIuoQ?qtTZP~RO2>Kt|ocTZV
zKMW}TbFp#u4~VogGB7Yu@JlTzPEIUH<#jAA$;dCVQt(YI%E`}DaLO#s$S>gaOa`)D
zQj0Uw^Q;s=oV3K`lKi4d1qBAhpDc`A4Ezi_AP0cl!oU*p;iP4^ZqvR6-pSr>tPG(I
z9Tu#fl?$ErXt{YBWLRl+3QDvbbu#ys5H(@in31E#!sgpxZo#w8_T0IfYdlwmXRqJ#
Zv~Q_xbJg3c4EG9lr1`DCEicGm4FIZDSDgR=
index fcfa9d65e69d7948562b353be867af6fc0461f5c..ac98f1cf663bd4338ac7d4779a81bf91dbf57fef
GIT binary patch
literal 239
zc${<hbhEHb6krfwc+AVdDx{#`$fy~_=oSziQlVenHYsbT)S9ga_8vLY|Ip^ytJgqq
z=Ksw9FrfI)#m3n`Akxmrz`#JkFSVpNIk6y>*RixDBfrQ>!8freCqGZYDYG~uzkt^>
z8OU}?EzV5Ovr+(Y(h`$P@{1}J6c`kLvM_Qn@H6Nz00GD?3@jlZPFi-VHtt*Kne6Gt
z%i!A3X2I)KxzKTsp1Y<&hLzqaLzyNQC-YzlaTCUk897=^>}MOo9YogIo;!DQjpxen
d?Dboo_ATApT=n)U!@YtXX@2W(%L_7C0{}clT=4(^
index 21b08a18cc91ecea1cc519fc40663d1d2a94aadc..56e6091a0b4271bdbb7a7b9887574e81f6fa6127
GIT binary patch
literal 193
zc${<hbhEHb6krfwIK<Atz#-${8B)>QzjDjI9S2T5dj1*+{{R24_|L`0**_rC&d9*P
zK*2Ayq&PXTAeGm#v?L?H$V$OCu_z}$Pr)g(I3vG+*E1Q&c1bPHOwY4Y0CCb1lS}f8
zDistM6o0ZXaxt(o=r8~Q$W8`kyNX?RWb{@sEa6^yOZ3cz=x`p#$T+u!QaN0HE4BLH
oD{{3gxZG>8dVZW&yYL6Ojqx80r7Y%qvn6;f&0BZFm5IR`03&%uF8}}l
index a8f1778190629e578e24bf2bf3e944ff16fa59a4..aae56078f85edaa4b2db0940c6f8cc7974c3beb1
GIT binary patch
literal 158
zc${<hbhEHb6krfwc+AHT8X9VBY|OyG(9zM6mUiadyLV|o>dYBq<FuJG|KGiPch#y@
zXU_cppT_VX3>1H|FfuUkGw1-dFo4WpVDbKN(sT7*i5F}2H5Mqzu_x4e%o1`g5aUo3
z_N><W7_(cn;6kUu;cM1BeI7~r2Xa1DEnw>0BCtoQ+x2q7TV0+92G@lIW}Hv&sp{=y
HV6X-NM&v<F
--- a/suite/themes/modern/messenger/mailWindow1.css
+++ b/suite/themes/modern/messenger/mailWindow1.css
@@ -159,8 +159,13 @@
   border-color: #000000;
 }
 
 /* ..... tabmail ..... */
 
 .tab-close-button {
   list-style-image: url("chrome://global/skin/icons/close.gif");
 }
+
+.tabmail-tab[type="folder"][IsServer="true"],
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
--- a/suite/themes/modern/messenger/threadPane.css
+++ b/suite/themes/modern/messenger/threadPane.css
@@ -217,82 +217,75 @@ treechildren::-moz-tree-image(junkStatus
 }
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
   list-style-image: url("chrome://messenger/skin/icons/readcol-read.gif");
   -moz-padding-start: 0px;
   -moz-padding-end: 4px;
 }
 
-/* ..... subject column ..... */
+/* ..... subject column, tab and menuitem icons ..... */
 
-.tabmail-tab[type="message"],
+.icon-holder[type="message"],
 treechildren::-moz-tree-image(subjectCol) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail.gif");
 }
 
 treechildren::-moz-tree-image(subjectCol) {
   -moz-margin-end: 2px;
 }
 
 treechildren::-moz-tree-image(subjectCol, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new.gif");
 }
 
-.tabmail-tab[type="message"][Attachment="true"],
+.icon-holder[type="message"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
 }
 
-.tabmail-tab[type="message"][IMAPDeleted="true"],
+.icon-holder[type="message"][IMAPDeleted="true"],
 treechildren::-moz-tree-image(subjectCol, imapdeleted) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.gif");
 }
-
-.tabmail-tab[type="message"][Offline="true"],
+.icon-holder[type="message"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-offl.gif");
 }
 
 treechildren::-moz-tree-image(subjectCol, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offl.gif");
 }
 
-.tabmail-tab[type="message"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl.gif");
 }
 
-.tabmail-tab[type="message"][IMAPDeleted="true"][Offline="true"],
+.icon-holder[type="message"][IMAPDeleted="true"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, imapdeleted, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-delete-offl.gif");
 }
 
-/* the news icons are only 14px high, unfortunately */
-.tabmail-tab[type="message"][MessageType="rss"] .tab-icon,
-.tabmail-tab[type="message"][MessageType="nntp"] .tab-icon {
-  height: 14px;
-}
-
-.tabmail-tab[type="message"][MessageType="rss"],
-.tabmail-tab[type="message"][MessageType="nntp"],
+.icon-holder[type="message"][MessageType="rss"],
+.icon-holder[type="message"][MessageType="nntp"],
 treechildren::-moz-tree-image(subjectCol, rss),
 treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
 }
 
-.tabmail-tab[type="message"][MessageType="rss"][Attachment="true"],
-.tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"],
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
 }
 
-.tabmail-tab[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
-.tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.gif");
 }
 
 treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
@@ -305,21 +298,20 @@ tree[noattachcol="true"] > treechildren:
 tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach-off.gif");
 }
 
 treechildren::-moz-tree-image(subjectCol, news, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-offl.gif");
 }
 
-.tabmail-tab[type="message"][MessageType="rss"][Offline="true"],
-.tabmail-tab[type="message"][MessageType="nntp"][Offline="true"],
+.icon-holder[type="message"][MessageType="rss"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, rss, offline),
 treechildren::-moz-tree-image(subjectCol, news, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offl.gif");
 }
 
 #sizeCol,
 #unreadCol,
 #totalCol {
   text-align: right;
 }
-