diff --git a/css/converse.css b/css/converse.css
index 4198bc13d..4e88e2538 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -8450,6 +8450,9 @@ body.reset {
 #conversejs .chatroom-body .message .separator {
   border: 0.5px solid #E77051; }
 
+#conversejs.converse-overlayed .message.chat-msg.chat-msg-followup .chat-msg-content {
+  margin-left: 0; }
+
 @media screen and (max-width: 767px) {
   #conversejs:not(.converse-embedded) .message.chat-msg .chat-msg-author {
     white-space: normal; } }
diff --git a/css/inverse.css b/css/inverse.css
index d3199b669..9128c87ab 100644
--- a/css/inverse.css
+++ b/css/inverse.css
@@ -8638,6 +8638,9 @@ body {
 #conversejs .chatroom-body .message .separator {
   border: 0.5px solid #E77051; }
 
+#conversejs.converse-overlayed .message.chat-msg.chat-msg-followup .chat-msg-content {
+  margin-left: 0; }
+
 @media screen and (max-width: 767px) {
   #conversejs:not(.converse-embedded) .message.chat-msg .chat-msg-author {
     white-space: normal; } }
diff --git a/mockup/overlayed-login.html b/mockup/overlayed-login.html
index dec613888..3ce9a767c 100644
--- a/mockup/overlayed-login.html
+++ b/mockup/overlayed-login.html
@@ -14,7 +14,7 @@
         <h1 class="brand-heading">Converse</h1>
     </div>
 
-    <div id="conversejs">
+    <div id="conversejs" class="converse-overlayed">
         <div class="converse-chatboxes row no-gutters">
             <div id="controlbox" class="chatbox">
                 <div class="flyout box-flyout">
diff --git a/mockup/overlayed.html b/mockup/overlayed.html
index 0c75d6d4a..4bb31b854 100644
--- a/mockup/overlayed.html
+++ b/mockup/overlayed.html
@@ -13,7 +13,7 @@
           <h1 class="brand-heading"><i class="icon-conversejs"></i>Converse.js</h1>
      </div>
 
-     <div id="conversejs">
+    <div id="conversejs" class="converse-overlayed">
         <div class="converse-chatboxes row no-gutters">
             <div id="controlbox" class="chatbox">
                 <div class="flyout box-flyout">
diff --git a/sass/_messages.scss b/sass/_messages.scss
index a10a67960..8918ec22c 100644
--- a/sass/_messages.scss
+++ b/sass/_messages.scss
@@ -160,7 +160,6 @@
                     margin-left: 2.75rem;
                 }
             }
-
         }
     }
 
@@ -175,6 +174,18 @@
     }
 }
 
+#conversejs.converse-overlayed {
+    .message {
+        &.chat-msg {
+            &.chat-msg-followup {
+                .chat-msg-content {
+                    margin-left: 0;
+                }
+            }
+        }
+    }
+}
+
 @media screen and (max-width: 767px) {
     #conversejs:not(.converse-embedded)  {
         .message {