diff --git a/ChangeLog b/ChangeLog
index 1de32b166..f1e91e804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/generic.js (_): new gettextable equivalent
+	of "getLabel".
+
 2010-03-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoDomainDefaults.m (-imapFolderSeparator): new
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index ec987c81e..d2a389bb7 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -294,7 +294,7 @@ function triggerAjaxRequest(url, callback, userdata, content, headers) {
         http.url = url;
         http.callback = callback;
         http.callbackData = userdata;
-        http.onreadystatechange = function() { onAjaxRequestStateChange(http) };
+        http.onreadystatechange = function() { onAjaxRequestStateChange(http);};
         //       = function() {
         // //       log ("state changed (" + http.readyState + "): " + url);
         //     };
@@ -511,6 +511,8 @@ function onRowClick(event) {
     if (rowIndex != null)
         lastClickedRow = rowIndex;
 
+    event.stop();
+
     return true;
 }
 
@@ -1625,22 +1627,27 @@ function getMenus() {
 function onHeaderClick(event) {
 }
 
-function getLabel(title) {
-    var rc = title;
-    if (!logWindow) {
-        logWindow = window;
-        while (logWindow.opener)
-            logWindow = logWindow.opener;
+function _(key) {
+    var value = key;
+    if (labels[key]) {
+        value = labels[key];
+    }
+    else {
+        var topWindow = null;
+        if (!topWindow) {
+            topWindow = window;
+            while (topWindow.opener)
+                topWindow = topWindow.opener;
+        }
+        if (topWindow && topWindow.clabels[key])
+            value = topWindow.clabels[key];
     }
 
-    if (labels[title]) {
-        rc = labels[title];
-    }
-    else if (logWindow.clabels[title]) {
-        rc = logWindow.clabels[title];
-    }
-    
-    return rc;
+    return value;
+}
+
+function getLabel(key) {
+    return _(key);
 }
 
 /**