diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index cc12fbd9..db21c206 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -1527,14 +1527,12 @@ class MessageInputState extends State<MessageInput> {
     return Transform(
       transform: Matrix4.rotationY(pi),
       alignment: Alignment.center,
-      child: Padding(
+      child: QuotedMessageWidget(
+        reverse: true,
+        showBorder: !containsUrl,
+        message: widget.quotedMessage,
+        messageTheme: StreamChatTheme.of(context).otherMessageTheme,
         padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
-        child: QuotedMessageWidget(
-          reverse: true,
-          showBorder: !containsUrl,
-          message: widget.quotedMessage,
-          messageTheme: StreamChatTheme.of(context).otherMessageTheme,
-        ),
       ),
     );
   }
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index ccefce6e..f4f8944f 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -494,21 +494,15 @@ class _MessageWidgetState extends State<MessageWidget> {
             widget.onQuotedMessageTap != null
         ? () => widget.onQuotedMessageTap(widget.message.quotedMessageId)
         : null;
-    return Padding(
+    return QuotedMessageWidget(
+      onTap: onTap,
+      message: widget.message.quotedMessage,
+      messageTheme: isMyMessage
+          ? StreamChatTheme.of(context).otherMessageTheme
+          : StreamChatTheme.of(context).ownMessageTheme,
+      reverse: widget.reverse,
       padding: EdgeInsets.only(
-        right: 8,
-        left: 8,
-        top: 8,
-        bottom: hasNonUrlAttachments ? 8 : 0,
-      ),
-      child: QuotedMessageWidget(
-        onTap: onTap,
-        message: widget.message.quotedMessage,
-        messageTheme: isMyMessage
-            ? StreamChatTheme.of(context).otherMessageTheme
-            : StreamChatTheme.of(context).ownMessageTheme,
-        reverse: widget.reverse,
-      ),
+          right: 8, left: 8, top: 8, bottom: hasNonUrlAttachments ? 8 : 0),
     );
   }
 
diff --git a/lib/src/quoted_message_widget.dart b/lib/src/quoted_message_widget.dart
index 309df703..e4e10e17 100644
--- a/lib/src/quoted_message_widget.dart
+++ b/lib/src/quoted_message_widget.dart
@@ -83,6 +83,8 @@ class QuotedMessageWidget extends StatelessWidget {
   final Map<String, QuotedMessageAttachmentThumbnailBuilder>
       attachmentThumbnailBuilders;
 
+  final EdgeInsetsGeometry padding;
+
   final GestureTapCallback onTap;
 
   ///
@@ -94,6 +96,7 @@ class QuotedMessageWidget extends StatelessWidget {
     this.showBorder = false,
     this.textLimit = 170,
     this.attachmentThumbnailBuilders,
+    this.padding = const EdgeInsets.all(8),
     this.onTap,
   }) : super(key: key);
 
@@ -107,16 +110,19 @@ class QuotedMessageWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.end,
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Flexible(child: _buildMessage(context)),
-          SizedBox(width: 8),
-          _buildUserAvatar(),
-        ],
+    return Padding(
+      padding: padding,
+      child: InkWell(
+        onTap: onTap,
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Flexible(child: _buildMessage(context)),
+            SizedBox(width: 8),
+            _buildUserAvatar(),
+          ],
+        ),
       ),
     );
   }