diff --git a/ChangeLog b/ChangeLog
index 18db181a5..346f878bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js (subscribeToFolder): prepend a
+	"/" to the folder name, as it comes originally in the form
+	user:module/folder.
+
 	* UI/WebServerResources/UIxPreferences.js (initMailAccounts)
 	(displayMailAccount): getElementsByTagName seems too standard for
 	IE, we use $$() now so that we can invoke "each" on the result set
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index aa232bbad..059395ac0 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1211,7 +1211,7 @@ function subscribeToFolder(refreshCallback, refreshCallbackData) {
     var folderPath = folderData[1];
     if (username != UserLogin) {
         var url = (UserFolderURL + "../" + username
-                   + folderPath + "/subscribe");
+                   + "/" + folderPath + "/subscribe");
         if (document.subscriptionAjaxRequest) {
             document.subscriptionAjaxRequest.aborted = true;
             document.subscriptionAjaxRequest.abort();
@@ -1266,10 +1266,10 @@ function accessToSubscribedFolder(serverFolder) {
         var username = parts[0];
         var paths = parts[1].split("/");
         if (username == UserLogin) {
-            folder = paths[2];
+            folder = paths[1];
         }
         else {
-            folder = "/" + username.asCSSIdentifier() + "_" + paths[2];
+            folder = "/" + username.asCSSIdentifier() + "_" + paths[1];
         }
     }
     else {
@@ -2047,7 +2047,7 @@ function _showPromptDialog(title, label, callback, defaultValue) {
         document.body.appendChild(dialog);
         dialogs[title+label] = dialog;
     }
-    jQuery(dialog).fadeIn('fast', function () { dialog.down("input").focus(); });       
+    jQuery(dialog).fadeIn('fast', function () { dialog.down("input").focus(); });
 }
 
 function showSelectDialog(title, label, options, button, callbackFcn, callbackArg, defaultValue) {