From e7b0119ab1df1cddca7d0c6a99ed84da1275f331 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 14 Mar 2016 13:18:24 -0400
Subject: [PATCH] (fix) don't skip last identity

---
 SoObjects/SOGo/SOGoUser.m | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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