diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 557ee60b14..42fa8ca863 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4040,7 +4040,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 finish();
             else {
                 Log.i("Navigating to id=" + closeId);
-                navigate(closeId, "previous".equals(onclose));
+
+                Context context = getContext();
+                if (context == null)
+                    finish();
+
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean reversed = prefs.getBoolean("reversed", false);
+                navigate(closeId, "previous".equals(onclose) ^ reversed);
             }
         }
     }