diff --git a/res/values/strings.xml b/res/values/strings.xml
index b8c80f3c7..172ecbf64 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -169,6 +169,8 @@
     <string name="add_feed_label">Add feed</string>
     <string name="miro_feed_added">Feed is being added</string>
     <string name="player_buffering_msg">Buffering</string>
+    <string name="pref_autoQueue_title">Auto-queue</string>
+    <string name="pref_autoQueue_sum">Add an episode to the queue after it has been downloaded.</string>
     
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d6c9ff1aa..0a2c5e73b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -30,6 +30,7 @@
             android:key="prefMobileUpdate"
             android:summary="@string/pref_mobileUpdate_sum"
             android:title="@string/pref_mobileUpdate_title" />
+        <CheckBoxPreference android:summary="@string/pref_autoQueue_sum" android:defaultValue="true" android:key="prefAutoQueue" android:title="@string/pref_autoQueue_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/flattr_settings_label" >
         <PreferenceScreen
diff --git a/src/de/danoeh/antennapod/PodcastApp.java b/src/de/danoeh/antennapod/PodcastApp.java
index 48afb7862..f9eed56cc 100644
--- a/src/de/danoeh/antennapod/PodcastApp.java
+++ b/src/de/danoeh/antennapod/PodcastApp.java
@@ -28,6 +28,7 @@ public class PodcastApp extends Application implements
 	public static final String PREF_DOWNLOAD_MEDIA_ON_WIFI_ONLY = "prefDownloadMediaOnWifiOnly";
 	public static final String PREF_UPDATE_INTERVALL = "prefAutoUpdateIntervall";
 	public static final String PREF_MOBILE_UPDATE = "prefMobileUpdate";
+	public static final String PREF_AUTO_QUEUE = "prefAutoQueue";
 
 	private static float LOGICAL_DENSITY;