diff --git a/anonstream/static/style.css b/anonstream/static/style.css
index 7e87a23..46fd76d 100644
--- a/anonstream/static/style.css
+++ b/anonstream/static/style.css
@@ -214,6 +214,7 @@ noscript {
   vertical-align: top;
 }
 .chat-message__markup {
+  white-space: pre-wrap;
   overflow-wrap: anywhere;
   line-height: 1.3125;
 }
diff --git a/anonstream/templates/nojs_chat_messages.html b/anonstream/templates/nojs_chat_messages.html
index 5f3b3d2..1487b5f 100644
--- a/anonstream/templates/nojs_chat_messages.html
+++ b/anonstream/templates/nojs_chat_messages.html
@@ -124,6 +124,7 @@
       vertical-align: top;
     }
     .chat-message__markup {
+      white-space: pre-wrap;
       overflow-wrap: anywhere;
       line-height: 1.3125;
     }