diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 725302e3d..3c9b95a69 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -115,7 +115,7 @@
 
 - (NSArray *) _jsonFolders: (NSEnumerator *) rawFolders
 {
-  NSString *currentFolder, *currentDisplayName, *currentFolderType, *login;
+  NSString *currentFolder, *currentDisplayName, *currentFolderType, *login, *fullName;
   NSMutableArray *pathComponents;
   SOGoUserManager *userManager;
   NSDictionary *folderData;
@@ -135,11 +135,12 @@
 	  pathComponents = [NSMutableArray arrayWithArray: [currentFolder pathComponents]];
 	  login = [pathComponents objectAtIndex: 2];
 	  userManager = [SOGoUserManager sharedUserManager];
+	  fullName = [userManager getCNForUID: login];
 	  [pathComponents removeObjectsInRange: NSMakeRange(0,1)];
 	  
 	  currentDisplayName = [NSString stringWithFormat: @"/%@/%@/%@", 
 					 [self labelForKey: @"OtherUsersFolderName"],
-					 [userManager getCNForUID: login],
+					 (fullName != nil ? fullName : login),
 					 [pathComponents componentsJoinedByString: @"/"]];
 				    
 	}