diff --git a/lib/pages/chat/events/message/message.dart b/lib/pages/chat/events/message/message.dart
index 68b163b960..adbe76d9a9 100644
--- a/lib/pages/chat/events/message/message.dart
+++ b/lib/pages/chat/events/message/message.dart
@@ -779,20 +779,19 @@ class _ReplyContent extends StatelessWidget {
         BuildContext context,
         snapshot,
       ) {
-        final replyEvent = snapshot.hasData
-            ? snapshot.data!
-            : Event(
-                eventId: event.relationshipEventId!,
-                content: {
-                  'msgtype': 'm.text',
-                  'body': '...',
-                },
-                senderId: event.senderId,
-                type: 'm.room.message',
-                room: event.room,
-                status: EventStatus.sent,
-                originServerTs: DateTime.now(),
-              );
+        final replyEvent = snapshot.data ??
+            Event(
+              eventId: event.relationshipEventId!,
+              content: {
+                'msgtype': 'm.text',
+                'body': '...',
+              },
+              senderId: event.senderId,
+              type: 'm.room.message',
+              room: event.room,
+              status: EventStatus.sent,
+              originServerTs: DateTime.now(),
+            );
         return InkWell(
           onTap: () {
             if (scrollToEventId != null) {
diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart
index 278b92ea36..17fb545fe2 100644
--- a/lib/pages/chat/events/reply_content.dart
+++ b/lib/pages/chat/events/reply_content.dart
@@ -1,13 +1,14 @@
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/chat/events/reply_content_style.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
+import 'package:fluffychat/widgets/mxc_image.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
-import '../../../config/app_config.dart';
 import 'html_message.dart';
 
 class ReplyContent extends StatelessWidget {
@@ -77,6 +78,18 @@ class ReplyContent extends StatelessWidget {
             decoration: ReplyContentStyle.prefixBarDecoration(context),
           ),
           const SizedBox(width: ReplyContentStyle.prefixAndDisplayNameSpacing),
+          if (displayEvent.hasAttachment)
+            ClipRRect(
+              borderRadius: const BorderRadius.all(Radius.circular(4)),
+              child: MxcImage(
+                event: displayEvent,
+                isThumbnail: true,
+                width: ReplyContentStyle.fontSizeDisplayContent * 2,
+                height: ReplyContentStyle.fontSizeDisplayContent * 2,
+                fit: BoxFit.cover,
+              ),
+            ),
+          const SizedBox(width: ReplyContentStyle.prefixAndDisplayNameSpacing),
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,