diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index e273e3069..b96539c2b 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -94,8 +94,6 @@ export class MailMessageList extends AbstractViewRight { constructor() { super(); - this.allowDangerousActions = SettingsCapa('DangerousActions'); - this.messageList = MessagelistUserStore; this.archiveAllowed = MessagelistUserStore.archiveAllowed; this.canMarkAsSpam = MessagelistUserStore.canMarkAsSpam; @@ -148,6 +146,8 @@ export class MailMessageList extends AbstractViewRight { write: value => sLastSearchValue = value }, + allowDangerousActions: () => SettingsCapa('DangerousActions') || MessagelistUserStore.isTrashFolder(), + isIncompleteChecked: () => { const c = MessagelistUserStore.listChecked().length; return c && MessagelistUserStore().length > c; @@ -360,7 +360,7 @@ export class MailMessageList extends AbstractViewRight { } clear() { - SettingsCapa('DangerousActions') + this.allowDangerousActions() && showScreenPopup(FolderClearPopupView, [FolderUserStore.currentFolder()]); }