diff --git a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
index 9bf398bd..51dd4460 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
@@ -1,5 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:shimmer/shimmer.dart';
 import 'package:stream_chat_flutter/src/stream_chat_theme.dart';
 import 'package:stream_chat_flutter/src/stream_svg_icon.dart';
 import 'package:stream_chat_flutter/src/utils.dart';
@@ -104,10 +105,15 @@ class FileAttachment extends AttachmentWidget {
               return getFileTypeImage(attachment.extraData['other']);
             },
             placeholder: (_, __) {
-              return Image.asset(
-                'images/placeholder.png',
-                fit: BoxFit.cover,
-                package: 'stream_chat_flutter',
+              return Shimmer.fromColors(
+                baseColor: StreamChatTheme.of(context).colorTheme.greyGainsboro,
+                highlightColor:
+                    StreamChatTheme.of(context).colorTheme.whiteSmoke,
+                child: Image.asset(
+                  'images/placeholder.png',
+                  fit: BoxFit.cover,
+                  package: 'stream_chat_flutter',
+                ),
               );
             },
           ),
diff --git a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
index 01a9ab0b..b54c0a7c 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
@@ -2,6 +2,7 @@ import 'dart:typed_data';
 
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:shimmer/shimmer.dart';
 import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 import 'package:transparent_image/transparent_image.dart';
 
@@ -348,10 +349,16 @@ class GiphyAttachment extends AttachmentWidget {
               height: size?.height,
               width: size?.width,
               placeholder: (_, __) {
-                return Image.asset(
-                  'images/placeholder.png',
-                  fit: BoxFit.cover,
-                  package: 'stream_chat_flutter',
+                return Shimmer.fromColors(
+                  baseColor:
+                      StreamChatTheme.of(context).colorTheme.greyGainsboro,
+                  highlightColor:
+                      StreamChatTheme.of(context).colorTheme.whiteSmoke,
+                  child: Image.asset(
+                    'images/placeholder.png',
+                    fit: BoxFit.cover,
+                    package: 'stream_chat_flutter',
+                  ),
                 );
               },
               imageUrl: imageUrl,
diff --git a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
index d562b7fb..98509bb9 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
@@ -1,8 +1,8 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:shimmer/shimmer.dart';
 import 'package:stream_chat_flutter/src/attachment/attachment_upload_state_builder.dart';
 import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
-import 'package:transparent_image/transparent_image.dart';
 
 import 'attachment_title.dart';
 import '../full_screen_media.dart';
@@ -84,10 +84,15 @@ class ImageAttachment extends AttachmentWidget {
             height: size?.height,
             width: size?.width,
             placeholder: (_, __) {
-              return Image.asset(
-                'images/placeholder.png',
-                fit: BoxFit.cover,
-                package: 'stream_chat_flutter',
+              return Shimmer.fromColors(
+                baseColor: StreamChatTheme.of(context).colorTheme.greyGainsboro,
+                highlightColor:
+                    StreamChatTheme.of(context).colorTheme.whiteSmoke,
+                child: Image.asset(
+                  'images/placeholder.png',
+                  fit: BoxFit.cover,
+                  package: 'stream_chat_flutter',
+                ),
               );
             },
             imageUrl: imageUrl,
diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index 8922a6c3..8649df94 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -11,6 +11,7 @@ import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:photo_manager/photo_manager.dart';
+import 'package:shimmer/shimmer.dart';
 import 'package:stream_chat_flutter/src/video_service.dart';
 import 'package:stream_chat_flutter/src/media_list_view.dart';
 import 'package:stream_chat_flutter/src/message_list_view.dart';
@@ -1642,11 +1643,15 @@ class MessageInputState extends State<MessageInput> {
                   return getFileTypeImage(attachment.extraData['other']);
                 },
                 progressIndicatorBuilder: (context, _, progress) {
-                  return Center(
-                    child: Container(
-                      width: 20.0,
-                      height: 20.0,
-                      child: const CircularProgressIndicator(),
+                  return Shimmer.fromColors(
+                    baseColor:
+                        StreamChatTheme.of(context).colorTheme.greyGainsboro,
+                    highlightColor:
+                        StreamChatTheme.of(context).colorTheme.whiteSmoke,
+                    child: Image.asset(
+                      'images/placeholder.png',
+                      fit: BoxFit.cover,
+                      package: 'stream_chat_flutter',
                     ),
                   );
                 },
diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index fba5b3bc..a56a60ff 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -216,9 +216,11 @@ class MessageWidget extends StatefulWidget {
               ),
               onShowMessage: onShowMessage,
               onReturnAction: onReturnAction,
-              onAttachmentTap: () {
-                onAttachmentTap(message, attachment);
-              },
+              onAttachmentTap: onAttachmentTap != null
+                  ? () {
+                      onAttachmentTap?.call(message, attachment);
+                    }
+                  : null,
             );
           },
           'video': (context, message, attachment) {
@@ -232,31 +234,35 @@ class MessageWidget extends StatefulWidget {
               message: message,
               onShowMessage: onShowMessage,
               onReturnAction: onReturnAction,
-              onAttachmentTap: () {
-                onAttachmentTap(message, attachment);
-              },
+              onAttachmentTap: onAttachmentTap != null
+                  ? () {
+                      onAttachmentTap?.call(message, attachment);
+                    }
+                  : null,
             );
           },
           'giphy': (context, message, attachment) {
             return GiphyAttachment(
-                attachment: attachment,
-                messageTheme: messageTheme,
-                message: message,
-                size: Size(
-                  MediaQuery.of(context).size.width * 0.8,
-                  MediaQuery.of(context).size.height * 0.3,
-                ),
-                onShowMessage: onShowMessage,
-                onReturnAction: onReturnAction);
+              attachment: attachment,
+              messageTheme: messageTheme,
+              message: message,
+              size: Size(
+                MediaQuery.of(context).size.width * 0.8,
+                MediaQuery.of(context).size.height * 0.3,
+              ),
+              onShowMessage: onShowMessage,
+              onReturnAction: onReturnAction,
+            );
           },
           'file': (context, message, attachment) {
             return FileAttachment(
-                message: message,
-                attachment: attachment,
-                size: Size(
-                  MediaQuery.of(context).size.width * 0.8,
-                  MediaQuery.of(context).size.height * 0.3,
-                ));
+              message: message,
+              attachment: attachment,
+              size: Size(
+                MediaQuery.of(context).size.width * 0.8,
+                MediaQuery.of(context).size.height * 0.3,
+              ),
+            );
           },
         }..addAll(customAttachmentBuilders ?? {}),
         super(key: key);
diff --git a/packages/stream_chat_flutter/lib/src/video_thumbnail_image.dart b/packages/stream_chat_flutter/lib/src/video_thumbnail_image.dart
index 70a30005..48f1b15b 100644
--- a/packages/stream_chat_flutter/lib/src/video_thumbnail_image.dart
+++ b/packages/stream_chat_flutter/lib/src/video_thumbnail_image.dart
@@ -1,6 +1,8 @@
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
+import 'package:shimmer/shimmer.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 import 'package:video_thumbnail/video_thumbnail.dart';
 
 import 'stream_svg_icon.dart';
@@ -69,12 +71,16 @@ class _VideoThumbnailImageState extends State<VideoThumbnailImage> {
               }
               if (!snapshot.hasData) {
                 return widget.placeholderBuilder?.call(context) ??
-                    Image.asset(
-                      'images/placeholder.png',
-                      package: 'stream_chat_flutter',
-                      fit: widget.fit,
-                      height: widget.height,
-                      width: widget.width,
+                    Shimmer.fromColors(
+                      baseColor:
+                          StreamChatTheme.of(context).colorTheme.greyGainsboro,
+                      highlightColor:
+                          StreamChatTheme.of(context).colorTheme.whiteSmoke,
+                      child: Image.asset(
+                        'images/placeholder.png',
+                        fit: BoxFit.cover,
+                        package: 'stream_chat_flutter',
+                      ),
                     );
               }
               return Image.memory(