diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts
index 9f886daae..4aeeb1818 100644
--- a/Linphone/data/languages/de.ts
+++ b/Linphone/data/languages/de.ts
@@ -4955,25 +4955,25 @@ Pour les activer dans un projet commercial, merci de nous contacter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="569"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="570"/>
         <source>shared_medias_title</source>
         <extracomment>Shared medias</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="571"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="572"/>
         <source>shared_documents_title</source>
         <extracomment>Shared documents</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="600"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="601"/>
         <source>forward_to_title</source>
         <extracomment>Forward to…</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="634"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="635"/>
         <source>conversations_title</source>
         <extracomment>Conversations</extracomment>
         <translation type="unfinished"></translation>
diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts
index 944faba65..fcfe94627 100644
--- a/Linphone/data/languages/en.ts
+++ b/Linphone/data/languages/en.ts
@@ -4854,25 +4854,25 @@ To enable them in a commercial project, please contact us.</translation>
         <translation>Reply to %1</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="569"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="570"/>
         <source>shared_medias_title</source>
         <extracomment>Shared medias</extracomment>
         <translation>Shared medias</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="571"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="572"/>
         <source>shared_documents_title</source>
         <extracomment>Shared documents</extracomment>
         <translation>Shared documents</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="600"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="601"/>
         <source>forward_to_title</source>
         <extracomment>Forward to…</extracomment>
         <translation>Froward to…</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="634"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="635"/>
         <source>conversations_title</source>
         <extracomment>Conversations</extracomment>
         <translation>Conversations</translation>
diff --git a/Linphone/data/languages/fr_FR.ts b/Linphone/data/languages/fr_FR.ts
index 3f4b118c3..f2461433e 100644
--- a/Linphone/data/languages/fr_FR.ts
+++ b/Linphone/data/languages/fr_FR.ts
@@ -4854,25 +4854,25 @@ Pour les activer dans un projet commercial, merci de nous contacter.</translatio
         <translation>Réponse à %1</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="569"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="570"/>
         <source>shared_medias_title</source>
         <extracomment>Shared medias</extracomment>
         <translation>Médias partagés</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="571"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="572"/>
         <source>shared_documents_title</source>
         <extracomment>Shared documents</extracomment>
         <translation>Documents partagés</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="600"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="601"/>
         <source>forward_to_title</source>
         <extracomment>Forward to…</extracomment>
         <translation>Transférer à…</translation>
     </message>
     <message>
-        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="634"/>
+        <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="635"/>
         <source>conversations_title</source>
         <extracomment>Conversations</extracomment>
         <translation>Conversations</translation>
diff --git a/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml b/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml
index 687a99206..f1c93ce53 100644
--- a/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml
+++ b/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml
@@ -14,11 +14,11 @@ Control.Control {
 	// property alias placeholderText: sendingTextArea.placeholderText
 	property string text
 	property var textArea
+	property int selectedFilesCount: 0
 	// property alias cursorPosition: sendingTextArea.cursorPosition
 	property bool emojiPickerButtonChecked
 	
 	property bool dropEnabled: true
-	property string dropDisabledReason
 	property bool isEphemeral : false
 	property bool emojiVisible: false
 
@@ -190,7 +190,7 @@ Control.Control {
 								ToolTip.visible: !enabled && hovered
 								//: Cannot record a message while a call is ongoing
 								ToolTip.text: qsTr("cannot_record_while_in_call_tooltip")
-								visible: sendingTextArea.text.length === 0
+								visible: sendingTextArea.text.length === 0 && mainItem.selectedFilesCount === 0
 								style: ButtonStyle.noBackground
 								hoverEnabled: true
 								icon.source: AppIcons.microphone
@@ -199,7 +199,7 @@ Control.Control {
 								}
 							}
 							BigButton {
-								visible: sendingTextArea.text.length !== 0
+								visible: sendingTextArea.text.length !== 0 || mainItem.selectedFilesCount > 0
 								style: ButtonStyle.noBackgroundOrange
 								icon.source: AppIcons.paperPlaneRight
 								onClicked: {
diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
index 2857fde53..1d10f2711 100644
--- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml
+++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
@@ -446,6 +446,7 @@ RowLayout {
                 Control.SplitView.preferredHeight: mainItem.chat?.core.isReadOnly ? 0 : height
                 Control.SplitView.minimumHeight: mainItem.chat?.core.isReadOnly ? 0 : Math.round(79 * DefaultStyle.dp)
                 chat: mainItem.chat
+                selectedFilesCount: contents.count
                 onChatChanged: {
                     if (chat) messageSender.text = mainItem.chat.core.sendingText
                 }