MessageHeader: fixed copy, ObjC wrappers for Address and MessageHeader

3 files changed, 19 insertions, 14 deletions

diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h
index 49d74079..add45f7d 100644
--- a/src/core/abstract/MCAddress.h
+++ b/src/core/abstract/MCAddress.h
@@ -28,15 +28,6 @@ namespace mailcore {
 		virtual String * RFC822String();
 		virtual String * nonEncodedRFC822String();
 		
-		// Additions
-		static Address * addressWithIMFMailbox(struct mailimf_mailbox * mb);
-		static Address * addressWithNonEncodedIMFMailbox(struct mailimf_mailbox * mb);
-		static Address * addressWithIMAPAddress(struct mailimap_address * imap_addr);
-		
-		// Must be released
-		virtual struct mailimf_address * createIMFAddress();
-		virtual struct mailimf_mailbox * createIMFMailbox();
-        
     public: // subclass behavior.
 		Address(Address * other);
 		virtual String * description();
@@ -44,6 +35,16 @@ namespace mailcore {
 		virtual unsigned int hash();
 		virtual Object * copy();
         
+    public: // private
+		// Must be released
+		virtual struct mailimf_address * createIMFAddress();
+		virtual struct mailimf_mailbox * createIMFMailbox();
+        
+		// Additions
+		static Address * addressWithIMFMailbox(struct mailimf_mailbox * mb);
+		static Address * addressWithNonEncodedIMFMailbox(struct mailimf_mailbox * mb);
+		static Address * addressWithIMAPAddress(struct mailimap_address * imap_addr);
+		
 	private:
 		String * mDisplayName;
 		String * mMailbox;
diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc
index a1b006b1..3502ea75 100644
--- a/src/core/abstract/MCMessageHeader.cc
+++ b/src/core/abstract/MCMessageHeader.cc
@@ -41,6 +41,8 @@ MessageHeader::MessageHeader(MessageHeader * other)
     setBcc(other->mBcc);
     setReplyTo(other->mReplyTo);
     setSubject(other->mSubject);
+    setDate(other->date());
+    setReceivedDate(other->receivedDate());
     setUserAgent(other->mUserAgent);
 }
 
diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h
index 045d91c5..33569204 100644
--- a/src/core/abstract/MCMessageHeader.h
+++ b/src/core/abstract/MCMessageHeader.h
@@ -58,6 +58,13 @@ namespace mailcore {
 		virtual String * extractedSubject();
 		virtual String * partialExtractedSubject();
 		virtual void importHeadersData(Data * data);
+        
+    public: // subclass behavior
+		MessageHeader(MessageHeader * other);
+		virtual String * description();
+		virtual Object * copy();
+        
+    public: // private
 		virtual void importIMAPEnvelope(struct mailimap_envelope * env);
 		virtual void importIMAPReferences(Data * data);
 		virtual void importIMAPInternalDate(struct mailimap_date_time * date);
@@ -65,11 +72,6 @@ namespace mailcore {
 		virtual struct mailimf_fields * createIMFFieldsAndFilterBcc(bool filterBcc);
 		virtual void importIMFFields(struct mailimf_fields * fields);
         
-    public: // subclass behavior
-		MessageHeader(MessageHeader * other);
-		virtual String * description();
-		virtual Object * copy();
-        
 	private:
 		String * mMessageID;
 		Array * /* String */ mReferences;