diff --git a/ChangeLog b/ChangeLog
index de12aaf4e..587378a53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-08-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoParentFolder.m (-appendPersonalSources): we
+	now that "owner" is always set properly from the init methods, no
+	need to invoke ownerInContext: anymore.
+
 	* SoObjects/SOGo/WORequest+SOGo.m (-isMacOSXAddressBookApp):
 	renamed from "isAddressBookApp".
 	(-isIPhoneAddressBookApp): new method to detect whether the
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index 52982439a..dafee4a8f 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -230,7 +230,7 @@ static SoSecurityManager *sm = nil;
 				       @" WHERE c_path2 = '%@'"
 				       @" AND c_folder_type = '%@'"),
 		    [folderLocation gcsTableName],
-		    [self ownerInContext: context],
+                    owner,
 		    gcsFolderType];
       error = [self _fetchPersonalFolders: sql withChannel: fc];
       [cm releaseChannel: fc];
@@ -276,7 +276,7 @@ static SoSecurityManager *sm = nil;
 
   error = nil; /* we ignore non-DB errors at this time... */
 
-  ownerUser = [SOGoUser userWithLogin: [self ownerInContext: context]];
+  ownerUser = [SOGoUser userWithLogin: owner];
   settings = [ownerUser userSettings];
   subscribedReferences = [[settings objectForKey: nameInContainer]
 			   objectForKey: @"SubscribedFolders"];