diff --git a/app/src/main/java/org/futo/circles/view/PreviewPostView.kt b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
index 9534b1430c02a7dc5d1d5df5d543503df05844f4..2d48e7f916d75c89dbce87ebe20c6d78744d2711 100644
--- a/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
+++ b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
@@ -72,11 +72,7 @@ class PreviewPostView(
             )
         }
         setOnClickListener { requestFocusOnText() }
-
-        binding.ivRemoveImage.setOnClickListener {
-            setTextContent()
-        }
-
+        binding.ivRemoveImage.setOnClickListener { setTextContent() }
         updateContentView()
 
         binding.btnSend.setOnClickListener { listener?.onSendClicked(getPostContent()) }
diff --git a/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt b/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
index 617838c4a8cd4a8891cab7ea4150e35cf4b6814a..2f2de08c3b42bfd2e7b494c1a049dcc0965d0f5a 100644
--- a/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
+++ b/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
@@ -1,11 +1,16 @@
 package org.futo.circles.core.extensions
 
 import org.futo.circles.core.model.PostContentType
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 
 
 fun TimelineEvent.getPostContentType(): PostContentType? {
-    val messageType = getLastMessageContent()?.msgType
+    val messageType = if (root.getClearType() == EventType.MESSAGE) root.getClearContent()
+        .toModel<MessageContent>()?.msgType
+    else getLastMessageContent()?.msgType
     return PostContentType.values().firstOrNull { it.typeKey == messageType }
 }
\ No newline at end of file