diff --git a/ChangeLog b/ChangeLog
index 26ede5240..aa4ac5b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-01-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m (-outlookFolderClass): removed
+	useless method.
+
 	* OpenChange/MAPIStoreUserContext.[hm]: new class for accessing
 	user data common to all "mapistore contexts" as a singleton: the
 	same instance is used across all requests until all related
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 882f5cac9..cedffbb96 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2617,11 +2617,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   return @"Appointment";
 }
 
-- (NSString *) outlookFolderClass
-{
-  return @"IPF.Appointment";
-}
-
 - (BOOL) isActive
 {
   SOGoUserSettings *settings;
diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.h b/SoObjects/Appointments/SOGoAppointmentFolders.h
index 36dff6dc7..a4b84a6dc 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolders.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.h
@@ -26,6 +26,7 @@
 #import <SOGo/SOGoParentFolder.h>
 
 @class NSArray;
+@class NSMutableArray;
 
 @class SOGoWebAppointmentFolder;
 
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 9fa758e75..c98e2ecd5 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -376,11 +376,6 @@ static NSArray *folderListingFields = nil;
   return @"Contact";
 }
 
-- (NSString *) outlookFolderClass
-{
-  return @"IPF.Contact";
-}
-
 /* TODO: multiget reorg */
 - (NSString *) _nodeTagForProperty: (NSString *) property
 {
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index ab8723508..fbcc73f7e 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -889,32 +889,6 @@ static NSString *defaultUserID =  @"anyone";
   return @"Mail";
 }
 
-- (NSString *) outlookFolderClass
-{
-  // TODO: detect Trash/Sent/Drafts folders
-  SOGoMailAccount *account;
-  NSString *name;
-
-  if (!folderType)
-    {
-      account = [self mailAccountFolder];
-      name = [self traversalFromMailAccount];
-
-      if ([name isEqualToString: [account trashFolderNameInContext: nil]])
-	folderType = @"IPF.Trash";
-      else if ([name
-		 isEqualToString: [account inboxFolderNameInContext: nil]])
-	folderType = @"IPF.Inbox";
-      else if ([name
-		 isEqualToString: [account sentFolderNameInContext: nil]])
-	folderType = @"IPF.Sent";
-      else
-	folderType = @"IPF.Folder";
-    }
-  
-  return folderType;
-}
-
 /* acls */
 
 - (NSArray *) _imapAclsToSOGoAcls: (NSString *) imapAcls
diff --git a/SoObjects/Mailer/SOGoSentFolder.m b/SoObjects/Mailer/SOGoSentFolder.m
index 92648a793..9dce47464 100644
--- a/SoObjects/Mailer/SOGoSentFolder.m
+++ b/SoObjects/Mailer/SOGoSentFolder.m
@@ -25,10 +25,4 @@
 
 @implementation SOGoSentFolder
 
-/* folder type */
-
-- (NSString *)outlookFolderClass {
-  return @"IPF.Sent";
-}
-
 @end /* SOGoSentFolder */
diff --git a/SoObjects/Mailer/SOGoTrashFolder.m b/SoObjects/Mailer/SOGoTrashFolder.m
index b034bfb16..e0e224af0 100644
--- a/SoObjects/Mailer/SOGoTrashFolder.m
+++ b/SoObjects/Mailer/SOGoTrashFolder.m
@@ -25,10 +25,4 @@
 
 @implementation SOGoTrashFolder
 
-/* folder type */
-
-- (NSString *)outlookFolderClass {
-  return @"IPF.Trash";
-}
-
 @end /* SOGoTrashFolder */
diff --git a/SoObjects/SOGo/SOGoFolder.h b/SoObjects/SOGo/SOGoFolder.h
index d51076805..1fa1c6ef8 100644
--- a/SoObjects/SOGo/SOGoFolder.h
+++ b/SoObjects/SOGo/SOGoFolder.h
@@ -54,9 +54,6 @@
 /* dav */
 - (NSArray *) davResourceType;
 
-/* outlook */
-- (NSString *) outlookFolderClass;
-
 /* email advisories */
 - (void) sendFolderAdvisoryTemplate: (NSString *) template;
 
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index adb8e4c4c..a27466cdd 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -563,13 +563,6 @@
 	       isEqualToString: [otherFolder nameInContainer]]);
 }
 
-- (NSString *) outlookFolderClass
-{
-  [self subclassResponsibility: _cmd];
-
-  return nil;
-}
-
 /* acls */
 
 - (NSString *) defaultUserID