diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 94b261dda..8631d8e3d 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -7,6 +7,8 @@ import 'app_config.dart';
 abstract class FluffyThemes {
   static const double columnWidth = 380.0;
 
+  static const double maxTimelineWidth = columnWidth * 2;
+
   // #Pangea
   // static const double navRailWidth = 80.0;
   static const double navRailWidth = 72.0;
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index dac63ef61..183b0cae7 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -333,7 +333,7 @@ class ChatView extends StatelessWidget {
                               Container(
                                 margin: EdgeInsets.all(bottomSheetPadding),
                                 constraints: const BoxConstraints(
-                                  maxWidth: FluffyThemes.columnWidth * 2.5,
+                                  maxWidth: FluffyThemes.maxTimelineWidth,
                                 ),
                                 alignment: Alignment.center,
                                 child: Material(
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index c5f73d449..2d3e83355 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -266,7 +266,7 @@ class Message extends StatelessWidget {
         onSwipe: (_) => onSwipe(),
         child: Container(
           constraints: const BoxConstraints(
-            maxWidth: FluffyThemes.columnWidth * 2.5,
+            maxWidth: FluffyThemes.maxTimelineWidth,
           ),
           padding: EdgeInsets.only(
             left: 8.0,
diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart
index 31f5910b9..52d9f0eb4 100644
--- a/lib/pages/chat/seen_by_row.dart
+++ b/lib/pages/chat/seen_by_row.dart
@@ -21,7 +21,7 @@ class SeenByRow extends StatelessWidget {
       alignment: Alignment.center,
       child: AnimatedContainer(
         constraints:
-            const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5),
+            const BoxConstraints(maxWidth: FluffyThemes.maxTimelineWidth),
         height: seenByUsers.isEmpty ? 0 : 24,
         duration: seenByUsers.isEmpty
             ? Duration.zero
diff --git a/lib/pages/chat/typing_indicators.dart b/lib/pages/chat/typing_indicators.dart
index 8c17ad701..640734084 100644
--- a/lib/pages/chat/typing_indicators.dart
+++ b/lib/pages/chat/typing_indicators.dart
@@ -34,7 +34,7 @@ class TypingIndicators extends StatelessWidget {
           alignment: Alignment.center,
           child: AnimatedContainer(
             constraints:
-                const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5),
+                const BoxConstraints(maxWidth: FluffyThemes.maxTimelineWidth),
             height: typingUsers.isEmpty ? 0 : avatarSize + 8,
             duration: FluffyThemes.animationDuration,
             curve: FluffyThemes.animationCurve,
diff --git a/lib/pangea/activity_planner/activity_plan_message.dart b/lib/pangea/activity_planner/activity_plan_message.dart
index ba8868e6b..f697ba441 100644
--- a/lib/pangea/activity_planner/activity_plan_message.dart
+++ b/lib/pangea/activity_planner/activity_plan_message.dart
@@ -266,7 +266,7 @@ class ActivityPlanMessage extends StatelessWidget {
         onSwipe: (_) {},
         child: Container(
           constraints: const BoxConstraints(
-            maxWidth: FluffyThemes.columnWidth * 2.5,
+            maxWidth: FluffyThemes.maxTimelineWidth,
           ),
           padding: const EdgeInsets.only(
             left: 8.0,
diff --git a/lib/pangea/chat/widgets/chat_input_bar.dart b/lib/pangea/chat/widgets/chat_input_bar.dart
index 6b7afb825..7c03b8b92 100644
--- a/lib/pangea/chat/widgets/chat_input_bar.dart
+++ b/lib/pangea/chat/widgets/chat_input_bar.dart
@@ -55,7 +55,7 @@ class ChatInputBarState extends State<ChatInputBar> {
             right: widget.padding,
           ),
           constraints: const BoxConstraints(
-            maxWidth: FluffyThemes.columnWidth * 2.5,
+            maxWidth: FluffyThemes.maxTimelineWidth,
           ),
           alignment: Alignment.center,
           child: Material(
diff --git a/lib/pangea/toolbar/widgets/message_selection_positioner.dart b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
index 375bf8000..3c3727950 100644
--- a/lib/pangea/toolbar/widgets/message_selection_positioner.dart
+++ b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
@@ -533,7 +533,7 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>
     const double messageMargin = 16.0;
     // widget.event.isActivityMessage ? 0 : Avatar.defaultSize + 16 + 8;
     final bool showingDetails = widget.chatController.displayChatDetailsColumn;
-    final double totalMaxWidth = (FluffyThemes.columnWidth * 2.5) -
+    final double totalMaxWidth = FluffyThemes.maxTimelineWidth -
         (showingDetails ? FluffyThemes.columnWidth : 0) -
         messageMargin;
     double? maxWidth;