diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
index f6ff2d28b..7848f08a4 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
@@ -88,6 +88,14 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
     }
     val hideNotificationContent = MutableLiveData<Boolean>()
 
+    val useInAppFileViewerListener = object : SettingListenerStub() {
+        override fun onBoolValueChanged(newValue: Boolean) {
+            prefs.useInAppFileViewerForNonEncryptedFiles = newValue
+            useInAppFileViewer.value = newValue
+        }
+    }
+    val useInAppFileViewer = MutableLiveData<Boolean>()
+
     val launcherShortcutsListener = object : SettingListenerStub() {
         override fun onBoolValueChanged(newValue: Boolean) {
             prefs.chatRoomShortcuts = newValue
@@ -122,7 +130,8 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
 
     init {
         markAsReadNotifDismissal.value = prefs.markAsReadUponChatMessageNotificationDismissal
-        downloadedMediaPublic.value = prefs.makePublicMediaFilesDownloaded
+        downloadedMediaPublic.value = prefs.makePublicMediaFilesDownloaded && !prefs.vfsEnabled
+        useInAppFileViewer.value = prefs.useInAppFileViewerForNonEncryptedFiles || prefs.vfsEnabled
         hideNotificationContent.value = prefs.hideChatMessageContentInNotification
         initAutoDownloadList()
         launcherShortcuts.value = prefs.chatRoomShortcuts
diff --git a/app/src/main/res/layout/settings_chat_fragment.xml b/app/src/main/res/layout/settings_chat_fragment.xml
index ad591c875..cc28d67db 100644
--- a/app/src/main/res/layout/settings_chat_fragment.xml
+++ b/app/src/main/res/layout/settings_chat_fragment.xml
@@ -98,6 +98,14 @@
                     linphone:listener="@{viewModel.downloadedMediaPublicListener}"
                     linphone:checked="@={viewModel.downloadedMediaPublic}"/>
 
+                <include
+                    layout="@layout/settings_widget_switch"
+                    linphone:title="@{@string/chat_settings_use_in_app_file_viewer_title}"
+                    linphone:subtitle="@{@string/chat_settings_use_in_app_file_viewer_summary}"
+                    linphone:enabled="@{!viewModel.vfs}"
+                    linphone:listener="@{viewModel.useInAppFileViewerListener}"
+                    linphone:checked="@={viewModel.useInAppFileViewer}"/>
+
                 <include
                     layout="@layout/settings_widget_switch"
                     linphone:title="@{@string/chat_settings_hide_notification_content_title}"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 12c740738..29b946525 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -569,4 +569,8 @@
     <string name="content_description_export">Ouvrir le fichier dans une application tierce</string>
     <string name="chat_message_no_app_found_to_handle_file_mime_type">Aucune application n\'est disponible pour ouvrir ce type de fichier</string>
     <string name="chat_bubble_cant_open_enrypted_file">Impossible d\'ouvrir un fichier chiffré dans la bulle de conversation</string>
+    <string name="advanced_settings_vfs_title">Chiffrer tous les fichiers</string>
+    <string name="advanced_settings_vfs_summary">Attention, ne pourra pas être désactivé !</string>
+    <string name="chat_settings_use_in_app_file_viewer_title">Ouvrir les fichiers dans l\'application</string>
+    <string name="chat_settings_use_in_app_file_viewer_summary">Vous pourrez toujours les exporter dans une appli tierce</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dac515aba..8196f3fd9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -434,6 +434,8 @@
     <string name="chat_settings_hide_rooms_removed_proxies_title">Hide chat rooms from removed proxy configs</string>
     <string name="chat_settings_hide_rooms_removed_proxies_summary">If you are missing chat rooms, try to uncheck this setting</string>
     <string name="chat_settings_go_to_android_notification_settings">Android notification settings</string>
+    <string name="chat_settings_use_in_app_file_viewer_title">Always open files inside this app</string>
+    <string name="chat_settings_use_in_app_file_viewer_summary">You\'ll still be able to export them in third-party apps</string>
 
     <!-- Network settings -->
     <string name="network_settings_wifi_only_title">Use WiFi only</string>