diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index dd8f34f1..e4cccd6b 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -367,6 +367,8 @@ class ChatController extends State<ChatPageWithRoom> {
     return;
   }
 
+  String? scrollToEventIdMarker;
+
   Future<void>? _setReadMarkerFuture;
 
   void setReadMarker({String? eventId}) {
@@ -912,6 +914,9 @@ class ChatController extends State<ChatPageWithRoom> {
       });
       return;
     }
+    setState(() {
+      scrollToEventIdMarker = eventId;
+    });
     await scrollController.scrollToIndex(
       eventIndex,
       preferPosition: AutoScrollPosition.middle,
diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart
index 51f481ae..709c07ca 100644
--- a/lib/pages/chat/chat_event_list.dart
+++ b/lib/pages/chat/chat_event_list.dart
@@ -119,6 +119,8 @@ class ChatEventList extends StatelessWidget {
                         '${event.senderFromMemoryOrFallback.mention} ',
                   ),
                 ),
+                highlightMarker:
+                    controller.scrollToEventIdMarker == event.eventId,
                 onSelect: controller.onSelectMessage,
                 scrollToEventId: (String eventId) =>
                     controller.scrollToEventId(eventId),
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index e7f0a9b6..7332cb8b 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -31,6 +31,7 @@ class Message extends StatelessWidget {
   final bool longPressSelect;
   final bool selected;
   final Timeline timeline;
+  final bool highlightMarker;
 
   const Message(
     this.event, {
@@ -44,6 +45,7 @@ class Message extends StatelessWidget {
     required this.onSwipe,
     this.selected = false,
     required this.timeline,
+    this.highlightMarker = false,
     super.key,
   });
 
@@ -186,8 +188,19 @@ class Message extends StatelessWidget {
                 padding: const EdgeInsets.only(left: 8),
                 child: Material(
                   color: noBubble ? Colors.transparent : color,
-                  borderRadius: borderRadius,
                   clipBehavior: Clip.antiAlias,
+                  elevation: highlightMarker || selected ? 10 : 0,
+                  shape: RoundedRectangleBorder(
+                    borderRadius: borderRadius,
+                    side: BorderSide(
+                      width: highlightMarker || selected ? 1 : 0,
+                      color: selected
+                          ? Theme.of(context).colorScheme.onBackground
+                          : highlightMarker
+                              ? Theme.of(context).colorScheme.primary
+                              : Colors.transparent,
+                    ),
+                  ),
                   child: Container(
                     decoration: BoxDecoration(
                       borderRadius:
@@ -393,9 +406,6 @@ class Message extends StatelessWidget {
             child: Stack(
               children: [
                 Container(
-                  color: selected
-                      ? Theme.of(context).colorScheme.primary.withAlpha(100)
-                      : Colors.transparent,
                   constraints: const BoxConstraints(
                     maxWidth: FluffyThemes.columnWidth * 2.5,
                   ),