diff --git a/SoObjects/Mailer/SOGoDraftObject.h b/SoObjects/Mailer/SOGoDraftObject.h
index f2d448492..39608997d 100644
--- a/SoObjects/Mailer/SOGoDraftObject.h
+++ b/SoObjects/Mailer/SOGoDraftObject.h
@@ -50,7 +50,6 @@
 @interface SOGoDraftObject : SOGoMailBaseObject
 {
   NSString *path;
-  NGImap4Envelope *envelope;
   int IMAP4ID;
   NSMutableDictionary *headers;
   NSString *inReplyTo;
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 2b6e5d3ef..cad8df860 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -103,6 +103,7 @@ static BOOL        showTextAttachmentsInline  = NO;
       IMAP4ID = -1;
       headers = [NSMutableDictionary new];
       text = @"";
+      path = nil;
       sourceURL = nil;
       sourceFlag = nil;
       inReplyTo = nil;
@@ -115,7 +116,6 @@ static BOOL        showTextAttachmentsInline  = NO;
 {
   [headers release];
   [text release];
-  [envelope release];
   [path release];
   [sourceURL release];
   [sourceFlag release];
diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m
index 1cf9d3794..80ea9a1b2 100644
--- a/SoObjects/SOGo/LDAPUserManager.m
+++ b/SoObjects/SOGo/LDAPUserManager.m
@@ -541,14 +541,12 @@ static BOOL forceImapLoginWithEmail = NO;
 
   now = [NSDate date];
   userIDs = [[users allKeys] objectEnumerator];
-  currentID = [userIDs nextObject];
-  while (currentID)
+  while ((currentID = [userIDs nextObject]))
     {
       currentUser = [users objectForKey: currentID];
       if ([now earlierDate:
 		 [currentUser objectForKey: @"cleanupDate"]] == now)
 	[users removeObjectForKey: currentID];
-      currentID = [userIDs nextObject];
     }
 }
 
diff --git a/SoObjects/SOGo/SOGoUser.h b/SoObjects/SOGo/SOGoUser.h
index 1d786cfac..f86281b7b 100644
--- a/SoObjects/SOGo/SOGoUser.h
+++ b/SoObjects/SOGo/SOGoUser.h
@@ -62,16 +62,16 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 
 @interface SOGoUser : SoUser
 {
-  NSString *currentPassword;
-  NSString *cn;
-  NSString *language;
-  NSArray *allEmails;
   NSUserDefaults *userDefaults;
   NSUserDefaults *userSettings;
-  NSTimeZone *userTimeZone;
+  NSArray *allEmails;
+  NSString *language;
+  NSString *currentPassword;
   SOGoDateFormatter *dateFormatter;
-  NSMutableArray *mailAccounts;
   SOGoUserFolder *homeFolder;
+  NSString *cn;
+  NSTimeZone *userTimeZone;
+  NSMutableArray *mailAccounts;
 }
 
 + (NSString *) language;
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index a38f76187..3a5d7dfb3 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -220,6 +220,9 @@ _timeValue (NSString *key)
       currentPassword = nil;
       dateFormatter = nil;
       homeFolder = nil;
+      cn = nil;
+      userTimeZone = nil;
+      mailAccounts = nil;
     }
 
   return self;
@@ -256,13 +259,16 @@ _timeValue (NSString *key)
 
 - (void) dealloc
 {
-  [currentPassword release];
   [userDefaults release];
   [userSettings release];
   [allEmails release];
   [language release];
+  [currentPassword release];
   [dateFormatter release];
   [homeFolder release];
+  [cn release];
+  [userTimeZone release];
+  [mailAccounts release];
   [super dealloc];
 }