diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt b/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
index 0c222b9a98..c3f96e2a90 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
@@ -1450,14 +1450,8 @@ sealed class MsgContent {
   @Serializable(with = MsgContentSerializer::class) class MCFile(override val text: String): MsgContent()
   @Serializable(with = MsgContentSerializer::class) class MCUnknown(val type: String? = null, override val text: String, val json: JsonElement): MsgContent()
 
-  val cmdString: String get() = when (this) {
-    is MCText -> "text $text"
-    is MCLink -> "json ${json.encodeToString(this)}"
-    is MCImage -> "json ${json.encodeToString(this)}"
-    is MCVoice-> "json ${json.encodeToString(this)}"
-    is MCFile -> "json ${json.encodeToString(this)}"
-    is MCUnknown -> "json $json"
-  }
+  val cmdString: String get() =
+    if (this is MCUnknown) "json $json" else "json ${json.encodeToString(this)}"
 }
 
 @Serializable
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index 57932e320f..ba405a1805 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -1915,10 +1915,7 @@ public enum MsgContent {
     }
 
     var cmdString: String {
-        switch self {
-        case let .text(text): return "text \(text)"
-        default: return "json \(encodeJSON(self))"
-        }
+        "json \(encodeJSON(self))"
     }
 
     enum CodingKeys: String, CodingKey {