diff --git a/ChangeLog b/ChangeLog
index c33e549c1..acdb2c904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-27  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * SoObjects/SOGo/SOGoGCSFolder.m (create)
+	We send the advisory to the owner of the newly
+	created collection, not the currently logged on
+	user (which might be different). The sender will
+	nevertheless be the currently logged on user, as
+	it's this particular user that triggered the
+	creation of the collection.
+
 2009-10-26  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/ContactsUI.js
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index b773d13c8..4b08cca77 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -392,7 +392,7 @@ static NSArray *childRecordFields = nil;
 
   if (sendFolderAdvisories)
     {
-      user = [context activeUser];
+      user = [SOGoUser userWithLogin: [self ownerInContext: context]];
       pageName = [NSString stringWithFormat: @"SOGoFolder%@%@Advisory",
 			   [user language], template];