1 files changed, 3 insertions, 3 deletions
diff --git a/web-ui/app/js/services/model/mail.js b/web-ui/app/js/services/model/mail.js
index 43ab4b86..34cba610 100644
--- a/web-ui/app/js/services/model/mail.js
+++ b/web-ui/app/js/services/model/mail.js
@@ -22,15 +22,15 @@ define(['helpers/contenttype'],
   var asMail = (function () {
 
     function isSentMail() {
-      return this.mailbox === 'SENT';
+      return _.has(this, 'mailbox') && this.mailbox.toUpperCase() === 'SENT';
     }
 
     function isDraftMail() {
-      return  this.mailbox === 'DRAFTS';
+      return _.has(this, 'mailbox') && this.mailbox.toUpperCase() === 'DRAFTS';
     }
 
     function isInTrash() {
-      return this.mailbox && this.mailbox.toLowerCase() === 'trash';
+      return _.has(this, 'mailbox') && this.mailbox.toUpperCase() === 'TRASH';
     }
 
     function setDraftReplyFor(ident) {