diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 5a4c3a686..70db9ef9d 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -786,12 +786,12 @@
   if ([object firstChildWithTag: @"X-SOGo-Send-Appointment-Notifications"])
     return;
 
-  // We never send IMIP inivitaton/deletion/update when the "initiator" is Outlook 2013/2016 over
-  // the EAS protocol. That is because Outlook will always issue a SendMail command
+  // We never send IMIP inivitaton/deletion/update when the "initiator" is an EAS client.
+  //That is because Outlook, iOS and Android will always issue a SendMail command
   // with the meeting details (ie., IMIP message with METHOD:REQUEST) so there's
   // no need to send it twice. Moreover, Outlook users can also choose to NOT send
   // the IMIP messsage at all, so SOGo won't send one without user's consent
-  if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15"])
+  if ([[[context request] requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"])
     return;
 
   ownerUser = [SOGoUser userWithLogin: owner];