diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2380ef9b7..dc11c890c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,9 @@
             android:name="com.fsck.k9.activity.setup.Prefs"
             android:label="@string/prefs_title"
             android:configChanges="locale"
+            android:taskAffinity="com.fsck.k9.activity.setup.Prefs"
+            android:launchMode="singleTask"
+            android:excludeFromRecents="true"
             >
         </activity>
         <activity