diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m
index a4312d009..55d5e1c7e 100644
--- a/SoObjects/Appointments/iCalEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m
@@ -118,7 +118,7 @@ NSNumber *iCalDistantFutureNumber = nil;
     {
       organizerData = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                              [organizer rfc822Email], @"email",
-                                           [organizer cnWithoutQuotes], @"name",
+                                           ([[organizer cnWithoutQuotes] length] ? [organizer cnWithoutQuotes] : [organizer rfc822Email]), @"name",
                                            nil];
       uid = [organizer uid];
       if ([uid length]) [organizerData setObject: uid forKey: @"uid"];
@@ -134,7 +134,7 @@ NSNumber *iCalDistantFutureNumber = nil;
     {
       attendeeData = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                             [currentAttendee rfc822Email], @"email",
-                                          [currentAttendee cnWithoutQuotes], @"name",
+                                          ([[currentAttendee cnWithoutQuotes] length] ? [currentAttendee cnWithoutQuotes] : [currentAttendee rfc822Email]) , @"name",
                                           nil];
       if ((uid = [currentAttendee uid]))
         {
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 042790529..548d0991b 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -546,7 +546,7 @@
       person = [participants objectAtIndex: i];
 
       if (![[person delegatedTo] length])
-        [a addObject: [NSDictionary dictionaryWithObjectsAndKeys: ([person cnWithoutQuotes] ? [person cnWithoutQuotes] : [person rfc822Email]), @"name",
+        [a addObject: [NSDictionary dictionaryWithObjectsAndKeys: ([[person cnWithoutQuotes] length] ? [person cnWithoutQuotes] : [person rfc822Email]), @"name",
                                     [person rfc822Email], @"email",
                                     [[person partStatWithDefault] lowercaseString], @"partstat", nil]];
     }