diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index 255360e4f..49742eb8e 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -10,7 +10,7 @@
     title="name"
     var:popup="isPopup">
     <var:if condition="hideFrame" const:negate="YES">
-      <div class="menu" id="contactFolderMenu">
+      <div class="menu" id="contactFoldersMenu">
         <ul>
           <li
             onmousedown="return false;"
@@ -60,11 +60,11 @@
               ><div class="toolbar">
                 <a href="#" class="toolbarButton" onclick="return onAddressBookAdd(this);"
                   ><span class="toolbarButton"
-                    ><img rsrc:src="add-contact.gif" label:title="Add..."
+                    ><img rsrc:src="add-addressbook.png" label:title="Add an Addressbook..."
                       /></span></a
                   ><a href="#" class="toolbarButton" onclick="return onAddressBookRemove(this);"
                   ><span class="toolbarButton"
-                    ><img rsrc:src="remove-contact.gif" label:title="Remove"
+                    ><img rsrc:src="remove-addressbook.png" label:title="Remove the selected Addressbook"
                       /></span></a
                   ></div></var:if>
 
@@ -77,7 +77,7 @@
                     class="_selected"
                     onmousedown="return false;"
                     onclick="return onRowClick(event);"
-                    oncontextmenu="return onContactFolderContextMenu(event);"
+                    oncontextmenu="return onContactFoldersContextMenu(event, this);"
                     ><var:string value="currentContactFolderName" /></li
                     ></var:if
                   ><var:if condition="isFolderCurrent"
@@ -85,7 +85,7 @@
                   ><li var:id="currentContactFolderId"
                     onmousedown="return false;"
                     onclick="return onRowClick(event);"
-                    oncontextmenu="return onContactFolderContextMenu(event);"
+                    oncontextmenu="return onContactFoldersContextMenu(event, this);"
                     ><var:string value="currentContactFolderName" /></li
                     ></var:if>
               </var:foreach
@@ -95,7 +95,7 @@
                   var:external-addressbook="currentAdditionalFolder"
                   onmousedown="return false;"
                   onclick="return onRowClick(event);"
-                  oncontextmenu="return onContactFolderContextMenu(event);"
+                  oncontextmenu="return onContactFoldersContextMenu(event, this);"
                   ><var:string value="currentAdditionalFolder" /></li
                   ></var:foreach>
             </ul>
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 17f13c146..b85788d3c 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -160,13 +160,28 @@ function contactsListCallback(http)
     log ("ajax fuckage");
 }
 
+function onContactFoldersContextMenu(event, element)
+{
+  var menu = $("contactFoldersMenu");
+  menu.addEventListener("hideMenu", onContactFoldersContextMenuHide, false);
+  onMenuClick(event, "contactFoldersMenu");
+
+  var topNode = $("contactFolders");
+  var selectedNodes = topNode.getSelectedRows();
+  topNode.menuSelectedRows = selectedNodes;
+  for (var i = 0; i < selectedNodes.length; i++)
+    deselectNode(selectedNodes[i]);
+  topNode.menuSelectedEntry = element;
+  selectNode(element);
+}
+
 function onContactContextMenu(event, element)
 {
-  var menu = $('contactMenu');
+  var menu = $("contactMenu");
   menu.addEventListener("hideMenu", onContactContextMenuHide, false);
-  onMenuClick(event, 'contactMenu');
+  onMenuClick(event, "contactMenu");
 
-  var topNode = $('contactsList');
+  var topNode = $("contactsList");
   var selectedNodes = topNode.getSelectedRows();
   topNode.menuSelectedRows = selectedNodes;
   for (var i = 0; i < selectedNodes.length; i++)
@@ -177,7 +192,23 @@ function onContactContextMenu(event, element)
 
 function onContactContextMenuHide(event)
 {
-  var topNode = $('contactsList');
+  var topNode = $("contactsList");
+
+  if (topNode.menuSelectedEntry) {
+    deselectNode(topNode.menuSelectedEntry);
+    topNode.menuSelectedEntry = null;
+  }
+  if (topNode.menuSelectedRows) {
+    var nodes = topNode.menuSelectedRows;
+    for (var i = 0; i < nodes.length; i++)
+      selectNode (nodes[i]);
+    topNode.menuSelectedRows = null;
+  }
+}
+
+function onContactFoldersContextMenuHide(event)
+{
+  var topNode = $("contactFolders");
 
   if (topNode.menuSelectedEntry) {
     deselectNode(topNode.menuSelectedEntry);
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 279bff086..844de1a49 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -137,10 +137,10 @@ function extractEmailName(mailTo) {
 
 function sanitizeMailTo(dirtyMailTo) {
   var emailName = extractEmailName(dirtyMailTo);
-  var email = extractEmailAddress(dirtyMailTo);
+  var email = "" + extractEmailAddress(dirtyMailTo);
 
   var mailto = "";
-  if (emailName.length > 0)
+  if (emailName && emailName.length > 0)
     mailto = emailName + ' <' + email + '>';
   else
     mailto = email;