diff --git a/browser/themes/gnomestripe/browser/pageInfo.css b/browser/themes/gnomestripe/browser/pageInfo.css
index fcf5081e3f5..8bfd5e256a8 100644
--- a/browser/themes/gnomestripe/browser/pageInfo.css
+++ b/browser/themes/gnomestripe/browser/pageInfo.css
@@ -150,7 +150,7 @@ groupbox.treebox .groupbox-body {
 }
 
 #general-security-identity {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   line-height: 2em;
 }
 
diff --git a/browser/themes/pinstripe/browser/pageInfo.css b/browser/themes/pinstripe/browser/pageInfo.css
index a5510364c40..e0c854796c4 100644
--- a/browser/themes/pinstripe/browser/pageInfo.css
+++ b/browser/themes/pinstripe/browser/pageInfo.css
@@ -147,7 +147,7 @@ groupbox.treebox .groupbox-body {
 }
 
 #general-security-identity {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   line-height: 2em;
 }
 
diff --git a/browser/themes/winstripe/browser/pageInfo.css b/browser/themes/winstripe/browser/pageInfo.css
index dc59f8ebb89..b16f321e1e8 100644
--- a/browser/themes/winstripe/browser/pageInfo.css
+++ b/browser/themes/winstripe/browser/pageInfo.css
@@ -168,7 +168,7 @@ groupbox.treebox .groupbox-body {
 }
 
 #general-security-identity {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   line-height: 2em;
 }
 
diff --git a/calendar/lightning/themes/pinstripe/imip.css b/calendar/lightning/themes/pinstripe/imip.css
index 3089455cdc1..024bf298163 100644
--- a/calendar/lightning/themes/pinstripe/imip.css
+++ b/calendar/lightning/themes/pinstripe/imip.css
@@ -60,7 +60,7 @@ td.content {
        background-color: white;
 }
 td.content p {
-       white-space: -moz-pre-wrap;
+       white-space: pre-wrap;
 }
 p.header {
        color: white;
diff --git a/calendar/lightning/themes/pinstripe/lightning.css b/calendar/lightning/themes/pinstripe/lightning.css
index a0f9c671871..e11a7f63e97 100644
--- a/calendar/lightning/themes/pinstripe/lightning.css
+++ b/calendar/lightning/themes/pinstripe/lightning.css
@@ -288,7 +288,7 @@ separator.tooltipBodySeparator {
 
 description.tooltipBody {
   font-weight: normal;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   margin: 0pt;
 }
 
diff --git a/calendar/lightning/themes/winstripe/imip.css b/calendar/lightning/themes/winstripe/imip.css
index e35d5b991c4..ed277cbbe7b 100644
--- a/calendar/lightning/themes/winstripe/imip.css
+++ b/calendar/lightning/themes/winstripe/imip.css
@@ -61,7 +61,7 @@ td.content {
        background-color: white;
 }
 td.content p {
-       white-space: -moz-pre-wrap;
+       white-space: pre-wrap;
 }
 p.header {
        color: white;
diff --git a/calendar/lightning/themes/winstripe/lightning.css b/calendar/lightning/themes/winstripe/lightning.css
index 4673351c75d..d3157756afb 100644
--- a/calendar/lightning/themes/winstripe/lightning.css
+++ b/calendar/lightning/themes/winstripe/lightning.css
@@ -289,7 +289,7 @@ separator.tooltipBodySeparator {
 
 description.tooltipBody {
   font-weight: normal;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   margin: 0pt;
 }
 
diff --git a/calendar/sunbird/themes/pinstripe/sunbird/calendar.css b/calendar/sunbird/themes/pinstripe/sunbird/calendar.css
index 857eeac559c..ccc13d3ac47 100644
--- a/calendar/sunbird/themes/pinstripe/sunbird/calendar.css
+++ b/calendar/sunbird/themes/pinstripe/sunbird/calendar.css
@@ -125,7 +125,7 @@ separator.tooltipBodySeparator {
 
 description.tooltipBody {
   font-weight: normal;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   margin: 0px;
 }
 
diff --git a/calendar/sunbird/themes/winstripe/sunbird/calendar.css b/calendar/sunbird/themes/winstripe/sunbird/calendar.css
index a26c593967c..245c245751b 100644
--- a/calendar/sunbird/themes/winstripe/sunbird/calendar.css
+++ b/calendar/sunbird/themes/winstripe/sunbird/calendar.css
@@ -115,7 +115,7 @@ separator.tooltipBodySeparator {
 
 description.tooltipBody {
   font-weight: normal;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   margin: 0px;
 }
 
diff --git a/content/base/src/nsPlainTextSerializer.cpp b/content/base/src/nsPlainTextSerializer.cpp
index 98dfc7aeab3..ab5b5dd9319 100644
--- a/content/base/src/nsPlainTextSerializer.cpp
+++ b/content/base/src/nsPlainTextSerializer.cpp
@@ -597,7 +597,7 @@ nsPlainTextSerializer::DoOpenContainer(const nsIParserNode* aNode, PRInt32 aTag)
     // Try to figure out here whether we have a
     // preformatted style attribute.
     //
-    // Trigger on the presence of a "-moz-pre-wrap" in the
+    // Trigger on the presence of a "pre-wrap" in the
     // style attribute. That's a very simplistic way to do
     // it, but better than nothing.
     // Also set mWrapColumn to the value given there
diff --git a/extensions/irc/xul/content/output-base.css b/extensions/irc/xul/content/output-base.css
index 31fab3f674e..5b8728d88c2 100644
--- a/extensions/irc/xul/content/output-base.css
+++ b/extensions/irc/xul/content/output-base.css
@@ -502,7 +502,7 @@ a.chatzilla-link:hover {
 .msg-data {                                 /* .msg-data = the text portion   */
     padding: 1px 1px 1px 3px;               /* of a message                   */
     width: 100%;
-    white-space: -moz-pre-wrap;
+    white-space: pre-wrap;
 }
 
 
diff --git a/extensions/venkman/resources/content/venkman-output-base.css b/extensions/venkman/resources/content/venkman-output-base.css
index 0d0a00ed5e2..717f1a048f6 100644
--- a/extensions/venkman/resources/content/venkman-output-base.css
+++ b/extensions/venkman/resources/content/venkman-output-base.css
@@ -54,7 +54,7 @@ a.venkman-link:hover {
 .msg {                                      /* .msg = a single message in the */
     width: 100%;                            /* output window                  */
     font: 11pt lucida, sans-serif;
-    white-space: -moz-pre-wrap;
+    white-space: pre-wrap;
 }
 
 .msg[monospace] { 
diff --git a/layout/generic/crashtests/387058-1.html b/layout/generic/crashtests/387058-1.html
index 1373867eb54..5a3eebcaa5c 100644
--- a/layout/generic/crashtests/387058-1.html
+++ b/layout/generic/crashtests/387058-1.html
@@ -8,7 +8,7 @@ function boom()
 </script>
 </head>
 <body onload="boom()" style="font-family: monospace; width: 20em;">
-<div id="div" style="white-space: -moz-pre-wrap; letter-spacing: 3em;">
+<div id="div" style="white-space: pre-wrap; letter-spacing: 3em;">
   x x x x x x
   x x x x x x
 </div>
diff --git a/layout/generic/crashtests/387058-2.html b/layout/generic/crashtests/387058-2.html
index d05b81859aa..eb5087aed4c 100644
--- a/layout/generic/crashtests/387058-2.html
+++ b/layout/generic/crashtests/387058-2.html
@@ -9,7 +9,7 @@ function boom()
 </head>
 
 <body onload="boom()" style="font-family: monospace; width: 3em;">
-<div id="div" style="white-space: -moz-pre-wrap; letter-spacing: 1em;">
+<div id="div" style="white-space: pre-wrap; letter-spacing: 1em;">
  x
 
 </div>
diff --git a/layout/html/tests/block/interactive/154924.html b/layout/html/tests/block/interactive/154924.html
index 51433344edc..47d5dabbd9d 100644
--- a/layout/html/tests/block/interactive/154924.html
+++ b/layout/html/tests/block/interactive/154924.html
@@ -3,7 +3,7 @@
 <head>
   <title>foobar</title>
 </head>
-<body style="white-space: -moz-pre-wrap">
+<body style="white-space: pre-wrap">
 make the window narrower until "height" wraps to the next line <BR>
 iframe name=selector2 src=http://www.mozilla.org/ width=100% <span>height</span>=100%
 </body>
diff --git a/layout/reftests/bugs/403455-1-ref.html b/layout/reftests/bugs/403455-1-ref.html
index 7ee92d2a8a3..bac7791f87d 100644
--- a/layout/reftests/bugs/403455-1-ref.html
+++ b/layout/reftests/bugs/403455-1-ref.html
@@ -6,7 +6,7 @@ a { color:pink; }
 </style>
 </head>
 <body>
-<p><a style="white-space:-moz-pre-wrap;">mmmmmmmmmm <br>m</a>mmmmmmmmm</p>
+<p><a style="white-space:pre-wrap;">mmmmmmmmmm <br>m</a>mmmmmmmmm</p>
 <p>m <br><a style="white-space:pre;">mmmmmmmmmm</a>mmmmmmmmm</p>
 </body>
 </html>
diff --git a/layout/reftests/bugs/403455-1.html b/layout/reftests/bugs/403455-1.html
index 96d003958b3..6713d53496e 100644
--- a/layout/reftests/bugs/403455-1.html
+++ b/layout/reftests/bugs/403455-1.html
@@ -7,7 +7,7 @@ a { color:pink; }
 </head>
 <body>
 <!-- A prewrap text frame should be able to record a break opportunity -->
-<p><a style="white-space:-moz-pre-wrap;">mmmmmmmmmm m</a>mmmmmmmmm</p>
+<p><a style="white-space:pre-wrap;">mmmmmmmmmm m</a>mmmmmmmmm</p>
 <!-- A 'pre' text frame should be able to record a break opportunity at its start -->
 <p>m <a style="white-space:pre;">mmmmmmmmmm</a>mmmmmmmmm</p>
 </body>
diff --git a/layout/reftests/bugs/411792-1.html b/layout/reftests/bugs/411792-1.html
index db9612d85a9..a14fe491f00 100644
--- a/layout/reftests/bugs/411792-1.html
+++ b/layout/reftests/bugs/411792-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body style="width:0">
-<div style="white-space:-moz-pre-wrap">One
+<div style="white-space:pre-wrap">One
 Two Three</div>
 </body>
 </html>
diff --git a/layout/reftests/text/white-space-1a.html b/layout/reftests/text/white-space-1a.html
index 4271011fd27..90cec9ddd40 100644
--- a/layout/reftests/text/white-space-1a.html
+++ b/layout/reftests/text/white-space-1a.html
@@ -5,7 +5,7 @@
 <style>
 .nowrap { white-space:nowrap; }
 .pre { white-space:pre; }
-.prewrap { white-space:-moz-pre-wrap; }
+.prewrap { white-space:pre-wrap; }
 div { border:1px solid black; }
 .container { float:left; width:20%; border-color:cyan; }
 p { width:0; }
diff --git a/layout/reftests/text/white-space-1b.html b/layout/reftests/text/white-space-1b.html
index 3152a90538a..715d0b2e817 100644
--- a/layout/reftests/text/white-space-1b.html
+++ b/layout/reftests/text/white-space-1b.html
@@ -5,7 +5,7 @@
 <style>
 .nowrap { white-space:nowrap; }
 .pre { white-space:pre; }
-.prewrap { white-space:-moz-pre-wrap; }
+.prewrap { white-space:pre-wrap; }
 div { border:1px solid black; }
 .container { float:left; width:20%; border-color:cyan; }
 p { width:0; }
diff --git a/layout/reftests/text/white-space-2.html b/layout/reftests/text/white-space-2.html
index 55055746ee2..db745e0681b 100644
--- a/layout/reftests/text/white-space-2.html
+++ b/layout/reftests/text/white-space-2.html
@@ -10,7 +10,7 @@ b { font-weight:normal; background-color:yellow; }
 .cell { display:table-cell; border:1px solid green; }
 .nowrap { white-space:nowrap; }
 .pre { white-space:pre; }
-.prewrap { white-space:-moz-pre-wrap; }
+.prewrap { white-space:pre-wrap; }
 </style>
 </head>
 <body>
diff --git a/layout/style/quirk.css b/layout/style/quirk.css
index 1435457f8e4..d35d810b887 100644
--- a/layout/style/quirk.css
+++ b/layout/style/quirk.css
@@ -209,7 +209,7 @@ td > ol:-moz-only-whitespace:-moz-last-node, th > ol:-moz-only-whitespace:-moz-l
 /* Quirk: support the ways of making PRE have wrapping */
 
 pre[wrap], pre[cols], pre[width] {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 
diff --git a/layout/style/viewsource.css b/layout/style/viewsource.css
index 49d1a8595a5..fb78cccd4ff 100644
--- a/layout/style/viewsource.css
+++ b/layout/style/viewsource.css
@@ -48,7 +48,7 @@
   white-space: pre;
 }
 #viewsource.wrap {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 pre {
   font: inherit;
diff --git a/mail/components/addrbook/content/addressbook.xul b/mail/components/addrbook/content/addressbook.xul
index a266c88f53b..9d7e8dc8da0 100644
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -745,7 +745,7 @@
                   <description class="CardViewText" id="cvCustom2"/>
                   <description class="CardViewText" id="cvCustom3"/>
                   <description class="CardViewText" id="cvCustom4"/>
-                  <description class="CardViewText" id="cvNotes" style="white-space: -moz-pre-wrap;"/>
+                  <description class="CardViewText" id="cvNotes" style="white-space: pre-wrap;"/>
                   <hbox>
                     <image id="cvBuddyIcon"/> 
                   </hbox>
diff --git a/mail/themes/pinstripe/mail/messageBody.css b/mail/themes/pinstripe/mail/messageBody.css
index 46294f037df..ccbe6853344 100644
--- a/mail/themes/pinstripe/mail/messageBody.css
+++ b/mail/themes/pinstripe/mail/messageBody.css
@@ -76,7 +76,7 @@ blockquote {
 }
 
 .moz-text-plain[wrap="true"] {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[wrap="false"] {
@@ -84,7 +84,7 @@ blockquote {
 }
 
 .moz-text-plain[wrap="flow"] .moz-txt-sig {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[graphical-quote="false"] blockquote {
diff --git a/mail/themes/qute/mail/messageBody.css b/mail/themes/qute/mail/messageBody.css
index 55ed4d3eb4a..d73fef91580 100644
--- a/mail/themes/qute/mail/messageBody.css
+++ b/mail/themes/qute/mail/messageBody.css
@@ -78,7 +78,7 @@ div.headerdisplayname {
 }
 
 .moz-text-plain[wrap="true"] {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[wrap="false"] {
@@ -86,7 +86,7 @@ div.headerdisplayname {
 }
 
 .moz-text-plain[wrap="flow"] .moz-txt-sig {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[graphical-quote="false"] blockquote {
diff --git a/mailnews/addrbook/resources/content/abCardViewOverlay.xul b/mailnews/addrbook/resources/content/abCardViewOverlay.xul
index bb06045704b..43a998ce193 100644
--- a/mailnews/addrbook/resources/content/abCardViewOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardViewOverlay.xul
@@ -103,7 +103,7 @@
           <description class="CardViewText" id="cvCustom2"/>
           <description class="CardViewText" id="cvCustom3"/>
           <description class="CardViewText" id="cvCustom4"/>
-          <description class="CardViewText" id="cvNotes" style="white-space: -moz-pre-wrap;"/>
+          <description class="CardViewText" id="cvNotes" style="white-space: pre-wrap;"/>
 
           <hbox>
             <image id="cvBuddyIcon"/> 
diff --git a/parser/htmlparser/tests/outsinks/entityxif.xif b/parser/htmlparser/tests/outsinks/entityxif.xif
index d3564c464d0..1c127e208f6 100644
--- a/parser/htmlparser/tests/outsinks/entityxif.xif
+++ b/parser/htmlparser/tests/outsinks/entityxif.xif
@@ -49,7 +49,7 @@
 </comment>
 </container><!--head-->
 <container isa="body">
-<attr name="style" value="white-space: -moz-pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); "/>
+<attr name="style" value="white-space: pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); "/>
 <leaf isa="br">
 </leaf><!--br-->
 <content>http://www.hotbot.com/?MT=Search+Engines</content>
diff --git a/parser/htmlparser/tests/outsinks/plain.html b/parser/htmlparser/tests/outsinks/plain.html
index 0cb4a13f433..c8127a35af6 100644
--- a/parser/htmlparser/tests/outsinks/plain.html
+++ b/parser/htmlparser/tests/outsinks/plain.html
@@ -35,7 +35,7 @@
    - ***** END LICENSE BLOCK ***** -->
 <title>Ender Plain Text Test Page</title>
 </head>
-<body style="white-space: -moz-pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); ">
+<body style="white-space: pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); ">
 
 80 char width (for reference only):
 ---------|---------|---------|---------|---------|---------|---------|---------|
diff --git a/parser/htmlparser/tests/outsinks/plainwrap.html b/parser/htmlparser/tests/outsinks/plainwrap.html
index 9a949fad50e..72879b810e9 100644
--- a/parser/htmlparser/tests/outsinks/plainwrap.html
+++ b/parser/htmlparser/tests/outsinks/plainwrap.html
@@ -38,7 +38,7 @@
 <title>Ender Plain Text Test Page</title>
 </head>
 
-<body style="white-space: -moz-pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); ">
+<body style="white-space: pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); ">
 
 80 char width (for reference only)
 ---------|---------|---------|---------|---------|---------|---------|---------|
diff --git a/security/manager/pki/resources/content/exceptionDialog.xul b/security/manager/pki/resources/content/exceptionDialog.xul
index f8c1c0d7a7b..285461dc7b9 100644
--- a/security/manager/pki/resources/content/exceptionDialog.xul
+++ b/security/manager/pki/resources/content/exceptionDialog.xul
@@ -69,9 +69,9 @@
       <!-- Note that because of the styling, there must be no whitespace within
       the description tags -->
       <description id="warningText"
-                   style="white-space: -moz-pre-wrap"/>
+                   style="white-space: pre-wrap"/>
       <description id="warningSupplemental"
-                   style="font-weight: bold; white-space: -moz-pre-wrap;"
+                   style="font-weight: bold; white-space: pre-wrap;"
                    >&exceptionMgr.supplementalWarning;</description>
     </vbox>
   </hbox>
@@ -92,7 +92,7 @@
     <caption label="&exceptionMgr.certstatus.caption;"/>
     <vbox  style="overflow: auto;" flex="1">
       <hbox>
-        <description id="headerDescription" style="white-space: -moz-pre-wrap;"
+        <description id="headerDescription" style="white-space: pre-wrap;"
                      flex="1"/>
         <vbox>
           <button id="viewCertButton" label="&exceptionMgr.certstatus.viewCert;"
@@ -102,13 +102,13 @@
       </hbox>      
       <description id="statusDescription"
                    style="font-weight: bold; padding-bottom: 1em;"/>
-      <description id="statusLongDescription" style="white-space: -moz-pre-wrap;"/>
+      <description id="statusLongDescription" style="white-space: pre-wrap;"/>
       <description id="status2Description"
                    style="font-weight: bold; padding-bottom: 1em;"/>
-      <description id="status2LongDescription" style="white-space: -moz-pre-wrap;"/>
+      <description id="status2LongDescription" style="white-space: pre-wrap;"/>
       <description id="status3Description" 
                    style="font-weight: bold; padding-bottom: 1em;"/>
-      <description id="status3LongDescription" style="white-space: -moz-pre-wrap;"/>
+      <description id="status3LongDescription" style="white-space: pre-wrap;"/>
       <spacer flex="1"/>
     </vbox>
     <checkbox id="permanent" checked="true" disabled="true"
diff --git a/suite/themes/classic/messenger/messageBody.css b/suite/themes/classic/messenger/messageBody.css
index 33b0091ed4c..e940a8ec71a 100644
--- a/suite/themes/classic/messenger/messageBody.css
+++ b/suite/themes/classic/messenger/messageBody.css
@@ -74,7 +74,7 @@ div.headerdisplayname {
 }
 
 .moz-text-plain[wrap="true"] {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[wrap="false"] {
@@ -82,7 +82,7 @@ div.headerdisplayname {
 }
 
 .moz-text-plain[wrap="flow"] .moz-txt-sig {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[graphical-quote="false"] blockquote {
diff --git a/suite/themes/classic/navigator/pageInfo.css b/suite/themes/classic/navigator/pageInfo.css
index 1f8effea2e2..5bad2793190 100644
--- a/suite/themes/classic/navigator/pageInfo.css
+++ b/suite/themes/classic/navigator/pageInfo.css
@@ -84,7 +84,7 @@ groupbox.treebox .groupbox-body {
 }
 
 #general-security-identity {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   line-height: 2em;
 }
 
diff --git a/suite/themes/modern/messenger/messageBody.css b/suite/themes/modern/messenger/messageBody.css
index 33b0091ed4c..e940a8ec71a 100644
--- a/suite/themes/modern/messenger/messageBody.css
+++ b/suite/themes/modern/messenger/messageBody.css
@@ -74,7 +74,7 @@ div.headerdisplayname {
 }
 
 .moz-text-plain[wrap="true"] {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[wrap="false"] {
@@ -82,7 +82,7 @@ div.headerdisplayname {
 }
 
 .moz-text-plain[wrap="flow"] .moz-txt-sig {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .moz-text-plain[graphical-quote="false"] blockquote {
diff --git a/suite/themes/modern/navigator/pageInfo.css b/suite/themes/modern/navigator/pageInfo.css
index 1f564e60d1c..7d375ca1f83 100644
--- a/suite/themes/modern/navigator/pageInfo.css
+++ b/suite/themes/modern/navigator/pageInfo.css
@@ -83,7 +83,7 @@ groupbox.treebox .groupbox-body {
 }
 
 #general-security-identity {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   line-height: 2em;
 }
 
diff --git a/toolkit/components/console/content/console.css b/toolkit/components/console/content/console.css
index b467efd50c9..558882ed745 100644
--- a/toolkit/components/console/content/console.css
+++ b/toolkit/components/console/content/console.css
@@ -19,7 +19,7 @@
 
 .console-msg-text,
 .console-error-msg {
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 .console-error-source {
diff --git a/toolkit/content/commonDialog.css b/toolkit/content/commonDialog.css
index 8732dc7c3ed..635d2b092f2 100644
--- a/toolkit/content/commonDialog.css
+++ b/toolkit/content/commonDialog.css
@@ -45,7 +45,7 @@
   -moz-user-focus: normal;
   -moz-user-select: text;
   cursor: text !important;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 #loginLabel, #password1Label, #password2Label {
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index 8e7c043d0b6..c3ace84e4b9 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -347,7 +347,7 @@ tooltip {
 tooltip {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#tooltip");
   -moz-box-orient: vertical;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
   margin-top: 21px;
 }
 
diff --git a/toolkit/themes/gnomestripe/global/netError.css b/toolkit/themes/gnomestripe/global/netError.css
index 1652b8f058f..c142f7a40f3 100644
--- a/toolkit/themes/gnomestripe/global/netError.css
+++ b/toolkit/themes/gnomestripe/global/netError.css
@@ -67,7 +67,7 @@ body[dir="rtl"] #errorPageContainer {
   border-bottom: 1px solid ThreeDLightShadow;
   padding-bottom: 1em;
   font-size: 130%;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 #errorLongDesc {
diff --git a/toolkit/themes/pinstripe/global/console/console.css b/toolkit/themes/pinstripe/global/console/console.css
index 86279461d2f..c95efee6596 100644
--- a/toolkit/themes/pinstripe/global/console/console.css
+++ b/toolkit/themes/pinstripe/global/console/console.css
@@ -76,7 +76,7 @@
 }
 
 .console-msg-text {
-  white-space: -moz-pre-wrap !important;
+  white-space: pre-wrap !important;
 }
 .console-icon {
   list-style-image: inherit;
diff --git a/toolkit/themes/pinstripe/global/netError.css b/toolkit/themes/pinstripe/global/netError.css
index bf02051b254..e8d22b18482 100644
--- a/toolkit/themes/pinstripe/global/netError.css
+++ b/toolkit/themes/pinstripe/global/netError.css
@@ -68,7 +68,7 @@ body[dir="rtl"] #errorPageContainer {
   border-bottom: 1px solid ThreeDLightShadow;
   padding-bottom: 1em;
   font-size: 130%;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 #errorLongDesc {
diff --git a/toolkit/themes/winstripe/global/netError.css b/toolkit/themes/winstripe/global/netError.css
index bf02051b254..e8d22b18482 100644
--- a/toolkit/themes/winstripe/global/netError.css
+++ b/toolkit/themes/winstripe/global/netError.css
@@ -68,7 +68,7 @@ body[dir="rtl"] #errorPageContainer {
   border-bottom: 1px solid ThreeDLightShadow;
   padding-bottom: 1em;
   font-size: 130%;
-  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
 }
 
 #errorLongDesc {
diff --git a/xpfe/components/console/resources/content/console.css b/xpfe/components/console/resources/content/console.css
index e6985e703fd..e69de29bb2d 100644
--- a/xpfe/components/console/resources/content/console.css
+++ b/xpfe/components/console/resources/content/console.css
@@ -1,61 +0,0 @@
-
-.console-box {
-  -moz-binding: url("chrome://global/content/consoleBindings.xml#console-box");
-  overflow: auto;
-}
-
-.console-rows {
-  -moz-user-focus: normal;
-}
-
-.console-row[type="error"],
-.console-row[type="warning"] {
-  -moz-binding: url("chrome://global/content/consoleBindings.xml#error");
-}
-
-.console-row[type="message"] {
-  -moz-binding: url("chrome://global/content/consoleBindings.xml#message");
-}
-
-.console-msg-text {
-  white-space: -moz-pre-wrap;
-}
-
-.console-error-source {
-  -moz-binding: url("chrome://global/content/consoleBindings.xml#console-error-source");
-}
-
-.console-dots {
-  width: 1px;
-}
-
-/* :::::::::: hiding and showing of rows for each mode :::::::::: */
-
-.console-box[mode="Warnings"] > .console-box-internal > .console-rows 
-    > .console-row[type="error"],
-.console-box[mode="Messages"] > .console-box-internal > .console-rows 
-    > .console-row[type="error"]
-{
-  display: none;
-}
-
-.console-box[mode="Errors"] > .console-box-internal > .console-rows 
-    > .console-row[type="warning"],
-.console-box[mode="Messages"] > .console-box-internal > .console-rows 
-    > .console-row[type="warning"]
-{
-  display: none;
-}
-
-.console-box[mode="Errors"] > .console-box-internal > .console-rows 
-    > .console-row[type="message"],
-.console-box[mode="Warnings"] > .console-box-internal > .console-rows 
-    > .console-row[type="message"]
-{
-  display: none;
-}
-
-/* If line number is 0, hide the line number section */
-.lineNumberRow[line="0"] {
-  display: none;
-}