diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js
index 5cf668d61..f93d1fb8b 100644
--- a/UI/WebServerResources/HTMLElement.js
+++ b/UI/WebServerResources/HTMLElement.js
@@ -125,8 +125,8 @@ Element.addMethods({
     if (document.currentPopupMenu)
       hideMenu(document.currentPopupMenu);
     
-    var menuTop = event.pageY;
-    var menuLeft = event.pageX;
+    var menuTop = Event.pointerY(event);
+    var menuLeft = Event.pointerX(event);
     var heightDiff = (window.innerHeight
 		      - (menuTop + popup.offsetHeight));
     if (heightDiff < 0)
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index a9e6b37c6..4eb2c9a4d 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -264,4 +264,4 @@ function onSelectAllAttachments() {
     nodes[i].select();
 }
 
-window.addEventListener("load", initMailEditor, false);
+addEvent(window, 'load', initMailEditor);
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index e5e01a70b..663573ec6 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -105,10 +105,10 @@ function fancyAddRow(shouldEdit, text) {
 
   // select popup
   var rowNodes = row.childNodesWithTag("span");
-  select = rowNodes[0].childNodesWithTag("select")[0];
+  select = $(rowNodes[0]).childNodesWithTag("select")[0];
   select.name = 'popup_' + currentIndex;
 //   select.value = row.childNodesWithTag("span")[0].childNodesWithTag("select")[0].value;
-  input = rowNodes[1].childNodesWithTag("input")[0];
+  input = $(rowNodes[1]).childNodesWithTag("input")[0];
   input.name  = 'addr_' + currentIndex;
   input.id = 'addr_' + currentIndex;
   input.value = text;