diff --git a/skins/default/mail.css b/skins/default/mail.css
index 9f64ea615..0c10ff717 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -782,9 +782,10 @@ div.message-part div.pre
   margin: 0px;
   padding: 0px;
   font-family: monospace;
-  white-space: pre;
   white-space: -moz-pre-wrap !important;
   white-space: -o-pre-wrap !important;
+  white-space: pre-wrap !important;
+  white-space: pre;
   word-wrap: break-word; /* IE (and Safari) */
 }
 
diff --git a/skins/default/print.css b/skins/default/print.css
index b3fdebfb4..fa9c38c7e 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -107,10 +107,11 @@ div.message-part div.pre
 {
   margin: 0;
   padding: 0;
-  white-space: pre;
+  font-family: monospace;
   white-space: -o-pre-wrap !important;
   white-space: -moz-pre-wrap !important;
-  font-family: monospace;
+  white-space: pre-wrap !important;
+  white-space: pre;
   word-wrap: break-word; /* IE (and Safari) */
 }