diff --git a/ChangeLog b/ChangeLog
index db529721d..082b71673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/generic.js (URLForFolderID): avoid double
+	slashes in the URL returned for personal folders.
+
 2010-04-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoCalendarComponent.m
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index d182ca73c..16ea1834d 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -80,8 +80,13 @@ function URLForFolderID(folderID) {
             url += '/';
         url += folderInfos[1];
     }
-    else
-        url = ApplicationBaseURL + encodeURI(folderInfos[0]);
+    else {
+        var folderInfo = folderInfos[0];
+        if (ApplicationBaseURL.endsWith('/')
+            && folderInfo.startsWith('/'))
+            folderInfo = folderInfo.substr(1);
+        url = ApplicationBaseURL + encodeURI(folderInfo);
+    }
 
     if (url[url.length-1] == '/')
         url = url.substr(0, url.length-1);