diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index e81ba896a..096863756 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -143,7 +143,10 @@
                 md-search-text="viewer.tags.searchText"
                 md-items="tag in viewer.service.filterTags(viewer.tags.searchText)"
                 label:placeholder="Add a tag">
-              <span md-highlight-text="viewer.tags.searchText">{{viewer.service.$tags[tag][0]}}</span>
+                <md-item-template>
+                  <span md-highlight-text="viewer.tags.searchText"
+                        md-highlight-flags="^i">{{tag}}</span>
+                </md-item-template>
             </md-autocomplete>
           </md-chips>
         </md-toolbar>
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 99da68ace..b12402e2b 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -88,8 +88,7 @@
   Message.filterTags = function(query) {
     var re = new RegExp(query, 'i');
     return _.filter(_.keys(Message.$tags), function(tag) {
-      var value = Message.$tags[tag];
-      return value[0].search(re) != -1;
+      return tag.search(re) != -1;
     });
   };