diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index f2dc88dc5..5d5506040 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -128,7 +128,10 @@
           <md-icon>arrow_back</md-icon>
         </md-button>
         <md-input-container class="md-flex" md-no-float="md-no-float">
-          <input name="folderSearch" type="search" ng-minlength="3" label:placeholder="Search"/>
+          <input name="folderSearch" type="search" var:minlength="minimumSearchLength" label:placeholder="Search"/>
+          <div ng-messages="searchForm.folderSearch.$error" ng-show="searchForm.folderSearch.$dirty">
+            <div ng-message="minlength"><var:string value="minimumSearchLengthLabel"/></div>
+          </div>
         </md-input-container>
         <md-input-container flex="25">
           <md-select>
diff --git a/UI/WebServerResources/js/Common/sgSearch.directive.js b/UI/WebServerResources/js/Common/sgSearch.directive.js
index 38cc205a6..6ee324588 100644
--- a/UI/WebServerResources/js/Common/sgSearch.directive.js
+++ b/UI/WebServerResources/js/Common/sgSearch.directive.js
@@ -123,7 +123,7 @@
           input = form[vm.inputName],
           rawSearchText = input.$viewValue;
 
-      if (vm.allowDot && rawSearchText == '.' || form.$valid) {
+      if (vm.allowDot && rawSearchText == '.' || form.$valid && rawSearchText) {
         if (rawSearchText == '.')
           // Ignore the minlength constraint when using the dot operator
           input.$setValidity('minlength', true);
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index f5f64c938..50940d0ab 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -274,7 +274,7 @@
       angular.extend(options, { sortingAttributes: Mailbox.$query });
       if (angular.isDefined(filters)) {
         options.filters = _.reject(filters, function(filter) {
-          return angular.isUndefined(filter.searchInput) || filter.searchInput.length === 0;
+          return !filter.searchInput || filter.searchInput.length === 0;
         });
         // Decompose filters that match two fields
         _.each(options.filters, function(filter) {