diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 157558216..d99549791 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -231,7 +231,7 @@ static BOOL debugSoParts       = NO;
   id msgs;
 
   if (!coreInfos)
-    {  
+    {
       msgs = [self fetchParts: coreInfoKeys]; // returns dict
       if (heavyDebug)
 	[self logWithFormat: @"M: %@", msgs];
@@ -990,7 +990,7 @@ static BOOL debugSoParts       = NO;
 
   // TODO: check for safe HTTP method
   
-  trashFolder = [[self mailAccountFolder] trashFolderInContext:_ctx];
+  trashFolder = [[self mailAccountFolder] trashFolderInContext: _ctx];
   if ([trashFolder isKindOfClass:[NSException class]])
     return (NSException *)trashFolder;
   if (![trashFolder isNotNull]) {
@@ -1004,17 +1004,17 @@ static BOOL debugSoParts       = NO;
   error = [self davCopyToTargetObject:trashFolder
 		newName: @"fakeNewUnusedByIMAP4" /* autoassigned */
 		inContext:_ctx];
-  if (error != nil) return error;
+  if (error) return error;
   
   /* b) mark deleted */
   
   error = [[self imap4Connection] markURLDeleted: [self imap4URL]];
-  if (error != nil) return error;
+  if (error) return error;
 
   [container markForExpunge];
 
   [self flushMailCaches];
-  
+
   return nil;
 }
 
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 80650e5e9..dfc37d341 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -549,15 +549,9 @@ static int sizeLimit;
 	entries = nil;
 
       if (entries)
-	{
-	  currentEntry = [entries nextObject];
-	  while (currentEntry)
-	    {
-	      [contacts addObject:
-			  [self _convertLDAPEntryToContact: currentEntry]];
-	      currentEntry = [entries nextObject];
-	    }
-	}
+	while ((currentEntry = [entries nextObject]))
+	  [contacts addObject:
+		      [self _convertLDAPEntryToContact: currentEntry]];
 
       [ldapConnection release];
     }
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index da8539d71..d52a19ee5 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -132,7 +132,7 @@
       [response appendContentString: @"Missing 'name' parameter."];
     }
 
-  return response;  
+  return response;
 }
 
 - (NSURL *) _trashedURLOfFolder: (NSURL *) srcURL