diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 4b19c6c23..4e74932ff 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -1059,11 +1059,9 @@ static NSString *inboxFolderName = @"INBOX";
         {
           currentDelegate = [oldDelegates objectAtIndex: count];
           delegateUser = [SOGoUser userWithLogin: currentDelegate];
+          [delegates removeObject: currentDelegate];
           if (delegateUser)
-            {
-              [delegates removeObject: currentDelegate];
-              [delegateUser removeMailDelegator: owner];
-            }
+            [delegateUser removeMailDelegator: owner];
         }
       
       [self _setDelegates: delegates];