diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 48d48924..06e72b8b 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -179,6 +179,8 @@
 
     .content {
       -webkit-user-select: text;
+      white-space: pre-wrap;
+
       a {
         word-break: break-all
       }
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 1cccbac1..9df669be 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -624,7 +624,8 @@ input.search {
       border-bottom: 6px solid transparent; }
     .message-detail .bubble .content,
     .message-list .bubble .content {
-      -webkit-user-select: text; }
+      -webkit-user-select: text;
+      white-space: pre-wrap; }
       .message-detail .bubble .content a,
       .message-list .bubble .content a {
         word-break: break-all; }