diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4fb4829e8d..253951d4eb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -8047,7 +8047,7 @@ public class FragmentMessages extends FragmentBase
                             if (!folder.read_only &&
                                     !EntityFolder.DRAFTS.equals(folder.type) &&
                                     !EntityFolder.OUTBOX.equals(folder.type) &&
-                                    (!EntityFolder.SENT.equals(folder.type) || move_thread_sent || !threading) &&
+                                    (!EntityFolder.SENT.equals(folder.type) || move_thread_sent) &&
                                     !EntityFolder.TRASH.equals(folder.type) &&
                                     !EntityFolder.JUNK.equals(folder.type))
                                 trashable = true;
@@ -8056,9 +8056,7 @@ public class FragmentMessages extends FragmentBase
                                 snoozable = true;
 
                             if (!folder.read_only &&
-                                    !EntityFolder.DRAFTS.equals(folder.type) &&
-                                    !EntityFolder.OUTBOX.equals(folder.type) &&
-                                    (!EntityFolder.SENT.equals(folder.type) || !threading) &&
+                                    !EntityFolder.isOutgoing(folder.type) &&
                                     !EntityFolder.TRASH.equals(folder.type) &&
                                     !EntityFolder.JUNK.equals(folder.type) &&
                                     !EntityFolder.ARCHIVE.equals(folder.type))