diff --git a/addons/mail/static/src/components/message/message.scss b/addons/mail/static/src/components/message/message.scss
index 0b03a8ba835..8fe3d7a2219 100644
--- a/addons/mail/static/src/components/message/message.scss
+++ b/addons/mail/static/src/components/message/message.scss
@@ -48,6 +48,11 @@
     // the style without this rule.
     overflow: auto;
 
+    > pre {
+        white-space: pre-wrap;
+        word-break: break-word;
+    }
+
     > p:last-of-type {
         margin-bottom: 0;
     }
diff --git a/addons/mail/static/src/scss/thread.scss b/addons/mail/static/src/scss/thread.scss
index 17c0ae72655..070adb6d518 100644
--- a/addons/mail/static/src/scss/thread.scss
+++ b/addons/mail/static/src/scss/thread.scss
@@ -84,10 +84,9 @@
             min-width: 0;
             max-width: 100%;
             word-wrap: break-word;
-            > pre {
+            .o_thread_message_content > pre {
                 white-space: pre-wrap;
                 word-break: break-word;
-                text-align: justify;
             }
 
             .o_mail_note_title {