diff --git a/NEWS b/NEWS
index 4bbfa4415..ed475d601 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Bug fixes
  - [web] fixed JavaScript exception after renaming an address book
  - [web] fixed Sieve folder encoding support (#3904)
  - [web] fixed ordering of calendars when renaming or adding a calendar (#3931)
+ - [web] use the organizer's alarm by default when accepting IMIP messages (#3934)
 
 3.2.4 (2016-12-01)
 ------------------
diff --git a/UI/MailPartViewers/UIxMailPartICalActions.m b/UI/MailPartViewers/UIxMailPartICalActions.m
index 2fecb3ab5..7a7a098c1 100644
--- a/UI/MailPartViewers/UIxMailPartICalActions.m
+++ b/UI/MailPartViewers/UIxMailPartICalActions.m
@@ -234,20 +234,20 @@
 - (WOResponse *) _changePartStatusAction: (NSString *) newStatus
                             withDelegate: (iCalPerson *) delegate
 {
-  WOResponse *response;
   SOGoAppointmentObject *eventObject;
+  WOResponse *response;
   iCalEvent *chosenEvent;
+  iCalAlarm *alarm;
 
   chosenEvent = [self _setupChosenEventAndEventObject: &eventObject];
   if (chosenEvent)
     {
+      // For invitations, we take the organizers's alarm to start with
+      alarm = [[chosenEvent alarms] lastObject];      
       response = (WOResponse*)[eventObject changeParticipationStatus: newStatus
 							withDelegate: delegate
-                                                               alarm: nil
+                                                               alarm: alarm
 						     forRecurrenceId: [chosenEvent recurrenceId]];
-//      if (ex)
-//	response = ex; //[self responseWithStatus: 500];
-//      else
       if (!response)
 	response = [self responseWith204];
     }