diff --git a/mozilla/themes/classic/messenger/mac/messageHeader.css b/mozilla/themes/classic/messenger/mac/messageHeader.css
index 250736e20e9..bbbf480e2e1 100644
--- a/mozilla/themes/classic/messenger/mac/messageHeader.css
+++ b/mozilla/themes/classic/messenger/mac/messageHeader.css
@@ -96,7 +96,7 @@ mail-emailaddress {
   list-style-image      : url("chrome://global/skin/twisty-open.gif");
 }
 
-label.headerValue   { white-space: normal; min-width: 50px; margin: 0px;}
+.headerValue   { white-space: normal; min-width: 50px; margin: 0px;}
 .subjectvalue      {font-weight: bold;}
 
 .headerdisplayname 
@@ -146,7 +146,7 @@ label.headerValue   { white-space: normal; min-width: 50px; margin: 0px;}
   width: 12em
 }
 
-label.collapsedHeaderDisplayName 
+.collapsedHeaderDisplayName 
 { 
   font-weight: bold; 
   margin-left: .7em;
diff --git a/mozilla/themes/classic/messenger/win/messageHeader.css b/mozilla/themes/classic/messenger/win/messageHeader.css
index cac091c0292..b11aa259936 100644
--- a/mozilla/themes/classic/messenger/win/messageHeader.css
+++ b/mozilla/themes/classic/messenger/win/messageHeader.css
@@ -35,12 +35,6 @@
     min-width             : 1px;
   }
 
-mail-emailaddress 
-  {
-    -moz-binding          : url(chrome://messenger/content/mailWidgets.xml#mail-emailaddress);
-    display               : -moz-inline-box;
-  }
-
 .buttonSpacer        
   { 
     width                 : 0.5em; 
@@ -88,7 +82,7 @@ mail-emailaddress
     -moz-box-pack: end;
   }
 
-label.emailDisplayButton 
+.emailDisplayButton 
   {
     color                 : blue;
     text-decoration       : underline;
@@ -107,21 +101,22 @@ label.emailDisplayButton
   list-style-image      : url("chrome://global/skin/twisty-open.gif");
 }
 
-label.headerValue   
+.headerValue   
   { 
     white-space           : normal;
+    margin: 0px;
     min-width             : 50px; 
   }
 
-label.subjectvalue  
+.subjectvalue  
   { 
     font-weight           : bold; 
   }
 
-label.headerdisplayname 
+.headerdisplayname 
   { 
     font-weight           : bold; 
-    margin                : 0em 0.5em 0em 0.5em !important;
+    margin                : 0em 0.5em 0em 0.5em;
     min-height: 16px;
   }
   
@@ -165,7 +160,7 @@ label.headerdisplayname
   width: 12em;
 }
 
-label.collapsedHeaderDisplayName 
+.collapsedHeaderDisplayName 
 { 
   font-weight: bold; 
   min-height: 16px;
diff --git a/mozilla/themes/modern/messenger/messageHeader.css b/mozilla/themes/modern/messenger/messageHeader.css
index 081038ba489..f6bb4b079bd 100644
--- a/mozilla/themes/modern/messenger/messageHeader.css
+++ b/mozilla/themes/modern/messenger/messageHeader.css
@@ -77,7 +77,7 @@
   min-width: 50px;
 }
 
-label.headerValue {
+.headerValue {
   min-width: 50px;
   margin: 0px;
   white-space: normal;
@@ -156,7 +156,7 @@ label.headerValue {
   width: 12em;
 }
 
-label.collapsedHeaderDisplayName { 
+.collapsedHeaderDisplayName { 
   font-weight: bold; 
   margin-left: .7em;
   min-height: 16px;