diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 7028b7b53..a682e4ff8 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -259,7 +259,7 @@
                           ng-dblclick="editFolder(folder)"
                           ui-sref="mail.account.mailbox({accountId: account.id, mailboxId: (folder.path | encodeUri)})"
                           ui-sref-active="sg-active">
-              <md-icon ng-class="'sg-child-level-' + folder.level">folder</md-icon>
+              <md-icon ng-class="'sg-child-level-' + folder.level">{{iconForFolder(folder)}}</md-icon>
               <p class="sg-item-name"
                  ng-show="editMode != folder.path">{{folder.name}}</p>
               <md-input-container class="md-flex md-tile-content"
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index 98d371f72..20e7def98 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -232,6 +232,23 @@
         }
       }
     };
+
+    $scope.iconForFolder = function(folder) {
+      if (folder.type == 'inbox')
+        return 'inbox';
+      else if (folder.type == 'draft')
+        return 'drafts';
+      else if (folder.type == 'sent')
+        return 'send';
+      else if (folder.type == 'trash')
+        return 'delete';
+
+      //if ($rootScope.currentFolder == folder)
+      //  return 'folder_open';
+
+      return 'folder';
+    };
+
     $scope.unselectMessages = function() {
       _.each($rootScope.mailbox.$messages, function(message) { message.selected = false; });
     };