diff --git a/ChangeLog b/ChangeLog
index d9fd6e16e..3b91687b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-05-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
+	-davCollectionQuery:queryContext]): fixed the owner url returned
+	in the list so that it matches what the regular davOwner method
+	returns.
+
 	* UI/MailerUI/UIxMailFolderActions.m ([UIxMailFolderActions
 	-renameFolderAction]): select the INBOX folder before renaming the
 	target folder.
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 0bc23b532..08ac31b6c 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -257,14 +257,14 @@
       while ((currentFolder = [folders nextObject]))
 	{
 	  [r appendContentString: @"<D:response><D:href>"];
-	  data = [NSString stringWithFormat: @"%@%@%@", baseHREF,
+	  data = [NSString stringWithFormat: @"%@%@%@/", baseHREF,
 			   [currentContact objectForKey: @"c_uid"],
 			   [currentFolder objectForKey: @"name"]];
 	  [r appendContentString: data];
 	  [r appendContentString: @"</D:href><D:propstat>"];
 	  [r appendContentString: @"<D:status>HTTP/1.1 200 OK</D:status>"];
 	  [r appendContentString: @"</D:propstat><D:owner>"];
-	  data = [NSString stringWithFormat: @"%@users/%@", baseHREF,
+	  data = [NSString stringWithFormat: @"%@%@", baseHREF,
 			   [currentContact objectForKey: @"c_uid"]];
 	  [r appendContentString: data];
 	  [r appendContentString: @"</D:owner><ownerdisplayname>"];