diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 52d79e43b1..9d36d9397e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -195,7 +195,7 @@ public class FragmentMessages extends FragmentBase {
         actionbar = prefs.getBoolean("actionbar", true);
         autoexpand = prefs.getBoolean("autoexpand", true);
         autoclose = prefs.getBoolean("autoclose", true);
-        autonext = prefs.getBoolean("autonext", false);
+        autonext = (!autoclose && prefs.getBoolean("autonext", false));
         addresses = prefs.getBoolean("addresses", true);
     }