diff --git a/ChangeLog b/ChangeLog
index af899e0cc..5c34e2dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-08-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoUserFolder+Appointments.m
+	([SOGoUserFolder -davCalendarUserAddressSet]): the addresses
+	returned should be those of the owner and not of the current user.
+
 	* SoObjects/Appointments/SOGoAppointmentObject.m
 	([SOGoAppointmentObject +webdavAclManager]): declare DAV:write as
 	equivalent of ..._ModifyComponent (instead of DAV:write-content).
diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
index 5d3ef1e07..d6817daed 100644
--- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m
+++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -47,15 +47,16 @@
 
 - (NSArray *) davCalendarUserAddressSet
 {
-  NSArray *tag, *allEmails;
+  NSArray *tag;
   NSMutableArray *addresses;
   NSEnumerator *emails;
   NSString *currentEmail;
+  SOGoUser *ownerUser;
 
   addresses = [NSMutableArray array];
 
-  allEmails = [[context activeUser] allEmails];
-  emails = [allEmails objectEnumerator];
+  ownerUser = [SOGoUser userWithLogin: owner roles: nil];
+  emails = [[ownerUser allEmails] objectEnumerator];
   while ((currentEmail = [emails nextObject]))
     {
       tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",