diff --git a/ChangeLog b/ChangeLog
index c76fdf60b..bff5ea4c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreMapping.m (+sharedMapping): singleton
+	constructor.
+
 2010-10-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/generic.js: (triggerAjaxRequest): save the
diff --git a/OpenChange/MAPIStoreMapping.h b/OpenChange/MAPIStoreMapping.h
index d416a99d2..d46677250 100644
--- a/OpenChange/MAPIStoreMapping.h
+++ b/OpenChange/MAPIStoreMapping.h
@@ -34,6 +34,8 @@
   NSMutableDictionary *reverseMapping; /* url -> FID/MID */
 }
 
++ (id) sharedMapping;
+
 - (NSString *) urlFromID: (uint64_t) idKey;
 
 - (uint64_t) idFromURL: (NSString *) url;
diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m
index ab84d6a88..9fbb2142c 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -34,6 +34,16 @@
 
 @implementation MAPIStoreMapping
 
++ (id) sharedMapping
+{
+  static id sharedMapping = nil;
+
+  if (!sharedMapping)
+    sharedMapping = [self new];
+
+  return sharedMapping;
+}
+
 - (void) _setupFixedMapping
 {
   [self registerURL: @"sogo://openchange:openchange@mail/folderINBOX" withID: 0x160001];