diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart
index ded377fc..c1c572a7 100644
--- a/lib/src/message_actions_modal.dart
+++ b/lib/src/message_actions_modal.dart
@@ -62,71 +62,78 @@ class MessageActionsModal extends StatelessWidget {
             ),
           ),
         ),
-        Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: <Widget>[
-            if (showReactions &&
-                (message.status == MessageSendingStatus.SENT ||
-                    message.status == null))
-              Center(
-                child: ReactionPicker(
-                  message: message,
+        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,
                 ),
               ),
-            AbsorbPointer(
-              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,
               ),
-            ),
-            SizedBox(
-              height: 8,
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(
-                horizontal: 48.0,
-              ),
-              child: Material(
-                clipBehavior: Clip.hardEdge,
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(16),
+              Flexible(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 48.0,
+                  ),
+                  child: Material(
+                    clipBehavior: Clip.hardEdge,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(16),
+                    ),
+                    child: SingleChildScrollView(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: ListTile.divideTiles(
+                          context: context,
+                          tiles: [
+                            if (showReply &&
+                                (message.status == MessageSendingStatus.SENT ||
+                                    message.status == null) &&
+                                message.parentId == null)
+                              _buildReplyButton(context),
+                            if (showEditMessage) _buildEditMessage(context),
+                            if (showDeleteMessage) _buildDeleteButton(context),
+                            if (showCopyMessage) _buildCopyButton(context),
+                          ],
+                        ).toList(),
+                      ),
+                    ),
+                  ),
                 ),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: ListTile.divideTiles(
-                    context: context,
-                    tiles: [
-                      if (showReply &&
-                          (message.status == MessageSendingStatus.SENT ||
-                              message.status == null) &&
-                          message.parentId == null)
-                        _buildReplyButton(context),
-                      if (showEditMessage) _buildEditMessage(context),
-                      if (showDeleteMessage) _buildDeleteButton(context),
-                      if (showCopyMessage) _buildCopyButton(context),
-                    ],
-                  ).toList(),
-                ),
-              ),
-            )
-          ],
+              )
+            ],
+          ),
         ),
       ],
     );
diff --git a/lib/src/message_reactions_modal.dart b/lib/src/message_reactions_modal.dart
index 319b8acd..b6026cf7 100644
--- a/lib/src/message_reactions_modal.dart
+++ b/lib/src/message_reactions_modal.dart
@@ -68,7 +68,7 @@ class MessageReactionsModal extends StatelessWidget {
                     messageTheme: messageTheme,
                   ),
                 ),
-              AbsorbPointer(
+              IgnorePointer(
                 child: MessageWidget(
                   key: Key('MessageWidget'),
                   reverse: reverse,
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index beff166a..a2c886af 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -387,7 +387,7 @@ class _MessageWidgetState extends State<MessageWidget> {
   ) {
     final ownId = StreamChat.of(context).user.id;
     final reactionsMap = <String, Reaction>{};
-    widget.message.latestReactions.forEach((element) {
+    widget.message.latestReactions?.forEach((element) {
       if (!reactionsMap.containsKey(element.type) || element.user.id == ownId) {
         reactionsMap[element.type] = element;
       }
diff --git a/lib/src/reaction_bubble.dart b/lib/src/reaction_bubble.dart
index 03f415b0..83593afc 100644
--- a/lib/src/reaction_bubble.dart
+++ b/lib/src/reaction_bubble.dart
@@ -26,6 +26,7 @@ class ReactionBubble extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final reactionIcons = StreamChatTheme.of(context).reactionIcons;
+    final offset = reactions.length > 1 ? 16.0 : 2.0;
     return Transform(
       transform: Matrix4.rotationY(reverse ? pi : 0),
       alignment: Alignment.center,
@@ -33,7 +34,7 @@ class ReactionBubble extends StatelessWidget {
         alignment: Alignment.center,
         children: [
           Transform.translate(
-            offset: Offset(reverse ? 2 : -2, 0),
+            offset: Offset(reverse ? offset : -offset, 0),
             child: Container(
               padding: const EdgeInsets.symmetric(vertical: 4),
               decoration: BoxDecoration(