Merge remote-tracking branch 'upstream/master' into message-rendering-with-session

Conflicts:
	build-mac/mailcore2.xcodeproj/project.pbxproj

2 files changed, 2 insertions, 2 deletions

diff --git a/src/core/rfc822/MCMessageBuilder.cc b/src/core/rfc822/MCMessageBuilder.cc
index 7f902be1..fe9d6903 100644
--- a/src/core/rfc822/MCMessageBuilder.cc
+++ b/src/core/rfc822/MCMessageBuilder.cc
@@ -474,7 +474,7 @@ MessageBuilder::MessageBuilder()
     init();
 }
 
-MessageBuilder::MessageBuilder(MessageBuilder * other)
+MessageBuilder::MessageBuilder(MessageBuilder * other) : AbstractMessage(other)
 {
     init();
     setHTMLBody(other->mHTMLBody);
diff --git a/src/core/rfc822/MCMessageParser.cc b/src/core/rfc822/MCMessageParser.cc
index 87b65a36..435841f5 100644
--- a/src/core/rfc822/MCMessageParser.cc
+++ b/src/core/rfc822/MCMessageParser.cc
@@ -43,7 +43,7 @@ MessageParser::MessageParser(Data * data)
 	mailmessage_free(msg);
 }
 
-MessageParser::MessageParser(MessageParser * other)
+MessageParser::MessageParser(MessageParser * other) : AbstractMessage(other)
 {
     init();
     MC_SAFE_REPLACE_RETAIN(Data, mData, other->mData);