diff --git a/addons/mail/static/src/components/message/message.scss b/addons/mail/static/src/components/message/message.scss
index 37c9f7eab5b..4f3c6dce294 100644
--- a/addons/mail/static/src/components/message/message.scss
+++ b/addons/mail/static/src/components/message/message.scss
@@ -44,17 +44,12 @@
 .o_Message_content {
     word-wrap: break-word;
     word-break: break-word;
-    // Message content can contain arbitrary HTML that might overflow and break
-    // the style without this rule.
-    overflow: auto;
 
-    > pre {
-        white-space: pre-wrap;
-        word-break: break-word;
-    }
-
-    > p:last-of-type {
-        margin-bottom: 0;
+    * {
+        // Message content can contain arbitrary HTML that might overflow and break
+        // the style without this rule.
+        max-width: 100%;
+        overflow: auto;
     }
 
     img {
@@ -132,6 +127,14 @@
     justify-content: center;
 }
 
+.o_Message_prettyBody {
+
+    > p:last-of-type {
+        margin-bottom: 0;
+    }
+
+}
+
 .o_Message_readMoreLess {
     display: block;
 }