diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index 11dfa75..350caae 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -41,7 +41,8 @@ class Message extends StatelessWidget {
     final bool ownMessage = event.senderId == client.userID;
     Alignment alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
     Color color = Theme.of(context).secondaryHeaderColor;
-    final bool sameSender = nextEvent != null && [EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type)
+    final bool sameSender = nextEvent != null &&
+            [EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type)
         ? nextEvent.sender.id == event.sender.id
         : false;
     BubbleNip nip = sameSender
diff --git a/lib/utils/event_extension.dart b/lib/utils/event_extension.dart
index 16d7406..e3cd5fb 100644
--- a/lib/utils/event_extension.dart
+++ b/lib/utils/event_extension.dart
@@ -19,10 +19,10 @@ extension LocalizedBody on Event {
   }
 
   bool get showThumbnail =>
-      [EventTypes.Message, EventTypes.Sticker].contains(type) &&
+      [MessageTypes.Image, MessageTypes.Sticker].contains(messageType) &&
       (kIsWeb ||
-      (content['info'] is Map &&
-          content['info']['size'] < room.client.store.maxFileSize));
+          (content['info'] is Map &&
+              content['info']['size'] < room.client.store.maxFileSize));
 
   String get sizeString {
     if (content["info"] is Map<String, dynamic> &&
diff --git a/pubspec.lock b/pubspec.lock
index e2de28e..6910ab1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -117,8 +117,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "73ed5ed093a1275f93adc946a605d46530cbdd39"
-      resolved-ref: "73ed5ed093a1275f93adc946a605d46530cbdd39"
+      ref: "4b2d4913b3e720f62698c46dfa6b17d5f0e1aa49"
+      resolved-ref: "4b2d4913b3e720f62698c46dfa6b17d5f0e1aa49"
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
@@ -254,6 +254,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.14.0+3"
+  html_unescape:
+    dependency: transitive
+    description:
+      name: html_unescape
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1+3"
   http:
     dependency: "direct main"
     description:
@@ -338,6 +345,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.11.4"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
   matcher:
     dependency: transitive
     description: