diff --git a/mozilla/themes/classic/communicator/smileys.css b/mozilla/themes/classic/communicator/smileys.css
index 9b96042b521..3db9ecf94f2 100644
--- a/mozilla/themes/classic/communicator/smileys.css
+++ b/mozilla/themes/classic/communicator/smileys.css
@@ -39,6 +39,8 @@
    == into skinnable images.
    ========================================================================== */
 
+@namespace url("http://www.w3.org/1999/xhtml");
+
 /* ::::: we also represent smilies inside of spans ::::: */
 
 span.moz-smiley-s1,
diff --git a/mozilla/themes/classic/messenger/messageBody.css b/mozilla/themes/classic/messenger/messageBody.css
index 3cefeb8cb04..a41c6a0642d 100644
--- a/mozilla/themes/classic/messenger/messageBody.css
+++ b/mozilla/themes/classic/messenger/messageBody.css
@@ -41,36 +41,10 @@
 
 @import url(chrome://communicator/skin/smileys.css);
 
-/* XXX Breaks the HTML rules below (.moz-class stuff), at least on Linux.
-   "html|.class" doesn't work.
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml"); 
-*/
-
-window {
-  overflow: auto;
-}
-
-html|html {
-  /* XXX Doesn't seem to work. (Same with "html|body".) */
-  background-color: window;
-}
-
-mailattachcount {
-  display: none;
-}
+@namespace url("http://www.w3.org/1999/xhtml");
 
 /* :::: message header ::::: */
 
-header {
-  text-align: left;
-}
-
-headerdisplayname {
-  font-weight: bold;
-  white-space: pre;
-}
-
 .header-part1 {
   background-color: #EFEFEF;
 }
@@ -136,7 +110,6 @@ span.moz-txt-formfeed {
   height: 100%;
 }
 
-
 /* ::::: signature ::::: */
 
 .moz-txt-sig,
diff --git a/mozilla/themes/modern/communicator/smileys.css b/mozilla/themes/modern/communicator/smileys.css
index 9b96042b521..3db9ecf94f2 100644
--- a/mozilla/themes/modern/communicator/smileys.css
+++ b/mozilla/themes/modern/communicator/smileys.css
@@ -39,6 +39,8 @@
    == into skinnable images.
    ========================================================================== */
 
+@namespace url("http://www.w3.org/1999/xhtml");
+
 /* ::::: we also represent smilies inside of spans ::::: */
 
 span.moz-smiley-s1,
diff --git a/mozilla/themes/modern/messenger/messageBody.css b/mozilla/themes/modern/messenger/messageBody.css
index 3c70b333d61..a41c6a0642d 100644
--- a/mozilla/themes/modern/messenger/messageBody.css
+++ b/mozilla/themes/modern/messenger/messageBody.css
@@ -41,36 +41,10 @@
 
 @import url(chrome://communicator/skin/smileys.css);
 
-/* XXX Breaks the HTML rules below (.moz-class stuff), at least on Linux.
-   "html|.class" doesn't work.
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml"); 
-*/
-
-window {
-  overflow: auto;
-}
-
-html|html {
-  /* XXX Doesn't seem to work. (Same with "html|body".) */
-  background-color: white;
-}
-
-mailattachcount {
-  display: none;
-}
+@namespace url("http://www.w3.org/1999/xhtml");
 
 /* :::: message header ::::: */
 
-header {
-  text-align: left;
-}
-
-headerdisplayname {
-  font-weight: bold;
-  white-space: pre;
-}
-
 .header-part1 {
   background-color: #EFEFEF;
 }
@@ -136,7 +110,6 @@ span.moz-txt-formfeed {
   height: 100%;
 }
 
-
 /* ::::: signature ::::: */
 
 .moz-txt-sig,