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)
             {