diff --git a/Chan/res/values/strings.xml b/Chan/res/values/strings.xml
index 47689e10..f278e6f5 100644
--- a/Chan/res/values/strings.xml
+++ b/Chan/res/values/strings.xml
@@ -94,9 +94,7 @@
     
     <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_autoplay">Start playing videos directly</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 d8047003..f79b8518 100644
--- a/Chan/res/xml/preference.xml
+++ b/Chan/res/xml/preference.xml
@@ -22,11 +22,9 @@
             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" />
+            android:defaultValue="false"
+            android:key="preference_autoplay"
+            android:title="@string/preference_autoplay" />
 
         <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 fcc60cb9..a7f17f6d 100644
--- a/Chan/src/org/floens/chan/core/ChanPreferences.java
+++ b/Chan/src/org/floens/chan/core/ChanPreferences.java
@@ -55,8 +55,8 @@ public class ChanPreferences {
         return Integer.parseInt(number) * 1000L;
     }
     
-    public static boolean getVideosEnabled() {
-        return ChanApplication.getPreferences().getBoolean("preference_enable_video", true);
+    public static boolean getVideoAutoPlay() {
+        return ChanApplication.getPreferences().getBoolean("preference_autoplay", false);
     }
 }
 
diff --git a/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java b/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java
index 2e091c63..1226d8c2 100644
--- a/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java
+++ b/Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java
@@ -1,6 +1,7 @@
 package org.floens.chan.ui.fragment;
 
 import org.floens.chan.R;
+import org.floens.chan.core.ChanPreferences;
 import org.floens.chan.core.model.Post;
 import org.floens.chan.ui.activity.ImageViewActivity;
 import org.floens.chan.ui.adapter.ImageViewAdapter;
@@ -27,7 +28,7 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
     private boolean isVideo = false;
     private boolean videoVisible = false;
     private boolean videoSetIconToPause = false;
-    
+
     public static ImageViewFragment newInstance(Post post, ImageViewActivity activity, int index) {
         ImageViewFragment imageViewFragment = new ImageViewFragment();
         imageViewFragment.post = post;
@@ -35,7 +36,7 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
 
         return imageViewFragment;
     }
-    
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         if (post == null) {
@@ -46,7 +47,7 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
 
             imageView = new ThumbnailImageView(context);
             imageView.setCallback(this);
-            
+
             int padding = (int) context.getResources().getDimension(R.dimen.image_view_padding);
             imageView.setPadding(padding, padding, padding, padding);
 
@@ -73,6 +74,10 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
                 isVideo = true;
                 activity.invalidateActionBar();
                 showProgressBar(false);
+
+                if (ChanPreferences.getVideoAutoPlay()) {
+                    startVideo();
+                }
             } else {
                 imageView.setBigImage(post.imageUrl);
             }
@@ -91,7 +96,7 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
 
         String filename = post.filename + "." + post.ext;
         activity.getActionBar().setTitle(filename);
-        
+
         String text = (position + 1) + "/" + adapter.getCount();
         activity.getActionBar().setSubtitle(text);
 
@@ -102,10 +107,11 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
         MenuItem item = menu.findItem(R.id.action_image_play_state);
         item.setVisible(isVideo);
         item.setEnabled(isVideo);
-        
+
         VideoView view = imageView.getVideoView();
         if (view != null) {
-            item.setIcon((videoSetIconToPause || view.isPlaying()) ? R.drawable.ic_action_pause : R.drawable.ic_action_play);
+            item.setIcon((videoSetIconToPause || view.isPlaying()) ? R.drawable.ic_action_pause
+                    : R.drawable.ic_action_play);
         }
         videoSetIconToPause = false;
     }
@@ -113,8 +119,7 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
     public void customOnOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.action_image_play_state) {
             if (!videoVisible) {
-                videoVisible = true;
-                imageView.setVideo(post.imageUrl);
+                startVideo();
             } else {
                 VideoView view = imageView.getVideoView();
                 if (view != null) {
@@ -125,11 +130,16 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
                     }
                 }
             }
-            
+
             activity.invalidateActionBar();
         }
     }
 
+    private void startVideo() {
+        videoVisible = true;
+        imageView.setVideo(post.imageUrl);
+    }
+
     public void showProgressBar(boolean e) {
         showProgressBar = e;
         activity.callOnSelect();
@@ -139,7 +149,7 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
     public void onTap() {
         activity.finish();
     }
-    
+
     @Override
     public void setProgress(boolean progress) {
         showProgressBar(progress);