diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml
index ab1b53eb60..5c8b638ae1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml
@@ -56,6 +56,7 @@ limitations under the License.
     .contents blockquote {
       -webkit-margin-before: 0;
       -webkit-margin-after: 0.3em;
+       white-space: pre-wrap;
     }
 
     .name {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css
index 523cadc398..c0f1fe9c47 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css
@@ -76,6 +76,9 @@
   -webkit-margin-before: 0.2em;
   -webkit-margin-after: 0.3em;
 }
+.message {
+  white-space: pre-wrap;
+}
 .commentBox button {
   margin-right: 3px;
   margin-bottom: 1px;