diff --git a/NEWS b/NEWS
index 81ef32b12..0c067a784 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Enhancements
- [web] constrain event/task reminder to a positive number
- [web] display year in day and week views
- [web] split string on comma and semicolon when pasting multiple addresses (#4097)
+ - [web] restrict Draft/Sent/Trash/Junk mailboxes to the top level (#6963)
Bug fixes
- [core] handle broken CalDAV clients sending bogus SENT-BY (#3992)
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index de90f07e8..743b27b64 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -161,23 +161,23 @@
-
+
-
+
-
+
-
+
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index abba6073d..bb56f3f06 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -571,6 +571,16 @@
});
};
+ /**
+ * @function $canFolderAs
+ * @memberof Mailbox.prototype
+ * @desc Check if the folder can be set as Drafts/Sent/Trash
+ * @returns true if folder is eligible
+ */
+ Mailbox.prototype.$canFolderAs = function() {
+ return this.type == 'folder' && this.level === 0;
+ };
+
/**
* @function $setFolderAs
* @memberof Mailbox.prototype