diff --git a/ChangeLog b/ChangeLog
index dc5736909..cd21751bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-11  Ludovic Marcotte <lmarcotte@inverse.ca>
+
+    * Finished the implementation and testing of the two
+	new defaults. Also added documentation in the SOGo Installation
+	and Configuration Guide.
+
 2012-07-09  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* Dropped old templates (SOGoAptMailDeletionReceipt.wox
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index 843a35b75..459776e63 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 2822535ab..eaa03b11b 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -418,6 +418,7 @@
                            withType: @"calendar:invitation-update"];
 
 #if 0
+  // DELETE CODE
   [self sendReceiptEmailForObject: newEvent
 		   addedAttendees: nil
 		 deletedAttendees: nil
@@ -1129,6 +1130,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 				toAttendees: delegates
                                    withType: @"calendar:cancellation"];
 #if 0
+	  // DELETE CODE
 	  [self sendReceiptEmailUsingTemplateNamed: @"Deletion"
 					 forObject: event
 						to: delegates];
@@ -1153,6 +1155,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 				toAttendees: delegates
                                    withType: @"calendar:invitation"];
 #if 0
+	  // DELETE CODE
 	  [self sendReceiptEmailUsingTemplateNamed: @"Invitation"
 					 forObject: event to: delegates];
 #endif
@@ -1428,14 +1431,17 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 //
 - (void) prepareDeleteOccurence: (iCalEvent *) occurence
 {
-  iCalEvent *event;
   SOGoUser *ownerUser, *currentUser;
-  NSArray *attendees;
   NSCalendarDate *recurrenceId;
+  NSArray *attendees;
+  iCalEvent *event;
+  BOOL send_receipt;
+
   
   ownerUser = [SOGoUser userWithLogin: owner];
   event = [self component: NO secure: NO];
-  
+  send_receipt = YES;
+
   if (![self _shouldScheduleEvent: [event organizer]])
     return;
 
@@ -1471,25 +1477,22 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
                                 toAttendees: attendees
                                    withType: @"calendar:cancellation"];
 	}
-
-      iCalPerson *foo = [[iCalPerson alloc] init];
-
-      [foo setCn: @"Ludovic Marcotte"];
-      [foo setEmail: @"lmarcotte@inverse.ca"];
-      
-      NSArray *zot = [NSArray arrayWithObject: foo];
-
-#if 0
-      [self sendReceiptEmailUsingTemplateNamed: @"Deletion"
-				     forObject: occurence
-					    to: foo];
-#endif
     }
   else if ([occurence userIsAttendee: ownerUser])
-    // The current user deletes the occurence; let the organizer know that
-    // the user has declined this occurence.
-    [self changeParticipationStatus: @"DECLINED" withDelegate: nil
-	  forRecurrenceId: recurrenceId];
+    {
+      // The current user deletes the occurence; let the organizer know that
+      // the user has declined this occurence.
+      [self changeParticipationStatus: @"DECLINED" withDelegate: nil
+		      forRecurrenceId: recurrenceId];
+      send_receipt = NO;
+    }
+
+  if (send_receipt)
+    [self sendReceiptEmailForObject: event
+		     addedAttendees: nil
+		   deletedAttendees: nil
+		   updatedAttendees: nil
+			  operation: EventDeleted];
 }
 
 - (NSException *) prepareDelete
@@ -1846,7 +1849,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 		     deletedAttendees: nil
 		     updatedAttendees: nil
 			    operation: EventCreated];
-    }
+    }  // if ([self isNew])
   else
     {
       iCalCalendar *oldCalendar, *newCalendar;
@@ -1999,7 +2002,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 	      NSString *delegateEmail;
 	      
 	      attendee = [newEvent userAsAttendee: [SOGoUser userWithLogin: owner]];
-	      
+
 	      // We first check of the sequences are alright. We don't accept attendees
 	      // accepting "old" invitations. If that's the case, we return a 403
               if ([[newEvent sequence] intValue] < [[oldEvent sequence] intValue])
@@ -2026,7 +2029,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 		  [self changeParticipationStatus: @"DECLINED"
 			withDelegate: nil // FIXME (specify delegate?)
 			forRecurrenceId: [self _addedExDate: oldEvent  newEvent: newEvent]];
-	      }
+		}
 	      else if (attendee)
 		{
 		  [self changeParticipationStatus: [attendee partStat]
@@ -2043,7 +2046,15 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 		  [self _handleRemovedUsers: [changes deletedAttendees]
 			   withRecurrenceId: recurrenceId];
 		}
-	    }
+	    }  
+	} // if ([[newEvent attendees] count] || [[oldEvent attendees] count])
+      else
+	{
+	  [self sendReceiptEmailForObject: newEvent
+			   addedAttendees: nil
+			 deletedAttendees: nil
+			 updatedAttendees: nil
+				operation: EventUpdated];
 	}
     }  // else of if (isNew) ...
 
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 811dbf734..c8aa91219 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -1070,11 +1070,18 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
       
       if ([[self container] notifyUserOnPersonalModifications])
 	{
+	  id o;
+
+	  o = [headerMap objectForKey: @"to"];
 	  recipientEmail = [[self container] notifiedUserOnPersonalModifications];
+	  [headerMap setObject: recipientEmail forKey: @"to"];
+	  
 	  [[SOGoMailer mailerWithDomainDefaults: dd]
 		    sendMimePart: msg
 		    toRecipients: [NSArray arrayWithObject: recipientEmail]
                           sender: senderEmail];
+
+	  [headerMap setObject: o forKey: @"to"];
 	}
     }