diff --git a/lib/src/channel_preview.dart b/lib/src/channel_preview.dart
index 9b113ca8..da244498 100644
--- a/lib/src/channel_preview.dart
+++ b/lib/src/channel_preview.dart
@@ -161,21 +161,21 @@ class ChannelPreview extends StatelessWidget {
         if (lastMessage.isDeleted) {
           text = 'This message was deleted.';
         } else if (lastMessage.attachments != null) {
-          final prefix = lastMessage.attachments
-              .map((e) {
-                if (e.type == 'image') {
-                  return '📷';
-                } else if (e.type == 'video') {
-                  return '🎬';
-                } else if (e.type == 'giphy') {
-                  return 'GIF';
-                }
-                return null;
-              })
-              .where((e) => e != null)
-              .join(' ');
+          final parts = <String>[
+            ...lastMessage.attachments.map((e) {
+              if (e.type == 'image') {
+                return '📷';
+              } else if (e.type == 'video') {
+                return '🎬';
+              } else if (e.type == 'giphy') {
+                return '[GIF]';
+              }
+              return null;
+            }).where((e) => e != null),
+            lastMessage.text ?? '',
+          ];
 
-          text = '$prefix ${lastMessage.text ?? ''}';
+          text = parts.join(' ');
         }
 
         return Text(
diff --git a/lib/src/sending_indicator.dart b/lib/src/sending_indicator.dart
index f92686c7..e93984e2 100644
--- a/lib/src/sending_indicator.dart
+++ b/lib/src/sending_indicator.dart
@@ -24,6 +24,7 @@ class SendingIndicator extends StatelessWidget {
       return Icon(
         Icons.done,
         size: 8,
+        color: IconTheme.of(context).color.withOpacity(0.5),
       );
     }
     if (message.status == MessageSendingStatus.SENDING ||