diff --git a/app/less/app.less b/app/less/app.less
index 9d44e6de..f0758772 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -2228,14 +2228,16 @@ a.im_message_fwd_photo {
 .im_message_text {
   word-wrap: break-word;
   line-height: 150%;
+  white-space: pre-wrap;
 }
 .im_message_photo_caption,
 .im_message_video_caption,
 .im_message_document_caption {
+  margin-top: 3px;
   clear: both;
   word-wrap: break-word;
   line-height: 150%;
-  margin-top: 3px;
+  white-space: pre-wrap;
 }
 .im_message_mymention {
   background: #fff8cc;