diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less
index bc660514325..3683ecd9bbe 100644
--- a/addons/mail/static/src/less/thread.less
+++ b/addons/mail/static/src/less/thread.less
@@ -103,6 +103,11 @@
             min-width: 0;
             max-width: 100%;
             word-wrap: break-word;
+            > pre {
+                white-space: pre-wrap;
+                word-break: break-word;
+                text-align: justify;
+            }
 
             &.o_mail_note {
                 background-color: @mail-thread-note;