diff --git a/packages/flutter_widgets/lib/src/file_attachment.dart b/packages/flutter_widgets/lib/src/file_attachment.dart
index 96061cab..2629b1a7 100644
--- a/packages/flutter_widgets/lib/src/file_attachment.dart
+++ b/packages/flutter_widgets/lib/src/file_attachment.dart
@@ -131,6 +131,10 @@ class _FileAttachmentState extends State<FileAttachment> {
           );
           break;
         case FileAttachmentType.online:
+          if (widget.attachment.extraData['mime_type'] == 'svg') {
+            return getFileTypeImage(widget.attachment.extraData['other']);
+          }
+
           return CachedNetworkImage(
             imageUrl: widget.attachment.imageUrl ??
                 widget.attachment.assetUrl ??
diff --git a/packages/flutter_widgets/lib/src/message_widget.dart b/packages/flutter_widgets/lib/src/message_widget.dart
index 226f6f56..94e2164f 100644
--- a/packages/flutter_widgets/lib/src/message_widget.dart
+++ b/packages/flutter_widgets/lib/src/message_widget.dart
@@ -926,7 +926,7 @@ class _MessageWidgetState extends State<MessageWidget> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Padding(
-            padding: widget.textPadding,
+            padding: isOnlyEmoji ? EdgeInsets.zero : widget.textPadding,
             child: widget.textBuilder != null
                 ? widget.textBuilder(context, widget.message)
                 : MessageText(