diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 39e97252c..363f97c6a 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -109,16 +109,6 @@ class CorePreferences @UiThread constructor(private val context: Context) {
             config.setBool("app", "show_confirmation_dialog_zrtp_trust_call", value)
         }
 
-    // Conversation settings
-
-    @get:WorkerThread @set:WorkerThread
-    var exportMediaToNativeGallery: Boolean // TODO: use it!
-        // Keep old name for backward compatibility
-        get() = config.getBool("app", "make_downloaded_images_public_in_gallery", true)
-        set(value) {
-            config.setBool("app", "make_downloaded_images_public_in_gallery", value)
-        }
-
     /* Voice Recordings */
 
     @get:WorkerThread @set:WorkerThread
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
index a87cae78d..e448ed0c0 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
@@ -239,7 +239,6 @@ class SettingsViewModel @UiThread constructor() : GenericViewModel() {
             useWifiOnly.postValue(core.isWifiOnlyEnabled)
 
             autoDownloadEnabled.postValue(core.maxSizeForAutoDownloadIncomingFiles == 0)
-            exportMediaEnabled.postValue(corePreferences.exportMediaToNativeGallery)
 
             defaultLayout.postValue(core.defaultConferenceLayout.toInt())
 
@@ -370,15 +369,6 @@ class SettingsViewModel @UiThread constructor() : GenericViewModel() {
         }
     }
 
-    @UiThread
-    fun toggleExportMedia() {
-        val newValue = exportMediaEnabled.value == false
-        coreContext.postOnCoreThread {
-            corePreferences.exportMediaToNativeGallery = newValue
-            exportMediaEnabled.postValue(newValue)
-        }
-    }
-
     @UiThread
     fun toggleContactsExpand() {
         expandContacts.value = expandContacts.value == false
diff --git a/app/src/main/res/layout/settings_chat.xml b/app/src/main/res/layout/settings_chat.xml
index a32813ceb..9f9e64559 100644
--- a/app/src/main/res/layout/settings_chat.xml
+++ b/app/src/main/res/layout/settings_chat.xml
@@ -44,48 +44,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_title_style"
-            android:onClick="@{() -> viewModel.toggleExportMedia()}"
-            android:id="@+id/export_media_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_conversations_export_media_title"
-            android:maxLines="2"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="@id/export_media_switch"
-            app:layout_constraintBottom_toTopOf="@id/export_media_subtitle"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/export_media_switch"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/settings_subtitle_style"
-            android:onClick="@{() -> viewModel.toggleExportMedia()}"
-            android:id="@+id/export_media_subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/settings_conversations_export_media_subtitle"
-            app:layout_constraintTop_toBottomOf="@id/export_media_title"
-            app:layout_constraintBottom_toBottomOf="@id/export_media_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/export_media_switch"/>
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            style="@style/material_switch_style"
-            android:id="@+id/export_media_switch"
-            android:onClick="@{() -> viewModel.toggleExportMedia()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
-            android:checked="@{viewModel.exportMediaEnabled}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/auto_download_switch" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index af2e43a07..a088a6df6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -227,8 +227,6 @@
     <string name="settings_calls_auto_record_title">Démarrer l\'enregistrement des appels automatiquement</string>
     <string name="settings_conversations_title">Conversations</string>
     <string name="settings_conversations_auto_download_title">Télécharger automatiquement les fichiers</string>
-    <string name="settings_conversations_export_media_title">Exporter les médias dans la gallerie</string>
-    <string name="settings_conversations_export_media_subtitle">Les médias des messages éphémères ne seront jamais exportés</string>
     <string name="settings_contacts_title">Contacts</string>
     <string name="settings_contacts_add_ldap_server_title">Ajouter un serveur LDAP</string>
     <string name="settings_contacts_edit_ldap_server_title">Editer le serveur LDAP</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f67ef3d6f..689a6684c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,8 +262,6 @@
     <string name="settings_calls_auto_record_title">Automatically start recording calls</string>
     <string name="settings_conversations_title">Conversations</string>
     <string name="settings_conversations_auto_download_title">Auto-download files</string>
-    <string name="settings_conversations_export_media_title">Export media in native gallery</string>
-    <string name="settings_conversations_export_media_subtitle">Media from ephemeral messages will never be exported</string>
     <string name="settings_contacts_title">Contacts</string>
     <string name="settings_contacts_add_ldap_server_title">Add LDAP server</string>
     <string name="settings_contacts_edit_ldap_server_title">Edit LDAP server</string>