diff --git a/OpenChange/MAPIStoreDraftsMessage.m b/OpenChange/MAPIStoreDraftsMessage.m
index 57d0a598b..4135df6c0 100644
--- a/OpenChange/MAPIStoreDraftsMessage.m
+++ b/OpenChange/MAPIStoreDraftsMessage.m
@@ -178,13 +178,15 @@ e)
 
   newAid = [attachmentKeys count];
 
-  newAttachment = [MAPIStoreDraftsAttachment new];
+  newAttachment = [MAPIStoreDraftsAttachment
+                    mapiStoreObjectWithSOGoObject: nil
+                                      inContainer: self];
+  [newAttachment setIsNew: YES];
   [newAttachment setAID: newAid];
   newKey = [NSString stringWithFormat: @"%ul", newAid];
   [attachmentParts setObject: newAttachment
                       forKey: newKey];
   [attachmentKeys addObject: newKey];
-  [newAttachment release];
 
   return newAttachment;
 }