diff --git a/ChangeLog b/ChangeLog
index ea05b9b29..8f6cabf13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder -ocsFolder]): create
+	the folder only if the current user is the owner of the future
+	folder.
+
 	* SoObjects/Appointments/SOGoCalendarComponent.m
 	([SOGoCalendarComponent -contentAsString]): we return the content
 	based on the permissions returned by the security manager instead
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 5eb8adb81..d3f73984a 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -28,6 +28,7 @@
 #import <Foundation/NSURL.h>
 
 #import <NGObjWeb/SoObject.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <EOControl/EOQualifier.h>
@@ -38,6 +39,7 @@
 #import <SaxObjC/XMLNamespaces.h>
 
 #import "SOGoPermissions.h"
+#import "SOGoUser.h"
 
 #import "SOGoFolder.h"
 
@@ -151,11 +153,14 @@ static NSString *defaultUserID = @"<default>";
 - (GCSFolder *) ocsFolder
 {
   GCSFolder *folder;
+  NSString *userLogin;
 
   if (!ocsFolder)
     {
       ocsFolder = [self ocsFolderForPath: [self ocsPath]];
+      userLogin = [[context activeUser] login];
       if (!ocsFolder
+	  && [userLogin isEqualToString: [self ownerInContext: context]]
 	  && [self folderIsMandatory]
 	  && [self create])
 	ocsFolder = [self ocsFolderForPath: [self ocsPath]];