diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b8dd4e0c78..4acc47bb90 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1160,9 +1160,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFull.setVisibility(View.VISIBLE);
             ibImages.setVisibility(View.GONE);
             ibUnsubscribe.setVisibility(message.unsubscribe == null ? View.GONE : View.VISIBLE);
+            ibJunk.setEnabled(false);
             ibJunk.setVisibility(
                     message.uid == null || message.folderReadOnly ||
-                            !hasJunk || EntityFolder.JUNK.equals(message.folderType)
+                            EntityFolder.JUNK.equals(message.folderType)
                             ? View.GONE : View.VISIBLE);
             ibDecrypt.setVisibility(View.GONE);
             ibVerify.setVisibility(View.GONE);
@@ -1290,6 +1291,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     delete = (inTrash || !hasTrash || inOutbox);
 
+                    ibJunk.setEnabled(hasJunk);
+
                     bnvActions.getMenu().findItem(R.id.action_more).setVisible(!inOutbox);
 
                     if (!message.folderReadOnly) {