diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6be98e6ea6..6b33e8952d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4943,7 +4943,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         !EntityFolder.TRASH.equals(message.folderType)) {
                     count++;
 
-                    singleMessage = message;
+                    if (singleMessage == null)
+                        singleMessage = message;
+
                     if (!message.ui_seen) {
                         unseen++;
                         unseenMessage = message;