diff --git a/flutter/lib/mobile/pages/chat_page.dart b/flutter/lib/common/widgets/chat_page.dart
similarity index 97%
rename from flutter/lib/mobile/pages/chat_page.dart
rename to flutter/lib/common/widgets/chat_page.dart
index 11794cb3d..affd674a2 100644
--- a/flutter/lib/mobile/pages/chat_page.dart
+++ b/flutter/lib/common/widgets/chat_page.dart
@@ -4,7 +4,7 @@ import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:provider/provider.dart';
 
-import 'home_page.dart';
+import '../../mobile/pages/home_page.dart';
 
 class ChatPage extends StatelessWidget implements PageShape {
   late final ChatModel chatModel;
@@ -94,6 +94,8 @@ class ChatPage extends StatelessWidget implements PageShape {
                       messageOptions: MessageOptions(
                           showOtherUsersAvatar: false,
                           showTime: true,
+                          currentUserTextColor: Colors.white,
+                          textColor: Colors.white,
                           maxWidth: constraints.maxWidth * 0.7,
                           messageDecorationBuilder: (_, __, ___) =>
                               defaultMessageDecoration(
diff --git a/flutter/lib/common/widgets/overlay.dart b/flutter/lib/common/widgets/overlay.dart
index 97815a998..44b3f1308 100644
--- a/flutter/lib/common/widgets/overlay.dart
+++ b/flutter/lib/common/widgets/overlay.dart
@@ -3,9 +3,9 @@ import 'package:flutter_hbb/common.dart';
 import 'package:provider/provider.dart';
 
 import '../../desktop/widgets/tabbar_widget.dart';
-import '../../mobile/pages/chat_page.dart';
 import '../../models/chat_model.dart';
 import '../../models/model.dart';
+import 'chat_page.dart';
 
 class DraggableChatWindow extends StatelessWidget {
   const DraggableChatWindow(
diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index d721cda4d..94e0c2197 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -5,7 +5,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
-import 'package:flutter_hbb/mobile/pages/chat_page.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
@@ -13,6 +12,7 @@ import 'package:window_manager/window_manager.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
 import '../../common.dart';
+import '../../common/widgets/chat_page.dart';
 import '../../models/platform_model.dart';
 import '../../models/server_model.dart';
 
diff --git a/flutter/lib/mobile/pages/home_page.dart b/flutter/lib/mobile/pages/home_page.dart
index 31240b895..f806c2576 100644
--- a/flutter/lib/mobile/pages/home_page.dart
+++ b/flutter/lib/mobile/pages/home_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_hbb/mobile/pages/chat_page.dart';
 import 'package:flutter_hbb/mobile/pages/server_page.dart';
 import 'package:flutter_hbb/mobile/pages/settings_page.dart';
 import '../../common.dart';
+import '../../common/widgets/chat_page.dart';
 import 'connection_page.dart';
 
 abstract class PageShape extends Widget {
diff --git a/flutter/lib/models/chat_model.dart b/flutter/lib/models/chat_model.dart
index 3ebc97d61..9a0d89ef4 100644
--- a/flutter/lib/models/chat_model.dart
+++ b/flutter/lib/models/chat_model.dart
@@ -108,6 +108,7 @@ class ChatModel with ChangeNotifier {
                   hideChatWindowOverlay();
                 }
               },
+              backgroundColor: Theme.of(context).colorScheme.primary,
               child: Icon(Icons.message)));
     });
     overlayState.insert(overlay);