diff --git a/example/lib/chat_info_screen.dart b/example/lib/chat_info_screen.dart
index 535c999b..c96d982f 100644
--- a/example/lib/chat_info_screen.dart
+++ b/example/lib/chat_info_screen.dart
@@ -223,11 +223,14 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
                         if (channel.state == null) {
                           await channel.watch();
                         }
-                        Navigator.pop(context);
-                        Navigator.pop(context);
-                        Navigator.pop(context);
-                        Navigator.pop(context);
-                        Navigator.pop(context);
+                        await Navigator.pop(context);
+                        await Future.delayed(Duration(milliseconds: 200));
+                        await Navigator.pop(context);
+                        await Future.delayed(Duration(milliseconds: 200));
+                        await Navigator.pop(context);
+                        await Future.delayed(Duration(milliseconds: 200));
+                        await Navigator.pop(context);
+                        await Navigator.pop(context);
                         Navigator.pushNamed(
                           context,
                           Routes.CHANNEL_PAGE,
diff --git a/example/lib/group_info_screen.dart b/example/lib/group_info_screen.dart
index a8fb52e4..ace7e2c8 100644
--- a/example/lib/group_info_screen.dart
+++ b/example/lib/group_info_screen.dart
@@ -496,12 +496,15 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
                         if (channel.state == null) {
                           await channel.watch();
                         }
-                        Navigator.pop(context);
-                        Navigator.pop(context);
-                        Navigator.pop(context);
-                        Navigator.pop(context);
-                        Navigator.pop(context);
-                        Navigator.pushNamed(
+                        await Navigator.pop(context);
+                        await Future.delayed(Duration(milliseconds: 200));
+                        await Navigator.pop(context);
+                        await Future.delayed(Duration(milliseconds: 200));
+                        await Navigator.pop(context);
+                        await Future.delayed(Duration(milliseconds: 200));
+                        await Navigator.pop(context);
+                        await Navigator.pop(context);
+                        await Navigator.pushNamed(
                           context,
                           Routes.CHANNEL_PAGE,
                           arguments: ChannelPageArgs(
diff --git a/lib/src/giphy_attachment.dart b/lib/src/giphy_attachment.dart
index 379fe182..c879cd5b 100644
--- a/lib/src/giphy_attachment.dart
+++ b/lib/src/giphy_attachment.dart
@@ -330,6 +330,7 @@ class GiphyAttachment extends StatelessWidget {
                 userName: message.user.name,
                 sentAt: message.createdAt,
                 message: message,
+                onShowMessage: onShowMessage,
               ),
             );
           }));
diff --git a/lib/src/image_group.dart b/lib/src/image_group.dart
index e9b52f88..bb577a4b 100644
--- a/lib/src/image_group.dart
+++ b/lib/src/image_group.dart
@@ -10,11 +10,13 @@ class ImageGroup extends StatelessWidget {
     @required this.images,
     @required this.message,
     @required this.size,
+    this.onShowMessage,
   }) : super(key: key);
 
   final List<Attachment> images;
   final Message message;
   final Size size;
+  final ShowMessageCallback onShowMessage;
 
   @override
   Widget build(BuildContext context) {
@@ -119,6 +121,7 @@ class ImageGroup extends StatelessWidget {
             userName: message.user.name,
             sentAt: message.createdAt,
             message: message,
+            onShowMessage: onShowMessage,
           ),
         ),
       ),
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 474c3bcf..b19a8840 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -736,6 +736,7 @@ class _MessageWidgetState extends State<MessageWidget> {
               ),
               images: images,
               message: widget.message,
+              onShowMessage: widget.onShowMessage,
             ),
           ),
         ),