From e533eb91a901764eae6a792ccbc27c9f8201f32e Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 7 Dec 2012 08:47:32 -0500
Subject: [PATCH 1/2] Web: reset search when search field is empty

---
 UI/WebServerResources/generic.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 118465e31..93394c4bf 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1183,7 +1183,8 @@ function onSearchFormSubmit(filterPanel) {
     if (searchValue.value != searchValue.ghostPhrase
         && (searchValue.value != searchValue.lastSearch
             && (searchValue.value.strip().length > minimumSearchLength
-                || searchValue.value.strip() == "." ))) {
+                || searchValue.value.strip() == "."
+                || searchValue.value.length == 0))) {
         search[id]["criteria"] = searchCriteria.value;
         search[id]["value"] = searchValue.value;
         searchValue.lastSearch = searchValue.value;

From 01e42dce7c9da3b5bd440ae2987eeae37831b6ef Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 7 Dec 2012 08:48:12 -0500
Subject: [PATCH 2/2] Webmail: fix reference of search field

---
 UI/WebServerResources/MailerUI.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 8d23e2430..9c1d1c577 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -623,7 +623,7 @@ function onMailboxTreeItemClick(event) {
     topNode.selectedEntry = this;
 
     search = {};
-    $("searchValue").value = "";
+    $$('[name="search"]').first().value = "";
     initCriteria();
 
     Mailer.currentMailboxType = this.parentNode.getAttribute("datatype");