diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index abe7e53dd..8bc7710cf 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -404,8 +404,11 @@ export class MailMessageList extends AbstractViewRight {
 
 	// User setting hideDeleted || immediatelyMoveToTrash ??
 	deleteCommand() {
-//		moveMessagesToFolderType(FolderType.Trash);
-		if (UNUSED_OPTION_VALUE === FolderUserStore.trashFolder() || '' === FolderUserStore.trashFolder()) {
+		/**
+		 * When FolderUserStore.trashFolder is set to "Do not use",
+		 * flag as \Deleted for removal by later EXPUNGE
+		 */
+		if (UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()) {
 			listAction(
 				FolderUserStore.currentFolderFullName(),
 				MessageSetAction.SetDeleted,
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index db01e4ce7..0082b3caf 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -105,7 +105,11 @@ export class MailMessageView extends AbstractViewRight {
 				createCommand(() => setAction(action), this.messageVisible),
 			createCommandDeleteHelper = () =>
 				createCommand(() => {
-					if (UNUSED_OPTION_VALUE === FolderUserStore.trashFolder() || '' === FolderUserStore.trashFolder()) {
+					/**
+					 * When FolderUserStore.trashFolder is set to "Do not use",
+					 * flag as \Deleted for removal by later EXPUNGE
+					 */
+					if (UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()) {
 						setAction(MessageSetAction.SetDeleted);
 					} else {
 						const message = currentMessage();