diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5cf89c0f47..23d9db9cd2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -6945,7 +6945,7 @@ public class FragmentMessages extends FragmentBase
             // - single, non archived/trashed/sent message
             // - one unread, non archived/trashed/sent message in conversation
             // - sole message
-            if (autoexpand) {
+            if (autoexpand || (pinned && pinnedMessage != null)) {
                 TupleMessageEx expand = null;
                 if (finds > 0) {
                     if (finds == 1)