diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt
index 74dc905ff..162c41109 100644
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt
@@ -75,11 +75,20 @@ class VideoViewerFragment : SecureFragment<VideoViewerFragmentBinding>() {
         if (mediaController.isShowing) {
             mediaController.hide()
         }
-        binding.videoView.pause()
+
+        if (binding.videoView.isPlaying) {
+            binding.videoView.pause()
+        }
 
         super.onPause()
     }
 
+    override fun onDestroyView() {
+        binding.videoView.stopPlayback()
+
+        super.onDestroyView()
+    }
+
     private fun initMediaController() {
         val videoView = binding.videoView
 
@@ -95,10 +104,6 @@ class VideoViewerFragment : SecureFragment<VideoViewerFragmentBinding>() {
             }
         }
 
-        videoView.setOnCompletionListener { mediaPlayer ->
-            mediaPlayer.release()
-        }
-
         videoView.setOnErrorListener { _, what, extra ->
             Log.e("[Video Viewer] Error: $what ($extra)")
             false
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 241876986..dd3065e71 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -107,7 +107,8 @@ class CorePreferences constructor(private val context: Context) {
 
     /* Chat */
 
-    // iOS app currently can't display more than 1 file per message
+    // iOS and Android 4.4.x releases currently can't display more than 1 file per message
+    // TODO: Remove for the release, this won't be necessary anymore
     var preventMoreThanOneFilePerMessage: Boolean
         get() = config.getBool("app", "prevent_more_than_one_file_per_message", true)
         set(value) {