diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index b3c37b65c..6c7c84cb1 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -430,11 +430,11 @@ static BOOL useAltNamespace = NO;
 - (NSArray *) aclsForUser: (NSString *) uid
 {
   NSDictionary *imapAcls;
-  NSArray *userAcls;
+  NSString *userAcls;
 
   imapAcls = [imap4 aclForMailboxAtURL: [self imap4URL]];
   userAcls = [imapAcls objectForKey: uid];
-  if (!([userAcls count] || [uid isEqualToString: defaultUserID]))
+  if (!([userAcls length] || [uid isEqualToString: defaultUserID]))
     userAcls = [imapAcls objectForKey: defaultUserID];
 
   return [self _imapAclsToSOGoAcls: userAcls];
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index d0d29c05e..68ec6326a 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -19,15 +19,35 @@
   02111-1307, USA.
 */
 
-#include "SOGoMailObject.h"
-#include "SOGoMailFolder.h"
-#include "SOGoMailAccount.h"
-#include "SOGoMailManager.h"
-#include "SOGoMailBodyPart.h"
-#include <NGImap4/NGImap4Envelope.h>
-#include <NGImap4/NGImap4EnvelopeAddress.h>
-#include <NGMail/NGMimeMessageParser.h>
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
+
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NGQuotedPrintableCoding.h>
+#import <NGExtensions/NSString+Encoding.h>
+#import <NGImap4/NGImap4Connection.h>
+#import <NGImap4/NGImap4Envelope.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
+#import <NGMail/NGMimeMessageParser.h>
+
+#import <SoObjects/SOGo/SOGoPermissions.h>
+#import <SoObjects/SOGo/SOGoUser.h>
+#import "SOGoMailFolder.h"
+#import "SOGoMailAccount.h"
+#import "SOGoMailManager.h"
+#import "SOGoMailBodyPart.h"
+
+#import "SOGoMailObject.h"
 
 @implementation SOGoMailObject
 
@@ -641,7 +661,7 @@ static BOOL debugSoParts       = NO;
 
 - (BOOL) isDeletionAllowed
 {
-  NSArray *parentAcls;
+  NSArray *parentAcl;
   NSString *login;
 
   login = [[context activeUser] login];
diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m
index f525b66fd..e6dccdfe0 100644
--- a/UI/Common/UIxAclEditor.m
+++ b/UI/Common/UIxAclEditor.m
@@ -44,6 +44,7 @@
       publishInFreeBusy = NO;
       users = [NSMutableArray new];
       currentUser = nil;
+      defaultUserID = nil;
       savedUIDs = nil;
     }
 
@@ -55,6 +56,7 @@
   [savedUIDs release];
   [users release];
   [currentUser release];
+  [defaultUserID release];
   [super dealloc];
 }
 
diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m
index 4146b30da..ad674f63e 100644
--- a/UI/Common/UIxUserRightsEditor.m
+++ b/UI/Common/UIxUserRightsEditor.m
@@ -47,6 +47,7 @@
 {
   [uid release];
   [userRights release];
+  [defaultUserID release];
   [super dealloc];
 }