diff --git a/ChangeLog b/ChangeLog
index a81a5eb19..c35e36c60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIApplication.m (-setUserContext:): do not retain
+	the user context.
+
 2012-02-01  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxCalUserRightsEditor.js (onUpdateACL):
diff --git a/OpenChange/MAPIApplication.m b/OpenChange/MAPIApplication.m
index ccdb59614..8cdce056d 100644
--- a/OpenChange/MAPIApplication.m
+++ b/OpenChange/MAPIApplication.m
@@ -67,15 +67,11 @@ MAPIApplication *MAPIApp = nil;
   return MAPIApp;
 }
 
-- (void) dealloc
-{
-  [userContext release];
-  [super dealloc];
-}
-
 - (void) setUserContext: (MAPIStoreUserContext *) newContext
 {
-  ASSIGN (userContext, newContext);
+  /* user contexts must not be retained here ad their holder (mapistore)
+     contexts must be active when any operation occurs. */
+  userContext = newContext;
 }
 
 - (id) authenticatorInContext: (id) context