diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart
index c1c572a7..582e8496 100644
--- a/lib/src/message_actions_modal.dart
+++ b/lib/src/message_actions_modal.dart
@@ -43,75 +43,71 @@ class MessageActionsModal extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        Positioned.fill(
-          child: GestureDetector(
-            behavior: HitTestBehavior.translucent,
-            onTap: () {
-              Navigator.pop(context);
-            },
-            child: BackdropFilter(
-              filter: ImageFilter.blur(
-                sigmaX: 10,
-                sigmaY: 10,
-              ),
-              child: Container(
-                color: Colors.transparent,
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onTap: () {
+        Navigator.pop(context);
+      },
+      child: SingleChildScrollView(
+        padding: const EdgeInsets.only(top: 160),
+        child: Stack(
+          children: [
+            Positioned.fill(
+              child: BackdropFilter(
+                filter: ImageFilter.blur(
+                  sigmaX: 10,
+                  sigmaY: 10,
+                ),
+                child: Container(
+                  color: Colors.transparent,
+                ),
               ),
             ),
-          ),
-        ),
-        Padding(
-          padding: const EdgeInsets.symmetric(vertical: 8.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: <Widget>[
-              if (showReactions &&
-                  (message.status == MessageSendingStatus.SENT ||
-                      message.status == null))
-                Center(
-                  child: ReactionPicker(
-                    message: message,
-                    messageTheme: messageTheme,
-                  ),
-                ),
-              IgnorePointer(
-                child: MessageWidget(
-                  key: Key('MessageWidget'),
-                  reverse: reverse,
-                  message: message.copyWith(
-                    text: message.text.length > 200
-                        ? '${message.text.substring(0, 200)}...'
-                        : message.text,
-                    attachments: message.attachments.length > 1
-                        ? [message.attachments[0]]
-                        : message.attachments,
-                  ),
-                  messageTheme: messageTheme,
-                  showReactions: false,
-                  showUsername: false,
-                  showReplyIndicator: false,
-                  showTimestamp: false,
-                  showSendingIndicator: DisplayWidget.gone,
-                  shape: messageShape,
-                ),
-              ),
-              SizedBox(
-                height: 8,
-              ),
-              Flexible(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 48.0,
-                  ),
-                  child: Material(
-                    clipBehavior: Clip.hardEdge,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(16),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 8.0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: <Widget>[
+                  if (showReactions &&
+                      (message.status == MessageSendingStatus.SENT ||
+                          message.status == null))
+                    Center(
+                      child: ReactionPicker(
+                        message: message,
+                        messageTheme: messageTheme,
+                      ),
                     ),
-                    child: SingleChildScrollView(
+                  IgnorePointer(
+                    child: MessageWidget(
+                      key: Key('MessageWidget'),
+                      reverse: reverse,
+                      message: message.copyWith(
+                        text: message.text.length > 200
+                            ? '${message.text.substring(0, 200)}...'
+                            : message.text,
+                      ),
+                      messageTheme: messageTheme,
+                      showReactions: false,
+                      showUsername: false,
+                      showReplyIndicator: false,
+                      showTimestamp: false,
+                      showSendingIndicator: DisplayWidget.gone,
+                      shape: messageShape,
+                    ),
+                  ),
+                  SizedBox(
+                    height: 8,
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 48.0,
+                    ),
+                    child: Material(
+                      clipBehavior: Clip.hardEdge,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(16),
+                      ),
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.stretch,
                         children: ListTile.divideTiles(
@@ -129,13 +125,13 @@ class MessageActionsModal extends StatelessWidget {
                         ).toList(),
                       ),
                     ),
-                  ),
-                ),
-              )
-            ],
-          ),
+                  )
+                ],
+              ),
+            ),
+          ],
         ),
-      ],
+      ),
     );
   }
 
diff --git a/lib/src/message_reactions_modal.dart b/lib/src/message_reactions_modal.dart
index b6026cf7..7db22ee1 100644
--- a/lib/src/message_reactions_modal.dart
+++ b/lib/src/message_reactions_modal.dart
@@ -34,75 +34,70 @@ class MessageReactionsModal extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        Positioned.fill(
-          child: GestureDetector(
-            behavior: HitTestBehavior.translucent,
-            onTap: () {
-              Navigator.pop(context);
-            },
-            child: BackdropFilter(
-              filter: ImageFilter.blur(
-                sigmaX: 10,
-                sigmaY: 10,
-              ),
-              child: Container(
-                color: Colors.transparent,
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onTap: () {
+        Navigator.pop(context);
+      },
+      child: SingleChildScrollView(
+        padding: const EdgeInsets.only(top: 160),
+        child: Stack(
+          children: [
+            Positioned.fill(
+              child: BackdropFilter(
+                filter: ImageFilter.blur(
+                  sigmaX: 10,
+                  sigmaY: 10,
+                ),
+                child: Container(
+                  color: Colors.transparent,
+                ),
               ),
             ),
-          ),
-        ),
-        Padding(
-          padding: const EdgeInsets.symmetric(vertical: 8.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: <Widget>[
-              if (showReactions &&
-                  (message.status == MessageSendingStatus.SENT ||
-                      message.status == null))
-                Center(
-                  child: ReactionPicker(
-                    message: message,
-                    messageTheme: messageTheme,
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 8.0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: <Widget>[
+                  if (showReactions &&
+                      (message.status == MessageSendingStatus.SENT ||
+                          message.status == null))
+                    Center(
+                      child: ReactionPicker(
+                        message: message,
+                        messageTheme: messageTheme,
+                      ),
+                    ),
+                  IgnorePointer(
+                    child: MessageWidget(
+                      key: Key('MessageWidget'),
+                      reverse: reverse,
+                      message: message.copyWith(
+                        text: message.text.length > 200
+                            ? '${message.text.substring(0, 200)}...'
+                            : message.text,
+                      ),
+                      messageTheme: messageTheme,
+                      showReactions: false,
+                      showUsername: false,
+                      showReplyIndicator: false,
+                      showTimestamp: false,
+                      showSendingIndicator: DisplayWidget.gone,
+                      shape: messageShape,
+                    ),
                   ),
-                ),
-              IgnorePointer(
-                child: MessageWidget(
-                  key: Key('MessageWidget'),
-                  reverse: reverse,
-                  message: message.copyWith(
-                    text: message.text.length > 200
-                        ? '${message.text.substring(0, 200)}...'
-                        : message.text,
-                    attachments: message.attachments.length > 1
-                        ? [message.attachments[0]]
-                        : message.attachments,
+                  SizedBox(
+                    height: 16,
                   ),
-                  messageTheme: messageTheme,
-                  showReactions: false,
-                  showUsername: false,
-                  showReplyIndicator: false,
-                  showTimestamp: false,
-                  showSendingIndicator: DisplayWidget.gone,
-                  shape: messageShape,
-                ),
+                  if (message.latestReactions?.isNotEmpty == true)
+                    _buildReactionCard(context),
+                ],
               ),
-              SizedBox(
-                height: 16,
-              ),
-              if (message.latestReactions?.isNotEmpty == true)
-                Flexible(
-                  child: Container(
-                    constraints: BoxConstraints.loose(Size.fromHeight(400)),
-                    child: _buildReactionCard(context),
-                  ),
-                ),
-            ],
-          ),
+            ),
+          ],
         ),
-      ],
+      ),
     );
   }
 
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index a2c886af..c3fa4c6e 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -392,6 +392,8 @@ class _MessageWidgetState extends State<MessageWidget> {
         reactionsMap[element.type] = element;
       }
     });
+    final reactionsList = reactionsMap.values.toList()
+      ..sort((a, b) => a.user.id == ownId ? 1 : -1);
 
     return AnimatedSwitcher(
       duration: Duration(milliseconds: 300),
@@ -406,7 +408,7 @@ class _MessageWidgetState extends State<MessageWidget> {
                 flipTail: widget.reverse,
                 backgroundColor: widget.messageTheme.reactionsBackgroundColor,
                 borderColor: widget.messageTheme.reactionsBorderColor,
-                reactions: reactionsMap.values.toList(),
+                reactions: reactionsList,
               ),
             )
           : SizedBox(),