From c8c8d12d1f7efb53267a4339daab080049e43aec Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 17 Jun 2016 14:28:03 -0400 Subject: [PATCH] (fix) fallback to email address if no CN is found (fixes #3733) --- SoObjects/Mailer/SOGoMailAccount.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m index 5541e7e68..8a706d8bf 100644 --- a/SoObjects/Mailer/SOGoMailAccount.m +++ b/SoObjects/Mailer/SOGoMailAccount.m @@ -513,9 +513,10 @@ static NSString *inboxFolderName = @"INBOX"; // Parent folder is the "Other users" folder; translate the user's mailbox name // to the full name of the person userManager = [SOGoUserManager sharedUserManager]; - fullName = [userManager getCNForUID: currentFolderName]; - if (fullName) + if ((fullName = [userManager getCNForUID: currentFolderName]) && [fullName length]) currentFolderName = fullName; + else if ((fullName = [userManager getEmailForUID: currentFolderName]) && [fullName length]) + currentFolderName = fullName; } else if (isOtherUsersFolder) {