diff --git a/Chan/res/values/strings.xml b/Chan/res/values/strings.xml
index cbcb097e..a593c58d 100644
--- a/Chan/res/values/strings.xml
+++ b/Chan/res/values/strings.xml
@@ -93,6 +93,10 @@
     
     <string name="preference_general">General</string>
     <string name="preference_open_link_confirmation">Ask before opening links</string>
+    <string name="preference_enable_video">Enable videos</string>
+    <string name="preference_enable_video_enabled">Displaying videos</string>
+    <string name="preference_enable_video_disabled">Not displaying videos</string>
+    
     <string name="preference_default_name">Default name</string>
     <string name="preference_default_email">Default email</string>
     
diff --git a/Chan/res/xml/preference.xml b/Chan/res/xml/preference.xml
index a4ac766f..d8047003 100644
--- a/Chan/res/xml/preference.xml
+++ b/Chan/res/xml/preference.xml
@@ -21,6 +21,12 @@
             android:defaultValue="true"
             android:key="preference_open_link_confirmation"
             android:title="@string/preference_open_link_confirmation" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="preference_enable_video"
+            android:title="@string/preference_enable_video"
+            android:summaryOn="@string/preference_enable_video_enabled"
+            android:summaryOff="@string/preference_enable_video_disabled" />
 
         <EditTextPreference
             android:key="preference_default_name"
diff --git a/Chan/src/org/floens/chan/core/ChanPreferences.java b/Chan/src/org/floens/chan/core/ChanPreferences.java
index 47caf835..fcc60cb9 100644
--- a/Chan/src/org/floens/chan/core/ChanPreferences.java
+++ b/Chan/src/org/floens/chan/core/ChanPreferences.java
@@ -54,6 +54,10 @@ public class ChanPreferences {
         String number = ChanApplication.getPreferences().getString("preference_watch_background_timeout", "0");
         return Integer.parseInt(number) * 1000L;
     }
+    
+    public static boolean getVideosEnabled() {
+        return ChanApplication.getPreferences().getBoolean("preference_enable_video", true);
+    }
 }
 
 
diff --git a/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java b/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java
index 97d5ae1e..2beb52c8 100644
--- a/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java
+++ b/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 
 import org.floens.chan.ChanApplication;
 import org.floens.chan.R;
+import org.floens.chan.core.ChanPreferences;
 import org.floens.chan.core.model.Post;
 import org.floens.chan.core.net.CachingRequest;
 import org.floens.chan.core.net.GIFRequest;
@@ -97,9 +98,13 @@ public class ImageViewFragment extends Fragment implements View.OnLongClickListe
             if (post.ext.equals("gif")) {
                 loadGif();
             } else if (post.ext.equals("webm")) {
-                loadMovie();
+                if (ChanPreferences.getVideosEnabled()) {
+                    loadMovie();                    
+                } else {
+                    loadOtherImage(post.thumbnailUrl);
+                }
             } else {
-                loadOtherImage();
+                loadOtherImage(post.imageUrl);
             }
         }
     }
@@ -165,11 +170,11 @@ public class ImageViewFragment extends Fragment implements View.OnLongClickListe
         }
     }
 
-    private void loadOtherImage() {
+    private void loadOtherImage(String url) {
         NetworkPhotoView imageView = new NetworkPhotoView(context);
         imageView.setImageViewFragment(this);
         imageView.setFadeIn(100);
-        imageView.setImageUrl(post.imageUrl, ChanApplication.getImageLoader());
+        imageView.setImageUrl(url, ChanApplication.getImageLoader());
         imageView.setMaxScale(3f);
         imageView.setOnLongClickListenerToAttacher(this);
         imageView.setOnViewTapListenerToAttacher(this);