diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart
index e678ac1ad..429dc6bb1 100644
--- a/lib/pangea/toolbar/widgets/overlay_message.dart
+++ b/lib/pangea/toolbar/widgets/overlay_message.dart
@@ -158,7 +158,10 @@ class OverlayMessage extends StatelessWidget {
                 FluffyThemes.columnWidth * 1.5,
                 MediaQuery.of(context).size.width -
                     (ownMessage ? 0 : Avatar.defaultSize) -
-                    24.0,
+                    32.0 -
+                    (FluffyThemes.isColumnMode(context)
+                        ? FluffyThemes.columnWidth + FluffyThemes.navRailWidth
+                        : 0.0),
               ),
             ),
             child: Padding(
@@ -243,7 +246,10 @@ class OverlayMessage extends StatelessWidget {
                 FluffyThemes.columnWidth * 1.5,
                 MediaQuery.of(context).size.width -
                     (ownMessage ? 0 : Avatar.defaultSize) -
-                    24.0,
+                    32.0 -
+                    (FluffyThemes.isColumnMode(context)
+                        ? FluffyThemes.columnWidth + FluffyThemes.navRailWidth
+                        : 0.0),
               ),
             ),
             child: Padding(