diff --git a/app/build.gradle b/app/build.gradle
index 39ef982eb..2bf1b658e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.35.8'
+    compile 'com.simplemobiletools:commons:2.35.10'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
index 8985628c1..9b1fb6d03 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
@@ -21,6 +21,7 @@ import com.simplemobiletools.gallery.extensions.*
 import com.simplemobiletools.gallery.helpers.MEDIUM
 import com.simplemobiletools.gallery.models.Medium
 import kotlinx.android.synthetic.main.pager_video_item.view.*
+import java.io.IOException
 
 class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSeekBarChangeListener {
     private val CLICK_MAX_DURATION = 150
@@ -40,6 +41,7 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
     private var mIsFragmentVisible = false
     private var mPlayOnPrepare = false
     private var mStoredShowExtendedDetails = false
+    private var wasEncoded = false
     private var wasInit = false
     private var mStoredExtendedDetails = 0
     private var mCurrTime = 0
@@ -424,6 +426,15 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
                 setAudioStreamType(AudioManager.STREAM_MUSIC)
                 prepare()
             }
+        } catch (e: IOException) {
+            medium.path = Uri.encode(medium.path)
+            if (wasEncoded) {
+                releaseMediaPlayer()
+            } else {
+                wasEncoded = true
+                mMediaPlayer = null
+                initMediaPlayer()
+            }
         } catch (e: Exception) {
             releaseMediaPlayer()
         }