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 b5a16950c0b..f89b9f9b9b5 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
@@ -172,6 +172,12 @@ class MessageInputFragment : Fragment() {
         if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
             mentionAutocomplete?.dismissPopup()
         }
+
+        val messageText = binding.fragmentMessageInputView.messageInput.text
+        if (messageText.isNotEmpty()) {
+            chatActivity.chatViewModel.messageDraft.messageText = messageText.toString()
+            chatActivity.chatViewModel.saveMessageDraft()
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -331,7 +337,6 @@ class MessageInputFragment : Fragment() {
 
                             override fun onSuccess(result: Drawable) {
                                 binding.fragmentCallStarted.callAuthorChip.chipIcon = result
-
                             }
                         })
                         .build()
diff --git a/gradle.properties b/gradle.properties
index 94be2c21840..4627006b25a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,3 +32,6 @@ android.newDsl=false
 
 # Needed for local libs
 # org.gradle.dependency.verification=lenient
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true