diff --git a/ChangeLog b/ChangeLog
index 3c7f45946..4afa5d28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-18  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentObject.m
+	(_setupResponseInRequestCalendar:): we now return the
+	calendar read from the database and not use the one
+	from the request anymore, as it can override properties
+	other than participation status changes.
+
 2012-07-18  Jean Raby  <jraby@inverse.ca>
 	* Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh 
 	* Scripts/sql-update-1.3.16_to_1.3.17.sh:
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 5c2cdd151..714d15693 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -1534,7 +1534,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   return partStats;
 }
 
-- (void) _setupResponseInRequestCalendar: (iCalCalendar *) rqCalendar
+- (iCalCalendar *) _setupResponseInRequestCalendar: (iCalCalendar *) rqCalendar
 {
   iCalCalendar *calendar;
   NSArray *keys;
@@ -1559,6 +1559,8 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
             }
         }
     }
+
+  return calendar;
 }
 
 - (void) _adjustTransparencyInRequestCalendar: (iCalCalendar *) rqCalendar
@@ -1718,7 +1720,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   //
   if ([roles containsObject: @"ComponentResponder"]
       && ![roles containsObject: @"ComponentModifier"])
-    [self _setupResponseInRequestCalendar: calendar];
+    calendar = [self _setupResponseInRequestCalendar: calendar];
   else
     {
       if (![[rq headersForKey: @"X-SOGo"]