diff --git a/ChangeLog b/ChangeLog
index b07b01644..79b2dcea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/SOGo/SOGoGCSFolder.m
+	(+folderWithSubscriptionReference:inContainer:)
+	We now consider the localIsSubscription when
+	building the folderName
+
 2010-09-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/SOGoContentObject.m (-davContentLength): use UTF8
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index aba227d92..4343c9e46 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -172,13 +172,19 @@ static NSArray *childRecordFields = nil;
 
   path = [NSString stringWithFormat: @"/Users/%@/%@/%@",
 		   login, [pathElements objectAtIndex: 0], ocsName];
-  folderName = [NSString stringWithFormat: @"%@_%@",
-			 [login asCSSIdentifier], ocsName];
+
+  localIsSubscription = ![login isEqualToString:
+				  [aContainer ownerInContext: localContext]];
+
+  if (localIsSubscription)
+    folderName = [NSString stringWithFormat: @"%@_%@",
+			   [login asCSSIdentifier], ocsName];
+  else
+    folderName = ocsName;
+  
   newFolder = [self objectWithName: folderName inContainer: aContainer];
   [newFolder setOCSPath: path];
   [newFolder setOwner: login];
-  localIsSubscription = ![login isEqualToString:
-                             [aContainer ownerInContext: localContext]];
   [newFolder setIsSubscription: localIsSubscription];
   if (![newFolder displayName])
     newFolder = nil;