diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt
index 39dafb639..2c19d19df 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt
@@ -272,8 +272,8 @@ fun ImageVideoPost(
     }
 
     SettingSwitchItem(
-        title = R.string.strip_location_metadata_label,
-        description = R.string.strip_location_metadata_description,
+        title = R.string.strip_metadata_label,
+        description = R.string.strip_metadata_description,
         modifier =
             Modifier
                 .fillMaxWidth()
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/utils/ChatFileUploadDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/utils/ChatFileUploadDialog.kt
index 895ccd634..219c418ad 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/utils/ChatFileUploadDialog.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/utils/ChatFileUploadDialog.kt
@@ -262,8 +262,8 @@ private fun ImageVideoPostChat(
     }
 
     SettingSwitchItem(
-        title = R.string.strip_location_metadata_label,
-        description = R.string.strip_location_metadata_description,
+        title = R.string.strip_metadata_label,
+        description = R.string.strip_metadata_description,
         modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
         checked = fileUploadState.stripLocationMetadata,
         onCheckedChange = { fileUploadState.stripLocationMetadata = it },
diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml
index 3b5feb37b..c29f730ab 100644
--- a/amethyst/src/main/res/values/strings.xml
+++ b/amethyst/src/main/res/values/strings.xml
@@ -1231,8 +1231,13 @@
     <string name="media_compression_quality_uncompressed">Uncompressed</string>
     <string name="video_codec_h265_label">Use H.265/HEVC Codec</string>
     <string name="video_codec_h265_description">Better quality at smaller file sizes but not all devices support H.265 playback.</string>
-    <string name="strip_location_metadata_label">Strip location metadata</string>
-    <string name="strip_location_metadata_description">Removes GPS location, camera info, and other sensitive metadata from files before uploading.</string>
+    <string name="strip_metadata_label">Remove private metadata</string>
+    <string name="strip_metadata_description">Private metadata will be attempted stripped from supported media files</string>
+
+    <string name="metadata_strip_failed_title">Metadata could not be removed</string>
+    <string name="metadata_strip_failed_body">This file format does not support metadata stripping. Private information such as location and device info may be included. Upload anyway?</string>
+    <string name="metadata_strip_failed_upload">Upload anyway</string>
+    <string name="upload_cancelled">Upload cancelled</string>
 
     <string name="edit_draft">Edit draft</string>