diff --git a/ChangeLog b/ChangeLog
index 0211bca1f..47260e335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreContext.m (-url): new method that returns
+	the context url.
+
 	* OpenChange/gen-property-selectors.py: new generator script that
 	outputs MAPIStorePropertySelectors.[hm], which is a helper
 	module that provides methods for handling of cached
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index a7b408729..2f886cb68 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -72,6 +72,8 @@
 - (void) setAuthenticator: (MAPIStoreAuthenticator *) newAuthenticator;
 - (MAPIStoreAuthenticator *) authenticator;
 
+- (NSURL *) url;
+
 - (WOContext *) woContext;
 
 - (void) setupRequest;
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 8f6ebe824..9f3600edf 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -258,6 +258,11 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
   return authenticator;
 }
 
+- (NSURL *) url
+{
+  return contextUrl;
+}
+
 - (void) setupRequest
 {
   NSMutableDictionary *info;