diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index 2a1e87b1b..0eef566c1 100644
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -990,14 +990,17 @@ static NSArray *contentFieldNames = nil;
   }
   if (ofFlags.sameTableForQuick)
     quickChannel = nil;
-  else {
-    if ((quickChannel = [self acquireQuickChannel]) == nil) {
-      [self errorWithFormat:@"could not open quick channel!"];
-      [self releaseChannel:storeChannel];
-      return nil;
+  else
+    {
+      quickChannel = [self acquireQuickChannel];
+      if (!quickChannel)
+	{
+	  [self errorWithFormat:@"could not open quick channel!"];
+	  [self releaseChannel:storeChannel];
+	  return nil;
+	}
     }
-  }
-  
+
   /* delete rows */
   nowDate = [NSCalendarDate calendarDate];
 
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 304b48f02..5f0975ca9 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -132,133 +132,133 @@ static Class sogoAppointmentFolderKlass = Nil;
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *webdavAclManager = nil;
+  SOGoWebDAVAclManager *aclManager = nil;
   NSString *nsI;
 
-  if (!webdavAclManager)
+  if (!aclManager)
     {
       nsI = @"urn:inverse:params:xml:ns:inverse-dav";
 
-      webdavAclManager = [SOGoWebDAVAclManager new];
-      [webdavAclManager registerDAVPermission: davElement (@"read", XMLNS_WEBDAV)
-			abstract: YES
-			withEquivalent: SoPerm_WebDAVAccess
-			asChildOf: davElement (@"all", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", XMLNS_WEBDAV)
-			abstract: YES
-			withEquivalent: SoPerm_WebDAVAccess
-			asChildOf: davElement (@"read", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"read-free-busy", XMLNS_WEBDAV)
-			abstract: NO
-			withEquivalent: SoPerm_AccessContentsInformation
-			asChildOf: davElement (@"read", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"write", XMLNS_WEBDAV)
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"bind", XMLNS_WEBDAV)
-			abstract: NO
-			withEquivalent: SoPerm_AddDocumentsImagesAndFiles
-			asChildOf: davElement (@"write", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"schedule",
-							   XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"bind", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"schedule-post",
-							   XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-post-vevent", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-post-vtodo", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-post-vjournal", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-post-vfreebusy", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"schedule-deliver",
-							   XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-deliver-vevent", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-deliver-vtodo", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-deliver-vjournal", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-deliver-vfreebusy", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"schedule-respond",
-							   XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-respond-vevent", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"schedule-respond-vtodo", XMLNS_CALDAV)
-			abstract: NO
-			withEquivalent: nil
-			asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"unbind", XMLNS_WEBDAV)
-			abstract: NO
-			withEquivalent: SoPerm_DeleteObjects
-			asChildOf: davElement (@"write", XMLNS_WEBDAV)];
-      [webdavAclManager
+      aclManager = [SOGoWebDAVAclManager new];
+      [aclManager registerDAVPermission: davElement (@"read", XMLNS_WEBDAV)
+		  abstract: YES
+		  withEquivalent: SoPerm_WebDAVAccess
+		  asChildOf: davElement (@"all", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", XMLNS_WEBDAV)
+		  abstract: YES
+		  withEquivalent: SoPerm_WebDAVAccess
+		  asChildOf: davElement (@"read", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"read-free-busy", XMLNS_WEBDAV)
+		  abstract: NO
+		  withEquivalent: SoPerm_AccessContentsInformation
+		  asChildOf: davElement (@"read", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"write", XMLNS_WEBDAV)
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"bind", XMLNS_WEBDAV)
+		  abstract: NO
+		  withEquivalent: SoPerm_AddDocumentsImagesAndFiles
+		  asChildOf: davElement (@"write", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"schedule",
+						     XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"bind", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"schedule-post",
+						     XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-post-vevent", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-post-vtodo", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-post-vjournal", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-post-vfreebusy", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission: davElement (@"schedule-deliver",
+						     XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-deliver-vevent", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-deliver-vtodo", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-deliver-vjournal", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-deliver-vfreebusy", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission: davElement (@"schedule-respond",
+						     XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-respond-vevent", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"schedule-respond-vtodo", XMLNS_CALDAV)
+		  abstract: NO
+		  withEquivalent: nil
+		  asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
+      [aclManager registerDAVPermission: davElement (@"unbind", XMLNS_WEBDAV)
+		  abstract: NO
+		  withEquivalent: SoPerm_DeleteObjects
+		  asChildOf: davElement (@"write", XMLNS_WEBDAV)];
+      [aclManager
 	registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV)
 	abstract: YES
 	withEquivalent: SoPerm_ChangePermissions /* hackish */
 	asChildOf: davElement (@"write", XMLNS_WEBDAV)];
-      [webdavAclManager
+      [aclManager
 	registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV)
 	abstract: YES
 	withEquivalent: nil
 	asChildOf: davElement (@"write", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"admin", nsI)
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"read-acl", XMLNS_WEBDAV)
-			abstract: YES
-			withEquivalent: SOGoPerm_ReadAcls
-			asChildOf: davElement (@"admin", nsI)];
-      [webdavAclManager registerDAVPermission: davElement (@"write-acl", XMLNS_WEBDAV)
-			abstract: YES
-			withEquivalent: SoPerm_ChangePermissions
-			asChildOf: davElement (@"admin", nsI)];
+      [aclManager registerDAVPermission: davElement (@"admin", nsI)
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"read-acl", XMLNS_WEBDAV)
+		  abstract: YES
+		  withEquivalent: SOGoPerm_ReadAcls
+		  asChildOf: davElement (@"admin", nsI)];
+      [aclManager registerDAVPermission: davElement (@"write-acl", XMLNS_WEBDAV)
+		  abstract: YES
+		  withEquivalent: SoPerm_ChangePermissions
+		  asChildOf: davElement (@"admin", nsI)];
     }
 
-  return webdavAclManager;
+  return aclManager;
 }
 
 - (id) initWithName: (NSString *) name
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 7854490e1..13ecce3dc 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -57,72 +57,67 @@
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *webdavAclManager = nil;
+  SOGoWebDAVAclManager *aclManager = nil;
   NSString *nsD, *nsI;
 
-  if (!webdavAclManager)
+  if (!aclManager)
     {
       nsD = @"DAV:";
       nsI = @"urn:inverse:params:xml:ns:inverse-dav";
 
-// extern NSString *SOGoCalendarPerm_ViewAllComponent;
-// extern NSString *SOGoCalendarPerm_ViewDAndT;
-// extern NSString *SOGoCalendarPerm_ModifyComponent;
-// extern NSString *SOGoCalendarPerm_RespondToComponent;
-
-      webdavAclManager = [SOGoWebDAVAclManager new];
-      [webdavAclManager registerDAVPermission: davElement (@"read", nsD)
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", nsD)];
-      [webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", nsD)
-			abstract: YES
-			withEquivalent: SoPerm_WebDAVAccess
-			asChildOf: davElement (@"read", nsD)];
-      [webdavAclManager registerDAVPermission: davElement (@"view-whole-component", nsI)
-			abstract: NO
-			withEquivalent: SOGoCalendarPerm_ViewAllComponent
-			asChildOf: davElement (@"read", nsD)];
-      [webdavAclManager registerDAVPermission: davElement (@"view-date-and-time", nsI)
-			abstract: NO
-			withEquivalent: SOGoCalendarPerm_ViewDAndT
-			asChildOf: davElement (@"view-whole-component", nsI)];
-      [webdavAclManager registerDAVPermission: davElement (@"write", nsD)
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", nsD)];
-      [webdavAclManager
+      aclManager = [SOGoWebDAVAclManager new];
+      [aclManager registerDAVPermission: davElement (@"read", nsD)
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", nsD)];
+      [aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", nsD)
+		  abstract: YES
+		  withEquivalent: SoPerm_WebDAVAccess
+		  asChildOf: davElement (@"read", nsD)];
+      [aclManager registerDAVPermission: davElement (@"view-whole-component", nsI)
+		  abstract: NO
+		  withEquivalent: SOGoCalendarPerm_ViewAllComponent
+		  asChildOf: davElement (@"read", nsD)];
+      [aclManager registerDAVPermission: davElement (@"view-date-and-time", nsI)
+		  abstract: NO
+		  withEquivalent: SOGoCalendarPerm_ViewDAndT
+		  asChildOf: davElement (@"view-whole-component", nsI)];
+      [aclManager registerDAVPermission: davElement (@"write", nsD)
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", nsD)];
+      [aclManager
 	registerDAVPermission: davElement (@"write-properties", nsD)
 	abstract: YES
 	withEquivalent: SoPerm_ChangePermissions /* hackish */
 	asChildOf: davElement (@"write", nsD)];
-      [webdavAclManager
+      [aclManager
 	registerDAVPermission: davElement (@"write-content", nsD)
 	abstract: YES
 	withEquivalent: SOGoCalendarPerm_ModifyComponent
 	asChildOf: davElement (@"write", nsD)];
-      [webdavAclManager
+      [aclManager
 	registerDAVPermission: davElement (@"respond-to-component", nsI)
 	abstract: YES
 	withEquivalent: SOGoCalendarPerm_RespondToComponent
 	asChildOf: davElement (@"write-content", nsD)];
-      [webdavAclManager registerDAVPermission: davElement (@"admin", nsI)
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", nsD)];
-      [webdavAclManager
+      [aclManager registerDAVPermission: davElement (@"admin", nsI)
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", nsD)];
+      [aclManager
 	registerDAVPermission: davElement (@"read-acl", nsD)
 	abstract: YES
 	withEquivalent: SOGoPerm_ReadAcls
 	asChildOf: davElement (@"admin", nsI)];
-      [webdavAclManager
+      [aclManager
 	registerDAVPermission: davElement (@"write-acl", nsD)
 	abstract: YES
 	withEquivalent: nil
 	asChildOf: davElement (@"admin", nsI)];
     }
 
-  return webdavAclManager;
+  return aclManager;
 }
 
 - (NSString *) componentTag
diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m
index eecd69736..41eb1c4e9 100644
--- a/SoObjects/Appointments/SOGoAptMailICalReply.m
+++ b/SoObjects/Appointments/SOGoAptMailICalReply.m
@@ -25,7 +25,7 @@
 #import <Foundation/NSTimeZone.h>
 
 #import <NGObjWeb/WOActionResults.h>
-#import <NGObjWeb/WOMessage.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 
diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index b08bf74df..eb92fa10f 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -24,7 +24,7 @@
 #import <Foundation/NSTimeZone.h>
 
 #import <NGObjWeb/WOActionResults.h>
-#import <NGObjWeb/WOMessage.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/iCalEntityObject.h>
 
diff --git a/SoObjects/SOGo/NSDictionary+DAV.m b/SoObjects/SOGo/NSDictionary+DAV.m
index 6ea330de4..49c120585 100644
--- a/SoObjects/SOGo/NSDictionary+DAV.m
+++ b/SoObjects/SOGo/NSDictionary+DAV.m
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
diff --git a/SoObjects/SOGo/NSScanner+BSJSONAdditions.m b/SoObjects/SOGo/NSScanner+BSJSONAdditions.m
index 33bf5847b..e0c561db6 100644
--- a/SoObjects/SOGo/NSScanner+BSJSONAdditions.m
+++ b/SoObjects/SOGo/NSScanner+BSJSONAdditions.m
@@ -276,37 +276,37 @@ NSString *jsonNullString = @"null";
 
 - (BOOL)scanJSONKeyValueSeparator
 {
-  return [self scanString:jsonKeyValueSeparatorString intoString:nil];
+  return [self scanString:jsonKeyValueSeparatorString intoString:NULL];
 }
 
 - (BOOL)scanJSONValueSeparator
 {
-  return [self scanString:jsonValueSeparatorString intoString:nil];
+  return [self scanString:jsonValueSeparatorString intoString:NULL];
 }
 
 - (BOOL)scanJSONObjectStartString
 {
-  return [self scanString:jsonObjectStartString intoString:nil];
+  return [self scanString:jsonObjectStartString intoString:NULL];
 }
 
 - (BOOL)scanJSONObjectEndString
 {
-  return [self scanString:jsonObjectEndString intoString:nil];
+  return [self scanString:jsonObjectEndString intoString:NULL];
 }
 
 - (BOOL)scanJSONArrayStartString
 {
-  return [self scanString:jsonArrayStartString intoString:nil];
+  return [self scanString:jsonArrayStartString intoString:NULL];
 }
 
 - (BOOL)scanJSONArrayEndString
 {
-  return [self scanString:jsonArrayEndString intoString:nil];
+  return [self scanString:jsonArrayEndString intoString:NULL];
 }
 
 - (BOOL)scanJSONStringDelimiterString;
 {
-  return [self scanString:jsonStringDelimiterString intoString:nil];
+  return [self scanString:jsonStringDelimiterString intoString:NULL];
 }
 
 @end
diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m
index d956ccd2d..b017ff7ab 100644
--- a/SoObjects/SOGo/SOGoCache.m
+++ b/SoObjects/SOGo/SOGoCache.m
@@ -26,7 +26,9 @@
 
 #import <NGObjWeb/SoObject.h>
 
+#import "SOGoObject.h"
 #import "SOGoUser.h"
+
 #import "SOGoCache.h"
 
 static SOGoCache *sharedCache = nil;
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index f0ab4f9ba..df0c47a65 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -26,6 +26,7 @@
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <GDLContentStore/GCSFolder.h>
 
diff --git a/SoObjects/SOGo/SOGoDAVAuthenticator.m b/SoObjects/SOGo/SOGoDAVAuthenticator.m
index 299b906a9..0b59e1459 100644
--- a/SoObjects/SOGo/SOGoDAVAuthenticator.m
+++ b/SoObjects/SOGo/SOGoDAVAuthenticator.m
@@ -24,6 +24,7 @@
 #import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGLdap/NGLdapConnection.h>
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 414f7db9b..f1b90e3e2 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -73,58 +73,58 @@ static NSArray *childRecordFields = nil;
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *webdavAclManager = nil;
+  SOGoWebDAVAclManager *aclManager = nil;
 
-  if (!webdavAclManager)
+  if (!aclManager)
     {
-      webdavAclManager = [SOGoWebDAVAclManager new];
-      [webdavAclManager registerDAVPermission: davElement (@"read", @"DAV:")
-			abstract: YES
-			withEquivalent: SoPerm_WebDAVAccess
-			asChildOf: davElement (@"all", @"DAV:")];
-      [webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", @"DAV:")
-			abstract: YES
-			withEquivalent: SoPerm_WebDAVAccess
-			asChildOf: davElement (@"read", @"DAV:")];
-      [webdavAclManager registerDAVPermission: davElement (@"write", @"DAV:")
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", @"DAV:")];
-      [webdavAclManager registerDAVPermission: davElement (@"bind", @"DAV:")
-			abstract: NO
-			withEquivalent: SoPerm_AddDocumentsImagesAndFiles
-			asChildOf: davElement (@"write", @"DAV:")];
-      [webdavAclManager registerDAVPermission: davElement (@"unbind", @"DAV:")
-			abstract: NO
-			withEquivalent: SoPerm_DeleteObjects
-			asChildOf: davElement (@"write", @"DAV:")];
-      [webdavAclManager
+      aclManager = [SOGoWebDAVAclManager new];
+      [aclManager registerDAVPermission: davElement (@"read", @"DAV:")
+		  abstract: YES
+		  withEquivalent: SoPerm_WebDAVAccess
+		  asChildOf: davElement (@"all", @"DAV:")];
+      [aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", @"DAV:")
+		  abstract: YES
+		  withEquivalent: SoPerm_WebDAVAccess
+		  asChildOf: davElement (@"read", @"DAV:")];
+      [aclManager registerDAVPermission: davElement (@"write", @"DAV:")
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", @"DAV:")];
+      [aclManager registerDAVPermission: davElement (@"bind", @"DAV:")
+		  abstract: NO
+		  withEquivalent: SoPerm_AddDocumentsImagesAndFiles
+		  asChildOf: davElement (@"write", @"DAV:")];
+      [aclManager registerDAVPermission: davElement (@"unbind", @"DAV:")
+		  abstract: NO
+		  withEquivalent: SoPerm_DeleteObjects
+		  asChildOf: davElement (@"write", @"DAV:")];
+      [aclManager
 	registerDAVPermission: davElement (@"write-properties", @"DAV:")
 	abstract: YES
 	withEquivalent: SoPerm_ChangePermissions /* hackish */
 	asChildOf: davElement (@"write", @"DAV:")];
-      [webdavAclManager
+      [aclManager
 	registerDAVPermission: davElement (@"write-content", @"DAV:")
 	abstract: YES
 	withEquivalent: nil
 	asChildOf: davElement (@"write", @"DAV:")];
-      [webdavAclManager registerDAVPermission: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", @"DAV:")];
-      [webdavAclManager
+      [aclManager registerDAVPermission: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", @"DAV:")];
+      [aclManager
 	registerDAVPermission: davElement (@"read-acl", @"DAV:")
 	abstract: YES
 	withEquivalent: SOGoPerm_ReadAcls
 	asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")];
-      [webdavAclManager
+      [aclManager
 	registerDAVPermission: davElement (@"write-acl", @"DAV:")
 	abstract: YES
 	withEquivalent: SoPerm_ChangePermissions
 	asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")];
     }
 
-  return webdavAclManager;
+  return aclManager;
 }
 
 + (void) initialize
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index b8bb2af17..aed5f3d34 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -134,12 +134,12 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *webdavAclManager = nil;
+  SOGoWebDAVAclManager *aclManager = nil;
 
-  if (!webdavAclManager)
-    webdavAclManager = [SOGoWebDAVAclManager new];
+  if (!aclManager)
+    aclManager = [SOGoWebDAVAclManager new];
 
-  return webdavAclManager;
+  return aclManager;
 }
 
 /*
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index fc813b8a8..1b3451bf4 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -54,50 +54,50 @@ static SoSecurityManager *sm = nil;
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *webdavAclManager = nil;
+  SOGoWebDAVAclManager *aclManager = nil;
 
-  if (!webdavAclManager)
+  if (!aclManager)
     {
-      webdavAclManager = [SOGoWebDAVAclManager new];
-      [webdavAclManager registerDAVPermission: davElement (@"read",
-							   XMLNS_WEBDAV)
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission:
-			  davElement (@"read-current-user-privilege-set",
-				      XMLNS_WEBDAV)
-			abstract: NO
-			withEquivalent: SoPerm_WebDAVAccess
-			asChildOf: davElement (@"read", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"write",
-							   XMLNS_WEBDAV)
-			abstract: YES
-			withEquivalent: nil
-			asChildOf: davElement (@"all", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"bind",
-							   XMLNS_WEBDAV)
-			abstract: NO
-			withEquivalent: SoPerm_AddFolders
-			asChildOf: davElement (@"write", XMLNS_WEBDAV)];
-      [webdavAclManager registerDAVPermission: davElement (@"unbind",
-							   XMLNS_WEBDAV)
-			abstract: NO
-			withEquivalent: SoPerm_DeleteObjects
-			asChildOf: davElement (@"write", XMLNS_WEBDAV)];
-      [webdavAclManager
+      aclManager = [SOGoWebDAVAclManager new];
+      [aclManager registerDAVPermission: davElement (@"read",
+						     XMLNS_WEBDAV)
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission:
+		    davElement (@"read-current-user-privilege-set",
+				XMLNS_WEBDAV)
+		  abstract: NO
+		  withEquivalent: SoPerm_WebDAVAccess
+		  asChildOf: davElement (@"read", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"write",
+						     XMLNS_WEBDAV)
+		  abstract: YES
+		  withEquivalent: nil
+		  asChildOf: davElement (@"all", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"bind",
+						     XMLNS_WEBDAV)
+		  abstract: NO
+		  withEquivalent: SoPerm_AddFolders
+		  asChildOf: davElement (@"write", XMLNS_WEBDAV)];
+      [aclManager registerDAVPermission: davElement (@"unbind",
+						     XMLNS_WEBDAV)
+		  abstract: NO
+		  withEquivalent: SoPerm_DeleteObjects
+		  asChildOf: davElement (@"write", XMLNS_WEBDAV)];
+      [aclManager
 	registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV)
 	abstract: YES
 	withEquivalent: nil
 	asChildOf: davElement (@"write", XMLNS_WEBDAV)];
-      [webdavAclManager
+      [aclManager
 	registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV)
 	abstract: YES
 	withEquivalent: nil
 	asChildOf: davElement (@"write", XMLNS_WEBDAV)];
     }
 
-  return webdavAclManager;
+  return aclManager;
 }
 
 - (id) init
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 19a416282..d321d08a5 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -35,13 +35,14 @@
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#import "SOGoUserDefaults.h"
 #import "LDAPUserManager.h"
 #import "NSArray+Utilities.h"
 #import "SOGoCache.h"
 #import "SOGoDateFormatter.h"
 #import "SOGoObject.h"
 #import "SOGoPermissions.h"
+#import "SOGoUserDefaults.h"
+#import "SOGoUserFolder.h"
 
 #import "SOGoUser.h"
 
diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainer.m
index a0fa305d1..d7da42448 100644
--- a/UI/Contacts/UIxContactsListViewContainer.m
+++ b/UI/Contacts/UIxContactsListViewContainer.m
@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/SoObjects.h>
 #import <NGExtensions/NSObject+Values.h>