diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
index d13be422c..e505ead99 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -410,6 +410,20 @@ class ConversationItem(
                             chatMessage?.getNullsafeActorDisplayName()
                         )
                     }
+                } else if (MessageType.DECK_CARD == chatMessage?.getCalculateMessageType()) {
+                    return if (chatMessage?.actorId == chatMessage?.activeUser!!.userId) {
+                        String.format(
+                            sharedApplication!!.getString(R.string.nc_sent_deck_card_you),
+                            chatMessage?.messageParameters?.get("object")?.get("name")
+                        )
+                    } else {
+                        String.format(
+                            sharedApplication!!.resources.getString(R.string.nc_sent_deck_card),
+                            chatMessage?.getNullsafeActorDisplayName(),
+                            chatMessage?.messageParameters?.get("object")?.get("name")
+
+                        )
+                    }
                 }
             }
             return ""
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fb5464bcf..8c4864cfa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -407,6 +407,7 @@ How to translate with transifex:
     <string name="nc_sent_poll" formatted="true">%1$s sent a poll.</string>
     <string name="nc_sent_location" formatted="true">%1$s sent a location.</string>
     <string name="nc_sent_voice" formatted="true">%1$s sent a voice message.</string>
+    <string name="nc_sent_deck_card" formatted="true">%1$s: %2$s</string>
     <string name="nc_sent_a_gif_you">You sent a GIF.</string>
     <string name="nc_sent_an_attachment_you">You sent an attachment.</string>
     <string name="nc_sent_an_audio_you">You sent an audio.</string>
@@ -415,6 +416,7 @@ How to translate with transifex:
     <string name="nc_sent_poll_you">You sent a poll.</string>
     <string name="nc_sent_location_you">You sent a location.</string>
     <string name="nc_sent_voice_you">You sent a voice message.</string>
+    <string name="nc_sent_deck_card_you">You: %1$s</string>
     <string name="nc_formatted_message" translatable="false">%1$s: %2$s</string>
     <string name="nc_message_quote_cancel_reply">Cancel reply</string>
     <!-- When translating to German, please use non-formal variant -->