diff --git a/ChangeLog b/ChangeLog
index b2bbc2e29..966c12941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreCalendarAttachment.m
+	(-getPidTagDisplayName:inMemCtx:): return an allocated value,
+	since returned values must be assigned to another parent.
+
 2012-08-28  Jean Raby  <jraby@inverse.ca>
 
 	* Scripts/openchange_cleanup.py:
diff --git a/OpenChange/MAPIStoreCalendarAttachment.m b/OpenChange/MAPIStoreCalendarAttachment.m
index cbe63c6d7..e4307f1f3 100644
--- a/OpenChange/MAPIStoreCalendarAttachment.m
+++ b/OpenChange/MAPIStoreCalendarAttachment.m
@@ -124,7 +124,7 @@
 - (int) getPidTagDisplayName: (void **) data
                     inMemCtx: (TALLOC_CTX *) localMemCtx
 {
-  *data = "Untitled";
+  *data = [@"Untitled" asUnicodeInMemCtx: localMemCtx];
 
   return MAPISTORE_SUCCESS;
 }