diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index d95e3cca6..4acccc07d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -101,7 +101,7 @@ public class SettingsFragment extends Fragment {
     private static final int ACTIVITY_CHOOSE_FILE = 411;
     private TextView set_folder;
     private EditText your_api_key;
-    private int count1, count2, count3, count4;
+    private int count1, count2, count3, count4, count5;
 
 
     @Override
@@ -142,7 +142,7 @@ public class SettingsFragment extends Fragment {
         count2 = 0;
         count3 = 0;
         count4 = 0;
-
+        count5 = 0;
 
         final Spinner battery_layout_spinner = rootView.findViewById(R.id.battery_layout_spinner);
         ArrayAdapter<CharSequence> adapterBattery = ArrayAdapter.createFromResource(getContext(),
@@ -356,6 +356,49 @@ public class SettingsFragment extends Fragment {
             }
         });
 
+
+        int videoMode = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_DIRECT);
+
+
+        //Video mode
+        final Spinner video_mode_spinner = rootView.findViewById(R.id.set_video_mode);
+        ArrayAdapter<CharSequence> video_mode_spinnerAdapter = ArrayAdapter.createFromResource(getContext(),
+                R.array.settings_video_mode, android.R.layout.simple_spinner_item);
+        video_mode_spinner.setAdapter(video_mode_spinnerAdapter);
+        if (videoMode == Helper.VIDEO_MODE_TORRENT)
+            videoMode = Helper.VIDEO_MODE_DIRECT;
+        int positionVideoMode = 0;
+        if( videoMode == Helper.VIDEO_MODE_DIRECT)
+            positionVideoMode = 1;
+        video_mode_spinner.setSelection(positionVideoMode);
+        video_mode_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                if( count5 > 0 ) {
+                    SharedPreferences.Editor editor = sharedpreferences.edit();
+                    switch (position) {
+                        /*case 0:
+                            editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_TORRENT);
+                            editor.apply();
+                            break;*/
+                        case 0:
+                            editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_WEBVIEW);
+                            editor.apply();
+                            break;
+                        case 1:
+                            editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_DIRECT);
+                            editor.apply();
+                            break;
+                    }
+                }
+                count5++;
+            }
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
         boolean patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
         final CheckBox set_security_provider = rootView.findViewById(R.id.set_security_provider);
         set_security_provider.setChecked(patch_provider);
diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml
index b6193174c..b2ee90b3c 100644
--- a/app/src/main/res/layout-sw600dp/fragment_settings.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml
@@ -502,8 +502,22 @@
             android:text="@string/set_security_provider"
             android:layout_height="wrap_content" />
 
-
-
+        <!-- Choose stream -->
+        <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/set_video_mode"/>
+            <Spinner
+                android:id="@+id/set_video_mode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
 
 
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 9228e3cb3..406ac5da9 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -497,8 +497,6 @@
             android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_optimize_loading"
             android:layout_height="wrap_content" />
-
-
         <CheckBox
             android:id="@+id/set_security_provider"
             android:layout_width="wrap_content"
@@ -506,6 +504,26 @@
             android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_security_provider"
             android:layout_height="wrap_content" />
+
+
+        <!-- Choose stream -->
+        <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/set_video_mode"/>
+            <Spinner
+                android:id="@+id/set_video_mode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+
         <!-- TRUNCATE LONG TOOTS -->
         <TextView
             android:layout_marginTop="10dp"