diff --git a/lib/core/models/chat_model.dart b/lib/core/models/chat_model.dart
index 36527d8..04e8e67 100644
--- a/lib/core/models/chat_model.dart
+++ b/lib/core/models/chat_model.dart
@@ -62,6 +62,7 @@ class ChatModel {
   int unreadMessagesCount;
 
 
+
   ChatModel({
     required this.title,
     required this.userIds,
diff --git a/lib/features/chat/view/screens/thread_screen.dart b/lib/features/chat/view/screens/thread_screen.dart
index 26b9da7..8c07ff6 100644
--- a/lib/features/chat/view/screens/thread_screen.dart
+++ b/lib/features/chat/view/screens/thread_screen.dart
@@ -571,6 +571,7 @@ class _ThreadScreen extends ConsumerState<ThreadScreen>
                                       onPin: (MessageModel message) {},
                                       showExtention: false,
                                       chat: chat,
+                            alwaysShow: true,
                                     ),
                         ),
                         if (replyMessage != null)
diff --git a/lib/features/chat/view/widget/chat_messages_list.dart b/lib/features/chat/view/widget/chat_messages_list.dart
index 488f555..830b82b 100644
--- a/lib/features/chat/view/widget/chat_messages_list.dart
+++ b/lib/features/chat/view/widget/chat_messages_list.dart
@@ -33,6 +33,7 @@ class ChatMessagesList extends ConsumerStatefulWidget {
     required this.onEdit,
     this.showExtention = true,
     this.chat,
+    this.alwaysShow=false,
   });
 
   final ScrollController scrollController;
@@ -51,6 +52,7 @@ class ChatMessagesList extends ConsumerStatefulWidget {
   final Function(MessageModel message) onEdit;
   final bool showExtention;
   final ChatModel? chat;
+  final bool alwaysShow;
 
   @override
   ConsumerState<ConsumerStatefulWidget> createState() =>
@@ -93,7 +95,8 @@ class _ChatMessagesListState extends ConsumerState<ChatMessagesList> {
                     parentMessage = widget.messages[parentIndex];
                   }
               return (item.parentMessage == null ||
-                      widget.chat?.type != ChatType.channel)
+                      widget.chat?.type != ChatType.channel||
+                      widget.alwaysShow == true)
                   ? Row(
                     mainAxisAlignment:
                         item.senderId == ref.read(userProvider)!.id
diff --git a/lib/features/groups/view/screens/group_creation_details.dart b/lib/features/groups/view/screens/group_creation_details.dart
index 024bdfa..ffa7aa8 100644
--- a/lib/features/groups/view/screens/group_creation_details.dart
+++ b/lib/features/groups/view/screens/group_creation_details.dart
@@ -9,6 +9,7 @@ import 'package:go_router/go_router.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:telware_cross_platform/core/constants/server_constants.dart';
 import 'package:telware_cross_platform/core/models/chat_model.dart';
+import 'package:telware_cross_platform/core/models/message_model.dart';
 import 'package:telware_cross_platform/core/models/user_model.dart';
 import 'package:telware_cross_platform/core/providers/token_provider.dart';
 import 'package:telware_cross_platform/core/providers/user_provider.dart';
@@ -248,7 +249,8 @@ class _GroupCreationDetailsState extends ConsumerState<GroupCreationDetails> {
                 id: res['data']['_id'],
               );
               debugPrint('Opening Chat: $chat');
-              context.push(ChatScreen.route, extra: chat);
+              List<MessageModel> l=[];
+              context.push(ChatScreen.route, extra: [chat,l]);
             } else {
               debugPrint('Failed to create group');
               // Show a SnackBar if group creation failed
diff --git a/lib/features/groups/view/screens/select_channel_members.dart b/lib/features/groups/view/screens/select_channel_members.dart
index 07baf7c..b1e813e 100644
--- a/lib/features/groups/view/screens/select_channel_members.dart
+++ b/lib/features/groups/view/screens/select_channel_members.dart
@@ -8,6 +8,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../../core/constants/server_constants.dart';
 import '../../../../core/models/chat_model.dart';
+import '../../../../core/models/message_model.dart';
 import '../../../../core/models/user_model.dart';
 import '../../../../core/providers/token_provider.dart';
 import '../../../../core/providers/user_provider.dart';
@@ -190,7 +191,8 @@ class _SelectChannelMembers extends ConsumerState<SelectChannelMembers>
                       id: res['data']['_id'],
                     );
                     debugPrint('Opening Chat: $chat');
-                    context.push(ChatScreen.route, extra: chat);
+                    List<MessageModel> l=[];
+                    context.push(ChatScreen.route, extra: [chat,l]);
                   } else {
                     debugPrint('Failed to create channel');
                     ScaffoldMessenger.of(context).showSnackBar(