diff --git a/ChangeLog b/ChangeLog
index 415c50a45..6ded5d610 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-06-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentObject.m: the owner of the
+	object must be present in the list of UIDs we delete the object
+	from. Otherwise Calendar objects having no organizer and no
+	attendees will remain in their owner's Calendar.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
 	-_urlPreferringParticle:expectedoverThisOne:possible]): remove the
 	first 3 elements of the path array if the url returned by
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 37a7301af..1b7a673ea 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -373,8 +373,7 @@
      - send iMIP mail for all folders not found
   */
   iCalEvent *apt;
-  NSArray *removedUIDs;
-  NSMutableArray *attendees;
+  NSMutableArray *attendees, *removedUIDs;
 
   /* load existing content */
 
@@ -386,7 +385,10 @@
 //     // TODO
 //   }
   
-  removedUIDs = [self attendeeUIDsFromAppointment:apt];
+  removedUIDs = [NSMutableArray arrayWithArray:
+				  [self attendeeUIDsFromAppointment: apt]];
+  if (![removedUIDs containsObject: owner])
+    [removedUIDs addObject: owner];
 
   if ([self sendEMailNotifications])
     {