12 files changed, 17 insertions, 24 deletions
diff --git a/src/objc/abstract/MCOAddress.mm b/src/objc/abstract/MCOAddress.mm
index da682582..663aa10e 100644
--- a/src/objc/abstract/MCOAddress.mm
+++ b/src/objc/abstract/MCOAddress.mm
@@ -21,7 +21,7 @@
 
 #define nativeType mailcore::Address
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/abstract/MCOMessageHeader.mm b/src/objc/abstract/MCOMessageHeader.mm
index 5b5844d0..3d31f758 100644
--- a/src/objc/abstract/MCOMessageHeader.mm
+++ b/src/objc/abstract/MCOMessageHeader.mm
@@ -26,7 +26,7 @@
 
 #define nativeType mailcore::MessageHeader
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
index d0af62b2..56f08aa7 100644
--- a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
+++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
@@ -30,7 +30,7 @@ using namespace mailcore;
 
 #define nativeType mailcore::IMAPFetchFoldersOperation
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/imap/MCOIMAPOperation.mm b/src/objc/imap/MCOIMAPOperation.mm
index c2b36e26..700269b3 100644
--- a/src/objc/imap/MCOIMAPOperation.mm
+++ b/src/objc/imap/MCOIMAPOperation.mm
@@ -25,17 +25,6 @@
 
 #define nativeType mailcore::IMAPOperation
 
-+ (void) initialize
-{
-    MCORegisterClass(self, &typeid(nativeType));
-}
-
-+ (NSObject *) mco_objectWithMCObject:(mailcore::Object *)object
-{
-    mailcore::IMAPOperation * op = (mailcore::IMAPOperation *) object;
-    return [[[self alloc] initWithMCOperation:op] autorelease];
-}
-
 - (void)start:(void (^)(NSError *error))completionBlock {
     self.completionBlock = completionBlock;
     [self start];
diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm
index a4a6e5cc..2a8c7465 100644
--- a/src/objc/imap/MCOIMAPSession.mm
+++ b/src/objc/imap/MCOIMAPSession.mm
@@ -9,6 +9,7 @@
 #import "MCOIMAPSession.h"
 
 #import "MCOOperation.h"
+#import "MCOOperation+Private.h"
 #import "MCOObjectWrapper.h"
 #import "MCOIMAPOperation.h"
 #import "MCOIMAPFetchFoldersOperation.h"
@@ -59,13 +60,12 @@ MCO_OBJC_SYNTHESIZE_SCALAR(char, char, setDelimiter, delimiter)
 
 - (MCOIMAPOperation *)checkAccountOperation {
     IMAPOperation *coreOp = MCO_NATIVE_INSTANCE->checkAccountOperation();
-    return MCO_TO_OBJC(coreOp);
-
+    return [[[MCOIMAPOperation alloc] initWithMCOperation:coreOp] autorelease];
 }
 
 - (MCOIMAPFetchFoldersOperation *)fetchAllFoldersOperation {
     IMAPOperation *coreOp = MCO_NATIVE_INSTANCE->fetchAllFoldersOperation();
-    return MCO_TO_OBJC(coreOp);
-    
+    return [[[MCOIMAPFetchFoldersOperation alloc] initWithMCOperation:coreOp] autorelease];
 }
+
 @end
diff --git a/src/objc/rfc822/MCOAttachment.mm b/src/objc/rfc822/MCOAttachment.mm
index d507ff50..ef581037 100644
--- a/src/objc/rfc822/MCOAttachment.mm
+++ b/src/objc/rfc822/MCOAttachment.mm
@@ -21,7 +21,7 @@
 
 #define nativeType mailcore::Attachment
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/rfc822/MCOMessageBuilder.mm b/src/objc/rfc822/MCOMessageBuilder.mm
index b25bd3c4..1f850932 100644
--- a/src/objc/rfc822/MCOMessageBuilder.mm
+++ b/src/objc/rfc822/MCOMessageBuilder.mm
@@ -17,7 +17,7 @@
 
 #define nativeType mailcore::MessageBuilder
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/rfc822/MCOMessageParser.mm b/src/objc/rfc822/MCOMessageParser.mm
index c3951d1d..325a6f3f 100644
--- a/src/objc/rfc822/MCOMessageParser.mm
+++ b/src/objc/rfc822/MCOMessageParser.mm
@@ -137,7 +137,7 @@ private:
 
 #define nativeType mailcore::MessageParser
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/rfc822/MCOMessagePart.mm b/src/objc/rfc822/MCOMessagePart.mm
index bb6c02cc..f1535049 100644
--- a/src/objc/rfc822/MCOMessagePart.mm
+++ b/src/objc/rfc822/MCOMessagePart.mm
@@ -17,7 +17,7 @@
 
 #define nativeType mailcore::MessagePart
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/rfc822/MCOMultipart.mm b/src/objc/rfc822/MCOMultipart.mm
index f81e0c8a..2267f775 100644
--- a/src/objc/rfc822/MCOMultipart.mm
+++ b/src/objc/rfc822/MCOMultipart.mm
@@ -17,7 +17,7 @@
 
 #define nativeType mailcore::Multipart
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/utils/MCOOperation.mm b/src/objc/utils/MCOOperation.mm
index bc14ad36..5386ae65 100644
--- a/src/objc/utils/MCOOperation.mm
+++ b/src/objc/utils/MCOOperation.mm
@@ -45,7 +45,7 @@ public:
 
 #define nativeType mailcore::Operation
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/utils/NSObject+MCO.mm b/src/objc/utils/NSObject+MCO.mm
index 8ea1843e..93b12bb9 100644
--- a/src/objc/utils/NSObject+MCO.mm
+++ b/src/objc/utils/NSObject+MCO.mm
@@ -31,6 +31,8 @@ static void init(void)
 
 void MCORegisterClass(Class aClass, const std::type_info * info)
 {
+    init();
+    
     chashdatum key;
     chashdatum value;
     key.data = &info;
@@ -42,6 +44,8 @@ void MCORegisterClass(Class aClass, const std::type_info * info)
 
 static Class classWithTypeInfo(const std::type_info * info)
 {
+    init();
+    
     int r;
     chashdatum key;
     chashdatum value;