diff --git a/lib/src/views/chats/chat_messages.view.dart b/lib/src/views/chats/chat_messages.view.dart
index 998054f..fa92c2e 100644
--- a/lib/src/views/chats/chat_messages.view.dart
+++ b/lib/src/views/chats/chat_messages.view.dart
@@ -263,7 +263,7 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
       duration: const Duration(milliseconds: 300),
       alignment: 0.5,
     );
-    Future.delayed(const Duration(milliseconds: 250), () {
+    Future.delayed(const Duration(milliseconds: 300), () {
       if (!context.mounted) return;
       setState(() {
         focusedScrollItem = null;
@@ -329,18 +329,15 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
                       } else {
                         final chatMessage = messages[i].message!;
                         return Transform.translate(
-                          offset: Offset((focusedScrollItem == i) ? -3 : 0, 0),
+                          offset: Offset(
+                              (focusedScrollItem == i)
+                                  ? (chatMessage.message.messageOtherId == null)
+                                      ? -8
+                                      : 8
+                                  : 0,
+                              0),
                           child: Transform.scale(
-                            scale: (focusedScrollItem == i) ? 1.03 : 1,
-                            // scale: Tween<double>(
-                            //         begin: 1,
-                            //         end: (focusedScrollItem == i) ? 1.03 : 1)
-                            //     .animate(
-                            //   CurvedAnimation(
-                            //     parent: _animationController,
-                            //     curve: Curves.easeInOut,
-                            //   ),
-                            // ),
+                            scale: (focusedScrollItem == i) ? 1.05 : 1,
                             child: ChatListEntry(
                               key:
                                   Key(chatMessage.message.messageId.toString()),
diff --git a/lib/src/views/chats/chat_messages_components/chat_list_entry.dart b/lib/src/views/chats/chat_messages_components/chat_list_entry.dart
index 21f49bf..3b1d831 100644
--- a/lib/src/views/chats/chat_messages_components/chat_list_entry.dart
+++ b/lib/src/views/chats/chat_messages_components/chat_list_entry.dart
@@ -83,7 +83,7 @@ class _ChatListEntryState extends State<ChatListEntry> {
                       scrollToMessage: widget.scrollToMessage,
                       child: (textMessage != null)
                           ? ChatTextEntry(
-                              message: widget.msg.message,
+                              message: widget.msg,
                               text: textMessage!,
                               hasReaction: widget.otherReactions.isNotEmpty,
                             )
diff --git a/lib/src/views/chats/chat_messages_components/chat_text_entry.dart b/lib/src/views/chats/chat_messages_components/chat_text_entry.dart
index 2cbe220..c249ae9 100644
--- a/lib/src/views/chats/chat_messages_components/chat_text_entry.dart
+++ b/lib/src/views/chats/chat_messages_components/chat_text_entry.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/views/chats/chat_messages.view.dart';
 import 'package:twonly/src/views/components/animate_icon.dart';
 import 'package:twonly/src/views/components/better_text.dart';
@@ -13,7 +12,7 @@ class ChatTextEntry extends StatelessWidget {
   });
 
   final String text;
-  final Message message;
+  final ChatMessage message;
   final bool hasReaction;
 
   @override
@@ -37,8 +36,8 @@ class ChatTextEntry extends StatelessWidget {
       padding: EdgeInsets.only(
           left: 10, top: 4, bottom: 4, right: hasReaction ? 30 : 10),
       decoration: BoxDecoration(
-        color: message.responseToMessageId == null
-            ? getMessageColor(message)
+        color: message.responseTo == null
+            ? getMessageColor(message.message)
             : null,
         borderRadius: BorderRadius.circular(12),
       ),