diff --git a/ChangeLog b/ChangeLog
index 7742fdb82..740164b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -isFolderish]): new
+	parent method, meant to be overriden.
+	([SOGoObject -davIsCollection]): moved method from SOGoFolder up
+	to this parent class.
+
 2008-02-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index b6ecfda2f..d8c3ea433 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -205,6 +205,11 @@
   return r;
 }
 
+- (BOOL) isFolderish
+{
+  return NO;
+}
+
 - (NSString *) davContentType
 {
   return @"text/calendar";
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.h b/SoObjects/Mailer/SOGoMailBaseObject.h
index 8d5967429..a7028b306 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.h
+++ b/SoObjects/Mailer/SOGoMailBaseObject.h
@@ -48,6 +48,8 @@
   NGImap4Connection *imap4;
 }
 
+- (BOOL) isFolderish;
+
 - (id) initWithImap4URL: (NSURL *) _url
 	    inContainer: (id) _container;
 
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index cfeda797f..7c5ec4e78 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -60,6 +60,11 @@ static BOOL debugOn = YES;
   [super dealloc];
 }
 
+- (BOOL) isFolderish
+{
+  return YES;
+}
+
 /* hierarchy */
 
 - (SOGoMailAccount *) mailAccountFolder
diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m
index 3afd10e07..38671f819 100644
--- a/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -449,6 +449,11 @@ static BOOL debugOn = NO;
   return klazz;
 }
 
+- (BOOL) isFolderish
+{
+  return NO;
+}
+
 /* etag support */
 
 - (id)davEntityTag {
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index ac27122be..a4bfbc377 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -377,10 +377,6 @@
                       reason:@"this object cannot be copied via WebDAV"];
 }
 
-- (BOOL)davIsCollection {
-  return [self isFolderish];
-}
-
 /* acls */
 
 - (NSArray *) aclUsers
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 7fbace9f9..84d69356b 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -634,6 +634,18 @@ static BOOL sendACLAdvisories = NO;
   return [NSNumber numberWithBool:YES]; /* delete worked out ... */
 }
 
+- (BOOL) isFolderish
+{
+  [self subclassResponsibility: _cmd];
+
+  return NO;
+}
+
+- (BOOL) davIsCollection
+{
+  return [self isFolderish];
+}
+
 - (NSString *) davContentType
 {
   return @"text/plain";