diff --git a/ChangeLog b/ChangeLog
index 0b1ebe5f3..9291ee6fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(-lookupCalendarFoldersForUID:): make use of -[SOGoUser
+	lookupCalendarFoldersForUID:].
+
 	* SoObjects/Appointments/SOGoAppointmentObject.m
 	(_handleAttendee:withDelegate:ownerUser:statusChange:inEvent:):
 	enable updating the attendee's calendar when a WORequest is not
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 814d2d50f..95c81a274 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2442,22 +2442,20 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 - (NSArray *) lookupCalendarFoldersForUID: (NSString *) theUID
 {
   NSArray *aFolders;
+  SOGoUser *theUser;
   NSEnumerator *e;
   NSMutableArray *aUserFolders;
   SOGoAppointmentFolders *aParent;
-  SOGoFolder *aContainer, *aFolder;
+  SOGoFolder *aFolder;
 
   aUserFolders = [NSMutableArray arrayWithCapacity: 16];
-  aContainer = [[container container] container];
-  aContainer = [aContainer lookupName: theUID
-			   inContext: context
-			   acquire: NO];
-  aParent = [aContainer lookupName: @"Calendar" 
-			inContext: context
-			acquire: NO];
+
+  theUser = [SOGoUser userWithLogin: theUID];
+  aParent = [theUser calendarsFolderInContext: context];
+  
   aFolders = [aParent subFolders];
   e = [aFolders objectEnumerator];
-  while ( (aFolder = [e nextObject]) )
+  while ((aFolder = [e nextObject]))
     {
       if (![aFolder isSubscription])
 	[aUserFolders addObject: aFolder];