diff --git a/ChangeLog b/ChangeLog
index 1b506f3e7..935d2b160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,13 @@
 
 2011-01-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/SOGoTaskObject+MAPIStore.m (-setMAPIProperties):
+	release fullCalendar and safeCalendar to force a rebuild of
+	the root object when next requested.
+
+	* OpenChange/SOGoAppointmentObject+MAPIStore.m (-setMAPIProperties):
+	idem.
+
 	* OpenChange/MAPIStoreContext.m
 	(-createMessagePropertiesWithMID:inFID:isAssociated:): added a
 	retain count handling.
diff --git a/OpenChange/SOGoAppointmentObject+MAPIStore.m b/OpenChange/SOGoAppointmentObject+MAPIStore.m
index 21bfdf9c7..e11e1745c 100644
--- a/OpenChange/SOGoAppointmentObject+MAPIStore.m
+++ b/OpenChange/SOGoAppointmentObject+MAPIStore.m
@@ -109,6 +109,11 @@
 
   // MAPIStoreDumpMessageProperties (properties);
   ASSIGN (content, [vCalendar versitString]);
+
+  [fullCalendar release];
+  fullCalendar = nil;
+  [safeCalendar release];
+  safeCalendar = nil;
 }
 
 @end
diff --git a/OpenChange/SOGoTaskObject+MAPIStore.m b/OpenChange/SOGoTaskObject+MAPIStore.m
index d8f00dbec..4a37b4b75 100644
--- a/OpenChange/SOGoTaskObject+MAPIStore.m
+++ b/OpenChange/SOGoTaskObject+MAPIStore.m
@@ -164,8 +164,12 @@
   //   }
 
   // MAPIStoreDumpMessageProperties (properties);
-
   ASSIGN (content, [vCalendar versitString]);
+
+  [fullCalendar release];
+  fullCalendar = nil;
+  [safeCalendar release];
+  safeCalendar = nil;
 }
 
 @end