diff --git a/lib/src/message_reactions_modal.dart b/lib/src/message_reactions_modal.dart
index af1d81ee..7e1e100a 100644
--- a/lib/src/message_reactions_modal.dart
+++ b/lib/src/message_reactions_modal.dart
@@ -36,6 +36,7 @@ class MessageReactionsModal extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    var user = StreamChat.of(context).user;
     return GestureDetector(
       behavior: HitTestBehavior.translucent,
       onTap: () {
@@ -66,16 +67,12 @@ class MessageReactionsModal extends StatelessWidget {
                         (message.status == MessageSendingStatus.SENT ||
                             message.status == null))
                       Align(
-                          alignment: Alignment(-0.3, 0.0),
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              ReactionPicker(
-                                message: message,
-                                messageTheme: messageTheme,
-                              ),
-                            ],
-                          )),
+                        alignment: Alignment(-0.3 + (user.id == message.id ? 0.2 : 0.0), 0.0),
+                        child: ReactionPicker(
+                          message: message,
+                          messageTheme: messageTheme,
+                        ),
+                      ),
                     IgnorePointer(
                       child: MessageWidget(
                         key: Key('MessageWidget'),