1 files changed, 8 insertions, 8 deletions
diff --git a/src/objc/abstract/MCOMessageHeader.mm b/src/objc/abstract/MCOMessageHeader.mm
index 649819e9..5b5844d0 100644
--- a/src/objc/abstract/MCOMessageHeader.mm
+++ b/src/objc/abstract/MCOMessageHeader.mm
@@ -31,6 +31,14 @@
     MCORegisterClass(self, &typeid(nativeType));
 }
 
+- (id) copyWithZone:(NSZone *)zone
+{
+    nativeType * nativeObject = (nativeType *) [self mco_mcObject]->copy();
+    id result = [[self class] mco_objectWithMCObject:nativeObject];
+    MC_SAFE_RELEASE(nativeObject);
+    return [result retain];
+}
+
 + (id) mco_objectWithMCObject:(mailcore::Object *)object
 {
     mailcore::MessageHeader * header = (mailcore::MessageHeader *) object;
@@ -69,14 +77,6 @@
     return [[[self alloc] initWithMCMessageHeader:header] autorelease];
 }
 
-- (id) copyWithZone:(NSZone *)zone
-{
-    mailcore::MessageHeader * header = (mailcore::MessageHeader *) _nativeHeader->copy();
-    MCOMessageHeader * result = [[MCOMessageHeader alloc] initWithMCMessageHeader:header];
-    MC_SAFE_RELEASE(header);
-    return result;
-}
-
 - (NSString *) description
 {
     return MCO_OBJC_BRIDGE_GET(description);