diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
index 57d05547d..7e691d61a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
@@ -95,6 +95,8 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent
     public HashMap<String, HashMap<String, String>> messageParameters;
     @JsonField(name = "systemMessage", typeConverter = EnumSystemMessageTypeConverter.class)
     public SystemMessageType systemMessageType;
+    @JsonField(name = "isReplyable")
+    public boolean replyable;
 
     @JsonIgnore
     @Ignore
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/local/models/MessageEntity.kt b/app/src/main/java/com/nextcloud/talk/newarch/local/models/MessageEntity.kt
index a7d7c8a59..f24a5bdce 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/local/models/MessageEntity.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/local/models/MessageEntity.kt
@@ -48,6 +48,7 @@ data class MessageEntity(
         @ColumnInfo(name = "message") var message: String? = null,
         /*@JsonField(name = "messageParameters")
         public HashMap<String, HashMap<String, String>> messageParameters;*/
+        @ColumnInfo(name = "replyable") var replyable: Boolean = false,
         @ColumnInfo(name = "system_message_type") var systemMessageType: SystemMessageType? = null
 )
 
@@ -64,6 +65,7 @@ fun MessageEntity.toChatMessage(): ChatMessage {
     chatMessage.message = this.message
     //chatMessage.messageParameters = this.messageParameters
     chatMessage.systemMessageType = this.systemMessageType
+    chatMessage.replyable = this.replyable
     return chatMessage
 }
 
@@ -77,6 +79,7 @@ fun ChatMessage.toMessageEntity(): MessageEntity {
     messageEntity.timestamp = this.timestamp
     messageEntity.message = this.message
     messageEntity.systemMessageType = this.systemMessageType
+    messageEntity.replyable = this.replyable
     //messageEntity.messageParameters = this.messageParameters
 
     return messageEntity