diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index fa763516d..6aa43f4f1 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -510,6 +510,8 @@ class ChatActivity :
         setContentView(binding.root)
         setupSystemColors()
 
+        binding.messageInputView.messageSendButton.visibility = View.GONE
+
         conversationUser = currentUserProvider.currentUser.blockingGet()
 
         handleIntent(intent)
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 12bc7c8eb..f9efc89c1 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -249,7 +249,8 @@
             layout="@layout/edit_message_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp" >
+            android:layout_marginEnd="6dp"
+            android:visibility="gone">
         </include>
 
         <com.nextcloud.talk.ui.MessageInput