diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m
index 5b100f9a5..6b67f2da4 100644
--- a/SoObjects/Appointments/iCalEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m
@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSEnumerator.h>
 
+#import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 
 #import "iCalEntityObject+SOGo.h"
@@ -32,12 +33,14 @@
 - (BOOL) userIsParticipant: (SOGoUser *) user
 {
   NSEnumerator *emails;
+  NSArray *identities;
   NSString *currentEmail;
   BOOL response;
 
   response = NO;
 
-  emails = [[user allEmails] objectEnumerator];
+  identities = [user allIdentities];
+  emails = [[identities objectsForKey: @"email"] objectEnumerator];
   currentEmail = [emails nextObject];
   while (!response && currentEmail)
     if ([self isParticipant: currentEmail])
@@ -51,12 +54,14 @@
 - (BOOL) userIsOrganizer: (SOGoUser *) user
 {
   NSEnumerator *emails;
+  NSArray *identities;
   NSString *currentEmail;
   BOOL response;
 
   response = NO;
 
-  emails = [[user allEmails] objectEnumerator];
+  identities = [user allIdentities];
+  emails = [[identities objectsForKey: @"email"] objectEnumerator];
   currentEmail = [emails nextObject];
   while (!response && currentEmail)
     if ([self isOrganizer: currentEmail])