diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/BroadcastMessage.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/BroadcastMessage.kt
index 3a299de5f63..dd80acb02e7 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/BroadcastMessage.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/BroadcastMessage.kt
@@ -65,17 +65,14 @@ data class BroadcastMessage(
 
             is MessageContent.Availability -> mutableMapOf(
                 typeKey to "availability",
-                "content" to "$content",
             )
 
             is MessageContent.Cleared -> mutableMapOf(
                 typeKey to "cleared",
-                "content" to "$content",
             )
 
             is MessageContent.Reaction -> mutableMapOf(
                 typeKey to "reaction",
-                "content" to "$content",
             )
 
             is MessageContent.Receipt -> mutableMapOf(
@@ -84,8 +81,14 @@ data class BroadcastMessage(
             )
 
             MessageContent.Ignored -> mutableMapOf(
-                typeKey to "ignored",
-                "content" to "$content",
+                typeKey to "ignored"
+            )
+
+            is MessageContent.ButtonAction -> mutableMapOf(
+                typeKey to "buttonAction",
+            )
+            is MessageContent.ButtonActionConfirmation -> mutableMapOf(
+                typeKey to "buttonActionConfirmation",
             )
         }
 
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
index 82f5a0765ec..4d5ef372056 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
@@ -124,6 +124,10 @@ sealed interface Message {
                 is MessageContent.Unknown -> mutableMapOf(
                     typeKey to "unknown"
                 )
+
+                is MessageContent.Composite -> mutableMapOf(
+                    typeKey to "composite"
+                )
             }
 
             val standardProperties = mapOf(
@@ -157,6 +161,7 @@ sealed interface Message {
         override val isSelfMessage: Boolean,
         override val expirationData: ExpirationData?
     ) : Sendable {
+        @Suppress("LongMethod")
         override fun toLogString(): String {
             val typeKey = "type"
 
@@ -189,17 +194,14 @@ sealed interface Message {
 
                 is MessageContent.Availability -> mutableMapOf(
                     typeKey to "availability",
-                    "content" to "$content",
                 )
 
                 is MessageContent.Cleared -> mutableMapOf(
                     typeKey to "cleared",
-                    "content" to "$content",
                 )
 
                 is MessageContent.Reaction -> mutableMapOf(
                     typeKey to "reaction",
-                    "content" to "$content",
                 )
 
                 is MessageContent.Receipt -> mutableMapOf(
@@ -209,7 +211,15 @@ sealed interface Message {
 
                 MessageContent.Ignored -> mutableMapOf(
                     typeKey to "ignored",
-                    "content" to "$content",
+                    "content" to content.getType(),
+                )
+
+                is MessageContent.ButtonAction -> mutableMapOf(
+                    typeKey to "buttonAction"
+                )
+
+                is MessageContent.ButtonActionConfirmation -> mutableMapOf(
+                    typeKey to "buttonActionConfirmation"
                 )
             }
 
@@ -279,6 +289,7 @@ sealed interface Message {
                 MessageContent.HistoryLost -> mutableMapOf(
                     typeKey to "conversationMightLostHistory"
                 )
+
                 is MessageContent.ConversationMessageTimerChanged -> mutableMapOf(
                     typeKey to "conversationMessageTimerChanged"
                 )
@@ -294,7 +305,7 @@ sealed interface Message {
 
             val standardProperties = mapOf(
                 "id" to id.obfuscateId(),
-                "conversationId" to "${conversationId.toLogString()}",
+                "conversationId" to conversationId.toLogString(),
                 "date" to date,
                 "senderUserId" to senderUserId.value.obfuscateId(),
                 "status" to "$status",
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
index 0a89bf341cd..2ef46962b48 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
@@ -25,6 +25,7 @@ import com.wire.kalium.logic.data.message.mention.MessageMention
 import com.wire.kalium.logic.data.message.receipt.ReceiptType
 import com.wire.kalium.logic.data.user.UserAvailabilityStatus
 import com.wire.kalium.logic.data.user.UserId
+import com.wire.kalium.protobuf.messages.Button
 import kotlinx.datetime.Instant
 
 sealed class MessageContent {
@@ -163,6 +164,54 @@ sealed class MessageContent {
 
     data class Knock(val hotKnock: Boolean) : Regular()
 
+    data class Composite(
+        val textContent: Text?,
+        val buttonList: List<Button>
+    ) : Regular() {
+        data class Button(
+            val text: String,
+            val id: String,
+            val isSelected: Boolean
+        )
+    }
+
+    /**
+     * Notifies the author of a [Composite] message that a user has
+     * selected one of its buttons.
+     * @see Composite
+     * @see ButtonActionConfirmation
+     */
+    data class ButtonAction(
+        /**
+         * The ID of the original composite message.
+         */
+        val referencedMessageId: String,
+
+        /**
+         * ID of the button that was selected.
+         */
+        val buttonId: String
+    ) : Signaling()
+
+    /**
+     * Message sent by the author of a [Composite] to
+     * notify which button should be marked as selected.
+     * For example, after we send [ButtonAction], the author might reply
+     * with [ButtonActionConfirmation] to confirm that the button event was processed.
+     * @see ButtonAction
+     * @see Composite
+     */
+    data class ButtonActionConfirmation(
+        /**
+         * ID fo the original composite message
+         */
+        val referencedMessageId: String,
+        /**
+         * ID of the selected button. Null if no button should be marked as selected.
+         */
+        val buttonId: String?,
+    ) : Signaling()
+
     data class Unknown( // messages that aren't yet handled properly but stored in db in case
         val typeName: String? = null,
         val encodedData: ByteArray? = null,
@@ -253,7 +302,6 @@ fun MessageContent?.getType() = when (this) {
     is MessageContent.Knock -> "Knock"
     is MessageContent.RestrictedAsset -> "RestrictedAsset"
     is MessageContent.Text -> "Text"
-    is MessageContent.Unknown -> "Unknown"
     is MessageContent.Availability -> "Availability"
     is MessageContent.Calling -> "Calling"
     is MessageContent.Cleared -> "Cleared"
@@ -279,63 +327,69 @@ fun MessageContent?.getType() = when (this) {
     is MessageContent.MemberChange.CreationAdded -> "MemberChange.CreationAdded"
     is MessageContent.MemberChange.FailedToAdd -> "MemberChange.FailedToAdd"
     is MessageContent.MLSWrongEpochWarning -> "MLSWrongEpochWarning"
-    null -> "Unknown"
+    is MessageContent.Composite -> "Composite"
+    is MessageContent.ButtonAction -> "ButtonAction"
+    is MessageContent.ButtonActionConfirmation -> "ButtonActionConfirmation"
+    is MessageContent.Unknown -> "Unknown"
+
+    null -> "null"
 }
 
-sealed class MessagePreviewContent {
+sealed interface MessagePreviewContent {
 
-    sealed class WithUser(open val username: String?) : MessagePreviewContent() {
+    sealed interface WithUser : MessagePreviewContent {
+        val username: String?
 
-        data class Text(override val username: String?, val messageBody: String) : WithUser(username)
+        data class Text(override val username: String?, val messageBody: String) : WithUser
 
-        data class Asset(override val username: String?, val type: AssetType) : WithUser(username)
+        data class Asset(override val username: String?, val type: AssetType) : WithUser
 
-        data class MentionedSelf(override val username: String?) : WithUser(username)
+        data class MentionedSelf(override val username: String?) : WithUser
 
-        data class QuotedSelf(override val username: String?) : WithUser(username)
+        data class QuotedSelf(override val username: String?) : WithUser
 
-        data class Knock(override val username: String?) : WithUser(username)
+        data class Knock(override val username: String?) : WithUser
 
-        data class MemberLeft(override val username: String?) : WithUser(username)
+        data class MemberLeft(override val username: String?) : WithUser
 
-        data class MemberJoined(override val username: String?) : WithUser(username)
+        data class MemberJoined(override val username: String?) : WithUser
 
         data class MembersAdded(
-            val senderName: String?,
+            override val username: String?,
             val isSelfUserAdded: Boolean,
             val otherUserIdList: List<UserId> // TODO add usernames
-        ) : WithUser(senderName)
+        ) : WithUser
 
         data class MembersRemoved(
-            val senderName: String?,
+            override val username: String?,
             val isSelfUserRemoved: Boolean,
             val otherUserIdList: List<UserId> // TODO add usernames
-        ) : WithUser(senderName)
+        ) : WithUser
 
         data class MembersFailedToAdd(
-            val senderName: String?,
+            override val username: String?,
             val isSelfUserRemoved: Boolean,
             val otherUserIdList: List<UserId> // TODO add usernames
-        ) : WithUser(senderName)
+        ) : WithUser
 
         data class MembersCreationAdded(
-            val senderName: String?,
+            override val username: String?,
             val isSelfUserRemoved: Boolean,
             val otherUserIdList: List<UserId> // TODO add usernames
-        ) : WithUser(senderName)
+        ) : WithUser
 
-        data class ConversationNameChange(val adminName: String?) : WithUser(adminName)
+        data class ConversationNameChange(override val username: String?) : WithUser
 
-        data class TeamMemberRemoved(val userName: String?) : WithUser(userName)
+        data class TeamMemberRemoved(override val username: String?) : WithUser
 
-        data class MissedCall(override val username: String?) : WithUser(username)
+        data class MissedCall(override val username: String?) : WithUser
 
     }
 
-    data class Ephemeral(val isGroupConversation: Boolean) : MessagePreviewContent()
+    data class Ephemeral(val isGroupConversation: Boolean) : MessagePreviewContent
 
-    object CryptoSessionReset : MessagePreviewContent()
+    object CryptoSessionReset : MessagePreviewContent
 
-    object Unknown : MessagePreviewContent()
+    object Unknown : MessagePreviewContent
 
 }
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
index 3faf72caa2f..4604b16750f 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
@@ -32,6 +32,7 @@ import com.wire.kalium.logic.data.notification.LocalNotificationMessageAuthor
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.di.MapperProvider
 import com.wire.kalium.persistence.dao.message.AssetTypeEntity
+import com.wire.kalium.persistence.dao.message.ButtonEntity
 import com.wire.kalium.persistence.dao.message.DeliveryStatusEntity
 import com.wire.kalium.persistence.dao.message.MessageEntity
 import com.wire.kalium.persistence.dao.message.MessageEntityContent
@@ -52,6 +53,7 @@ interface MessageMapper {
     fun toMessageEntityContent(regularMessage: MessageContent.Regular): MessageEntityContent.Regular
 }
 
+@Suppress("TooManyFunctions")
 class MessageMapperImpl(
     private val selfUserId: UserId,
     private val messageMentionMapper: MessageMentionMapper = MapperProvider.messageMentionMapper(selfUserId),
@@ -259,17 +261,13 @@ class MessageMapperImpl(
             MessageEntity.ContentType.CONVERSATION_MESSAGE_TIMER_CHANGED -> null
             MessageEntity.ContentType.CONVERSATION_CREATED -> null
             MessageEntity.ContentType.MLS_WRONG_EPOCH_WARNING -> null
+            MessageEntity.ContentType.COMPOSITE -> null
         }
     }
 
     @Suppress("ComplexMethod")
     override fun toMessageEntityContent(regularMessage: MessageContent.Regular): MessageEntityContent.Regular = when (regularMessage) {
-        is MessageContent.Text -> MessageEntityContent.Text(
-            messageBody = regularMessage.value,
-            mentions = regularMessage.mentions.map { messageMentionMapper.fromModelToDao(it) },
-            quotedMessageId = regularMessage.quotedMessageReference?.quotedMessageId,
-            isQuoteVerified = regularMessage.quotedMessageReference?.isVerified,
-        )
+        is MessageContent.Text -> toTextEntity(regularMessage)
 
         is MessageContent.Asset -> with(regularMessage.value) {
             val assetWidth = when (metadata) {
@@ -326,8 +324,23 @@ class MessageMapperImpl(
         // We don't care about the content of these messages as they are only used to perform other actions, i.e. update the content of a
         // previously stored message, delete the content of a previously stored message, etc... Therefore, we map their content to Unknown
         is MessageContent.Knock -> MessageEntityContent.Knock(hotKnock = regularMessage.hotKnock)
+        is MessageContent.Composite -> MessageEntityContent.Composite(
+            text = regularMessage.textContent?.let(this::toTextEntity),
+            buttonList = regularMessage.buttonList.map { ButtonEntity(
+                id = it.id,
+                text = it.text,
+                isSelected = it.isSelected
+            ) },
+        )
     }
 
+    private fun toTextEntity(textContent: MessageContent.Text): MessageEntityContent.Text = MessageEntityContent.Text(
+        messageBody = textContent.value,
+        mentions = textContent.mentions.map(messageMentionMapper::fromModelToDao),
+        quotedMessageId = textContent.quotedMessageReference?.quotedMessageId,
+        isQuoteVerified = textContent.quotedMessageReference?.isVerified,
+    )
+
     @Suppress("ComplexMethod")
     private fun MessageContent.System.toMessageEntityContent(): MessageEntityContent.System = when (this) {
         is MessageContent.MemberChange -> {
@@ -404,6 +417,17 @@ class MessageMapperImpl(
             this.senderUserId.toModel(),
             ClientId(this.senderClientId.orEmpty())
         )
+
+        is MessageEntityContent.Composite -> MessageContent.Composite(
+            this.text?.toMessageContent(hidden) as MessageContent.Text,
+            this.buttonList.map {
+                MessageContent.Composite.Button(
+                    text = it.text,
+                    id = it.id,
+                    isSelected = it.isSelected
+                )
+            }
+        )
     }
 
     private fun quotedContentFromEntity(it: MessageEntityContent.Text.QuotedMessage) = when {
@@ -467,25 +491,25 @@ private fun MessagePreviewEntityContent.toMessageContent(): MessagePreviewConten
     is MessagePreviewEntityContent.MemberJoined -> MessagePreviewContent.WithUser.MemberJoined(senderName)
     is MessagePreviewEntityContent.MemberLeft -> MessagePreviewContent.WithUser.MemberLeft(senderName)
     is MessagePreviewEntityContent.MembersAdded -> MessagePreviewContent.WithUser.MembersAdded(
-        senderName = senderName,
+        username = senderName,
         isSelfUserAdded = isContainSelfUserId,
         otherUserIdList = otherUserIdList.map { it.toModel() }
     )
 
     is MessagePreviewEntityContent.MembersRemoved -> MessagePreviewContent.WithUser.MembersRemoved(
-        senderName = senderName,
+        username = senderName,
         isSelfUserRemoved = isContainSelfUserId,
         otherUserIdList = otherUserIdList.map { it.toModel() }
     )
 
     is MessagePreviewEntityContent.MembersCreationAdded -> MessagePreviewContent.WithUser.MembersCreationAdded(
-        senderName = senderName,
+        username = senderName,
         isSelfUserRemoved = isContainSelfUserId,
         otherUserIdList = otherUserIdList.map { it.toModel() }
     )
 
     is MessagePreviewEntityContent.MembersFailedToAdded -> MessagePreviewContent.WithUser.MembersFailedToAdd(
-        senderName = senderName,
+        username = senderName,
         isSelfUserRemoved = isContainSelfUserId,
         otherUserIdList = otherUserIdList.map { it.toModel() }
     )
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt
index 5c2ceecc6b5..db516bdc31c 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt
@@ -97,5 +97,8 @@ internal class PersistMessageUseCaseImpl(
             is MessageContent.MemberChange.FailedToAdd -> false
             is MessageContent.ConversationCreated -> false
             is MessageContent.MLSWrongEpochWarning -> false
+            is MessageContent.Composite -> true
+            is MessageContent.ButtonAction -> false
+            is MessageContent.ButtonActionConfirmation -> false
         }
 }
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt
index 2e68d617b2c..1270a468a79 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt
@@ -31,9 +31,11 @@ import com.wire.kalium.logic.kaliumLogger
 import com.wire.kalium.protobuf.decodeFromByteArray
 import com.wire.kalium.protobuf.encodeToByteArray
 import com.wire.kalium.protobuf.messages.Asset
+import com.wire.kalium.protobuf.messages.Button
 import com.wire.kalium.protobuf.messages.Calling
 import com.wire.kalium.protobuf.messages.Cleared
 import com.wire.kalium.protobuf.messages.ClientAction
+import com.wire.kalium.protobuf.messages.Composite
 import com.wire.kalium.protobuf.messages.Confirmation
 import com.wire.kalium.protobuf.messages.Ephemeral
 import com.wire.kalium.protobuf.messages.External
@@ -117,11 +119,41 @@ class ProtoContentMapperImpl(
             is MessageContent.TextEdited -> packEdited(readableContent)
             is MessageContent.FailedDecryption, is MessageContent.RestrictedAsset, is MessageContent.Unknown, MessageContent.Ignored ->
                 throw IllegalArgumentException(
-                    "Unexpected message content type: $readableContent"
+                    "Unexpected message content type: ${readableContent.getType()}"
                 )
+
+            is MessageContent.Composite -> packComposite(readableContent, expectsReadConfirmation)
+
+            is MessageContent.ButtonActionConfirmation -> TODO()
+            is MessageContent.ButtonAction -> TODO()
         }
     }
 
+    private fun packComposite(
+        readableContent: MessageContent.Composite,
+        expectsReadConfirmation: Boolean
+    ): GenericMessage.Content.Composite {
+        val items: MutableList<Composite.Item> = mutableListOf()
+
+        readableContent.textContent?.let {
+            val text = packText(it, expectsReadConfirmation)
+            Composite.Item.Content.Text(text.value).also {
+                items.add(Composite.Item(it))
+            }
+        }
+        packButtonList(readableContent.buttonList).also {
+            items.addAll(it)
+        }
+
+        val composite = GenericMessage.Content.Composite(
+            Composite(
+                items = items,
+                expectsReadConfirmation = expectsReadConfirmation
+            )
+        )
+        return composite
+    }
+
     private fun mapEphemeralContent(
         readableContent: MessageContent.FromProto,
         expireAfterMillis: Long,
@@ -162,6 +194,9 @@ class ProtoContentMapperImpl(
             is MessageContent.LastRead,
             is MessageContent.Reaction,
             is MessageContent.Receipt,
+            is MessageContent.Composite,
+            is MessageContent.ButtonAction,
+            is MessageContent.ButtonActionConfirmation,
             is MessageContent.TextEdited -> throw IllegalArgumentException(
                 "Unexpected message content type: ${readableContent.getType()}"
             )
@@ -211,7 +246,7 @@ class ProtoContentMapperImpl(
         val typeName = genericMessage.content?.value?.let { it as? pbandk.Message }?.descriptor?.name
 
         val readableContent = when (val protoContent = genericMessage.content) {
-            is GenericMessage.Content.Text -> unpackText(protoContent)
+            is GenericMessage.Content.Text -> unpackText(protoContent.value)
             is GenericMessage.Content.Asset -> unpackAsset(protoContent)
             is GenericMessage.Content.Availability -> MessageContent.Availability(
                 availabilityMapper.fromProtoAvailabilityToModel(
@@ -219,12 +254,21 @@ class ProtoContentMapperImpl(
                 )
             )
 
-            is GenericMessage.Content.ButtonAction -> MessageContent.Unknown(typeName, encodedContent.data, true)
-            is GenericMessage.Content.ButtonActionConfirmation -> MessageContent.Unknown(typeName, encodedContent.data, true)
+            is GenericMessage.Content.Composite -> unpackComposite(protoContent)
+
+            is GenericMessage.Content.ButtonAction -> MessageContent.ButtonAction(
+                buttonId = protoContent.value.buttonId,
+                referencedMessageId = protoContent.value.referenceMessageId
+            )
+
+            is GenericMessage.Content.ButtonActionConfirmation -> MessageContent.ButtonActionConfirmation(
+                referencedMessageId = protoContent.value.referenceMessageId,
+                buttonId = protoContent.value.buttonId
+            )
+
             is GenericMessage.Content.Calling -> unpackCalling(protoContent)
             is GenericMessage.Content.Cleared -> unpackCleared(protoContent)
             is GenericMessage.Content.ClientAction -> MessageContent.ClientAction
-            is GenericMessage.Content.Composite -> MessageContent.Unknown(typeName, encodedContent.data)
             is GenericMessage.Content.Confirmation -> unpackReceipt(protoContent)
             is GenericMessage.Content.DataTransfer -> MessageContent.Ignored
             is GenericMessage.Content.Deleted -> MessageContent.DeleteMessage(protoContent.value.messageId)
@@ -241,6 +285,7 @@ class ProtoContentMapperImpl(
                 kaliumLogger.w("External content when parsing protobuf. Message UUID = ${genericMessage.messageId.obfuscateId()}")
                 MessageContent.Ignored
             }
+
             null -> {
                 kaliumLogger.w("Null content when parsing protobuf. Message UUID = ${genericMessage.messageId.obfuscateId()}")
                 MessageContent.Ignored
@@ -420,10 +465,21 @@ class ProtoContentMapperImpl(
         )
     }
 
-    private fun unpackText(protoContent: GenericMessage.Content.Text) = MessageContent.Text(
-        value = protoContent.value.content,
-        mentions = protoContent.value.mentions.mapNotNull { messageMentionMapper.fromProtoToModel(it) },
-        quotedMessageReference = protoContent.value.quote?.let {
+    private fun packButtonList(buttonList: List<MessageContent.Composite.Button>): List<Composite.Item> = buttonList.map {
+        Composite.Item(
+            Composite.Item.Content.Button(
+                button = Button(
+                    text = it.text,
+                    id = it.id
+                )
+            )
+        )
+    }
+
+    private fun unpackText(protoContent: Text) = MessageContent.Text(
+        value = protoContent.content,
+        mentions = protoContent.mentions.mapNotNull { messageMentionMapper.fromProtoToModel(it) },
+        quotedMessageReference = protoContent.quote?.let {
             MessageContent.QuoteReference(
                 quotedMessageId = it.quotedMessageId, quotedMessageSha256 = it.quotedMessageSha256?.array, isVerified = false
             )
@@ -431,6 +487,17 @@ class ProtoContentMapperImpl(
         quotedMessageDetails = null
     )
 
+    private fun unpackButtonList(compositeItemList: List<Composite.Item>): List<MessageContent.Composite.Button> =
+        compositeItemList.mapNotNull {
+            it.button?.let { button ->
+                MessageContent.Composite.Button(
+                    text = button.text,
+                    id = button.id,
+                    isSelected = false
+                )
+            }
+        }
+
     private fun packAsset(readableContent: MessageContent.Asset, expectsReadConfirmation: Boolean): GenericMessage.Content.Asset {
         return GenericMessage.Content.Asset(
             asset = assetMapper.fromAssetContentToProtoAssetMessage(
@@ -453,7 +520,7 @@ class ProtoContentMapperImpl(
                         expectsReadConfirmation = ephemeralContent.value.expectsReadConfirmation
                     )
                 )
-                unpackText(genericMessageTextContent)
+                unpackText(genericMessageTextContent.value)
             }
 
             is Ephemeral.Content.Asset -> {
@@ -492,6 +559,18 @@ class ProtoContentMapperImpl(
         )
     }
 
+    private fun unpackComposite(protoContent: GenericMessage.Content.Composite): MessageContent.Composite {
+        val text = protoContent.value.items.firstNotNullOfOrNull { item ->
+            item.text
+        }?.let(::unpackText)
+        val buttonList = unpackButtonList(protoContent.value.items)
+
+        return MessageContent.Composite(
+            textContent = text,
+            buttonList = buttonList
+        )
+    }
+
     private fun extractConversationId(
         qualifiedConversationID: QualifiedConversationId?,
         unqualifiedConversationID: String
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/PersistMigratedMessagesUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/PersistMigratedMessagesUseCase.kt
index 04850818179..3c9ea1bf872 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/PersistMigratedMessagesUseCase.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/PersistMigratedMessagesUseCase.kt
@@ -192,5 +192,8 @@ internal class PersistMigratedMessagesUseCaseImpl(
         MessageContent.Ignored -> MessageEntity.Visibility.HIDDEN
         is MessageContent.Reaction -> MessageEntity.Visibility.HIDDEN
         is MessageContent.Receipt -> MessageEntity.Visibility.HIDDEN
+        is MessageContent.Composite -> MessageEntity.Visibility.VISIBLE
+        is MessageContent.ButtonAction -> MessageEntity.Visibility.HIDDEN
+        is MessageContent.ButtonActionConfirmation -> MessageEntity.Visibility.HIDDEN
     }
 }
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ApplicationMessageHandler.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ApplicationMessageHandler.kt
index 551d3eb2481..36051bc1f45 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ApplicationMessageHandler.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/ApplicationMessageHandler.kt
@@ -88,7 +88,7 @@ internal class ApplicationMessageHandlerImpl(
 
     private val logger by lazy { kaliumLogger.withFeatureId(ApplicationFlow.EVENT_RECEIVER) }
 
-    @Suppress("ComplexMethod")
+    @Suppress("ComplexMethod", "LongMethod")
     override suspend fun handleContent(
         conversationId: ConversationId,
         timestampIso: String,
@@ -111,6 +111,7 @@ internal class ApplicationMessageHandlerImpl(
                     is MessageContent.FailedDecryption -> Message.Visibility.VISIBLE
                     is MessageContent.LastRead -> Message.Visibility.HIDDEN
                     is MessageContent.Cleared -> Message.Visibility.HIDDEN
+                    is MessageContent.Composite -> Message.Visibility.VISIBLE
                 }
                 val message = Message.Regular(
                     id = content.messageUid,
@@ -200,6 +201,8 @@ internal class ApplicationMessageHandlerImpl(
             is MessageContent.LastRead -> lastReadContentHandler.handle(signaling, content)
             is MessageContent.Cleared -> clearConversationContentHandler.handle(signaling, content)
             is MessageContent.Receipt -> receiptMessageHandler.handle(signaling, content)
+            is MessageContent.ButtonAction -> TODO()
+            is MessageContent.ButtonActionConfirmation -> TODO()
         }
     }
 
@@ -213,10 +216,13 @@ internal class ApplicationMessageHandlerImpl(
             is MessageContent.RestrictedAsset -> {
                 /* no-op */
             }
+
             is MessageContent.Unknown -> {
                 logger.i(message = "Unknown Message received: { \"message\" : ${message.toLogString()} }")
                 persistMessage(message)
             }
+
+            is MessageContent.Composite -> persistMessage(message)
         }
     }
 
diff --git a/persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessageDetailsView.sq b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessageDetailsView.sq
new file mode 100644
index 00000000000..90e5d7e7d41
--- /dev/null
+++ b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessageDetailsView.sq
@@ -0,0 +1,153 @@
+import com.wire.kalium.persistence.dao.QualifiedIDEntity;
+import com.wire.kalium.persistence.dao.message.MessageEntity.ContentType;
+import com.wire.kalium.persistence.dao.message.MessageEntity.MemberChangeType;
+import com.wire.kalium.persistence.dao.message.MessageEntity;
+import com.wire.kalium.persistence.dao.message.MessageEntityContent;
+import com.wire.kalium.persistence.dao.message.RecipientFailureTypeEntity;
+import kotlin.Boolean;
+import kotlin.Int;
+import kotlin.collections.List;
+import kotlinx.datetime.Instant;
+
+CREATE VIEW IF NOT EXISTS MessageDetailsView
+AS SELECT
+Message.id AS id,
+Message.conversation_id AS conversationId,
+Message.content_type AS contentType,
+Message.creation_date AS date,
+Message.sender_user_id AS senderUserId,
+Message.sender_client_id AS senderClientId,
+Message.status AS status,
+Message.last_edit_date AS lastEditTimestamp,
+Message.visibility AS visibility,
+Message.expects_read_confirmation AS expectsReadConfirmation,
+Message.expire_after_millis AS expireAfterMillis,
+Message.self_deletion_start_date AS selfDeletionStartDate,
+User.name AS senderName,
+User.handle AS senderHandle,
+User.email AS senderEmail,
+User.phone AS senderPhone,
+User.accent_id AS senderAccentId,
+User.team AS senderTeamId,
+User.connection_status AS senderConnectionStatus,
+User.preview_asset_id AS senderPreviewAssetId,
+User.complete_asset_id AS senderCompleteAssetId,
+User.user_availability_status AS senderAvailabilityStatus,
+User.user_type AS senderUserType,
+User.bot_service AS senderBotService,
+User.deleted AS senderIsDeleted,
+(Message.sender_user_id == SelfUser.id) AS isSelfMessage,
+TextContent.text_body AS text,
+TextContent.is_quoting_self AS isQuotingSelfUser,
+AssetContent.asset_size AS assetSize,
+AssetContent.asset_name AS assetName,
+AssetContent.asset_mime_type AS assetMimeType,
+AssetContent.asset_upload_status AS assetUploadStatus,
+AssetContent.asset_download_status AS assetDownloadStatus,
+AssetContent.asset_otr_key AS assetOtrKey,
+AssetContent.asset_sha256 AS assetSha256,
+AssetContent.asset_id AS assetId,
+AssetContent.asset_token AS assetToken,
+AssetContent.asset_domain AS assetDomain,
+AssetContent.asset_encryption_algorithm AS assetEncryptionAlgorithm,
+AssetContent.asset_width AS assetWidth,
+AssetContent.asset_height AS assetHeight,
+AssetContent.asset_duration_ms AS assetDuration,
+AssetContent.asset_normalized_loudness AS assetNormalizedLoudness,
+MissedCallContent.caller_id AS callerId,
+MemberChangeContent.member_change_list AS memberChangeList,
+MemberChangeContent.member_change_type AS memberChangeType,
+UnknownContent.unknown_type_name AS unknownContentTypeName,
+UnknownContent.unknown_encoded_data AS unknownContentData,
+RestrictedAssetContent.asset_mime_type AS restrictedAssetMimeType,
+RestrictedAssetContent.asset_size AS restrictedAssetSize,
+RestrictedAssetContent.asset_name AS restrictedAssetName,
+FailedToDecryptContent.unknown_encoded_data AS failedToDecryptData,
+FailedToDecryptContent.is_decryption_resolved AS isDecryptionResolved,
+ConversationNameChangedContent.conversation_name AS conversationName,
+'{' || IFNULL(
+    (SELECT GROUP_CONCAT('"' || emoji || '":' || count)
+    FROM (
+        SELECT COUNT(*) count, Reaction.emoji emoji
+        FROM Reaction
+        WHERE Reaction.message_id = Message.id
+        AND Reaction.conversation_id = Message.conversation_id
+        GROUP BY Reaction.emoji
+    )),
+    '')
+|| '}' AS allReactionsJson,
+IFNULL(
+    (SELECT '[' || GROUP_CONCAT('"' || Reaction.emoji || '"') || ']'
+    FROM Reaction
+    WHERE Reaction.message_id = Message.id
+        AND Reaction.conversation_id = Message.conversation_id
+        AND Reaction.sender_id = SelfUser.id
+    ),
+    '[]'
+) AS selfReactionsJson,
+IFNULL(
+    (SELECT '[' || GROUP_CONCAT(
+        '{"start":' || start || ', "length":' || length ||
+        ', "userId":{"value":"' || replace(substr(user_id, 0, instr(user_id, '@')), '@', '') || '"' ||
+        ',"domain":"' || replace(substr(user_id, instr(user_id, '@')+1, length(user_id)), '@', '') || '"' ||
+        '}' || '}') || ']'
+    FROM MessageMention
+    WHERE MessageMention.message_id = Message.id
+        AND MessageMention.conversation_id = Message.conversation_id
+    ),
+    '[]'
+) AS mentions,
+TextContent.quoted_message_id AS quotedMessageId,
+QuotedMessage.sender_user_id AS quotedSenderId,
+TextContent.is_quote_verified AS isQuoteVerified,
+QuotedSender.name AS quotedSenderName,
+QuotedMessage.creation_date AS quotedMessageDateTime,
+QuotedMessage.last_edit_date AS quotedMessageEditTimestamp,
+QuotedMessage.visibility AS quotedMessageVisibility,
+QuotedMessage.content_type AS quotedMessageContentType,
+QuotedTextContent.text_body AS quotedTextBody,
+QuotedAssetContent.asset_mime_type AS quotedAssetMimeType,
+QuotedAssetContent.asset_name AS quotedAssetName,
+
+NewConversationReceiptMode.receipt_mode AS newConversationReceiptMode,
+
+ConversationReceiptModeChanged.receipt_mode AS conversationReceiptModeChanged,
+ConversationTimerChangedContent.message_timer AS messageTimerChanged,
+FailedRecipientsWithNoClients.recipient_failure_list AS recipientsFailedWithNoClientsList,
+FailedRecipientsDeliveryFailed.recipient_failure_list AS recipientsFailedDeliveryList,
+
+IFNULL(
+    (SELECT '[' ||
+            GROUP_CONCAT('{"text":"' || text || '", "id":"' || id || '""is_selected":' || is_selected || '}')
+        || ']'
+    FROM ButtonContent
+    WHERE ButtonContent.message_id = Message.id
+        AND ButtonContent.conversation_id = Message.conversation_id
+    ),
+    '[]'
+) AS buttonsJson
+
+FROM Message
+JOIN User ON Message.sender_user_id = User.qualified_id
+LEFT JOIN MessageTextContent AS TextContent ON Message.id = TextContent.message_id AND Message.conversation_id = TextContent.conversation_id
+LEFT JOIN MessageAssetContent AS AssetContent ON Message.id = AssetContent.message_id AND Message.conversation_id = AssetContent.conversation_id
+LEFT JOIN MessageMissedCallContent AS MissedCallContent ON Message.id = MissedCallContent.message_id AND Message.conversation_id = MissedCallContent.conversation_id
+LEFT JOIN MessageMemberChangeContent AS MemberChangeContent ON Message.id = MemberChangeContent.message_id AND Message.conversation_id = MemberChangeContent.conversation_id
+LEFT JOIN MessageUnknownContent AS UnknownContent ON Message.id = UnknownContent.message_id AND Message.conversation_id = UnknownContent.conversation_id
+LEFT JOIN MessageRestrictedAssetContent AS RestrictedAssetContent ON Message.id = RestrictedAssetContent.message_id AND RestrictedAssetContent.conversation_id = RestrictedAssetContent.conversation_id
+LEFT JOIN MessageFailedToDecryptContent AS FailedToDecryptContent ON Message.id = FailedToDecryptContent.message_id AND Message.conversation_id = FailedToDecryptContent.conversation_id
+LEFT JOIN MessageConversationChangedContent AS ConversationNameChangedContent ON Message.id = ConversationNameChangedContent.message_id AND Message.conversation_id = ConversationNameChangedContent.conversation_id
+LEFT JOIN MessageRecipientFailure AS FailedRecipientsWithNoClients ON Message.id = FailedRecipientsWithNoClients.message_id AND Message.conversation_id = FailedRecipientsWithNoClients.conversation_id AND FailedRecipientsWithNoClients.recipient_failure_type = 'NO_CLIENTS_TO_DELIVER'
+LEFT JOIN MessageRecipientFailure AS FailedRecipientsDeliveryFailed ON Message.id = FailedRecipientsDeliveryFailed.message_id AND Message.conversation_id = FailedRecipientsDeliveryFailed.conversation_id AND FailedRecipientsDeliveryFailed.recipient_failure_type = 'MESSAGE_DELIVERY_FAILED'
+
+-- joins for quoted messages
+LEFT JOIN Message AS QuotedMessage ON QuotedMessage.id = TextContent.quoted_message_id AND QuotedMessage.conversation_id = TextContent.conversation_id
+LEFT JOIN User AS QuotedSender ON QuotedMessage.sender_user_id = QuotedSender.qualified_id
+LEFT JOIN MessageTextContent AS QuotedTextContent ON QuotedTextContent.message_id = QuotedMessage.id AND QuotedMessage.conversation_id = TextContent.conversation_id
+LEFT JOIN MessageAssetContent AS QuotedAssetContent ON QuotedAssetContent.message_id = QuotedMessage.id AND QuotedMessage.conversation_id = TextContent.conversation_id
+-- end joins for quoted messages
+LEFT JOIN MessageNewConversationReceiptModeContent AS NewConversationReceiptMode ON Message.id = NewConversationReceiptMode.message_id AND Message.conversation_id = NewConversationReceiptMode.conversation_id
+LEFT JOIN MessageConversationReceiptModeChangedContent AS ConversationReceiptModeChanged ON Message.id = ConversationReceiptModeChanged.message_id AND Message.conversation_id = ConversationReceiptModeChanged.conversation_id
+LEFT JOIN MessageConversationTimerChangedContent AS ConversationTimerChangedContent ON Message.id = ConversationTimerChangedContent.message_id AND Message.conversation_id = ConversationTimerChangedContent.conversation_id
+LEFT JOIN SelfUser;
+-- TODO: Remove IFNULL functions above if we can force SQLDelight to not unpack as notnull
diff --git a/persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessagePreview.sq b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessagePreview.sq
new file mode 100644
index 00000000000..4a5a38dc7fc
--- /dev/null
+++ b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessagePreview.sq
@@ -0,0 +1,46 @@
+import com.wire.kalium.persistence.dao.QualifiedIDEntity;
+import com.wire.kalium.persistence.dao.message.MessageEntity.ContentType;
+import com.wire.kalium.persistence.dao.message.MessageEntity.MemberChangeType;
+import com.wire.kalium.persistence.dao.message.MessageEntity;
+import com.wire.kalium.persistence.dao.message.MessageEntityContent;
+import com.wire.kalium.persistence.dao.message.RecipientFailureTypeEntity;
+import kotlin.Boolean;
+import kotlin.Int;
+import kotlin.collections.List;
+import kotlinx.datetime.Instant;
+
+CREATE VIEW IF NOT EXISTS MessagePreview
+AS SELECT
+    Message.id AS id,
+    Message.conversation_id AS conversationId,
+    Message.content_type AS contentType,
+    Message.creation_date AS date,
+    Message.visibility AS visibility,
+    Message.sender_user_id AS senderUserId,
+    (Message.expire_after_millis IS NOT NULL) AS isEphemeral,
+    User.name AS senderName,
+    User.connection_status AS senderConnectionStatus,
+    User.deleted AS senderIsDeleted,
+    SelfUser.id AS selfUserId,
+    (Message.sender_user_id == SelfUser.id) AS isSelfMessage,
+    MemberChangeContent.member_change_list AS memberChangeList,
+    MemberChangeContent.member_change_type AS memberChangeType,
+    ConversationNameChangedContent.conversation_name AS updateConversationName,
+    Conversation.name AS conversationName,
+    (Mention.user_id IS NOT NULL) AS isMentioningSelfUser,
+    TextContent.is_quoting_self AS isQuotingSelfUser,
+    TextContent.text_body AS text,
+    AssetContent.asset_mime_type AS assetMimeType,
+    (Message.creation_date > Conversation.last_read_date) AS isUnread,
+    IFNULL((Message.creation_date > IFNULL(Conversation.last_notified_date, 0)), FALSE) AS shouldNotify,
+    Conversation.muted_status AS mutedStatus,
+    Conversation.type AS conversationType
+FROM Message
+LEFT JOIN SelfUser
+LEFT JOIN User ON Message.sender_user_id = User.qualified_id
+LEFT JOIN Conversation AS Conversation ON Message.conversation_id == Conversation.qualified_id
+LEFT JOIN MessageMemberChangeContent AS MemberChangeContent ON Message.id = MemberChangeContent.message_id AND Message.conversation_id = MemberChangeContent.conversation_id
+LEFT JOIN MessageMention AS Mention ON Message.id == Mention.message_id AND SelfUser.id == Mention.user_id
+LEFT JOIN MessageConversationChangedContent AS ConversationNameChangedContent ON Message.id = ConversationNameChangedContent.message_id AND Message.conversation_id = ConversationNameChangedContent.conversation_id
+LEFT JOIN MessageAssetContent AS AssetContent ON Message.id = AssetContent.message_id AND Message.conversation_id = AssetContent.conversation_id
+LEFT JOIN MessageTextContent AS TextContent ON Message.id = TextContent.message_id AND Message.conversation_id = TextContent.conversation_id;
diff --git a/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Messages.sq b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Messages.sq
index bd2b897bd53..2acbf861e75 100644
--- a/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Messages.sq
+++ b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Messages.sq
@@ -198,171 +198,6 @@ CREATE TABLE MessageRecipientFailure (
       PRIMARY KEY (message_id, conversation_id, recipient_failure_type)
 );
 
-CREATE VIEW IF NOT EXISTS MessageDetailsView
-AS SELECT
-Message.id AS id,
-Message.conversation_id AS conversationId,
-Message.content_type AS contentType,
-Message.creation_date AS date,
-Message.sender_user_id AS senderUserId,
-Message.sender_client_id AS senderClientId,
-Message.status AS status,
-Message.last_edit_date AS lastEditTimestamp,
-Message.visibility AS visibility,
-Message.expects_read_confirmation AS expectsReadConfirmation,
-Message.expire_after_millis AS expireAfterMillis,
-Message.self_deletion_start_date AS selfDeletionStartDate,
-User.name AS senderName,
-User.handle AS senderHandle,
-User.email AS senderEmail,
-User.phone AS senderPhone,
-User.accent_id AS senderAccentId,
-User.team AS senderTeamId,
-User.connection_status AS senderConnectionStatus,
-User.preview_asset_id AS senderPreviewAssetId,
-User.complete_asset_id AS senderCompleteAssetId,
-User.user_availability_status AS senderAvailabilityStatus,
-User.user_type AS senderUserType,
-User.bot_service AS senderBotService,
-User.deleted AS senderIsDeleted,
-(Message.sender_user_id == SelfUser.id) AS isSelfMessage,
-TextContent.text_body AS text,
-TextContent.is_quoting_self AS isQuotingSelfUser,
-AssetContent.asset_size AS assetSize,
-AssetContent.asset_name AS assetName,
-AssetContent.asset_mime_type AS assetMimeType,
-AssetContent.asset_upload_status AS assetUploadStatus,
-AssetContent.asset_download_status AS assetDownloadStatus,
-AssetContent.asset_otr_key AS assetOtrKey,
-AssetContent.asset_sha256 AS assetSha256,
-AssetContent.asset_id AS assetId,
-AssetContent.asset_token AS assetToken,
-AssetContent.asset_domain AS assetDomain,
-AssetContent.asset_encryption_algorithm AS assetEncryptionAlgorithm,
-AssetContent.asset_width AS assetWidth,
-AssetContent.asset_height AS assetHeight,
-AssetContent.asset_duration_ms AS assetDuration,
-AssetContent.asset_normalized_loudness AS assetNormalizedLoudness,
-MissedCallContent.caller_id AS callerId,
-MemberChangeContent.member_change_list AS memberChangeList,
-MemberChangeContent.member_change_type AS memberChangeType,
-UnknownContent.unknown_type_name AS unknownContentTypeName,
-UnknownContent.unknown_encoded_data AS unknownContentData,
-RestrictedAssetContent.asset_mime_type AS restrictedAssetMimeType,
-RestrictedAssetContent.asset_size AS restrictedAssetSize,
-RestrictedAssetContent.asset_name AS restrictedAssetName,
-FailedToDecryptContent.unknown_encoded_data AS failedToDecryptData,
-FailedToDecryptContent.is_decryption_resolved AS isDecryptionResolved,
-ConversationNameChangedContent.conversation_name AS conversationName,
-'{' || IFNULL(
-    (SELECT GROUP_CONCAT('"' || emoji || '":' || count)
-    FROM (
-        SELECT COUNT(*) count, Reaction.emoji emoji
-        FROM Reaction
-        WHERE Reaction.message_id = Message.id
-        AND Reaction.conversation_id = Message.conversation_id
-        GROUP BY Reaction.emoji
-    )),
-    '')
-|| '}' AS allReactionsJson,
-IFNULL(
-    (SELECT '[' || GROUP_CONCAT('"' || Reaction.emoji || '"') || ']'
-    FROM Reaction
-    WHERE Reaction.message_id = Message.id
-        AND Reaction.conversation_id = Message.conversation_id
-        AND Reaction.sender_id = SelfUser.id
-    ),
-    '[]'
-) AS selfReactionsJson,
-IFNULL(
-    (SELECT '[' || GROUP_CONCAT(
-        '{"start":' || start || ', "length":' || length ||
-        ', "userId":{"value":"' || replace(substr(user_id, 0, instr(user_id, '@')), '@', '') || '"' ||
-        ',"domain":"' || replace(substr(user_id, instr(user_id, '@')+1, length(user_id)), '@', '') || '"' ||
-        '}' || '}') || ']'
-    FROM MessageMention
-    WHERE MessageMention.message_id = Message.id
-        AND MessageMention.conversation_id = Message.conversation_id
-    ),
-    '[]'
-) AS mentions,
-TextContent.quoted_message_id AS quotedMessageId,
-QuotedMessage.sender_user_id AS quotedSenderId,
-TextContent.is_quote_verified AS isQuoteVerified,
-QuotedSender.name AS quotedSenderName,
-QuotedMessage.creation_date AS quotedMessageDateTime,
-QuotedMessage.last_edit_date AS quotedMessageEditTimestamp,
-QuotedMessage.visibility AS quotedMessageVisibility,
-QuotedMessage.content_type AS quotedMessageContentType,
-QuotedTextContent.text_body AS quotedTextBody,
-QuotedAssetContent.asset_mime_type AS quotedAssetMimeType,
-QuotedAssetContent.asset_name AS quotedAssetName,
-NewConversationReceiptMode.receipt_mode AS newConversationReceiptMode,
-ConversationReceiptModeChanged.receipt_mode AS conversationReceiptModeChanged,
-ConversationTimerChangedContent.message_timer AS messageTimerChanged,
-FailedRecipientsWithNoClients.recipient_failure_list AS recipientsFailedWithNoClientsList,
-FailedRecipientsDeliveryFailed.recipient_failure_list AS recipientsFailedDeliveryList
-FROM Message
-JOIN User ON Message.sender_user_id = User.qualified_id
-LEFT JOIN MessageTextContent AS TextContent ON Message.id = TextContent.message_id AND Message.conversation_id = TextContent.conversation_id
-LEFT JOIN MessageAssetContent AS AssetContent ON Message.id = AssetContent.message_id AND Message.conversation_id = AssetContent.conversation_id
-LEFT JOIN MessageMissedCallContent AS MissedCallContent ON Message.id = MissedCallContent.message_id AND Message.conversation_id = MissedCallContent.conversation_id
-LEFT JOIN MessageMemberChangeContent AS MemberChangeContent ON Message.id = MemberChangeContent.message_id AND Message.conversation_id = MemberChangeContent.conversation_id
-LEFT JOIN MessageUnknownContent AS UnknownContent ON Message.id = UnknownContent.message_id AND Message.conversation_id = UnknownContent.conversation_id
-LEFT JOIN MessageRestrictedAssetContent AS RestrictedAssetContent ON Message.id = RestrictedAssetContent.message_id AND RestrictedAssetContent.conversation_id = RestrictedAssetContent.conversation_id
-LEFT JOIN MessageFailedToDecryptContent AS FailedToDecryptContent ON Message.id = FailedToDecryptContent.message_id AND Message.conversation_id = FailedToDecryptContent.conversation_id
-LEFT JOIN MessageConversationChangedContent AS ConversationNameChangedContent ON Message.id = ConversationNameChangedContent.message_id AND Message.conversation_id = ConversationNameChangedContent.conversation_id
-LEFT JOIN MessageRecipientFailure AS FailedRecipientsWithNoClients ON Message.id = FailedRecipientsWithNoClients.message_id AND Message.conversation_id = FailedRecipientsWithNoClients.conversation_id AND FailedRecipientsWithNoClients.recipient_failure_type = 'NO_CLIENTS_TO_DELIVER'
-LEFT JOIN MessageRecipientFailure AS FailedRecipientsDeliveryFailed ON Message.id = FailedRecipientsDeliveryFailed.message_id AND Message.conversation_id = FailedRecipientsDeliveryFailed.conversation_id AND FailedRecipientsDeliveryFailed.recipient_failure_type = 'MESSAGE_DELIVERY_FAILED'
-
--- joins for quoted messages
-LEFT JOIN Message AS QuotedMessage ON QuotedMessage.id = TextContent.quoted_message_id AND QuotedMessage.conversation_id = TextContent.conversation_id
-LEFT JOIN User AS QuotedSender ON QuotedMessage.sender_user_id = QuotedSender.qualified_id
-LEFT JOIN MessageTextContent AS QuotedTextContent ON QuotedTextContent.message_id = QuotedMessage.id AND QuotedMessage.conversation_id = TextContent.conversation_id
-LEFT JOIN MessageAssetContent AS QuotedAssetContent ON QuotedAssetContent.message_id = QuotedMessage.id AND QuotedMessage.conversation_id = TextContent.conversation_id
--- end joins for quoted messages
-LEFT JOIN MessageNewConversationReceiptModeContent AS NewConversationReceiptMode ON Message.id = NewConversationReceiptMode.message_id AND Message.conversation_id = NewConversationReceiptMode.conversation_id
-LEFT JOIN MessageConversationReceiptModeChangedContent AS ConversationReceiptModeChanged ON Message.id = ConversationReceiptModeChanged.message_id AND Message.conversation_id = ConversationReceiptModeChanged.conversation_id
-LEFT JOIN MessageConversationTimerChangedContent AS ConversationTimerChangedContent ON Message.id = ConversationTimerChangedContent.message_id AND Message.conversation_id = ConversationTimerChangedContent.conversation_id
-LEFT JOIN SelfUser;
--- TODO: Remove IFNULL functions above if we can force SQLDelight to not unpack as notnull
-
-CREATE VIEW IF NOT EXISTS MessagePreview
-AS SELECT
-    Message.id AS id,
-    Message.conversation_id AS conversationId,
-    Message.content_type AS contentType,
-    Message.creation_date AS date,
-    Message.visibility AS visibility,
-    Message.sender_user_id AS senderUserId,
-    (Message.expire_after_millis IS NOT NULL) AS isEphemeral,
-    User.name AS senderName,
-    User.connection_status AS senderConnectionStatus,
-    User.deleted AS senderIsDeleted,
-    SelfUser.id AS selfUserId,
-    (Message.sender_user_id == SelfUser.id) AS isSelfMessage,
-    MemberChangeContent.member_change_list AS memberChangeList,
-    MemberChangeContent.member_change_type AS memberChangeType,
-    ConversationNameChangedContent.conversation_name AS updateConversationName,
-    Conversation.name AS conversationName,
-    (Mention.user_id IS NOT NULL) AS isMentioningSelfUser,
-    TextContent.is_quoting_self AS isQuotingSelfUser,
-    TextContent.text_body AS text,
-    AssetContent.asset_mime_type AS assetMimeType,
-    (Message.creation_date > Conversation.last_read_date) AS isUnread,
-    IFNULL((Message.creation_date > IFNULL(Conversation.last_notified_date, 0)), FALSE) AS shouldNotify,
-    Conversation.muted_status AS mutedStatus,
-    Conversation.type AS conversationType
-FROM Message
-LEFT JOIN SelfUser
-LEFT JOIN User ON Message.sender_user_id = User.qualified_id
-LEFT JOIN Conversation AS Conversation ON Message.conversation_id == Conversation.qualified_id
-LEFT JOIN MessageMemberChangeContent AS MemberChangeContent ON Message.id = MemberChangeContent.message_id AND Message.conversation_id = MemberChangeContent.conversation_id
-LEFT JOIN MessageMention AS Mention ON Message.id == Mention.message_id AND SelfUser.id == Mention.user_id
-LEFT JOIN MessageConversationChangedContent AS ConversationNameChangedContent ON Message.id = ConversationNameChangedContent.message_id AND Message.conversation_id = ConversationNameChangedContent.conversation_id
-LEFT JOIN MessageAssetContent AS AssetContent ON Message.id = AssetContent.message_id AND Message.conversation_id = AssetContent.conversation_id
-LEFT JOIN MessageTextContent AS TextContent ON Message.id = TextContent.message_id AND Message.conversation_id = TextContent.conversation_id;
-
 needsToBeNotified:
 WITH targetMessage(isSelfMessage, isMentioningSelfUser, isQuotingSelfUser, mutedStatus) AS (
 SELECT isSelfMessage,
diff --git a/persistence/src/commonMain/db_user/com/wire/kalium/persistence/content/ButtonContent.sq b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/content/ButtonContent.sq
new file mode 100644
index 00000000000..7d741474b7b
--- /dev/null
+++ b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/content/ButtonContent.sq
@@ -0,0 +1,34 @@
+import com.wire.kalium.persistence.dao.QualifiedIDEntity;
+import kotlin.Boolean;
+
+CREATE TABLE ButtonContent (
+      message_id TEXT NOT NULL,
+      conversation_id TEXT AS QualifiedIDEntity NOT NULL,
+
+      id TEXT NOT NULL,
+      text TEXT NOT NULL,
+      is_selected INTEGER AS Boolean NOT NULL DEFAULT(0),
+
+      FOREIGN KEY (conversation_id, message_id) REFERENCES Message(conversation_id, id) ON DELETE CASCADE ON UPDATE CASCADE,
+      PRIMARY KEY (conversation_id, message_id, id)
+);
+
+insertButton:
+INSERT INTO ButtonContent (message_id, conversation_id, id, text)
+VALUES (:message_id, :conversation_id, :id, :text);
+
+markSelected {
+    UPDATE ButtonContent
+    SET is_selected = 0
+    WHERE conversation_id = :conversation_id AND
+     message_id = :message_id;
+
+    UPDATE ButtonContent
+    SET is_selected = 1
+    WHERE conversation_id = :conversation_id AND
+      message_id = :message_id AND
+      id = :id;
+}
+
+remmoveAllSelection:
+UPDATE ButtonContent SET is_selected = 0 WHERE conversation_id = :conversation_id AND message_id = :message_id;
diff --git a/persistence/src/commonMain/db_user/migrations/50.sqm b/persistence/src/commonMain/db_user/migrations/50.sqm
new file mode 100644
index 00000000000..05650274105
--- /dev/null
+++ b/persistence/src/commonMain/db_user/migrations/50.sqm
@@ -0,0 +1,167 @@
+import com.wire.kalium.persistence.dao.QualifiedIDEntity;
+import com.wire.kalium.persistence.dao.message.MessageEntity.ContentType;
+import com.wire.kalium.persistence.dao.message.MessageEntity.MemberChangeType;
+import com.wire.kalium.persistence.dao.message.MessageEntity;
+import com.wire.kalium.persistence.dao.message.MessageEntityContent;
+import com.wire.kalium.persistence.dao.message.RecipientFailureTypeEntity;
+import kotlin.Int;
+import kotlin.Boolean;
+import kotlin.collections.List;
+import kotlinx.datetime.Instant;
+
+CREATE TABLE ButtonContent (
+      message_id TEXT NOT NULL,
+      conversation_id TEXT AS QualifiedIDEntity NOT NULL,
+
+      id TEXT NOT NULL,
+      text TEXT NOT NULL,
+      is_selected INTEGER AS Boolean NOT NULL DEFAULT(0),
+
+      FOREIGN KEY (conversation_id, message_id) REFERENCES Message(conversation_id, id) ON DELETE CASCADE ON UPDATE CASCADE,
+      PRIMARY KEY (conversation_id, message_id, id)
+);
+
+DROP VIEW IF EXISTS MessageDetailsView;
+
+CREATE VIEW MessageDetailsView
+AS SELECT
+Message.id AS id,
+Message.conversation_id AS conversationId,
+Message.content_type AS contentType,
+Message.creation_date AS date,
+Message.sender_user_id AS senderUserId,
+Message.sender_client_id AS senderClientId,
+Message.status AS status,
+Message.last_edit_date AS lastEditTimestamp,
+Message.visibility AS visibility,
+Message.expects_read_confirmation AS expectsReadConfirmation,
+Message.expire_after_millis AS expireAfterMillis,
+Message.self_deletion_start_date AS selfDeletionStartDate,
+User.name AS senderName,
+User.handle AS senderHandle,
+User.email AS senderEmail,
+User.phone AS senderPhone,
+User.accent_id AS senderAccentId,
+User.team AS senderTeamId,
+User.connection_status AS senderConnectionStatus,
+User.preview_asset_id AS senderPreviewAssetId,
+User.complete_asset_id AS senderCompleteAssetId,
+User.user_availability_status AS senderAvailabilityStatus,
+User.user_type AS senderUserType,
+User.bot_service AS senderBotService,
+User.deleted AS senderIsDeleted,
+(Message.sender_user_id == SelfUser.id) AS isSelfMessage,
+TextContent.text_body AS text,
+TextContent.is_quoting_self AS isQuotingSelfUser,
+AssetContent.asset_size AS assetSize,
+AssetContent.asset_name AS assetName,
+AssetContent.asset_mime_type AS assetMimeType,
+AssetContent.asset_upload_status AS assetUploadStatus,
+AssetContent.asset_download_status AS assetDownloadStatus,
+AssetContent.asset_otr_key AS assetOtrKey,
+AssetContent.asset_sha256 AS assetSha256,
+AssetContent.asset_id AS assetId,
+AssetContent.asset_token AS assetToken,
+AssetContent.asset_domain AS assetDomain,
+AssetContent.asset_encryption_algorithm AS assetEncryptionAlgorithm,
+AssetContent.asset_width AS assetWidth,
+AssetContent.asset_height AS assetHeight,
+AssetContent.asset_duration_ms AS assetDuration,
+AssetContent.asset_normalized_loudness AS assetNormalizedLoudness,
+MissedCallContent.caller_id AS callerId,
+MemberChangeContent.member_change_list AS memberChangeList,
+MemberChangeContent.member_change_type AS memberChangeType,
+UnknownContent.unknown_type_name AS unknownContentTypeName,
+UnknownContent.unknown_encoded_data AS unknownContentData,
+RestrictedAssetContent.asset_mime_type AS restrictedAssetMimeType,
+RestrictedAssetContent.asset_size AS restrictedAssetSize,
+RestrictedAssetContent.asset_name AS restrictedAssetName,
+FailedToDecryptContent.unknown_encoded_data AS failedToDecryptData,
+FailedToDecryptContent.is_decryption_resolved AS isDecryptionResolved,
+ConversationNameChangedContent.conversation_name AS conversationName,
+'{' || IFNULL(
+    (SELECT GROUP_CONCAT('"' || emoji || '":' || count)
+    FROM (
+        SELECT COUNT(*) count, Reaction.emoji emoji
+        FROM Reaction
+        WHERE Reaction.message_id = Message.id
+        AND Reaction.conversation_id = Message.conversation_id
+        GROUP BY Reaction.emoji
+    )),
+    '')
+|| '}' AS allReactionsJson,
+IFNULL(
+    (SELECT '[' || GROUP_CONCAT('"' || Reaction.emoji || '"') || ']'
+    FROM Reaction
+    WHERE Reaction.message_id = Message.id
+        AND Reaction.conversation_id = Message.conversation_id
+        AND Reaction.sender_id = SelfUser.id
+    ),
+    '[]'
+) AS selfReactionsJson,
+IFNULL(
+    (SELECT '[' || GROUP_CONCAT(
+        '{"start":' || start || ', "length":' || length ||
+        ', "userId":{"value":"' || replace(substr(user_id, 0, instr(user_id, '@')), '@', '') || '"' ||
+        ',"domain":"' || replace(substr(user_id, instr(user_id, '@')+1, length(user_id)), '@', '') || '"' ||
+        '}' || '}') || ']'
+    FROM MessageMention
+    WHERE MessageMention.message_id = Message.id
+        AND MessageMention.conversation_id = Message.conversation_id
+    ),
+    '[]'
+) AS mentions,
+TextContent.quoted_message_id AS quotedMessageId,
+QuotedMessage.sender_user_id AS quotedSenderId,
+TextContent.is_quote_verified AS isQuoteVerified,
+QuotedSender.name AS quotedSenderName,
+QuotedMessage.creation_date AS quotedMessageDateTime,
+QuotedMessage.last_edit_date AS quotedMessageEditTimestamp,
+QuotedMessage.visibility AS quotedMessageVisibility,
+QuotedMessage.content_type AS quotedMessageContentType,
+QuotedTextContent.text_body AS quotedTextBody,
+QuotedAssetContent.asset_mime_type AS quotedAssetMimeType,
+QuotedAssetContent.asset_name AS quotedAssetName,
+
+NewConversationReceiptMode.receipt_mode AS newConversationReceiptMode,
+
+ConversationReceiptModeChanged.receipt_mode AS conversationReceiptModeChanged,
+ConversationTimerChangedContent.message_timer AS messageTimerChanged,
+FailedRecipientsWithNoClients.recipient_failure_list AS recipientsFailedWithNoClientsList,
+FailedRecipientsDeliveryFailed.recipient_failure_list AS recipientsFailedDeliveryList,
+
+IFNULL(
+    (SELECT '[' ||
+            GROUP_CONCAT('{"text":"' || text || '", "id":"' || id || '""is_selected":' || is_selected || '}')
+        || ']'
+    FROM ButtonContent
+    WHERE ButtonContent.message_id = Message.id
+        AND ButtonContent.conversation_id = Message.conversation_id
+    ),
+    '[]'
+) AS buttonsJson
+
+FROM Message
+JOIN User ON Message.sender_user_id = User.qualified_id
+LEFT JOIN MessageTextContent AS TextContent ON Message.id = TextContent.message_id AND Message.conversation_id = TextContent.conversation_id
+LEFT JOIN MessageAssetContent AS AssetContent ON Message.id = AssetContent.message_id AND Message.conversation_id = AssetContent.conversation_id
+LEFT JOIN MessageMissedCallContent AS MissedCallContent ON Message.id = MissedCallContent.message_id AND Message.conversation_id = MissedCallContent.conversation_id
+LEFT JOIN MessageMemberChangeContent AS MemberChangeContent ON Message.id = MemberChangeContent.message_id AND Message.conversation_id = MemberChangeContent.conversation_id
+LEFT JOIN MessageUnknownContent AS UnknownContent ON Message.id = UnknownContent.message_id AND Message.conversation_id = UnknownContent.conversation_id
+LEFT JOIN MessageRestrictedAssetContent AS RestrictedAssetContent ON Message.id = RestrictedAssetContent.message_id AND RestrictedAssetContent.conversation_id = RestrictedAssetContent.conversation_id
+LEFT JOIN MessageFailedToDecryptContent AS FailedToDecryptContent ON Message.id = FailedToDecryptContent.message_id AND Message.conversation_id = FailedToDecryptContent.conversation_id
+LEFT JOIN MessageConversationChangedContent AS ConversationNameChangedContent ON Message.id = ConversationNameChangedContent.message_id AND Message.conversation_id = ConversationNameChangedContent.conversation_id
+LEFT JOIN MessageRecipientFailure AS FailedRecipientsWithNoClients ON Message.id = FailedRecipientsWithNoClients.message_id AND Message.conversation_id = FailedRecipientsWithNoClients.conversation_id AND FailedRecipientsWithNoClients.recipient_failure_type = 'NO_CLIENTS_TO_DELIVER'
+LEFT JOIN MessageRecipientFailure AS FailedRecipientsDeliveryFailed ON Message.id = FailedRecipientsDeliveryFailed.message_id AND Message.conversation_id = FailedRecipientsDeliveryFailed.conversation_id AND FailedRecipientsDeliveryFailed.recipient_failure_type = 'MESSAGE_DELIVERY_FAILED'
+
+-- joins for quoted messages
+LEFT JOIN Message AS QuotedMessage ON QuotedMessage.id = TextContent.quoted_message_id AND QuotedMessage.conversation_id = TextContent.conversation_id
+LEFT JOIN User AS QuotedSender ON QuotedMessage.sender_user_id = QuotedSender.qualified_id
+LEFT JOIN MessageTextContent AS QuotedTextContent ON QuotedTextContent.message_id = QuotedMessage.id AND QuotedMessage.conversation_id = TextContent.conversation_id
+LEFT JOIN MessageAssetContent AS QuotedAssetContent ON QuotedAssetContent.message_id = QuotedMessage.id AND QuotedMessage.conversation_id = TextContent.conversation_id
+-- end joins for quoted messages
+LEFT JOIN MessageNewConversationReceiptModeContent AS NewConversationReceiptMode ON Message.id = NewConversationReceiptMode.message_id AND Message.conversation_id = NewConversationReceiptMode.conversation_id
+LEFT JOIN MessageConversationReceiptModeChangedContent AS ConversationReceiptModeChanged ON Message.id = ConversationReceiptModeChanged.message_id AND Message.conversation_id = ConversationReceiptModeChanged.conversation_id
+LEFT JOIN MessageConversationTimerChangedContent AS ConversationTimerChangedContent ON Message.id = ConversationTimerChangedContent.message_id AND Message.conversation_id = ConversationTimerChangedContent.conversation_id
+LEFT JOIN SelfUser;
+-- TODO: Remove IFNULL functions above if we can force SQLDelight to not unpack as notnull
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/MigrationDAO.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/MigrationDAO.kt
index 17a3a840016..23f9663a367 100644
--- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/MigrationDAO.kt
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/MigrationDAO.kt
@@ -22,6 +22,7 @@ import com.wire.kalium.persistence.ConversationsQueries
 import com.wire.kalium.persistence.MessagesQueries
 import com.wire.kalium.persistence.MigrationQueries
 import com.wire.kalium.persistence.UnreadEventsQueries
+import com.wire.kalium.persistence.content.ButtonContentQueries
 import com.wire.kalium.persistence.dao.conversation.ConversationEntity
 import com.wire.kalium.persistence.dao.conversation.MLS_DEFAULT_CIPHER_SUITE
 import com.wire.kalium.persistence.dao.conversation.MLS_DEFAULT_EPOCH
@@ -42,11 +43,13 @@ internal class MigrationDAOImpl(
     messagesQueries: MessagesQueries,
     private val unreadEventsQueries: UnreadEventsQueries,
     private val conversationsQueries: ConversationsQueries,
+    buttonContentQueries: ButtonContentQueries,
     selfUserIDEntity: UserIDEntity,
 ) : MigrationDAO, MessageInsertExtension by MessageInsertExtensionImpl(
     messagesQueries,
     unreadEventsQueries,
     conversationsQueries,
+    buttonContentQueries,
     selfUserIDEntity
 ) {
     override suspend fun insertConversation(conversationList: List<ConversationEntity>) {
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/CompositeMessageDAO.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/CompositeMessageDAO.kt
new file mode 100644
index 00000000000..5fb7387a6a5
--- /dev/null
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/CompositeMessageDAO.kt
@@ -0,0 +1,49 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.kalium.persistence.dao.message
+
+import com.wire.kalium.persistence.content.ButtonContentQueries
+import com.wire.kalium.persistence.dao.QualifiedIDEntity
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.CoroutineContext
+
+interface CompositeMessageDAO {
+    suspend fun markAsSelected(
+        messageId: String,
+        conversationId: QualifiedIDEntity,
+        buttonId: String
+    )
+
+    suspend fun resetSelection(
+        messageId: String,
+        conversationId: QualifiedIDEntity
+    )
+}
+
+internal class CompositeMessageDAOImpl internal constructor(
+    private val buttonContentQueries: ButtonContentQueries,
+    private val context: CoroutineContext
+) : CompositeMessageDAO {
+    override suspend fun markAsSelected(messageId: String, conversationId: QualifiedIDEntity, buttonId: String) = withContext(context) {
+        buttonContentQueries.markSelected(conversation_id = conversationId, message_id = messageId, id = buttonId)
+    }
+
+    override suspend fun resetSelection(messageId: String, conversationId: QualifiedIDEntity) = withContext(context) {
+        buttonContentQueries.remmoveAllSelection(conversation_id = conversationId, message_id = messageId)
+    }
+}
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt
index 96d5c70e0bf..c06855b8e6a 100644
--- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt
@@ -24,6 +24,7 @@ import com.wire.kalium.persistence.MessagesQueries
 import com.wire.kalium.persistence.NotificationQueries
 import com.wire.kalium.persistence.ReactionsQueries
 import com.wire.kalium.persistence.UnreadEventsQueries
+import com.wire.kalium.persistence.content.ButtonContentQueries
 import com.wire.kalium.persistence.dao.ConversationIDEntity
 import com.wire.kalium.persistence.dao.QualifiedIDEntity
 import com.wire.kalium.persistence.dao.UserIDEntity
@@ -50,9 +51,16 @@ internal class MessageDAOImpl internal constructor(
     private val unreadEventsQueries: UnreadEventsQueries,
     private val selfUserId: UserIDEntity,
     private val reactionsQueries: ReactionsQueries,
-    private val coroutineContext: CoroutineContext
+    private val coroutineContext: CoroutineContext,
+    buttonContentQueries: ButtonContentQueries
 ) : MessageDAO,
-    MessageInsertExtension by MessageInsertExtensionImpl(queries, unreadEventsQueries, conversationsQueries, selfUserId) {
+    MessageInsertExtension by MessageInsertExtensionImpl(
+        queries,
+        unreadEventsQueries,
+        conversationsQueries,
+        buttonContentQueries,
+        selfUserId
+    ) {
     private val mapper = MessageMapper
     private val unreadEventMapper = UnreadEventMapper
 
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
index 944ae558a43..d1739b4ccc3 100644
--- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
@@ -24,8 +24,15 @@ import com.wire.kalium.persistence.dao.UserIDEntity
 import com.wire.kalium.persistence.dao.conversation.ConversationEntity
 import com.wire.kalium.persistence.dao.reaction.ReactionsEntity
 import kotlinx.datetime.Instant
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 @Suppress("LongParameterList")
 sealed interface MessageEntity {
@@ -176,7 +183,7 @@ sealed interface MessageEntity {
         TEXT, ASSET, KNOCK, MEMBER_CHANGE, MISSED_CALL, RESTRICTED_ASSET,
         CONVERSATION_RENAMED, UNKNOWN, FAILED_DECRYPTION, REMOVED_FROM_TEAM, CRYPTO_SESSION_RESET,
         NEW_CONVERSATION_RECEIPT_MODE, CONVERSATION_RECEIPT_MODE_CHANGED, HISTORY_LOST, CONVERSATION_MESSAGE_TIMER_CHANGED,
-        CONVERSATION_CREATED, MLS_WRONG_EPOCH_WARNING
+        CONVERSATION_CREATED, MLS_WRONG_EPOCH_WARNING, COMPOSITE
     }
 
     enum class MemberChangeType {
@@ -293,6 +300,11 @@ sealed class MessageEntityContent {
         val assetName: String,
     ) : Regular()
 
+    data class Composite(
+        val text: Text?,
+        val buttonList: List<ButtonEntity>
+    ) : Regular()
+
     object MissedCall : System()
     object CryptoSessionReset : System()
     data class ConversationRenamed(val conversationName: String) : System()
@@ -422,3 +434,22 @@ sealed class DeliveryStatusEntity {
 
     object CompleteDelivery : DeliveryStatusEntity()
 }
+
+@Serializable
+class ButtonEntity(
+    @SerialName("text") val text: String,
+    @SerialName("id") val id: String,
+    @Serializable(with = BooleanIntSerializer::class)
+    @SerialName("is_selected") val isSelected: Boolean
+)
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializer(Boolean::class)
+class BooleanIntSerializer : KSerializer<Boolean> {
+    override val descriptor = PrimitiveSerialDescriptor("common_api_version", PrimitiveKind.INT)
+    override fun serialize(encoder: Encoder, value: Boolean) {
+        encoder.encodeInt(if (value) 1 else 0)
+    }
+
+    override fun deserialize(decoder: Decoder): Boolean = decoder.decodeInt() == 1
+}
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtension.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtension.kt
index 09edadf8deb..7dd00ac670d 100644
--- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtension.kt
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtension.kt
@@ -3,6 +3,7 @@ package com.wire.kalium.persistence.dao.message
 import com.wire.kalium.persistence.ConversationsQueries
 import com.wire.kalium.persistence.MessagesQueries
 import com.wire.kalium.persistence.UnreadEventsQueries
+import com.wire.kalium.persistence.content.ButtonContentQueries
 import com.wire.kalium.persistence.dao.UserIDEntity
 import com.wire.kalium.persistence.dao.unread.UnreadEventTypeEntity
 import kotlinx.datetime.Instant
@@ -31,6 +32,7 @@ internal class MessageInsertExtensionImpl(
     private val messagesQueries: MessagesQueries,
     private val unreadEventsQueries: UnreadEventsQueries,
     private val conversationsQueries: ConversationsQueries,
+    private val buttonContentQueries: ButtonContentQueries,
     private val selfUserIDEntity: UserIDEntity
 ) : MessageInsertExtension {
 
@@ -219,10 +221,8 @@ internal class MessageInsertExtensionImpl(
                 message_timer = content.messageTimer
             )
 
-            is MessageEntityContent.ConversationCreated -> {
-                /* no-op */
-            }
-
+            is MessageEntityContent.Composite -> insertCompositeMessage(content, message)
+            is MessageEntityContent.ConversationCreated,
             is MessageEntityContent.MLSWrongEpochWarning -> {
                 /* no-op */
             }
@@ -249,6 +249,7 @@ internal class MessageInsertExtensionImpl(
 
                 is MessageEntityContent.Asset,
                 is MessageEntityContent.RestrictedAsset,
+                is MessageEntityContent.Composite,
                 is MessageEntityContent.FailedDecryption -> unreadEventsQueries.insertEvent(
                     message.id,
                     UnreadEventTypeEntity.MESSAGE,
@@ -263,7 +264,19 @@ internal class MessageInsertExtensionImpl(
                     message.date
                 )
 
-                else -> {}
+                is MessageEntityContent.Unknown,
+                MessageEntityContent.ConversationCreated,
+                is MessageEntityContent.ConversationMessageTimerChanged,
+                is MessageEntityContent.ConversationReceiptModeChanged,
+                is MessageEntityContent.ConversationRenamed,
+                MessageEntityContent.CryptoSessionReset,
+                MessageEntityContent.HistoryLost,
+                MessageEntityContent.MLSWrongEpochWarning,
+                is MessageEntityContent.MemberChange,
+                is MessageEntityContent.NewConversationReceiptMode,
+                is MessageEntityContent.TeamMemberRemoved -> {
+                    /* no-op */
+                }
             }
         }
     }
@@ -303,6 +316,29 @@ internal class MessageInsertExtensionImpl(
         }
     }
 
+    private fun insertCompositeMessage(
+        content: MessageEntityContent.Composite,
+        message: MessageEntity
+    ) {
+        content.text?.let { text ->
+            messagesQueries.insertMessageTextContent(
+                message_id = message.id,
+                conversation_id = message.conversationId,
+                text_body = text.messageBody,
+                quoted_message_id = text.quotedMessageId,
+                is_quote_verified = text.isQuoteVerified
+            )
+        }
+        content.buttonList.forEach { button ->
+            buttonContentQueries.insertButton(
+                message_id = message.id,
+                conversation_id = message.conversationId,
+                id = button.id,
+                text = button.text
+            )
+        }
+    }
+
     @Suppress("ComplexMethod")
     override fun contentTypeOf(content: MessageEntityContent): MessageEntity.ContentType = when (content) {
         is MessageEntityContent.Text -> MessageEntity.ContentType.TEXT
@@ -322,5 +358,6 @@ internal class MessageInsertExtensionImpl(
         is MessageEntityContent.ConversationMessageTimerChanged -> MessageEntity.ContentType.CONVERSATION_MESSAGE_TIMER_CHANGED
         is MessageEntityContent.ConversationCreated -> MessageEntity.ContentType.CONVERSATION_CREATED
         is MessageEntityContent.MLSWrongEpochWarning -> MessageEntity.ContentType.MLS_WRONG_EPOCH_WARNING
+        is MessageEntityContent.Composite -> MessageEntity.ContentType.COMPOSITE
     }
 }
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
index b1a1d650a19..0c56db4c7fb 100644
--- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
@@ -176,16 +176,18 @@ object MessageMapper {
                 adminName = senderName
             )
 
-            MessageEntity.ContentType.UNKNOWN -> MessagePreviewEntityContent.Unknown
-            MessageEntity.ContentType.FAILED_DECRYPTION -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.REMOVED_FROM_TEAM -> MessagePreviewEntityContent.TeamMemberRemoved(userName = senderName)
-            MessageEntity.ContentType.CRYPTO_SESSION_RESET -> MessagePreviewEntityContent.CryptoSessionReset
+
             MessageEntity.ContentType.NEW_CONVERSATION_RECEIPT_MODE -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.CONVERSATION_RECEIPT_MODE_CHANGED -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.HISTORY_LOST -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.CONVERSATION_MESSAGE_TIMER_CHANGED -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.CONVERSATION_CREATED -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.MLS_WRONG_EPOCH_WARNING -> MessagePreviewEntityContent.Unknown
+            MessageEntity.ContentType.UNKNOWN -> MessagePreviewEntityContent.Unknown
+            MessageEntity.ContentType.FAILED_DECRYPTION -> MessagePreviewEntityContent.Unknown
+            MessageEntity.ContentType.COMPOSITE -> MessagePreviewEntityContent.Unknown
+            MessageEntity.ContentType.CRYPTO_SESSION_RESET -> MessagePreviewEntityContent.CryptoSessionReset
         }
     }
 
@@ -355,7 +357,7 @@ object MessageMapper {
         visibility: MessageEntity.Visibility,
         expectsReadConfirmation: Boolean,
         expireAfterMillis: Long?,
-        selfDeletionDate: Instant?,
+        selfDeletionStartDate: Instant?,
         senderName: String?,
         senderHandle: String?,
         senderEmail: String?,
@@ -414,9 +416,10 @@ object MessageMapper {
         quotedAssetName: String?,
         newConversationReceiptMode: Boolean?,
         conversationReceiptModeChanged: Boolean?,
-        conversationMessageTimerChanged: Long?,
+        messageTimerChanged: Long?,
         recipientsFailedWithNoClientsList: List<QualifiedIDEntity>?,
-        recipientsFailedDeliveryList: List<QualifiedIDEntity>?
+        recipientsFailedDeliveryList: List<QualifiedIDEntity>?,
+        buttonsJson: String,
     ): MessageEntity {
         // If message hsa been deleted, we don't care about the content. Also most of their internal content is null anyways
         val content = if (visibility == MessageEntity.Visibility.DELETED) {
@@ -487,6 +490,37 @@ object MessageMapper {
                 restrictedAssetName.requireField("assetName")
             )
 
+            MessageEntity.ContentType.COMPOSITE -> {
+                // if the text body is null then the composite message had no text body
+                val compositeText: MessageEntityContent.Text? = text?.let {
+                    MessageEntityContent.Text(
+                        messageBody = text,
+                        mentions = messageMentionsFromJsonString(mentions),
+                        quotedMessageId = quotedMessageId,
+                        quotedMessage = quotedMessageContentType?.let {
+                            MessageEntityContent.Text.QuotedMessage(
+                                id = quotedMessageId.requireField("quotedMessageId"),
+                                senderId = quotedSenderId.requireField("quotedSenderId"),
+                                isQuotingSelfUser = isQuotingSelfUser.requireField("isQuotingSelfUser"),
+                                isVerified = isQuoteVerified ?: false,
+                                senderName = quotedSenderName,
+                                dateTime = quotedMessageDateTime.requireField("quotedMessageDateTime").toIsoDateTimeString(),
+                                editTimestamp = quotedMessageEditTimestamp?.toIsoDateTimeString(),
+                                visibility = quotedMessageVisibility.requireField("quotedMessageVisibility"),
+                                contentType = quotedMessageContentType.requireField("quotedMessageContentType"),
+                                textBody = quotedTextBody,
+                                assetMimeType = quotedAssetMimeType,
+                                assetName = quotedAssetName,
+                            )
+                        },
+                    )
+                }
+                MessageEntityContent.Composite(
+                    compositeText,
+                    JsonSerializer().decodeFromString(buttonsJson)
+                )
+            }
+
             MessageEntity.ContentType.CONVERSATION_RENAMED -> MessageEntityContent.ConversationRenamed(conversationName.orEmpty())
             MessageEntity.ContentType.REMOVED_FROM_TEAM -> MessageEntityContent.TeamMemberRemoved(senderName.orEmpty())
             MessageEntity.ContentType.CRYPTO_SESSION_RESET -> MessageEntityContent.CryptoSessionReset
@@ -500,11 +534,12 @@ object MessageMapper {
 
             MessageEntity.ContentType.HISTORY_LOST -> MessageEntityContent.HistoryLost
             MessageEntity.ContentType.CONVERSATION_MESSAGE_TIMER_CHANGED -> MessageEntityContent.ConversationMessageTimerChanged(
-                messageTimer = conversationMessageTimerChanged
+                messageTimer = messageTimerChanged
             )
 
             MessageEntity.ContentType.CONVERSATION_CREATED -> MessageEntityContent.ConversationCreated
             MessageEntity.ContentType.MLS_WRONG_EPOCH_WARNING -> MessageEntityContent.MLSWrongEpochWarning
+
         }
 
         return createMessageEntity(
@@ -523,7 +558,7 @@ object MessageMapper {
             isSelfMessage,
             expectsReadConfirmation,
             expireAfterMillis,
-            selfDeletionDate,
+            selfDeletionStartDate,
             recipientsFailedWithNoClientsList,
             recipientsFailedDeliveryList
         )
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/TableMapper.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/TableMapper.kt
index 66aa0da6c62..a1c61a04427 100644
--- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/TableMapper.kt
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/TableMapper.kt
@@ -55,6 +55,7 @@ import com.wire.kalium.persistence.adapter.MemberRoleAdapter
 import com.wire.kalium.persistence.adapter.QualifiedIDAdapter
 import com.wire.kalium.persistence.adapter.QualifiedIDListAdapter
 import com.wire.kalium.persistence.adapter.ServiceTagListAdapter
+import com.wire.kalium.persistence.content.ButtonContent
 
 internal object TableMapper {
     val callAdapter = Call.Adapter(
@@ -199,4 +200,8 @@ internal object TableMapper {
         recipient_failure_listAdapter = QualifiedIDListAdapter,
         recipient_failure_typeAdapter = EnumColumnAdapter()
     )
+
+    val buttonContentAdapter = ButtonContent.Adapter(
+        conversation_idAdapter = QualifiedIDAdapter
+    )
 }
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt
index 2af0982775f..af662683e2b 100644
--- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt
+++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt
@@ -52,6 +52,8 @@ import com.wire.kalium.persistence.dao.conversation.ConversationDAO
 import com.wire.kalium.persistence.dao.conversation.ConversationDAOImpl
 import com.wire.kalium.persistence.dao.member.MemberDAO
 import com.wire.kalium.persistence.dao.member.MemberDAOImpl
+import com.wire.kalium.persistence.dao.message.CompositeMessageDAO
+import com.wire.kalium.persistence.dao.message.CompositeMessageDAOImpl
 import com.wire.kalium.persistence.dao.message.MessageDAO
 import com.wire.kalium.persistence.dao.message.MessageDAOImpl
 import com.wire.kalium.persistence.dao.newclient.NewClientDAO
@@ -143,7 +145,8 @@ class UserDatabaseBuilder internal constructor(
         MessageConversationTimerChangedContentAdapter = TableMapper.messageConversationTimerChangedContentAdapter,
         ServiceAdapter = TableMapper.serviceAdapter,
         NewClientAdapter = TableMapper.newClientAdapter,
-        MessageRecipientFailureAdapter = TableMapper.messageRecipientFailureAdapter
+        MessageRecipientFailureAdapter = TableMapper.messageRecipientFailureAdapter,
+        ButtonContentAdapter = TableMapper.buttonContentAdapter
     )
 
     init {
@@ -205,7 +208,8 @@ class UserDatabaseBuilder internal constructor(
             database.unreadEventsQueries,
             userId,
             database.reactionsQueries,
-            queriesContext
+            queriesContext,
+            database.buttonContentQueries
         )
 
     val assetDAO: AssetDAO
@@ -223,9 +227,17 @@ class UserDatabaseBuilder internal constructor(
     val prekeyDAO: PrekeyDAO
         get() = PrekeyDAOImpl(database.metadataQueries, queriesContext)
 
+    val compositeMessageDAO: CompositeMessageDAO
+        get() = CompositeMessageDAOImpl(database.buttonContentQueries, queriesContext)
+
     val migrationDAO: MigrationDAO
         get() = MigrationDAOImpl(
-            database.migrationQueries, database.messagesQueries, database.unreadEventsQueries, database.conversationsQueries, userId
+            database.migrationQueries,
+            database.messagesQueries,
+            database.unreadEventsQueries,
+            database.conversationsQueries,
+            database.buttonContentQueries,
+            userId
         )
 
     val serviceDAO: ServiceDAO get() = ServiceDAOImpl(database.serviceQueries, queriesContext)
diff --git a/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/CompositeMessageTest.kt b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/CompositeMessageTest.kt
new file mode 100644
index 00000000000..e11bddaad46
--- /dev/null
+++ b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/CompositeMessageTest.kt
@@ -0,0 +1,156 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.kalium.persistence.dao.message
+
+import com.wire.kalium.persistence.BaseDatabaseTest
+import com.wire.kalium.persistence.dao.UserDAO
+import com.wire.kalium.persistence.dao.UserIDEntity
+import com.wire.kalium.persistence.dao.conversation.ConversationDAO
+import com.wire.kalium.persistence.utils.stubs.newConversationEntity
+import com.wire.kalium.persistence.utils.stubs.newRegularMessageEntity
+import com.wire.kalium.persistence.utils.stubs.newUserEntity
+import kotlinx.coroutines.test.runTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+class CompositeMessageTest : BaseDatabaseTest() {
+
+    private lateinit var messageDAO: MessageDAO
+    private lateinit var conversationDAO: ConversationDAO
+    private lateinit var userDAO: UserDAO
+    private lateinit var compositeMessageDAO: CompositeMessageDAO
+
+    private val conversationEntity1 = newConversationEntity("Test1")
+    private val userEntity1 = newUserEntity("userEntity1")
+    private val selfUserId = UserIDEntity("selfValue", "selfDomain")
+
+    @BeforeTest
+    fun setUp() {
+        deleteDatabase(selfUserId)
+        val db = createDatabase(selfUserId, encryptedDBSecret, true)
+        messageDAO = db.messageDAO
+        conversationDAO = db.conversationDAO
+        userDAO = db.userDAO
+        compositeMessageDAO = db.compositeMessageDAO
+    }
+
+    @Test
+    fun givenSuccess_whenInsertingCompositeMessage_thenMessageCanBeRetrieved() = runTest {
+        val conversation = conversationEntity1
+        conversationDAO.insertConversation(conversation)
+        userDAO.insertUser(userEntity1)
+
+        val compositeMessage = newRegularMessageEntity().copy(
+            senderUserId = userEntity1.id,
+            conversationId = conversation.id,
+            content = MessageEntityContent.Composite(
+                MessageEntityContent.Text("text"),
+                listOf(
+                    ButtonEntity("text", "id", false)
+                )
+            )
+        )
+
+        messageDAO.insertOrIgnoreMessages(listOf(compositeMessage))
+
+        messageDAO.getMessageById(compositeMessage.id, compositeMessage.conversationId).also {
+            assertNotNull(it)
+            assertIs<MessageEntityContent.Composite>(it.content)
+            assertEquals("text", (it.content as MessageEntityContent.Composite).text?.messageBody)
+            assertEquals(1, (it.content as MessageEntityContent.Composite).buttonList.size)
+            assertEquals("text", (it.content as MessageEntityContent.Composite).buttonList[0].text)
+            assertEquals("id", (it.content as MessageEntityContent.Composite).buttonList[0].id)
+        }
+    }
+
+    @Test
+    fun givenCompositeMessage_whenMarkingButtonAsSelected_thenOnlyOneItIsMarked() = runTest {
+        val conversation = conversationEntity1
+        conversationDAO.insertConversation(conversation)
+        userDAO.insertUser(userEntity1)
+
+        val compositeMessage = newRegularMessageEntity().copy(
+            senderUserId = userEntity1.id,
+            conversationId = conversation.id,
+            content = MessageEntityContent.Composite(
+                MessageEntityContent.Text("text"),
+                listOf(
+                    ButtonEntity("text1", "id1", false),
+                    ButtonEntity("tex2", "id2", false),
+                    ButtonEntity("tex3", "id3", false),
+                    ButtonEntity("tex4", "id4", false)
+                )
+            )
+        )
+        messageDAO.insertOrIgnoreMessages(listOf(compositeMessage))
+
+        compositeMessageDAO.markAsSelected(compositeMessage.id, compositeMessage.conversationId, "id2")
+
+        messageDAO.getMessageById(compositeMessage.id, compositeMessage.conversationId).also {
+            assertEquals(4, (it?.content as MessageEntityContent.Composite).buttonList.size)
+            assertTrue { (it.content as MessageEntityContent.Composite).buttonList[1].isSelected }
+        }
+
+        compositeMessageDAO.markAsSelected(compositeMessage.id, compositeMessage.conversationId, "id4")
+
+        messageDAO.getMessageById(compositeMessage.id, compositeMessage.conversationId).also {
+            assertEquals(4, (it?.content as MessageEntityContent.Composite).buttonList.size)
+            assertFalse { (it.content as MessageEntityContent.Composite).buttonList[1].isSelected }
+            assertTrue { (it.content as MessageEntityContent.Composite).buttonList[3].isSelected }
+        }
+    }
+
+    @Test
+    fun givenCompositeMessageWithSelection_whenResetSelection_thenSelectionIsFalse() = runTest {
+        val conversation = conversationEntity1
+        conversationDAO.insertConversation(conversation)
+        userDAO.insertUser(userEntity1)
+
+        val compositeMessage = newRegularMessageEntity().copy(
+            senderUserId = userEntity1.id,
+            conversationId = conversation.id,
+            content = MessageEntityContent.Composite(
+                MessageEntityContent.Text("text"),
+                listOf(
+                    ButtonEntity("text1", "id1", false),
+                    ButtonEntity("tex2", "id2", false),
+                    ButtonEntity("tex3", "id3", false),
+                    ButtonEntity("tex4", "id4", false)
+                )
+            )
+        )
+        messageDAO.insertOrIgnoreMessages(listOf(compositeMessage))
+
+        compositeMessageDAO.markAsSelected(compositeMessage.id, compositeMessage.conversationId, "id2")
+        messageDAO.getMessageById(compositeMessage.id, compositeMessage.conversationId).also {
+            assertEquals(4, (it?.content as MessageEntityContent.Composite).buttonList.size)
+            assertTrue { (it.content as MessageEntityContent.Composite).buttonList[1].isSelected }
+        }
+
+        compositeMessageDAO.resetSelection(compositeMessage.id, compositeMessage.conversationId)
+        messageDAO.getMessageById(compositeMessage.id, compositeMessage.conversationId).also {
+            assertEquals(4, (it?.content as MessageEntityContent.Composite).buttonList.size)
+            assertFalse { (it.content as MessageEntityContent.Composite).buttonList[1].isSelected }
+        }
+    }
+}
diff --git a/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtensionTest.kt b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtensionTest.kt
index 0a5aac21ab4..a585abe557f 100644
--- a/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtensionTest.kt
+++ b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtensionTest.kt
@@ -55,6 +55,7 @@ class MessageInsertExtensionTest : BaseDatabaseTest() {
             db.database.messagesQueries,
             db.database.unreadEventsQueries,
             db.database.conversationsQueries,
+            db.database.buttonContentQueries,
             selfUserId
         )
     }