diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 5b6f5d2c2..d6676c0e5 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -23,8 +23,10 @@
 #import <stdlib.h>
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
+#import <Foundation/NSKeyValueCoding.h>
 #import <Foundation/NSURL.h>
 
 #import <NGObjWeb/SoObject.h>
@@ -134,10 +136,7 @@ static NSString *defaultUserID = @"<default>";
   static GCSFolderManager *folderManager = nil;
 
   if (!folderManager)
-    {
-      folderManager = [GCSFolderManager defaultFolderManager];
-      [folderManager setFolderNamePrefix: @"SOGo"];
-    }
+    folderManager = [GCSFolderManager defaultFolderManager];
 
   return folderManager;
 }