diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart
index eda38307f..5b30668e8 100644
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -9,7 +9,6 @@ import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:wakelock/wakelock.dart';
-import 'package:desktop_multi_window/desktop_multi_window.dart';
 
 // import 'package:window_manager/window_manager.dart';
 
diff --git a/flutter/lib/mobile/pages/chat_page.dart b/flutter/lib/mobile/pages/chat_page.dart
index 0bc4c2a25..738f34e89 100644
--- a/flutter/lib/mobile/pages/chat_page.dart
+++ b/flutter/lib/mobile/pages/chat_page.dart
@@ -50,26 +50,29 @@ class ChatPage extends StatelessWidget implements PageShape {
               final currentUser = chatModel.currentUser;
               return Stack(
                 children: [
-                  DashChat(
-                    onSend: (chatMsg) {
-                      chatModel.send(chatMsg);
-                    },
-                    currentUser: chatModel.me,
-                    messages:
-                        chatModel.messages[chatModel.currentID]?.chatMessages ??
-                            [],
-                    messageOptions: MessageOptions(
-                        showOtherUsersAvatar: false,
-                        showTime: true,
-                        messageDecorationBuilder: (_, __, ___) =>
-                            defaultMessageDecoration(
-                              color: MyTheme.accent80,
-                              borderTopLeft: 8,
-                              borderTopRight: 8,
-                              borderBottomRight: 8,
-                              borderBottomLeft: 8,
-                            )),
-                  ),
+                  LayoutBuilder(builder: (context, constraints) {
+                    return DashChat(
+                      onSend: (chatMsg) {
+                        chatModel.send(chatMsg);
+                      },
+                      currentUser: chatModel.me,
+                      messages: chatModel
+                              .messages[chatModel.currentID]?.chatMessages ??
+                          [],
+                      messageOptions: MessageOptions(
+                          showOtherUsersAvatar: false,
+                          showTime: true,
+                          maxWidth: constraints.maxWidth * 0.7,
+                          messageDecorationBuilder: (_, __, ___) =>
+                              defaultMessageDecoration(
+                                color: MyTheme.accent80,
+                                borderTopLeft: 8,
+                                borderTopRight: 8,
+                                borderBottomRight: 8,
+                                borderBottomLeft: 8,
+                              )),
+                    );
+                  }),
                   chatModel.currentID == ChatModel.clientModeID
                       ? SizedBox.shrink()
                       : Padding(
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 40aa1ca43..fcc7b5f49 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -40,7 +40,10 @@ dependencies:
     url_launcher: ^6.0.9
     shared_preferences: ^2.0.6
     toggle_switch: ^1.4.0
-    dash_chat_2: ^0.0.12
+    dash_chat_2:
+        git:
+          url: https://github.com/fufesou/Dash-Chat-2
+          ref: feat_maxWidth
     draggable_float_widget: ^0.0.2
     settings_ui: ^2.0.2
     flutter_breadcrumb: ^1.0.1