diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 257cfc669..38b27f29e 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -146,6 +146,7 @@
 /* Mailer */
 "Labels" = "Labels";
 "Label" = "Label";
+"New label" = "New label";
 "Show subscribed mailboxes only" = "Show subscribed mailboxes only";
 "Synchronize only default mail folders (EAS)" = "Synchronize only default mail folders (EAS)";
 "Sort messages by threads" = "Sort messages by threads";
@@ -212,6 +213,7 @@
 /* Event+task categories */
 "Calendar Category" = "Calendar Category";
 "Add Calendar Category" = "Add Calendar Category";
+"New category" = "New category";
 "Remove Calendar Category" = "Remove Calendar Category";
 "Contact Category" = "Contact Category";
 "Add Contact Category" = "Add Contact Category";
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 7069349aa..604f86fca 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -250,6 +250,7 @@
       </div>
       <div class="md-toolbar-tools">
         <md-chips class="md-flex"
+                  ng-show="app.search.params.length != 0 || app.currentSearchParam"
                   ng-model="app.search.params"
                   md-transform-chip="app.newSearchParam($chip)"
                   sg-transform-on-blur="sg-transform-on-blur">
diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js
index f465f7956..5c7dc9092 100644
--- a/UI/WebServerResources/js/Contacts/AddressBooksController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js
@@ -70,8 +70,8 @@
     }
 
     function newAddressbook() {
-      Dialog.prompt(l('New addressbook'),
-                    l('Name of new addressbook'))
+      Dialog.prompt(l('New Addressbook...'),
+                    l('Name of the Address Book'))
         .then(function(name) {
           var addressbook = new AddressBook(
             {
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index 698221cd6..e2f2a2801 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -43,12 +43,12 @@
     vm.hideAdvancedSearch = hideAdvancedSearch;
     vm.toggleAdvancedSearch = toggleAdvancedSearch;
     vm.search = {
-      options: {'': l('Select a criteria'),
+      options: {'': '',  // no placeholder when no criteria is active
                 subject: l('Enter Subject'),
-                from: l('Enter From'),
-                to: l('Enter To'),
-                cc: l('Enter Cc'),
-                body: l('Enter Body')
+                from:    l('Enter From'),
+                to:      l('Enter To'),
+                cc:      l('Enter Cc'),
+                body:    l('Enter Body')
                },
       mailbox: 'INBOX',
       subfolders: 1,
@@ -223,8 +223,8 @@
     }
 
     function newFolder(parentFolder) {
-      Dialog.prompt(l('New folder'),
-                    l('Enter the new name of your folder :'))
+      Dialog.prompt(l('New Folder...'),
+                    l('Enter the new name of your folder'))
         .then(function(name) {
           parentFolder.$newMailbox(parentFolder.id, name)
             .then(function() {