diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml
index 2bff07164..beb9f37af 100644
--- a/app/src/main/res/layout/chat_info_fragment.xml
+++ b/app/src/main/res/layout/chat_info_fragment.xml
@@ -376,7 +376,7 @@
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="26dp"
                     android:padding="5dp"
-                    android:text="@string/contact_details_media_documents_title"
+                    android:text="@string/conversation_details_media_documents_title"
                     app:layout_constraintBottom_toTopOf="@id/action_media"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 20baa0925..abf40ce1a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -212,7 +212,7 @@
     <string name="settings_contacts_carddav_sync_successful_toast">Synchronization réussie</string>
     <string name="settings_contacts_carddav_sync_error_toast">Erreur de synchronization !</string>
     <string name="settings_contacts_carddav_deleted_toast">Compte CardDAV supprimé</string>
-    <string name="settings_contacts_carddav_mandatory_field_not_filled_toast">Au moins un champ obligatoire n\'est pas rempli</string>
+    <string name="settings_contacts_carddav_mandatory_field_not_filled_toast">Veuillez remplir au moins le nom d\'affichage et l\'URL du serveur</string>
     <string name="settings_contacts_ldap_server_url_title">URL du serveur (ne peut être vide)</string>
     <string name="settings_contacts_ldap_bind_dn_title">Bind DN</string>
     <string name="settings_contacts_ldap_password_title">Mot de passe</string>
@@ -357,7 +357,7 @@
     <string name="contact_editor_error_saving_contact_toast">Erreur lors de la création du contact</string>
     <string name="contact_editor_dialog_abort_confirmation_title">Ne pas sauvegarder vos changements</string>
     <string name="contact_editor_dialog_abort_confirmation_message">Toutes vos modifications seront perdues.</string>
-    <string name="contact_editor_mandatory_field_not_filled_toast">Au moins un champ obligatoire n\'est pas rempli</string>
+    <string name="contact_editor_mandatory_field_not_filled_toast">Veuillez saisir au moins un nom, prénom ou le nom de l\'entreprise</string>
 
     <string name="contact_details_numbers_and_addresses_title">Numéros de téléphone et adresses SIP</string>
     <string name="contact_details_company_name">Entreprise :</string>
@@ -514,6 +514,7 @@
     <string name="conversation_event_ephemeral_messages_disabled">Les messages éphémères ont été désactivés</string>
     <string name="conversation_event_ephemeral_messages_lifetime_changed">La durée des messages éphémères est de %s</string>
 
+    <string name="conversation_details_media_documents_title">Médias &amp; documents</string>
     <string name="conversation_media_list_title">Médias partagés</string>
     <string name="conversation_document_list_title">Documents partagés</string>
 
@@ -567,7 +568,7 @@
     <string name="meeting_info_cancelled_toast">La réunion a été annulée</string>
     <string name="meeting_info_cancelled">Réunion annulée</string>
     <string name="meeting_failed_to_schedule_toast">Échec de la création de la réunion !</string>
-    <string name="meeting_schedule_mandatory_field_not_filled_toast">Au moins un champ obligatoire n\'a pas été rempli</string>
+    <string name="meeting_schedule_mandatory_field_not_filled_toast">Veuillez saisir un titre et sélectionner au moins un participant</string>
     <string name="meeting_failed_to_send_invites_toast">Échec de l\'envoi des invitations à la réunion !</string>
     <string name="meeting_failed_to_send_part_of_invites_toast">Échec de l\'envoi des invitations à la réunion pour certains des participants !</string>
     <string name="meeting_address_copied_to_clipboard_toast">L\'adresse de la réunion a été copiée</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index edd0a8d17..b60d4e35c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -249,7 +249,7 @@
     <string name="settings_contacts_carddav_sync_successful_toast">Synchronization was successful</string>
     <string name="settings_contacts_carddav_sync_error_toast">Synchronization error!</string>
     <string name="settings_contacts_carddav_deleted_toast">CardDAV account removed</string>
-    <string name="settings_contacts_carddav_mandatory_field_not_filled_toast">At least one mandatory field wasn\'t filled</string>
+    <string name="settings_contacts_carddav_mandatory_field_not_filled_toast">Please fill at least the display name and the server URL</string>
     <string name="settings_contacts_ldap_server_url_title">Server URL (can\'t be empty)</string>
     <string name="settings_contacts_ldap_bind_dn_title">Bind DN</string>
     <string name="settings_contacts_ldap_password_title">Password</string>
@@ -395,7 +395,7 @@
     <string name="contact_editor_error_saving_contact_toast">Failed to create contact!</string>
     <string name="contact_editor_dialog_abort_confirmation_title">Don\'t save changes?</string>
     <string name="contact_editor_dialog_abort_confirmation_message">All changes will be lost</string>
-    <string name="contact_editor_mandatory_field_not_filled_toast">At least one mandatory field wasn\'t filled</string>
+    <string name="contact_editor_mandatory_field_not_filled_toast">Please fill either first name, last name or company name</string>
 
     <string name="contact_details_numbers_and_addresses_title">Phone numbers &amp; SIP addresses</string>
     <string name="contact_details_company_name">Company:</string>
@@ -403,7 +403,6 @@
     <string name="contact_details_trust_title">Trust</string>
     <string name="contact_details_no_device_found">No device found…</string>
     <string name="contact_details_trusted_devices_count">Number of trusted devices:</string>
-    <string name="contact_details_media_documents_title">Media &amp; documents</string>
     <string name="contact_details_actions_title">Other actions</string>
     <string name="contact_details_edit">Edit</string>
     <string name="contact_details_add_to_favourites">Add to favourites</string>
@@ -553,6 +552,7 @@
     <string name="conversation_event_ephemeral_messages_disabled">Ephemeral messages have been disabled</string>
     <string name="conversation_event_ephemeral_messages_lifetime_changed">Ephemeral lifetime is now %s</string>
 
+    <string name="conversation_details_media_documents_title">Media &amp; documents</string>
     <string name="conversation_media_list_title">Shared media</string>
     <string name="conversation_document_list_title">Shared documents</string>
 
@@ -606,7 +606,7 @@
     <string name="meeting_info_cancelled_toast">Meeting has been cancelled</string>
     <string name="meeting_info_cancelled">Meeting cancelled</string>
     <string name="meeting_failed_to_schedule_toast">Failed to schedule meeting!</string>
-    <string name="meeting_schedule_mandatory_field_not_filled_toast">A least a mandatory field wasn\'t filled</string>
+    <string name="meeting_schedule_mandatory_field_not_filled_toast">Please fill the title and select at least one participant</string>
     <string name="meeting_failed_to_send_invites_toast">Failed to send all invites to meeting!</string>
     <string name="meeting_failed_to_send_part_of_invites_toast">Failed to send invites to some participants of the meeting!</string>
     <string name="meeting_address_copied_to_clipboard_toast">Meeting address copied into clipboard</string>