Bug 495478 - "Buttons on summary page for collapsed threads don't have same height" [r=bienvenu ui-r=clarkbw]
authorJim <squibblyflabbetydoo@gmail.com>
Thu, 06 Aug 2009 09:49:40 +0100
changeset 3240 b9f3451243e90dac9f6d52f5786e8d417f1e17d3
parent 3239 bc7b3a0ae6ca0d7b2c5bed69fa32beaacedc4d6f
child 3241 846e9ef0f13872f5110b5c8adcb6ef1049a3ecb1
push idunknown
push userunknown
push dateunknown
reviewersbienvenu, clarkbw
bugs495478
Bug 495478 - "Buttons on summary page for collapsed threads don't have same height" [r=bienvenu ui-r=clarkbw]
mail/base/content/multimessageview.css
mail/base/content/multimessageview.xhtml
mail/themes/gnomestripe/mail/messageHeader.css
mail/themes/gnomestripe/mail/multimessageview.css
mail/themes/qute/mail/messageHeader.css
mail/themes/qute/mail/multimessageview.css
--- a/mail/base/content/multimessageview.css
+++ b/mail/base/content/multimessageview.css
@@ -144,22 +144,16 @@
   font-family: Lucida Grande;
   border: 1px solid transparent; 
 }
 
 .button {
   display: inline;
 }
 
-#trash {
-  min-height: 16px !important;
-  min-width: 21px !important;
-  padding: 0px;
-}
-
 #column {
   float: right;
   right: 1em;
   top: 1em;
 }
 
 #header {
   border: 1px solid transparent;
--- a/mail/base/content/multimessageview.xhtml
+++ b/mail/base/content/multimessageview.xhtml
@@ -62,19 +62,21 @@
     </head>
 <body>
     <div id="headingwrappertable">
         <div id="headingwrapper">
             <div id="buttonbox"
                  xmlns:html="http://www.w3.org/1999/xhtml"
                  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
                 <hbox id="buttonhbox" align="start">
-                    <button id="archive" class="multimessage button"
+                    <button id="archive"
+                            class="button msgHeaderView-button hdrArchiveButton"
                             onclick="window.top.MsgArchiveSelectedMessages(null)" label="&archive.label;"></button>
-                    <button id="trash" class="multimessage button trashButton"
+                    <button id="trash"
+                            class="button msgHeaderView-button hdrTrashButton"
                             onclick="window.top.DefaultController.doCommand('cmd_delete');"/>
                 </hbox>
             </div>
             <div class="heading" id="heading">&selectedmessages.label;</div>
         </div>
     </div>
     <div id="content">
         <div id="messagelist"/>
--- a/mail/themes/gnomestripe/mail/messageHeader.css
+++ b/mail/themes/gnomestripe/mail/messageHeader.css
@@ -256,17 +256,17 @@ description[selectable="true"]:focus > d
   margin: 0;
   -moz-border-top-colors: none;
   -moz-border-right-colors: none;
   -moz-border-bottom-colors: none;
   -moz-border-left-colors: none;
 }
 
 .msgHeaderView-button > .button-box,
-.msgHeaderView-button[type="menu-button"] > .button-menubutton-button {
+.msgHeaderView-button[type="menu-button"] > .button-menubutton-button > .button-box {
   /* Needed to make the buttons the same height as the trash icon */
   min-height: 16px;
 }
 
 .msgHeaderView-flat-button[type="menu-button"]:hover > .button-menubutton-button {
   background-color: transparent;
 }
 
--- a/mail/themes/gnomestripe/mail/multimessageview.css
+++ b/mail/themes/gnomestripe/mail/multimessageview.css
@@ -22,37 +22,17 @@ body {
   color: GrayText;
 }
 
 
 /* buttons are always tricky */
 
 
 .button {
-  -moz-appearance: button;
   font: message-box;
-  min-width: 32px !important;
-  margin-bottom: 2em;
-}
-
-/* and every trash is different */
-
-#trash {
-  min-height: 28px !important;
-  min-width: 32px !important;
-  padding: 0px;
-}
-
-.trashButton {
-  padding: 2px;
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu");
-  min-height: 16px !important;
-  min-width: 16px !important;
-  width: 16px;
-  height: 16px;
 }
 
 .star {
   width: 12px;
   height: 12px;
   margin-right: 0.5em;
 }
 
--- a/mail/themes/qute/mail/messageHeader.css
+++ b/mail/themes/qute/mail/messageHeader.css
@@ -1,485 +1,489 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ===== messageHeader.css ==============================================
-  == Styles for the header toolbars of a mail message.
-  ======================================================================= */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: for the entire area ::::: */
-.main-header-area {
-  color: WindowText;
-  background-color: ButtonFace;
-  border-bottom: 2px groove ThreeDLightShadow;
-  padding: 0.4ex;
-}
-
-/* ::::: msg header toolbars ::::: */
-
-#expandedHeaderView {
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-height: 14em;
-}
-
-#variousHeadersBox{
-  padding-bottom: 1em;
-}
-
-/* ::::: msg header buttons ::::: */
-.headerContainer
-{
-  min-width: 1px;
-}
-
-#otherActionsButton {
-  margin-bottom: .1em;
-  padding-top: 0px;
-}
-
-/* ::::: expanded header pane ::::: */
-
-header-view-button-box {
-  padding: 0px;
-}
-
-#expandedfromBox {
-  padding-top: 0.5em;
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* ===== messageHeader.css ==============================================
+  == Styles for the header toolbars of a mail message.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: for the entire area ::::: */
+.main-header-area {
+  color: WindowText;
+  background-color: ButtonFace;
+  border-bottom: 2px groove ThreeDLightShadow;
+  padding: 0.4ex;
+}
+
+/* ::::: msg header toolbars ::::: */
+
+#expandedHeaderView {
+  overflow-y: auto;
+  overflow-x: hidden;
+  max-height: 14em;
+}
+
+#variousHeadersBox{
+  padding-bottom: 1em;
+}
+
+/* ::::: msg header buttons ::::: */
+.headerContainer
+{
+  min-width: 1px;
+}
+
+#otherActionsButton {
+  margin-bottom: .1em;
+  padding-top: 0px;
+}
+
+/* ::::: expanded header pane ::::: */
+
+header-view-button-box {
+  padding: 0px;
+}
+
+#expandedfromBox {
+  padding-top: 0.5em;
 }
 
 #expandedsubjectBox > .headerValue {
   font-weight: bold;
-}
-
-/* ::::: edit message bar ::::: */
-
-#editMessageBox
-{
-  min-width: 1px;
-  -moz-border-radius-bottomleft: 0.2em;
-  -moz-border-radius-bottomright: 0.2em;
-}
-
-#editMessageDescription
-{
-  font-style: italic;
-  font-weight: bolder;
-}
-
-/* ::::: attachment view ::::: */
-
-#attachmentList
-{
-  margin: 0px;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-/* XXX: Move all of the description attributes to the toolkit */
-
-description[selectable="true"]
-{
-  margin: 1px 5px 4px;
-}
-
-descriptionitem
-{
-  border: 1px solid transparent;
-  margin: 1px;
-}
-
-description[selectable="true"]:focus > descriptionitem[selected="true"][current="true"] 
-{
-  border: 1px dotted #F5DB95;
-}
-
-descriptionitem[selected="true"] 
-{
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
-}
-
-description[selectable="true"]:focus > descriptionitem[selected="true"] 
-{
-  background-color: Highlight;
-  color: HighlightText;
-}
-
-.attachmentBox 
-{
-  width: 15em;
-}
-
-#attachmentView[largeView="true"] .attachmentBox
-{
-  -moz-box-orient: vertical;
-}
-
-#attachmentView
-{
-  border-top: 1px solid ThreeDShadow;
-  min-height: 30px;
-}
-
-#attachmentView[largeView="true"]
-{
-  min-height: 55px;
-}
-
-#attachmentView[attachmentOverflow="true"] {
-  overflow: auto;
-}
-
-/* ::::: msg header captions ::::: */
-
-#msgHeaderView {
-}
-
-#msgHeaderViewDeck {
-  margin: 0;
-  padding: 0;
-}
-
-.hdrReplyButton {
-  -moz-appearance: dualbutton;
-}
-
-.hdrReplyButton > .button-menubutton-button {
-  min-width: 1em;
-  min-height: 1ex;
-  margin: 0px;
-}
-
-.hdrReplyButton > .button-menubutton-dropmarker {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
-}
-
-.hdrReplyButton > .button-menubutton-dropmarker[open="true"] {
-  margin-top: 0px;
-  -moz-margin-end: 2px;
-}
-
-.msgHeaderView-button {
-  min-width: 1px;
-  min-height: 1ex;
-}
-
-.msgHeaderView-flat-button {
-  min-width: 1px;
-  -moz-appearance: none;
-  color: ButtonText;
-  background-color: transparent;
-  border: 3px solid transparent;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  padding: 0px 3px;
-  -moz-border-radius: 4px;
-  -moz-border-top-colors: none;
-  -moz-border-right-colors: none;
-  -moz-border-bottom-colors: none;
-  -moz-border-left-colors: none;
-  min-height: 1ex;
-}
-
-.hdrTrashButton {
-  -moz-box-orient: vertical !important;
-  list-style-image: url("chrome://messenger/skin/icons/folder.png") !important;
-  -moz-image-region: rect(0px 144px 16px 128px);
-}
-
-.msgHeaderView-flat-button[type="menu-button"] > .button-menubutton-button {
-  -moz-appearance: none;
-  background-color: rgb(211,215,207);
-  -moz-border-radius: 0px;
-  border: 0;
-  border-right: 2px solid transparent;
-  -moz-padding-end: 0.2em;
-  margin: 0;
-  -moz-border-top-colors: none;
-  -moz-border-right-colors: none;
-  -moz-border-bottom-colors: none;
-  -moz-border-left-colors: none;
-}
-
-.msgHeaderView-button > .button-box,
-.msgHeaderView-button[type="menu-button"] > .button-menubutton-button {
-  /* Needed to make the buttons the same height as the trash icon */
-  min-height: 16px;
-}
-
-.msgHeaderView-flat-button[type="menu-button"]:hover > .button-menubutton-button {
-  background-color: transparent;
-}
-
-.msgHeaderView-button[type="menu-button"] > .button-menubutton-button:hover {
-  border-right-color: ButtonShadow;
-} 
-
-.msgHeaderView-flat-button[secondary="true"] {
-  background-color: transparent;
-}
-
-.msgHeaderView-button[disabled="true"] {
-  display: none;
-}
-
-.msgHeaderView-button > .button-text {
-  margin: 0px;
-  padding: 0px;
-}
-
-.msgHeaderView-flat-button:hover {
-  -moz-appearance: button;
-  color: -moz-buttonhovertext;
-}
-
-.headerNameBox {
-  width: 7.7em;
-  background-color: transparent;
-}
-
-.headerName {
-  color: #888a85; /* lower contrast */
-  text-align: right;
-  background-color: transparent;
-  padding: 0px;
-  margin-top: 0;
-  -moz-margin-end: 0;
-}
-
-.headerValueBox {
-  overflow:visible;
-  margin-bottom: 0 !important;
-  padding-bottom: 0 !important;
-}
-
-.headerValue {
-  min-width: 50px;
-  white-space: normal;
-  color: WindowText;
-  line-height: 1.4em;
-  -moz-appearance: none;
-  padding: 0px;
-  margin: 0px;
-  -moz-margin-start: 3px;
-  border-width: 0px;
-  background-color: transparent;
-}
-
-.headerValue[containsEmail="true"] {
-  -moz-margin-start: 0px !important;
-}
-
-.headerValueBox[singleline="true"] {
-  height: 1.9em;
-  overflow: hidden;
-}
-
-.headerValueUrl {
-  cursor: pointer;
-  color: #0000FF;
-  text-decoration: underline;
-}
-
-.headerValueUrl:hover {
-  color: red;
-}
-
-.headerField {
-  color: inherit;
-}
-
-.moreIndicator {
-  font-weight: bold;
-}
-
-.moreIndicator:hover {
-  text-decoration: underline;
-  color: darkred;
-}
-
-.hdrJunkButton[disabled="true"] {
-  background: none;
-  opacity: 0;
-}
-
-.tagvalue {
-  -moz-margin-start: 0px;
-  background-image: url("chrome://messenger/skin/tagbg.png");
-  color: black;
-  -moz-border-radius: 2px;
-  padding: 1px 3px;
-}
-
-/* ::::: msg header message ids ::::: */
-
-.messageIdDisplayButton {
-  cursor: pointer;
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-  margin: 0;
-  background-color: transparent;
-}
-
-.messageIdDisplayButton:hover {
-  color: #FF0000;
-}
-
-.messageIdDisplayImage {
-  -moz-padding-start: 2px;
-  -moz-box-pack: end;
-}
-
-
-/* ::::: msg header email addresses ::::: */
-
-.emailDisplayButton {
-  margin: 0;
-  -moz-padding-start: 3px !important;
-  -moz-padding-end: 3px !important;
-  padding-top: .1em;
-  padding-bottom: .1em;
-  margin-bottom: 3px !important;
-  background-color: transparent;
-}
-
-.emailDisplayButton:hover {
-  cursor: pointer;
-  -moz-border-radius: 2px;
-  color: HighlightText;
-  background-color: Highlight;
-}
-
-mail-emailaddress[selected="true"] .emailDisplayButton{
-  /* when an email address context menu is selected,
-    make sure that the email bubble stays displayed, and
-    tweak the bottom to blend in more w/ the menu */
-  cursor: pointer;
-  -moz-border-radius: 3px;
-  color: HighlightText;
-  background-color: Highlight;
-  -moz-border-radius-bottomleft: 0;
-  -moz-border-radius-bottomright: 0;
-}
-
-.emailSeparator {
-  /* this is for the comma in between email addresses */
-  -moz-margin-start: -4px; /* squeeze it inside the bubble, by the star */
-}
-
-.emailDisplayButton:focus {
-  border: 1px dotted Highlight;
-}
-
-.emailStar:focus {
-  border: 1px dotted;
-}
-
-.emaillabel {
-  padding: 0px !important;  /* override <label> defaults */
-  margin: 0px !important;  /* override <label> defaults */
-  overflow: hidden;
-}
-
-.emailStar {
-  max-width: 1em;
-  max-height: 1em;
-  -moz-appearance: none;
-  -moz-box-orient: vertical;
-  padding: 0px;
-  -moz-margin-start: -2px !important;
-  /*margin: 0px 2px;*/
-  list-style-image: url("chrome://messenger/skin/starContact.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.emailStar:hover {
-  -moz-image-region:rect(0px 32px 16px 16px);
-}
-
-.emailStar:hover:active {
-  -moz-image-region:rect(0px 48px 16px 32px);
-}
-
-.emailStar[hascard="true"] {
-  list-style-image: url("chrome://messenger/skin/contactStarred.png");
-}
-
-.emailPopup {
-  font-size: inherit;
-  max-height: 7px; /* the height of the image */
-  margin: 0.2em 2px 0px; /* 0.2em just to move it off the top of the text */
-  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-grey.png");
-}
-
-.emailPopup:hover {
-  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-blue.png");
-}
-
-/* ::::: email address twisty ::::: */
-
-.addresstwisty {
-  -moz-padding-end: 0px;
-  padding-top: 4px;
-  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-right-dim.png");
-}
-
-.addresstwisty:hover {
-  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-right.png");
-}
-
-.addresstwisty[open] {
-  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-down-dim.png");
-}
-
-.addresstwisty[open]:hover {
-  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-down.png");
-}
-
-/* ::::: view expand and collapse twisties  ::::: */
-
-.expandHeaderViewButton {
-  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
-}
-
-mail-multi-emailHeaderField,
-mail-headerfield {
-  margin: 0;
-  padding: 0;
-}
+}
+
+/* ::::: edit message bar ::::: */
+
+#editMessageBox
+{
+  min-width: 1px;
+  -moz-border-radius-bottomleft: 0.2em;
+  -moz-border-radius-bottomright: 0.2em;
+}
+
+#editMessageDescription
+{
+  font-style: italic;
+  font-weight: bolder;
+}
+
+/* ::::: attachment view ::::: */
+
+#attachmentList
+{
+  margin: 0px;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+/* XXX: Move all of the description attributes to the toolkit */
+
+description[selectable="true"]
+{
+  margin: 1px 5px 4px;
+}
+
+descriptionitem
+{
+  border: 1px solid transparent;
+  margin: 1px;
+}
+
+description[selectable="true"]:focus > descriptionitem[selected="true"][current="true"]
+{
+  border: 1px dotted #F5DB95;
+}
+
+descriptionitem[selected="true"]
+{
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
+description[selectable="true"]:focus > descriptionitem[selected="true"]
+{
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.attachmentBox
+{
+  width: 15em;
+}
+
+#attachmentView[largeView="true"] .attachmentBox
+{
+  -moz-box-orient: vertical;
+}
+
+#attachmentView
+{
+  border-top: 1px solid ThreeDShadow;
+  min-height: 30px;
+}
+
+#attachmentView[largeView="true"]
+{
+  min-height: 55px;
+}
+
+#attachmentView[attachmentOverflow="true"] {
+  overflow: auto;
+}
+
+/* ::::: msg header captions ::::: */
+
+#msgHeaderView {
+}
+
+#msgHeaderViewDeck {
+  margin: 0;
+  padding: 0;
+}
+
+.hdrReplyButton {
+  -moz-appearance: dualbutton;
+}
+
+.hdrReplyButton > .button-menubutton-button {
+  min-width: 1em;
+  min-height: 1ex;
+  margin: 0px;
+}
+
+.hdrReplyButton > .button-menubutton-dropmarker {
+  -moz-margin-start: 2px;
+  -moz-margin-end: 2px;
+}
+
+.hdrReplyButton > .button-menubutton-dropmarker[open="true"] {
+  margin-top: 0px;
+  -moz-margin-end: 2px;
+}
+
+.msgHeaderView-button {
+  min-width: 1px;
+  min-height: 1ex;
+}
+
+.msgHeaderView-flat-button {
+  min-width: 1px;
+  -moz-appearance: none;
+  color: ButtonText;
+  background-color: transparent;
+  border: 3px solid transparent;
+  margin-top: 1px;
+  margin-bottom: 2px;
+  padding: 0px 3px;
+  -moz-border-radius: 4px;
+  -moz-border-top-colors: none;
+  -moz-border-right-colors: none;
+  -moz-border-bottom-colors: none;
+  -moz-border-left-colors: none;
+  min-height: 1ex;
+}
+
+.hdrTrashButton {
+  -moz-box-orient: vertical !important;
+  list-style-image: url("chrome://messenger/skin/icons/folder.png") !important;
+  -moz-image-region: rect(0px 144px 16px 128px);
+}
+
+.msgHeaderView-flat-button[type="menu-button"] > .button-menubutton-button {
+  -moz-appearance: none;
+  background-color: rgb(211,215,207);
+  -moz-border-radius: 0px;
+  border: 0;
+  border-right: 2px solid transparent;
+  -moz-padding-end: 0.2em;
+  margin: 0;
+  -moz-border-top-colors: none;
+  -moz-border-right-colors: none;
+  -moz-border-bottom-colors: none;
+  -moz-border-left-colors: none;
+}
+
+.msgHeaderView-button[type="menu-button"] {
+  padding-top: 1px;
+}
+
+.msgHeaderView-button > .button-box > .button-icon,
+.msgHeaderView-button[type="menu-button"] .button-icon {
+  /* Needed to make the buttons the same height as the trash icon */
+  min-height: 16px;
+}
+
+.msgHeaderView-flat-button[type="menu-button"]:hover > .button-menubutton-button {
+  background-color: transparent;
+}
+
+.msgHeaderView-button[type="menu-button"] > .button-menubutton-button:hover {
+  border-right-color: ButtonShadow;
+} 
+
+.msgHeaderView-flat-button[secondary="true"] {
+  background-color: transparent;
+}
+
+.msgHeaderView-button[disabled="true"] {
+  display: none;
+}
+
+.msgHeaderView-button > .button-text {
+  margin: 0px;
+  padding: 0px;
+}
+
+.msgHeaderView-flat-button:hover {
+  -moz-appearance: button;
+  color: -moz-buttonhovertext;
+}
+
+.headerNameBox {
+  width: 7.7em;
+  background-color: transparent;
+}
+
+.headerName {
+  color: #888a85; /* lower contrast */
+  text-align: right;
+  background-color: transparent;
+  padding: 0px;
+  margin-top: 0;
+  -moz-margin-end: 0;
+}
+
+.headerValueBox {
+  overflow:visible;
+  margin-bottom: 0 !important;
+  padding-bottom: 0 !important;
+}
+
+.headerValue {
+  min-width: 50px;
+  white-space: normal;
+  color: WindowText;
+  line-height: 1.4em;
+  -moz-appearance: none;
+  padding: 0px;
+  margin: 0px;
+  -moz-margin-start: 3px;
+  border-width: 0px;
+  background-color: transparent;
+}
+
+.headerValue[containsEmail="true"] {
+  -moz-margin-start: 0px !important;
+}
+
+.headerValueBox[singleline="true"] {
+  height: 1.9em;
+  overflow: hidden;
+}
+
+.headerValueUrl {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+}
+
+.headerValueUrl:hover {
+  color: red;
+}
+
+.headerField {
+  color: inherit;
+}
+
+.moreIndicator {
+  font-weight: bold;
+}
+
+.moreIndicator:hover {
+  text-decoration: underline;
+  color: darkred;
+}
+
+.hdrJunkButton[disabled="true"] {
+  background: none;
+  opacity: 0;
+}
+
+.tagvalue {
+  -moz-margin-start: 0px;
+  background-image: url("chrome://messenger/skin/tagbg.png");
+  color: black;
+  -moz-border-radius: 2px;
+  padding: 1px 3px;
+}
+
+/* ::::: msg header message ids ::::: */
+
+.messageIdDisplayButton {
+  cursor: pointer;
+  color: -moz-nativehyperlinktext;
+  text-decoration: underline;
+  margin: 0;
+  background-color: transparent;
+}
+
+.messageIdDisplayButton:hover {
+  color: #FF0000;
+}
+
+.messageIdDisplayImage {
+  -moz-padding-start: 2px;
+  -moz-box-pack: end;
+}
+
+
+/* ::::: msg header email addresses ::::: */
+
+.emailDisplayButton {
+  margin: 0;
+  -moz-padding-start: 3px !important;
+  -moz-padding-end: 3px !important;
+  padding-top: .1em;
+  padding-bottom: .1em;
+  margin-bottom: 3px !important;
+  background-color: transparent;
+}
+
+.emailDisplayButton:hover {
+  cursor: pointer;
+  -moz-border-radius: 2px;
+  color: HighlightText;
+  background-color: Highlight;
+}
+
+mail-emailaddress[selected="true"] .emailDisplayButton{
+  /* when an email address context menu is selected,
+    make sure that the email bubble stays displayed, and
+    tweak the bottom to blend in more w/ the menu */
+  cursor: pointer;
+  -moz-border-radius: 3px;
+  color: HighlightText;
+  background-color: Highlight;
+  -moz-border-radius-bottomleft: 0;
+  -moz-border-radius-bottomright: 0;
+}
+
+.emailSeparator {
+  /* this is for the comma in between email addresses */
+  -moz-margin-start: -4px; /* squeeze it inside the bubble, by the star */
+}
+
+.emailDisplayButton:focus {
+  border: 1px dotted Highlight;
+}
+
+.emailStar:focus {
+  border: 1px dotted;
+}
+
+.emaillabel {
+  padding: 0px !important;  /* override <label> defaults */
+  margin: 0px !important;  /* override <label> defaults */
+  overflow: hidden;
+}
+
+.emailStar {
+  max-width: 1em;
+  max-height: 1em;
+  -moz-appearance: none;
+  -moz-box-orient: vertical;
+  padding: 0px;
+  -moz-margin-start: -2px !important;
+  /*margin: 0px 2px;*/
+  list-style-image: url("chrome://messenger/skin/starContact.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.emailStar:hover {
+  -moz-image-region:rect(0px 32px 16px 16px);
+}
+
+.emailStar:hover:active {
+  -moz-image-region:rect(0px 48px 16px 32px);
+}
+
+.emailStar[hascard="true"] {
+  list-style-image: url("chrome://messenger/skin/contactStarred.png");
+}
+
+.emailPopup {
+  font-size: inherit;
+  max-height: 7px; /* the height of the image */
+  margin: 0.2em 2px 0px; /* 0.2em just to move it off the top of the text */
+  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-grey.png");
+}
+
+.emailPopup:hover {
+  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-blue.png");
+}
+
+/* ::::: email address twisty ::::: */
+
+.addresstwisty {
+  -moz-padding-end: 0px;
+  padding-top: 4px;
+  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-right-dim.png");
+}
+
+.addresstwisty:hover {
+  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-right.png");
+}
+
+.addresstwisty[open] {
+  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-down-dim.png");
+}
+
+.addresstwisty[open]:hover {
+  list-style-image:url("chrome://messenger/skin/icons/arrow/arrow-down.png");
+}
+
+/* ::::: view expand and collapse twisties  ::::: */
+
+.expandHeaderViewButton {
+  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
+}
+
+mail-multi-emailHeaderField,
+mail-headerfield {
+  margin: 0;
+  padding: 0;
+}
--- a/mail/themes/qute/mail/multimessageview.css
+++ b/mail/themes/qute/mail/multimessageview.css
@@ -18,35 +18,17 @@ body {
 .message > .header > .snippet,
 .message > .header > .senders {
   color: GrayText;
 }
 
 /* buttons aren't reliable either */
 
 .button {
-  -moz-appearance: button;
   font: message-box;
-  min-width: 32px !important;
-}
-
-
-/* and trash icon URLs aren't either */
-
-#trash {
-  min-height: 28px !important;
-  min-width: 32px !important;
-  padding: 0px;
-}
-
-.trashButton {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png") !important;
-  -moz-image-region: rect(0px 144px 16px 128px);
-  width: 16px;
-  height: 16px;
 }
 
 .star {
   width: 12px;
   height: 12px;
   margin-right: 0.5em;
 }