diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index b0b8d0f7b..aa6b3c5c1 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -698,8 +698,6 @@
   replyTo = [_defaults mailReplyTo];
 
   max = [mails count];
-  if (max > 1)
-    max--;
 
   /* custom from */
   if ([[self domainDefaults] mailCustomFromEnabled])
@@ -757,7 +755,7 @@
       [identities addObject: identity];
 
       if ([[identity objectForKey: @"email"] caseInsensitiveCompare: defaultEmail] == NSOrderedSame)
-            default_identity = [identities count]-1;
+        default_identity = [identities count]-1;
 
       [identity release];
     }