diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
index 7ca5c873bd..c413e06599 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
@@ -610,7 +610,7 @@ fun ComposeView(
                 if (remoteHost == null) saveAnimImage(it.uri)
                 else CryptoFile.desktopPlain(it.uri)
               is UploadContent.Video ->
-                if (remoteHost == null) saveFileFromUri(it.uri)
+                if (remoteHost == null) saveFileFromUri(it.uri, hiddenFileNamePrefix = "video")
                 else CryptoFile.desktopPlain(it.uri)
             }
             if (file != null) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
index 5c4f9b631e..db1a0be9da 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
@@ -247,13 +247,26 @@ fun saveAnimImage(uri: URI): CryptoFile? {
 
 expect suspend fun saveTempImageUncompressed(image: ImageBitmap, asPng: Boolean): File?
 
-fun saveFileFromUri(uri: URI, withAlertOnException: Boolean = true): CryptoFile? {
+fun saveFileFromUri(
+  uri: URI,
+  withAlertOnException: Boolean = true,
+  hiddenFileNamePrefix: String? = null
+): CryptoFile? {
   return try {
     val encrypted = chatController.appPrefs.privacyEncryptLocalFiles.get()
     val inputStream = uri.inputStream()
     val fileToSave = getFileName(uri)
     return if (inputStream != null && fileToSave != null) {
-      val destFileName = uniqueCombine(fileToSave, File(getAppFilePath("")))
+      val destFileName = if (hiddenFileNamePrefix == null) {
+        uniqueCombine(fileToSave, File(getAppFilePath("")))
+      } else {
+        val ext = when {
+          // remove everything but extension
+          fileToSave.contains(".") -> fileToSave.substringAfterLast(".")
+          else -> null
+        }
+        generateNewFileName(hiddenFileNamePrefix, ext, File(getAppFilePath("")))
+      }
       val destFile = File(getAppFilePath(destFileName))
       if (encrypted) {
         createTmpFileAndDelete { tmpFile ->
@@ -353,11 +366,12 @@ fun <T> createTmpFileAndDelete(dir: File = tmpDir, onCreated: (File) -> T): T {
   }
 }
 
-fun generateNewFileName(prefix: String, ext: String, dir: File): String {
+fun generateNewFileName(prefix: String, ext: String?, dir: File): String {
   val sdf = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
   sdf.timeZone = TimeZone.getTimeZone("GMT")
   val timestamp = sdf.format(Date())
-  return uniqueCombine("${prefix}_$timestamp.$ext", dir)
+  val extension = if (ext != null) ".$ext" else ""
+  return uniqueCombine("${prefix}_$timestamp$extension", dir)
 }
 
 fun uniqueCombine(fileName: String, dir: File): String {