diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index cc72b55274..e06ca7195e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3069,7 +3069,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 finish();
             else {
                 Log.i("Navigating to id=" + closeId);
-                navigate(closeId, false);
+                navigate(closeId, "previous".equals(onclose));
             }
         }
     }