diff --git a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
index 54614dc01..916ce36c4 100644
--- a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
+++ b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
@@ -16,7 +16,9 @@
     <div id="filterPanel">
       <span class="searchBox" style="float: right">
         <input id="searchCriteria" name="criteria" type="hidden" var:value="searchCriteria" />
-        <input id="searchValue" class="textField" autocomplete="off" name="search" type="text" var:value="searchText" onmousedown="onSearchMouseDown(event, this);" onclick="popupSearchMenu(event, 'searchMenu');" onblur="onSearchBlur(this);" onfocus="onSearchFocus(this);" onkeydown="onSearchKeyDown(this);" />
+        <input id="searchValue" class="textField" autocomplete="off" name="search"
+	  menuid="searchMenu"
+	  type="text" var:value="searchText" />
       </span>
     </div>
   </container>
diff --git a/UI/Templates/MailerUI/UIxMailFilterPanel.wox b/UI/Templates/MailerUI/UIxMailFilterPanel.wox
index c36477672..349b5c0bf 100644
--- a/UI/Templates/MailerUI/UIxMailFilterPanel.wox
+++ b/UI/Templates/MailerUI/UIxMailFilterPanel.wox
@@ -35,12 +35,7 @@
           <input id="searchValue"
             class="textField"
             autocomplete="off" name="search" type="text" var:value="searchText"
-            onmousedown="onSearchMouseDown(event, this);"
-            onclick="popupSearchMenu(event, 'searchMenu');"
-            onchange="onSearchChange();"
-            onblur="onSearchBlur(this);"
-            onfocus="onSearchFocus(this);"
-            onkeydown="onSearchKeyDown(this);" />
+	    menuid="searchMenu" />
         </span>
 
         <var:string label:value="View:" />
diff --git a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
index b1bd4da03..44c03cade 100644
--- a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
+++ b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
@@ -19,12 +19,7 @@
         <input id="searchValue"
           class="textField"
           autocomplete="off" name="search" type="text" var:value="searchText"
-          onmousedown="onSearchMouseDown(event, this);"
-          onclick="popupSearchMenu(event, 'searchMenu');"
-          onchange="onSearchChange();"
-          onblur="onSearchBlur(this);"
-          onfocus="onSearchFocus(this);"
-          onkeydown="onSearchKeyDown(this);" />
+	  menuid="searchMenu" />
       </span>
 
       <var:string label:value="View:" />
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 5ac0bfba6..c889d4754 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -789,10 +789,21 @@ function initializeMenus() {
   menuEntry.addEventListener("mouseup", onAccessRightsMenuEntryMouseUp, false);
 }
 
+function configureSearchField() {
+   var searchValue = $("searchValue");
+
+   searchValue.addEventListener("mousedown", onSearchMouseDown, false);
+   searchValue.addEventListener("click", popupSearchMenu, false);
+   searchValue.addEventListener("blur", onSearchBlur, false);
+   searchValue.addEventListener("focus", onSearchFocus, false);
+   searchValue.addEventListener("keydown", onSearchKeyDown, false);
+}
+
 var initContacts = {
   handleEvent: function (event) {
     if (!document.body.hasClassName("popup")) {
       configureAbToolbar();
+      configureSearchField();
     }
     configureContactFolders();
 //     initDnd();
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 9be2fc50f..23279ad90 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1013,32 +1013,42 @@ function openInbox(node) {
   }
 }
 
+function configureSearchField() {
+   var searchValue = $("searchValue");
+
+   searchValue.addEventListener("mousedown", onSearchMouseDown, false);
+   searchValue.addEventListener("click", popupSearchMenu, false);
+   searchValue.addEventListener("blur", onSearchBlur, false);
+   searchValue.addEventListener("focus", onSearchFocus, false);
+   searchValue.addEventListener("keydown", onSearchKeyDown, false);
+}
+
 var initMailer = {
-  handleEvent: function (event) {
-    if (!document.body.hasClassName("popup")) {
-      var inboxFound = false;
-      configureMessageListEvents();
-      initDnd();
-      var tree = $("d");
-      var nodes = document.getElementsByClassName("node", tree);
-      for (i = 0; i < nodes.length; i++) {
-        nodes[i].addEventListener("click", onMailboxTreeItemClick, false);
-        nodes[i].addEventListener("contextmenu", onFolderMenuClick, false);
-        if (!inboxFound
-            && nodes[i].parentNode.getAttribute("datatype") == "inbox") {
-          openInbox(nodes[i]);
-          inboxFound = true;
-        }
+   handleEvent: function (event) {
+      if (!document.body.hasClassName("popup")) {
+	 configureSearchField();
+	 var inboxFound = false;
+	 configureMessageListEvents();
+	 initDnd();
+	 var tree = $("d");
+	 var nodes = document.getElementsByClassName("node", tree);
+	 for (i = 0; i < nodes.length; i++) {
+	    nodes[i].addEventListener("click", onMailboxTreeItemClick, false);
+	    nodes[i].addEventListener("contextmenu", onFolderMenuClick, false);
+	    if (!inboxFound
+		&& nodes[i].parentNode.getAttribute("datatype") == "inbox") {
+	       openInbox(nodes[i]);
+	       inboxFound = true;
+	    }
+	 }
       }
-    }
-
-    /*
-, 'onMailboxTreeItemClick(this);'
-<!--      if (typeof(node.datatype) != "undefined") str += ' oncontextmenu="onFolderMenuClick(event, this);"';
-
-    */
-
-  }
+      
+      /*
+      , 'onMailboxTreeItemClick(this);'
+      <!--      if (typeof(node.datatype) != "undefined") str += ' oncontextmenu="onFolderMenuClick(event, this);"';
+      
+      */
+   }
 }
 
 function initializeMenus() {
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 77d5d205f..4c1c33c71 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1116,9 +1116,21 @@ function initCalendarContactsSelector() {
   }
 }
 
+function configureSearchField() {
+   var searchValue = $("searchValue");
+
+   searchValue.addEventListener("mousedown", onSearchMouseDown, false);
+   searchValue.addEventListener("click", popupSearchMenu, false);
+   searchValue.addEventListener("blur", onSearchBlur, false);
+   searchValue.addEventListener("focus", onSearchFocus, false);
+   searchValue.addEventListener("keydown", onSearchKeyDown, false);
+}
+
 function initCalendars() {
-  if (!document.body.hasClassName("popup"))
-    initCalendarContactsSelector();
+   if (!document.body.hasClassName("popup")) {
+      initCalendarContactsSelector();
+      configureSearchField();
+   }
 }
 
 function onSchedulerBodyKeyUp(event) {
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 5b6a8fa10..e9d8bce83 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -633,8 +633,10 @@ function checkDropDown(event) {
 }
 
 /* search field */
-function popupSearchMenu(event, menuId) {
+function popupSearchMenu(event) {
   var node = event.target;
+
+  var menuId = this.getAttribute("menuid");
   relX = event.pageX - node.cascadeLeftOffset();
   relY = event.pageY - node.cascadeTopOffset();
 
@@ -679,50 +681,50 @@ function onSearchChange() {
   log ("onSearchChange()...");
 }
 
-function onSearchMouseDown(event, searchValue) {
-  superNode = searchValue.parentNode.parentNode.parentNode;
-  relX = (event.pageX - superNode.offsetLeft - searchValue.offsetLeft);
-  relY = (event.pageY - superNode.offsetTop - searchValue.offsetTop);
+function onSearchMouseDown(event) {
+   var superNode = this.parentNode.parentNode.parentNode;
+   relX = (event.pageX - superNode.offsetLeft - this.offsetLeft);
+   relY = (event.pageY - superNode.offsetTop - this.offsetTop);
 
-  if (relY < 24) {
-    event.cancelBubble = true;
-    event.returnValue = false;
-  }
+   if (relY < 24) {
+      event.cancelBubble = true;
+      event.returnValue = false;
+   }
 }
 
-function onSearchFocus(searchValue) {
-  ghostPhrase = searchValue.getAttribute("ghost-phrase");
-  if (searchValue.value == ghostPhrase) {
-    searchValue.value = "";
-    searchValue.setAttribute("modified", "");
+function onSearchFocus() {
+  ghostPhrase = this.getAttribute("ghost-phrase");
+  if (this.value == ghostPhrase) {
+    this.value = "";
+    this.setAttribute("modified", "");
   } else {
-    searchValue.select();
+    this.select();
   }
 
-  searchValue.style.color = "#000";
+  this.style.color = "#000";
 }
 
-function onSearchBlur(searchValue) {
-  var ghostPhrase = searchValue.getAttribute("ghost-phrase");
-//   log ("search blur: '" + searchValue.value + "'");
-  if (!searchValue.value) {
-    searchValue.setAttribute("modified", "");
-    searchValue.style.color = "#aaa";
-    searchValue.value = ghostPhrase;
-  } else if (searchValue.value == ghostPhrase) {
-    searchValue.setAttribute("modified", "");
-    searchValue.style.color = "#aaa";
+function onSearchBlur(event) {
+  var ghostPhrase = this.getAttribute("ghost-phrase");
+//   log ("search blur: '" + this.value + "'");
+  if (!this.value) {
+    this.setAttribute("modified", "");
+    this.style.color = "#aaa";
+    this.value = ghostPhrase;
+  } else if (this.value == ghostPhrase) {
+    this.setAttribute("modified", "");
+    this.style.color = "#aaa";
   } else {
-    searchValue.setAttribute("modified", "yes");
-    searchValue.style.color = "#000";
+    this.setAttribute("modified", "yes");
+    this.style.color = "#000";
   }
 }
 
-function onSearchKeyDown(searchValue) {
-  if (searchValue.timer)
-    clearTimeout(searchValue.timer);
+function onSearchKeyDown(event) {
+  if (this.timer)
+    clearTimeout(this.timer);
 
-  searchValue.timer = setTimeout("onSearchFormSubmit()", 1000);
+  this.timer = setTimeout("onSearchFormSubmit()", 1000);
 }
 
 function initCriteria() {