diff --git a/ChangeLog b/ChangeLog
index d9506b2be..a897b2012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js (onBodyClickContextMenu):
+	leave the context menu to appear on "A" elements with a
+	"clickableLink" class.
+
 	* SoObjects/SOGo/SOGoGCSFolder.m (-realDavURL): new method that
 	returns the the owner version of the URL to the current folder.
 
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index d84af51bc..e83af18ab 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1442,9 +1442,12 @@ function onLoadHandler(event) {
 }
 
 function onBodyClickContextMenu(event) {
-    if (!(event.target
-          && (event.target.tagName == "INPUT"
-              || event.target.tagName == "TEXTAREA")))
+    var target = $(event.target);
+    if (!(target
+          && (target.tagName == "INPUT"
+              || target.tagName == "TEXTAREA"
+              || (target.tagName == "A"
+                  && target.hasClassName("clickableLink")))))
         preventDefault(event);
 }