diff --git a/ChangeLog b/ChangeLog
index 20228c37a..00b72deda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js (accessToSubscribedFolder): use
+	the last part of the string as folder identifier. Otherwise we end
+	up with the module name.
+
 	* SoObjects/Mailer/SOGoDraftObject.m
 	(-bodyPartForAttachmentWithName:): attach rfc822 content as 8bit,
 	since the "quoted-printable" encoder of SOPE is broken.
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 4c8c36c8d..b72e16921 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1266,10 +1266,10 @@ function accessToSubscribedFolder(serverFolder) {
         var username = parts[0];
         var paths = parts[1].split("/");
         if (username == UserLogin) {
-            folder = paths[1];
+            folder = paths[2];
         }
         else {
-            folder = "/" + username.asCSSIdentifier() + "_" + paths[1];
+            folder = "/" + username.asCSSIdentifier() + "_" + paths[2];
         }
     }
     else {