diff --git a/ChangeLog b/ChangeLog
index cbbe4a60d..f6af7e639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-06-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
+	-folderIsMandatory]): returns NO unconditionnally.
+
 	* SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders
 	-appendPersonalSources]): add the "personal" folder to the list of
 	user folders even if it doesn't exist, so that it is created when
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 3fc0684e9..933779c33 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -86,7 +86,7 @@
 
 - (NSString *) ocsPath
 {
-  return [@"/Users/" stringByAppendingString: [self login]];
+  return [NSString stringWithFormat: @"/Users/%@", nameInContainer];
 }
 
 - (NSString *) ocsUserPath
@@ -94,6 +94,11 @@
   return [self ocsPath];
 }
 
+- (BOOL) folderIsMandatory
+{
+  return NO;
+}
+
 - (NSString *) ocsPrivateCalendarPath
 {
   return [[self ocsUserPath] stringByAppendingString:@"/Calendar"];
@@ -163,13 +168,11 @@
   obj = [super lookupName: _key inContext: _ctx acquire: NO];
   if (!obj)
     {
-      if ([_key hasPrefix: @"Calendar"])
-        {
-          obj = [self privateCalendar: @"Calendar" inContext: _ctx];
-          if (![_key isEqualToString: @"Calendar"])
-            obj = [obj lookupName: [_key pathExtension] 
-                       inContext: _ctx acquire: NO];
-        }
+      if ([_key isEqualToString: @"Calendar"])
+	obj = [self privateCalendar: @"Calendar" inContext: _ctx];
+//           if (![_key isEqualToString: @"Calendar"])
+//             obj = [obj lookupName: [_key pathExtension] 
+//                        inContext: _ctx acquire: NO];
       else if ([_key isEqualToString: @"Contacts"])
         obj = [self privateContacts: _key inContext: _ctx];
 //       else if ([_key isEqualToString: @"Groups"])