diff --git a/mozilla/layout/style/html.css b/mozilla/layout/style/html.css
index 01322d126e3..28565289c17 100644
--- a/mozilla/layout/style/html.css
+++ b/mozilla/layout/style/html.css
@@ -488,7 +488,8 @@ noembed, param {
 
 /* emulation of non-standard HTML <marquee> tag */
 marquee {
-  display: block;
+  display: inline-block;
+  vertical-align: text-bottom;
   -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-horizontal');
 }
 
diff --git a/mozilla/layout/style/xbl-marquee/xbl-marquee.xml b/mozilla/layout/style/xbl-marquee/xbl-marquee.xml
index 1e2bb77b13b..1dffb5f97f4 100644
--- a/mozilla/layout/style/xbl-marquee/xbl-marquee.xml
+++ b/mozilla/layout/style/xbl-marquee/xbl-marquee.xml
@@ -643,7 +643,7 @@
            inheritstyle="false">
 
     <content>
-      <html:div xbl:inherits="" style="overflow: -moz-scrollbars-none">
+      <html:div xbl:inherits="" style="overflow: hidden">
         <html:div style="display: -moz-box; margin: 0 100%;"> 
           <html:div class="innerDiv">
             <children/>
@@ -654,11 +654,13 @@
 
   </binding>
 
+  <!-- use margin-right to force large intrinsic width -->
   <binding id="marquee-vertical"
-           extends="chrome://xbl-marquee/content/xbl-marquee.xml#marquee">
+           extends="chrome://xbl-marquee/content/xbl-marquee.xml#marquee"
+           inheritstyle="false">
 
     <content>
-      <html:div xbl:inherits="" style="overflow: -moz-scrollbars-none">
+      <html:div xbl:inherits="" style="overflow: hidden; width: 100%; margin-right: 100%">
         <html:div class="innerDiv">
           <children/>
         </html:div>