diff --git a/ChangeLog b/ChangeLog
index bdb612633..f0f686be9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreMailFolder.m (_parseCOPYUID): the uniString
+	buffer was allocated one byte too short.
+
 2012-01-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/NSObject+MAPIStore.m (-getValue:forTag:inMemCtx:):
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 393788914..5df5bf0ef 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -848,7 +848,7 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
   /* sample: 1 OK [COPYUID 1311899334 1:3 11:13] Completed */
 
   max = [line length];
-  uniString = NSZoneMalloc (NULL, max * sizeof (unichar) + 1);
+  uniString = NSZoneMalloc (NULL, sizeof (unichar) * (max + 1));
   [line getCharacters: uniString];
   uniString[max] = 0;