diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
index 627369649..5834cf744 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
@@ -857,9 +857,14 @@ class MessageInputFragment : Fragment() {
             replaceMentionChipSpans(editable)
             binding.fragmentMessageInputView.inputEditText?.setText("")
             sendStopTypingMessage()
-            val replyMessageId = binding.fragmentMessageInputView
+
+            var replyMessageId = binding.fragmentMessageInputView
                 .findViewById<RelativeLayout>(R.id.quotedChatMessageView)?.tag as Int? ?: 0
 
+            if (replyMessageId == 0) {
+                replyMessageId = chatActivity.thread?.last?.id?.toInt() ?: 0
+            }
+
             sendMessage(
                 editable.toString(),
                 replyMessageId,
diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
index a8294c1fe..3333ffd46 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
@@ -1063,6 +1063,7 @@ class OfflineFirstChatRepository @Inject constructor(
             internalId = "$internalConversationId@_temp_$currentTimeMillies",
             internalConversationId = internalConversationId,
             id = currentTimeWithoutYear.toLong(),
+            threadId = threadId,
             message = message,
             deleted = false,
             token = conversationModel.token,