diff --git a/ChangeLog b/ChangeLog
index 01a314f7a..a3f9fa915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * SoObjects/SOGo/SOGoUserFolder.m (-subFoldersFromFolder:)
+	Addded a check to NOT return web calendars in this query.
+
 2009-10-23  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailMainFrame.m (-formattedMailtoString:): fixed
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 1bcdb660d..e55f8bce9 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -170,7 +170,8 @@ static NSString *LDAPContactInfoAttribute = nil;
       if (![securityManager validatePermission: SOGoPerm_AccessObject
 			    onObject: currentFolder inContext: context]
 	  && [[currentFolder ownerInContext: context]
-	       isEqualToString: folderOwner])
+	       isEqualToString: folderOwner]
+	  && [NSStringFromClass([currentFolder class]) compare: @"SOGoWebAppointmentFolder"] != NSOrderedSame)
 	{
 	  folderName = [NSString stringWithFormat: @"/%@/%@",
 				 [parentFolder nameInContainer],