diff --git a/Mail/Views/Thread List/FlushFolderAlertView.swift b/Mail/Views/Thread List/FlushFolderAlertView.swift
index 6e3a1e104..9b40a598d 100644
--- a/Mail/Views/Thread List/FlushFolderAlertView.swift	
+++ b/Mail/Views/Thread List/FlushFolderAlertView.swift	
@@ -32,10 +32,10 @@ struct FlushFolderAlertView: View {
         }
 
         switch folder?.role {
-        case .trash:
-            return MailResourcesStrings.Localizable.threadListEmptyTrashButton
         case .spam:
             return MailResourcesStrings.Localizable.threadListEmptySpamButton
+        case .trash:
+            return MailResourcesStrings.Localizable.threadListEmptyTrashButton
         default:
             return ""
         }
diff --git a/Mail/Views/Thread List/FlushFolderView.swift b/Mail/Views/Thread List/FlushFolderView.swift
index 3940559ee..d30674cab 100644
--- a/Mail/Views/Thread List/FlushFolderView.swift	
+++ b/Mail/Views/Thread List/FlushFolderView.swift	
@@ -24,8 +24,8 @@ import SwiftUI
 
 struct FlushFolderView: View {
     private static let labels: [FolderRole: String] = [
-        .trash: MailResourcesStrings.Localizable.threadListTrashHint,
-        .spam: MailResourcesStrings.Localizable.threadListSpamHint
+        .spam: MailResourcesStrings.Localizable.threadListSpamHint,
+        .trash: MailResourcesStrings.Localizable.threadListTrashHint
     ]
     private static let buttons: [FolderRole: String] = [
         .trash: MailResourcesStrings.Localizable.threadListEmptyTrashButton,
diff --git a/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift b/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift
index dfff25518..a4974f3ba 100644
--- a/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift	
+++ b/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift	
@@ -87,13 +87,14 @@ import SwiftUI
             try await mailboxManager.toggleStar(threads: Array(selectedItems))
         case .delete:
             let threads = Array(selectedItems)
-            if selectedItems.first?.folder?.role == .trash || selectedItems.first?.folder?.role == .spam {
+            switch selectedItems.first?.folder?.role {
+            case .draft, .spam, .trash:
                 flushAlert.wrappedValue = FlushAlertState(deletedMessages: selectedItems.count) {
                     await tryOrDisplayError {
                         try await self.mailboxManager.moveOrDelete(threads: threads)
                     }
                 }
-            } else {
+            default:
                 try await mailboxManager.moveOrDelete(threads: threads)
             }
         default: