diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index b274ce058..4ccc8dd48 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -37,10 +37,12 @@
               <md-autocomplete
                   md-selected-item="editor.autocomplete.to.selected"
                   md-search-text="editor.autocomplete.to.searchText"
-                  md-items="user in editor.userFilter(editor.autocomplete.to.searchText)"
+                  md-items="user in editor.contactFilter(editor.autocomplete.to.searchText)"
                   label:placeholder="Add a recipient">
-                <span md-highlight-text="editor.autocomplete.to.searchText">{{user}}</span>
+                <span md-highlight-text="editor.autocomplete.to.searchText"
+                      md-highlight-flags="^i">{{user}}</span>
               </md-autocomplete>
+              <md-chip-template>{{$chip}}</md-chip-template>
             </md-chips>
           </div>
 
@@ -52,10 +54,12 @@
               <md-autocomplete
                   md-selected-item="editor.autocomplete.cc.selected"
                   md-search-text="editor.autocomplete.cc.searchText"
-                  md-items="user in editor.userFilter(editor.autocomplete.cc.searchText)"
+                  md-items="user in editor.contactFilter(editor.autocomplete.cc.searchText)"
                   label:placeholder="Add a recipient">
-                <span md-highlight-text="editor.autocomplete.cc.searchText">{{user}}</span>
+                <span md-highlight-text="editor.autocomplete.cc.searchText"
+                      md-highlight-flags="^i">{{user}}</span>
               </md-autocomplete>
+              <md-chip-template>{{$chip}}</md-chip-template>
             </md-chips>
           </div>
 
@@ -67,10 +71,12 @@
               <md-autocomplete
                   md-selected-item="editor.autocomplete.bcc.selected"
                   md-search-text="editor.autocomplete.bcc.searchText"
-                  md-items="user in editor.userFilter(editor.autocomplete.bcc.searchText)"
+                  md-items="user in editor.contactFilter(editor.autocomplete.bcc.searchText)"
                   label:placeholder="Add a recipient">
-                <span md-highlight-text="editor.autocomplete.bcc.searchText">{{user}}</span>
+                <span md-highlight-text="editor.autocomplete.bcc.searchText"
+                      md-highlight-flags="^i">{{user}}</span>
               </md-autocomplete>
+              <md-chip-template>{{$chip}}</md-chip-template>
             </md-chips>
           </div>
 
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index 473674b44..7b1a9de9b 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -17,7 +17,7 @@
     vm.hideBcc = true;
     vm.cancel = cancel;
     vm.send = send;
-    vm.userFilter = userFilter;
+    vm.contactFilter = contactFilter;
     vm.identities = _.pluck(_.flatten(_.pluck(stateAccounts, 'identities')), 'full');
     vm.uploader = new FileUploader({
       url: stateMessage.$absolutePath({asDraft: true}) + '/save',
@@ -88,7 +88,7 @@
       });
     }
 
-    function userFilter($query) {
+    function contactFilter($query) {
       var deferred = $q.defer();
       AddressBook.$filterAll($query).then(function(results) {
         deferred.resolve(_.invoke(results, '$shortFormat', $query));