diff --git a/css/_chat.scss b/css/_chat.scss
index 36f5fc9b0..ef5fb61e6 100644
--- a/css/_chat.scss
+++ b/css/_chat.scss
@@ -312,6 +312,10 @@
         }
     }
 
+    .chatmessage-wrapper {
+        max-width: 100%;
+    }
+
     .chatmessage {
         background-color: $chatRemoteMessageBackgroundColor;
         border-radius: 0px 6px 6px 6px;
diff --git a/react/features/chat/components/web/ChatMessage.js b/react/features/chat/components/web/ChatMessage.js
index 7e436166e..5b1c8e001 100644
--- a/react/features/chat/components/web/ChatMessage.js
+++ b/react/features/chat/components/web/ChatMessage.js
@@ -56,7 +56,7 @@ class ChatMessage extends AbstractChatMessage<Props> {
         });
 
         return (
-            <div>
+            <div className = 'chatmessage-wrapper'>
                 <div className = 'chatmessage'>
                     { this.props.showDisplayName && this._renderDisplayName() }
                     <div className = 'usermessage'>