diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index 18992430a..bf4200f91 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -104,9 +104,12 @@
     var collection = [],
         // Local recursive function
         createMailboxes = function(level, mailbox) {
+          mailbox.isSentFolder = mailbox.isSentFolder || mailbox.type == 'sent';
           for (var i = 0; i < mailbox.children.length; i++) {
             mailbox.children[i].level = level;
             mailbox.children[i] = new Mailbox(account, mailbox.children[i]);
+            if (mailbox.isSentFolder)
+              mailbox.children[i].isSentFolder = true;
             createMailboxes(level+1, mailbox.children[i]);
           }
         };
diff --git a/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js b/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
index abd080598..fe9c9f5c5 100644
--- a/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
+++ b/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
@@ -140,7 +140,7 @@
           $ctrl.mailboxNameElement.innerHTML = $ctrl.message.$mailbox.$displayName;
 
         // Sender or recipient when in
-        if ($ctrl.MailboxService.selectedFolder.type == 'sent')
+        if ($ctrl.MailboxService.selectedFolder.isSentFolder)
           $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('to').encodeEntities();
         else
           $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('from').encodeEntities();