diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 78b6e07183..22183a534e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3786,14 +3786,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             context.getString(R.string.title_accessibility_view_help)));
                 ibHelp.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 
-                if (expanded) {
+                if (expanded)
                     for (int i = 0; i < bnvActions.getMenu().size(); i++) {
                         MenuItem menuItem = bnvActions.getMenu().getItem(i);
                         if (menuItem.isVisible() && menuItem.isEnabled())
                             info.addAction(new AccessibilityNodeInfo.AccessibilityAction(
                                     menuItem.getItemId(), menuItem.getTitle()));
                     }
-                }
 
                 info.setContentDescription(TextUtils.join(", ", result));
             }
@@ -3804,6 +3803,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 if (message == null)
                     return false;
 
+                boolean expanded = properties.getValue("expanded", message.id);
+
                 switch (action) {
                     case R.id.ibExpander:
                         onToggleMessage(message);
@@ -3824,13 +3825,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         onHelp(message);
                         return true;
                     default:
-                        for (int i = 0; i < bnvActions.getMenu().size(); i++) {
-                            MenuItem menuItem = bnvActions.getMenu().getItem(i);
-                            if (menuItem.getItemId() == action) {
-                                bnvActions.getMenu().performIdentifierAction(action, 0);
-                                return true;
+                        if (expanded)
+                            for (int i = 0; i < bnvActions.getMenu().size(); i++) {
+                                MenuItem menuItem = bnvActions.getMenu().getItem(i);
+                                if (menuItem.getItemId() == action) {
+                                    bnvActions.getMenu().performIdentifierAction(action, 0);
+                                    return true;
+                                }
                             }
-                        }
                         return super.performAccessibilityAction(host, action, args);
                 }
             }