From e1e6fd4e43a58d6d2b82bc8068e73a3e644e1174 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 12 Dec 2024 19:57:21 +0100 Subject: [PATCH] Revert "Allow trashing/archiving of sent messages when not threading" This reverts commit 3aafbcfd5c573582cfbd414f2b55066394fccb82. --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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))