Index: /trunk/roundcubemail/skins/default/mail.css
===================================================================
--- /trunk/roundcubemail/skins/default/mail.css	(revision 1857)
+++ /trunk/roundcubemail/skins/default/mail.css	(revision 1858)
@@ -783,7 +783,8 @@
   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) */
 }
Index: /trunk/roundcubemail/skins/default/print.css
===================================================================
--- /trunk/roundcubemail/skins/default/print.css	(revision 1857)
+++ /trunk/roundcubemail/skins/default/print.css	(revision 1858)
@@ -108,8 +108,9 @@
   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) */
 }