diff --git a/ChangeLog b/ChangeLog
index 2160ff38b..a10120bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-27  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder
+	-roleForComponentsWithAccessClass:forUser:]): now returns an empty
+	string when user is owner of the calendar.
+
 2009-07-23  Cyril Robert <crobert@inverse.ca>
 
 	* UI/Scheduler/UIxComponentEditor.m (repeatLabel), (ownerIsAttendee),
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 9d13a8551..7347727e7 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2449,7 +2449,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 - (NSString *) roleForComponentsWithAccessClass: (iCalAccessClass) accessClass
 					forUser: (NSString *) uid
 {
-  NSString *accessRole, *prefix, *currentRole, *suffix;
+  NSString *accessRole, *ownerLogin, *prefix, *currentRole, *suffix;
   NSEnumerator *acls;
   NSMutableDictionary *userRoles;
 
@@ -2468,22 +2468,28 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       userRoles = [NSMutableDictionary dictionaryWithCapacity: 3];
       [aclMatrix setObject: userRoles forKey: uid];
     }
-
+  
   accessRole = [userRoles objectForKey: prefix];
   if (!accessRole)
     {
-      acls = [[self aclsForUser: uid] objectEnumerator];
-      currentRole = [acls nextObject];
-      while (currentRole && !accessRole)
-	if ([currentRole hasPrefix: prefix])
-	  {
-	    suffix = [currentRole substringFromIndex: [prefix length]];
-	    accessRole = [NSString stringWithFormat: @"Component%@", suffix];
-	  }
-	else
-	  currentRole = [acls nextObject];
-      if (!accessRole)
+      ownerLogin = [self ownerInContext: context];
+      if ([ownerLogin isEqualToString: uid])
 	accessRole = @"";
+      else
+	{
+	  acls = [[self aclsForUser: uid] objectEnumerator];
+	  currentRole = [acls nextObject];
+	  while (currentRole && !accessRole)
+	    if ([currentRole hasPrefix: prefix])
+	      {
+		suffix = [currentRole substringFromIndex: [prefix length]];
+		accessRole = [NSString stringWithFormat: @"Component%@", suffix];
+	      }
+	    else
+	      currentRole = [acls nextObject];
+	  if (!accessRole)
+	    accessRole = @"";
+	}
       [userRoles setObject: accessRole forKey: prefix];
     }