diff --git a/NEWS b/NEWS
index 9690d3be7..4a4cedbdd 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ master
 Enhancements
  - Synchronize events, contacts and tasks in reverse chronological order
 
+Bug fixes
+ - Optional attendes on events are now shown properly
+
 2.2.17a-zentyal1 (2014-04-15)
 --------------------
 
diff --git a/OpenChange/MAPIStoreAppointmentWrapper.m b/OpenChange/MAPIStoreAppointmentWrapper.m
index 7fa60c5c5..07996572b 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.m
+++ b/OpenChange/MAPIStoreAppointmentWrapper.m
@@ -273,7 +273,7 @@ static NSCharacterSet *hexCharacterSet = nil;
               recipient->username = NULL;
               entryId = MAPIStoreExternalEntryId (cn, email);
             }
-          recipient->type = MAPI_TO;
+          recipient->type = [[person role] isEqualToString: @"OPT-PARTICIPANT"] ? MAPI_CC : MAPI_TO;
 
           /* properties */
           p = 0;
@@ -283,7 +283,7 @@ static NSCharacterSet *hexCharacterSet = nil;
           // PR_OBJECT_TYPE = MAPI_MAILUSER (see MAPI_OBJTYPE)
           recipient->data[p] = MAPILongValue (msgData, MAPI_MAILUSER);
           p++;
-          
+
           // PR_DISPLAY_TYPE = DT_MAILUSER (see MS-NSPI)
           recipient->data[p] = MAPILongValue (msgData, 0);
           p++;
@@ -383,7 +383,7 @@ static NSCharacterSet *hexCharacterSet = nil;
         // PR_OBJECT_TYPE = MAPI_MAILUSER (see MAPI_OBJTYPE)
         recipient->data[p] = MAPILongValue (msgData, MAPI_MAILUSER);
         p++;
-          
+
         // PR_DISPLAY_TYPE = DT_MAILUSER (see MS-NSPI)
         recipient->data[p] = MAPILongValue (msgData, 0);
         p++;