Merge remote-tracking branch 'upstream/master' into message-preview-in-examples

17 files changed, 229 insertions, 299 deletions

diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index 78d112b2..2cd3c94e 100644
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -616,6 +616,8 @@
 		C6D6F96B1720F92D006F5B28 /* MCICUTypes.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6D6F9691720F8F4006F5B28 /* MCICUTypes.h */; };
 		C6D6F97017211173006F5B28 /* MCIterator.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6D6F96D1721028D006F5B28 /* MCIterator.h */; };
 		C6D6F97117211177006F5B28 /* MCIterator.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6D6F96D1721028D006F5B28 /* MCIterator.h */; };
+		C6E665001790963E0063F2CF /* MCIMAPMessageRenderingOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA0F1C7A177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.h */; };
+		C6E6652F1791B2530063F2CF /* MCIMAPMessageRenderingOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA0F1C7A177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.h */; };
 		C6EB30DE16B5B8050091F4F1 /* MCObjC.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6EB30DC16B5B7770091F4F1 /* MCObjC.h */; };
 		C6EB30F716B8C9480091F4F1 /* NSDictionary+MCO.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6EB30F616B8C9480091F4F1 /* NSDictionary+MCO.mm */; };
 		C6EB30F816B8DED30091F4F1 /* NSDictionary+MCO.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6EB30F516B8C9480091F4F1 /* NSDictionary+MCO.h */; };
@@ -716,6 +718,7 @@
 			dstPath = include/MailCore;
 			dstSubfolderSpec = 16;
 			files = (
+				C6E665001790963E0063F2CF /* MCIMAPMessageRenderingOperation.h in CopyFiles */,
 				DAE42E89178F7E1800E0DB8F /* MCOIMAPMessageRenderingOperation.h in CopyFiles */,
 				9E774D8C1767CD490065EB9B /* MCIMAPFolderStatus.h in CopyFiles */,
 				9EF9AB24175F409D0027FA3B /* MCIMAPFolderStatusOperation.h in CopyFiles */,
@@ -905,6 +908,7 @@
 			dstSubfolderSpec = 16;
 			files = (
 				DAE42E8A178F7E2200E0DB8F /* MCOIMAPMessageRenderingOperation.h in CopyFiles */,
+				C6E6652F1791B2530063F2CF /* MCIMAPMessageRenderingOperation.h in CopyFiles */,
 				9E774D8B1767CD3C0065EB9B /* MCIMAPFolderStatus.h in CopyFiles */,
 				9EF9AB25175F40C70027FA3B /* MCIMAPFolderStatusOperation.h in CopyFiles */,
 				9EF9AB20175F3FD10027FA3B /* MCOIMAPFolderStatus.h in CopyFiles */,
@@ -1459,7 +1463,6 @@
 		C6F61FB41702AB2F0073032E /* MCOIMAPBaseOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPBaseOperation.mm; sourceTree = "<group>"; };
 		DA0F1C79177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPMessageRenderingOperation.cc; sourceTree = "<group>"; };
 		DA0F1C7A177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPMessageRenderingOperation.h; sourceTree = "<group>"; };
-		DA81EECD178E2AC500A8C678 /* MCMessageConstantsPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCMessageConstantsPrivate.h; sourceTree = "<group>"; };
 		DA89896B178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPMessageRenderingOperation.h; sourceTree = "<group>"; };
 		DA89896C178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPMessageRenderingOperation.mm; sourceTree = "<group>"; };
 		DAACAD4F17886807000B4517 /* MCHTMLRendererIMAPDataCallback.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCHTMLRendererIMAPDataCallback.cc; sourceTree = "<group>"; };
@@ -1798,7 +1801,6 @@
 				C64EA69E169E847800778456 /* MCMessageConstants.h */,
 				C64EA69F169E847800778456 /* MCMessageHeader.cc */,
 				C64EA6A0169E847800778456 /* MCMessageHeader.h */,
-				DA81EECD178E2AC500A8C678 /* MCMessageConstantsPrivate.h */,
 			);
 			path = abstract;
 			sourceTree = "<group>";
@@ -2503,7 +2505,7 @@
 				9EF9AB19175F36600027FA3B /* MCOIMAPFolderStatusOperation.mm in Sources */,
 				9E774D891767C7F60065EB9B /* MCIMAPFolderStatus.cc in Sources */,
 				DAD28C8B1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc in Sources */,
-				BD63713B177DFF080094121B /* MCLibetpan.cpp in Sources */,
+				BD63713B177DFF080094121B /* MCLibetpan.cc in Sources */,
 				DAACAD5117886807000B4517 /* MCHTMLRendererIMAPDataCallback.cc in Sources */,
 				DA89896D178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.mm in Sources */,
 			);
@@ -2538,7 +2540,6 @@
 				C6BA2B9A1705F4E6003F0E9E /* MCAbstractMessagePart.cc in Sources */,
 				C6BA2B9B1705F4E6003F0E9E /* MCAbstractMultipart.cc in Sources */,
 				C6BA2B9C1705F4E6003F0E9E /* MCAbstractPart.cc in Sources */,
-				C64DBFFE1787CA050012CA0B /* HTMLBodyRendererTemplateCallback.cc in Sources */,
 				C6BA2B9D1705F4E6003F0E9E /* MCAddress.cc in Sources */,
 				C6BA2B9E1705F4E6003F0E9E /* MCMessageHeader.cc in Sources */,
 				C6BA2B9F1705F4E6003F0E9E /* MCAutoreleasePool.cc in Sources */,
@@ -2690,7 +2691,7 @@
 				9EF9AB1A175F36600027FA3B /* MCOIMAPFolderStatusOperation.mm in Sources */,
 				9E774D8A1767C7F60065EB9B /* MCIMAPFolderStatus.cc in Sources */,
 				DAD28C8C1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc in Sources */,
-				BD63713C177DFF080094121B /* MCLibetpan.cpp in Sources */,
+				BD63713C177DFF080094121B /* MCLibetpan.cc in Sources */,
 				DAACAD5217886807000B4517 /* MCHTMLRendererIMAPDataCallback.cc in Sources */,
 				DA89896E178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.mm in Sources */,
 			);
diff --git a/scripts/prepare-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh
index 02c2a7b0..50521f57 100755
--- a/scripts/prepare-ctemplate-ios.sh
+++ b/scripts/prepare-ctemplate-ios.sh
@@ -58,7 +58,6 @@ cd "$srcdir/ctemplate"
 TOOLCHAIN=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
 export CC=$TOOLCHAIN/clang
 export CXX=$TOOLCHAIN/clang++
-export LDLAGS="-lc++ -isysroot $sysrootpath"
 
 sdk="iphoneos$sdkversion"
 sysroot="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$sdkversion.sdk"
diff --git a/scripts/prepare-ctemplate-macos.sh b/scripts/prepare-ctemplate-macos.sh
index 2e0fdd60..718dd0bc 100755
--- a/scripts/prepare-ctemplate-macos.sh
+++ b/scripts/prepare-ctemplate-macos.sh
@@ -65,7 +65,6 @@ export CC=clang
 export CXX=clang++
 export CFLAGS="$arch_flags"
 export CXXFLAGS="-std=c++11 -stdlib=libc++ $arch_flags"
-export LDLAGS="-lc++ $arch_flags -isysroot $sysrootpath"
 ./configure --disable-shared --disable-dependency-tracking >> "$logdir/ctemplate-build.log"
 #make libctemplate.la >> "$logdir/ctemplate-build.log"
 #make libctemplate_nothreads.la >> "$logdir/ctemplate-build.log"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d314aea..d90246c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ ELSE()
 ENDIF()
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(public-headers)
 include(core)
 include(async)
 include(objc)
@@ -93,10 +94,7 @@ SET_SOURCE_FILES_PROPERTIES(
 )
 
 file(COPY
-  MailCore.h
-  ${public_headers_objc}
-  ${public_headers_core}
-  ${public_headers_async}
+  ${public_headers}
 
   DESTINATION
   ${CMAKE_CURRENT_BINARY_DIR}/include/MailCore
diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h
index 1a7a955d..a6bf40d0 100644
--- a/src/async/imap/MCAsyncIMAP.h
+++ b/src/async/imap/MCAsyncIMAP.h
@@ -28,6 +28,6 @@
 #include <MailCore/MCIMAPIdentityOperation.h>
 #include <MailCore/MCIMAPCapabilityOperation.h>
 #include <MailCore/MCIMAPOperationCallback.h>
-
+#include <MailCore/MCIMAPMessageRenderingOperation.h>
 
 #endif
diff --git a/src/async/imap/MCIMAPAsyncConnection.cc b/src/async/imap/MCIMAPAsyncConnection.cc
index 86ba6b89..85c411a8 100644
--- a/src/async/imap/MCIMAPAsyncConnection.cc
+++ b/src/async/imap/MCIMAPAsyncConnection.cc
@@ -35,7 +35,6 @@
 #include "MCIMAPAsyncSession.h"
 #include "MCConnectionLogger.h"
 #include "MCIMAPMessageRenderingOperation.h"
-#include "MCMessageConstantsPrivate.h"
 
 using namespace mailcore;
 
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h
index 65c793bb..45acb707 100644
--- a/src/async/imap/MCIMAPAsyncConnection.h
+++ b/src/async/imap/MCIMAPAsyncConnection.h
@@ -4,7 +4,6 @@
 
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCMessageConstants.h>
-#include "MCMessageConstantsPrivate.h"
 
 #ifdef __cplusplus
 
diff --git a/src/async/imap/MCIMAPMessageRenderingOperation.h b/src/async/imap/MCIMAPMessageRenderingOperation.h
index c0fcc92c..9840fd88 100644
--- a/src/async/imap/MCIMAPMessageRenderingOperation.h
+++ b/src/async/imap/MCIMAPMessageRenderingOperation.h
@@ -12,7 +12,6 @@
 
 #include <MailCore/MCIMAPOperation.h>
 #include <MailCore/MCIMAPMessage.h>
-#include "MCMessageConstantsPrivate.h"
 
 #ifdef __cplusplus
 
diff --git a/src/cmake/async.cmake b/src/cmake/async.cmake
index 239d3cce..8b4857ea 100644
--- a/src/cmake/async.cmake
+++ b/src/cmake/async.cmake
@@ -1,48 +1,3 @@
-# public headers
-
-set(public_headers_async_imap
-  async/imap/MCAsyncIMAP.h
-  async/imap/MCIMAPAppendMessageOperation.h
-  async/imap/MCIMAPAsyncSession.h
-  async/imap/MCIMAPCapabilityOperation.h
-  async/imap/MCIMAPCopyMessagesOperation.h
-  async/imap/MCIMAPFetchContentOperation.h
-  async/imap/MCIMAPFetchFoldersOperation.h
-  async/imap/MCIMAPFetchMessagesOperation.h
-  async/imap/MCIMAPFetchNamespaceOperation.h
-  async/imap/MCIMAPFolderInfoOperation.h
-  async/imap/MCIMAPFolderStatusOperation.h
-  async/imap/MCIMAPIdentityOperation.h
-  async/imap/MCIMAPIdleOperation.h
-  async/imap/MCIMAPOperation.h
-  async/imap/MCIMAPOperationCallback.h
-  async/imap/MCIMAPSearchOperation.h
-)
-
-set(public_headers_async_pop
-  async/pop/MCAsyncPOP.h
-  async/pop/MCPOPAsyncSession.h
-  async/pop/MCPOPFetchHeaderOperation.h
-  async/pop/MCPOPFetchMessageOperation.h
-  async/pop/MCPOPFetchMessagesOperation.h
-  async/pop/MCPOPOperation.h
-  async/pop/MCPOPOperationCallback.h
-)
-
-set(public_headers_async_smtp
-  async/smtp/MCAsyncSMTP.h
-  async/smtp/MCSMTPAsyncSession.h
-  async/smtp/MCSMTPOperation.h
-  async/smtp/MCSMTPOperationCallback.h
-)
-
-set(public_headers_async
-  async/MCAsync.h
-  ${public_headers_async_pop}
-  ${public_headers_async_smtp}
-  ${public_headers_async_imap}
-)
-
 # Files to build
 
 set(async_imap_files
@@ -54,14 +9,17 @@ set(async_imap_files
   async/imap/MCIMAPCopyMessagesOperation.cc
   async/imap/MCIMAPCreateFolderOperation.cc
   async/imap/MCIMAPDeleteFolderOperation.cc
+  async/imap/MCIMAPDisconnectOperation.cc
   async/imap/MCIMAPExpungeOperation.cc
   async/imap/MCIMAPFetchContentOperation.cc
   async/imap/MCIMAPFetchFoldersOperation.cc
   async/imap/MCIMAPFetchMessagesOperation.cc
   async/imap/MCIMAPFetchNamespaceOperation.cc
   async/imap/MCIMAPFolderInfoOperation.cc
+  async/imap/MCIMAPFolderStatusOperation.cc
   async/imap/MCIMAPIdentityOperation.cc
   async/imap/MCIMAPIdleOperation.cc
+  async/imap/MCIMAPMessageRenderingOperation.cc
   async/imap/MCIMAPOperation.cc
   async/imap/MCIMAPRenameFolderOperation.cc
   async/imap/MCIMAPSearchOperation.cc
@@ -83,6 +41,7 @@ set(async_pop_files
 set(async_smtp_files
   async/smtp/MCSMTPAsyncSession.cc
   async/smtp/MCSMTPCheckAccountOperation.cc
+  async/smtp/MCSMTPDisconnectOperation.cc
   async/smtp/MCSMTPOperation.cc
   async/smtp/MCSMTPSendWithDataOperation.cc
 )
diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake
index 24de3963..1322318c 100644
--- a/src/cmake/core.cmake
+++ b/src/cmake/core.cmake
@@ -1,110 +1,3 @@
-# public headers
-
-set(public_headers_abstract
-  core/abstract/MCAbstract.h
-  core/abstract/MCAbstractMessage.h
-  core/abstract/MCAbstractMessagePart.h
-  core/abstract/MCAbstractMultipart.h
-  core/abstract/MCAbstractPart.h
-  core/abstract/MCAddress.h
-  core/abstract/MCMessageConstants.h
-  core/abstract/MCMessageHeader.h
-)
-
-set(public_headers_basetypes
-  core/basetypes/MCArray.h
-  core/basetypes/MCAssert.h
-  core/basetypes/MCAutoreleasePool.h
-  core/basetypes/MCBaseTypes.h
-  core/basetypes/MCData.h
-  core/basetypes/MCHash.h
-  core/basetypes/MCHashMap.h
-  core/basetypes/MCHTMLCleaner.h
-  core/basetypes/MCIndexSet.h
-  core/basetypes/MCIterator.h
-  core/basetypes/MCICUTypes.h
-  core/basetypes/MCJSON.h
-  core/basetypes/MCLibetpanTypes.h
-  core/basetypes/MCLog.h
-  core/basetypes/MCMainThread.h
-  core/basetypes/MCMD5.h
-  core/basetypes/MCNull.h
-  core/basetypes/MCObject.h
-  core/basetypes/MCOperation.h
-  core/basetypes/MCOperationCallback.h
-  core/basetypes/MCOperationQueue.h
-  core/basetypes/MCRange.h
-  core/basetypes/MCSet.h
-  core/basetypes/MCString.h
-  core/basetypes/MCUtils.h
-  core/basetypes/MCValue.h
-)
-
-set(public_headers_imap
-  core/imap/MCIMAP.h
-  core/imap/MCIMAPFolder.h
-  core/imap/MCIMAPFolderStatus.h
-  core/imap/MCIMAPMessage.h
-  core/imap/MCIMAPMessagePart.h
-  core/imap/MCIMAPMultipart.h
-  core/imap/MCIMAPNamespace.h
-  core/imap/MCIMAPNamespaceItem.h
-  core/imap/MCIMAPPart.h
-  core/imap/MCIMAPProgressCallback.h
-  core/imap/MCIMAPSearchExpression.h
-  core/imap/MCIMAPSession.h
-  core/imap/MCIMAPSyncResult.h
-)
-
-set(public_headers_pop
-  core/pop/MCPOP.h
-  core/pop/MCPOPMessageInfo.h
-  core/pop/MCPOPProgressCallback.h
-  core/pop/MCPOPSession.h
-)
-
-set(public_headers_provider
-  core/provider/MCMailProvider.h
-  core/provider/MCMailProvidersManager.h
-  core/provider/MCNetService.h
-  core/provider/MCProvider.h
-)
-
-set(public_headers_renderer
-  core/renderer/MCAddressDisplay.h
-  core/renderer/MCDateFormatter.h
-  core/renderer/MCHTMLRendererCallback.h
-  core/renderer/MCRenderer.h
-  core/renderer/MCSizeFormatter.h
-)
-
-set(public_headers_rfc822
-  core/rfc822/MCAttachment.h
-  core/rfc822/MCMessageBuilder.h
-  core/rfc822/MCMessageParser.h
-  core/rfc822/MCMessagePart.h
-  core/rfc822/MCMultipart.h
-  core/rfc822/MCRFC822.h
-)
-
-set(public_headers_smtp
-  core/smtp/MCSMTP.h
-  core/smtp/MCSMTPProgressCallback.h
-  core/smtp/MCSMTPSession.h
-)
-
-set(public_headers_core
-  core/MCCore.h
-  ${public_headers_basetypes}
-  ${public_headers_renderer}
-  ${public_headers_imap}
-  ${public_headers_pop}
-  ${public_headers_smtp}
-  ${public_headers_abstract}
-  ${public_headers_rfc822}
-  ${public_headers_provider}
-)
-
 # Files to build
 
 set(abstract_files
@@ -126,8 +19,9 @@ ENDIF()
 
 set(basetypes_files
   core/basetypes/MCArray.cc
-  core/basetypes/MCAssert.cc
+  core/basetypes/MCAssert.c
   core/basetypes/MCAutoreleasePool.cc
+  core/basetypes/MCConnectionLoggerUtils.cc
   core/basetypes/MCData.cc
   core/basetypes/MCHash.cc
   core/basetypes/MCHashMap.cc
@@ -135,7 +29,8 @@ set(basetypes_files
   core/basetypes/MCIndexSet.cc
   core/basetypes/MCJSON.cc
   core/basetypes/MCJSONParser.cc
-  core/basetypes/MCLog.cc
+  core/basetypes/MCLibetpan.cc
+  core/basetypes/MCLog.c
   core/basetypes/MCMD5.cc
   core/basetypes/MCNull.cc
   core/basetypes/MCObject.cc
@@ -176,9 +71,12 @@ set(provider_files
 set(renderer_files
   core/renderer/MCAddressDisplay.cc
   core/renderer/MCDateFormatter.cc
+  core/renderer/MCHTMLBodyRendererTemplateCallback.cc
   core/renderer/MCHTMLRenderer.cc
   core/renderer/MCHTMLRendererCallback.cc
+  core/renderer/MCHTMLRendererIMAPDataCallback.cc
   core/renderer/MCSizeFormatter.cc
+  
 )
 
 set(rfc822_files
diff --git a/src/cmake/gen-public-headers.sh b/src/cmake/gen-public-headers.sh
new file mode 100755
index 00000000..1cb591d6
--- /dev/null
+++ b/src/cmake/gen-public-headers.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+files=""
+
+list_headers()
+{
+  local filename="$1"
+  
+  if echo $files | grep "\[$filename\]" >/dev/null ; then
+    return
+  fi
+  
+  local path="`find . -name $filename`"
+  echo $path | sed 's/^.\///'
+  files="$files[$filename]"
+  subfilenames="`grep '#include <MailCore/' "$path" | sed 's/^#include <MailCore\/\(.*\)>$/\1/'`"
+  subfilenames+=" "
+  subfilenames+="`grep '#import <MailCore/' "$path" | sed 's/^#import <MailCore\/\(.*\)>$/\1/'`"
+  for include_dir in $subfilenames ; do
+    list_headers $include_dir
+  done
+}
+
+cd ..
+echo 'set(public_headers'
+list_headers MailCore.h
+echo ')'
diff --git a/src/cmake/objc.cmake b/src/cmake/objc.cmake
index 72975a1f..57a8c317 100644
--- a/src/cmake/objc.cmake
+++ b/src/cmake/objc.cmake
@@ -1,105 +1,3 @@
-set(public_headers_objc_abstract
-  objc/abstract/MCOAbstract.h
-  objc/abstract/MCOAbstractMessage.h
-  objc/abstract/MCOAbstractMessagePart.h
-  objc/abstract/MCOAbstractMultipart.h
-  objc/abstract/MCOAbstractPart.h
-  objc/abstract/MCOAddress.h
-  objc/abstract/MCOConstants.h
-  objc/abstract/MCOHTMLRendererDelegate.h
-  objc/abstract/MCOHTMLRendererIMAPDelegate.h
-  objc/abstract/MCOMessageHeader.h
-)
-
-set(public_headers_objc_imap
-  objc/imap/MCOIMAP.h
-  objc/imap/MCOIMAPAppendMessageOperation.h
-  objc/imap/MCOIMAPBaseOperation.h
-  objc/imap/MCOIMAPCapabilityOperation.h
-  objc/imap/MCOIMAPCopyMessagesOperation.h
-  objc/imap/MCOIMAPFetchContentOperation.h
-  objc/imap/MCOIMAPFetchFoldersOperation.h
-  objc/imap/MCOIMAPFetchMessagesOperation.h
-  objc/imap/MCOIMAPFetchNamespaceOperation.h
-  objc/imap/MCOIMAPFolder.h
-  objc/imap/MCOIMAPFolderInfo.h
-  objc/imap/MCOIMAPFolderInfoOperation.h
-  objc/imap/MCOIMAPFolderStatus.h
-  objc/imap/MCOIMAPFolderStatusOperation.h
-  objc/imap/MCOIMAPIdentityOperation.h
-  objc/imap/MCOIMAPIdleOperation.h
-  objc/imap/MCOIMAPMessage.h
-  objc/imap/MCOIMAPMessagePart.h
-  objc/imap/MCOIMAPMultipart.h
-  objc/imap/MCOIMAPNamespace.h
-  objc/imap/MCOIMAPNamespaceItem.h
-  objc/imap/MCOIMAPOperation.h
-  objc/imap/MCOIMAPPart.h
-  objc/imap/MCOIMAPSearchExpression.h
-  objc/imap/MCOIMAPSearchOperation.h
-  objc/imap/MCOIMAPSession.h
-)
-
-set(public_headers_objc_pop
-  objc/pop/MCOPOP.h
-  objc/pop/MCOPOPFetchHeaderOperation.h
-  objc/pop/MCOPOPFetchMessageOperation.h
-  objc/pop/MCOPOPFetchMessagesOperation.h
-  objc/pop/MCOPOPMessageInfo.h
-  objc/pop/MCOPOPOperation.h
-  objc/pop/MCOPOPSession.h
-)
-
-set(public_headers_objc_provider
-  objc/provider/MCOProvider.h
-  objc/provider/MCOMailProvider.h
-  objc/provider/MCOMailProvidersManager.h
-  objc/provider/MCONetService.h
-)
-
-set(public_headers_objc_rfc822
-  objc/rfc822/MCOAttachment.h
-  objc/rfc822/MCOMessageBuilder.h
-  objc/rfc822/MCOMessageParser.h
-  objc/rfc822/MCOMessagePart.h
-  objc/rfc822/MCOMultipart.h
-  objc/rfc822/MCORFC822.h
-)
-
-set(public_headers_objc_smtp
-  objc/smtp/MCOSMTP.h
-  objc/smtp/MCOSMTPOperation.h
-  objc/smtp/MCOSMTPSendOperation.h
-  objc/smtp/MCOSMTPSession.h
-)
-
-set(public_headers_objc_utils
-  objc/utils/MCOIndexSet.h
-  objc/utils/MCOObjectWrapper.h
-  objc/utils/MCOOperation.h
-  objc/utils/MCORange.h
-  objc/utils/MCOUtils.h
-  objc/utils/NSArray+MCO.h
-  objc/utils/NSData+MCO.h
-  objc/utils/NSDictionary+MCO.h
-  objc/utils/NSError+MCO.h
-  objc/utils/NSObject+MCO.h
-  objc/utils/NSString+MCO.h
-  objc/utils/NSValue+MCO.h
-)
-
-IF(APPLE)
-set(public_headers_objc
-  objc/MCObjC.h
-  ${public_headers_objc_abstract}
-  ${public_headers_objc_imap}
-  ${public_headers_objc_pop}
-  ${public_headers_objc_rfc822}
-  ${public_headers_objc_smtp}
-  ${public_headers_objc_utils}
-)
-ENDIF()
-
 # Files to build
 
 set(async_objc_abstract
@@ -130,6 +28,7 @@ set(async_objc_imap
   objc/imap/MCOIMAPIdleOperation.mm
   objc/imap/MCOIMAPMessage.mm
   objc/imap/MCOIMAPMessagePart.mm
+  objc/imap/MCOIMAPMessageRenderingOperation.mm
   objc/imap/MCOIMAPMultipart.mm
   objc/imap/MCOIMAPNamespace.mm
   objc/imap/MCOIMAPNamespaceItem.mm
diff --git a/src/cmake/public-headers.cmake b/src/cmake/public-headers.cmake
new file mode 100644
index 00000000..41409f59
--- /dev/null
+++ b/src/cmake/public-headers.cmake
@@ -0,0 +1,171 @@
+set(public_headers
+MailCore.h
+core/MCCore.h
+core/abstract/MCAbstract.h
+core/abstract/MCAbstractMessage.h
+core/basetypes/MCBaseTypes.h
+core/basetypes/MCAutoreleasePool.h
+core/basetypes/MCObject.h
+core/basetypes/MCValue.h
+core/basetypes/MCString.h
+core/basetypes/MCRange.h
+core/basetypes/MCICUTypes.h
+core/basetypes/MCData.h
+core/abstract/MCMessageConstants.h
+core/basetypes/MCArray.h
+core/basetypes/MCHashMap.h
+core/basetypes/MCJSON.h
+core/basetypes/MCMD5.h
+core/basetypes/MCNull.h
+core/basetypes/MCSet.h
+core/basetypes/MCHash.h
+core/basetypes/MCLog.h
+core/basetypes/MCAssert.h
+core/basetypes/MCUtils.h
+core/basetypes/MCIndexSet.h
+core/basetypes/MCOperation.h
+core/basetypes/MCOperationQueue.h
+core/basetypes/MCLibetpanTypes.h
+core/basetypes/MCOperationCallback.h
+core/basetypes/MCIterator.h
+core/basetypes/MCConnectionLogger.h
+core/abstract/MCAbstractMessagePart.h
+core/abstract/MCAbstractPart.h
+core/abstract/MCAbstractMultipart.h
+core/abstract/MCAddress.h
+core/abstract/MCMessageHeader.h
+core/imap/MCIMAP.h
+core/imap/MCIMAPFolder.h
+core/imap/MCIMAPMessage.h
+core/imap/MCIMAPMessagePart.h
+core/imap/MCIMAPMultipart.h
+core/imap/MCIMAPNamespace.h
+core/imap/MCIMAPNamespaceItem.h
+core/imap/MCIMAPPart.h
+core/imap/MCIMAPProgressCallback.h
+core/imap/MCIMAPSearchExpression.h
+core/imap/MCIMAPSession.h
+core/imap/MCIMAPSyncResult.h
+core/imap/MCIMAPFolderStatus.h
+core/pop/MCPOP.h
+core/pop/MCPOPMessageInfo.h
+core/pop/MCPOPProgressCallback.h
+core/pop/MCPOPSession.h
+core/rfc822/MCRFC822.h
+core/rfc822/MCAttachment.h
+core/rfc822/MCMessageBuilder.h
+core/rfc822/MCMessageParser.h
+core/rfc822/MCMessagePart.h
+core/rfc822/MCMultipart.h
+core/smtp/MCSMTP.h
+core/smtp/MCSMTPProgressCallback.h
+core/smtp/MCSMTPSession.h
+core/renderer/MCRenderer.h
+core/renderer/MCHTMLRendererCallback.h
+core/renderer/MCDateFormatter.h
+core/renderer/MCAddressDisplay.h
+core/provider/MCProvider.h
+core/provider/MCMailProvidersManager.h
+core/provider/MCMailProvider.h
+core/provider/MCNetService.h
+async/MCAsync.h
+async/smtp/MCAsyncSMTP.h
+async/smtp/MCSMTPAsyncSession.h
+async/smtp/MCSMTPOperation.h
+async/smtp/MCSMTPOperationCallback.h
+async/imap/MCAsyncIMAP.h
+async/imap/MCIMAPAsyncSession.h
+async/imap/MCIMAPOperation.h
+async/imap/MCIMAPFetchFoldersOperation.h
+async/imap/MCIMAPAppendMessageOperation.h
+async/imap/MCIMAPCopyMessagesOperation.h
+async/imap/MCIMAPFetchMessagesOperation.h
+async/imap/MCIMAPFetchContentOperation.h
+async/imap/MCIMAPIdleOperation.h
+async/imap/MCIMAPFolderInfoOperation.h
+async/imap/MCIMAPFolderStatusOperation.h
+async/imap/MCIMAPSearchOperation.h
+async/imap/MCIMAPFetchNamespaceOperation.h
+async/imap/MCIMAPIdentityOperation.h
+async/imap/MCIMAPCapabilityOperation.h
+async/imap/MCIMAPOperationCallback.h
+async/imap/MCIMAPMessageRenderingOperation.h
+async/pop/MCAsyncPOP.h
+async/pop/MCPOPAsyncSession.h
+async/pop/MCPOPOperation.h
+async/pop/MCPOPFetchHeaderOperation.h
+async/pop/MCPOPFetchMessageOperation.h
+async/pop/MCPOPFetchMessagesOperation.h
+async/pop/MCPOPOperationCallback.h
+objc/MCObjC.h
+objc/utils/MCOUtils.h
+objc/utils/MCOObjectWrapper.h
+objc/utils/NSData+MCO.h
+objc/utils/NSString+MCO.h
+objc/utils/NSDictionary+MCO.h
+objc/utils/NSArray+MCO.h
+objc/utils/NSObject+MCO.h
+objc/utils/NSError+MCO.h
+objc/utils/NSValue+MCO.h
+objc/utils/MCOOperation.h
+objc/abstract/MCOConstants.h
+objc/utils/MCOIndexSet.h
+objc/utils/MCORange.h
+objc/abstract/MCOAbstract.h
+objc/abstract/MCOAbstractMessage.h
+objc/abstract/MCOAbstractMessagePart.h
+objc/abstract/MCOAbstractPart.h
+objc/abstract/MCOAbstractMultipart.h
+objc/abstract/MCOAddress.h
+objc/abstract/MCOMessageHeader.h
+objc/abstract/MCOHTMLRendererDelegate.h
+objc/abstract/MCOHTMLRendererIMAPDelegate.h
+objc/imap/MCOIMAP.h
+objc/imap/MCOIMAPSession.h
+objc/imap/MCOIMAPOperation.h
+objc/imap/MCOIMAPBaseOperation.h
+objc/imap/MCOIMAPFetchFoldersOperation.h
+objc/imap/MCOIMAPFolder.h
+objc/imap/MCOIMAPMessage.h
+objc/imap/MCOIMAPMessagePart.h
+objc/imap/MCOIMAPMultipart.h
+objc/imap/MCOIMAPNamespace.h
+objc/imap/MCOIMAPNamespaceItem.h
+objc/imap/MCOIMAPPart.h
+objc/imap/MCOIMAPFolderInfoOperation.h
+objc/imap/MCOIMAPFolderInfo.h
+objc/imap/MCOIMAPFolderStatusOperation.h
+objc/imap/MCOIMAPFolderStatus.h
+objc/imap/MCOIMAPAppendMessageOperation.h
+objc/imap/MCOIMAPCopyMessagesOperation.h
+objc/imap/MCOIMAPFetchMessagesOperation.h
+objc/imap/MCOIMAPFetchContentOperation.h
+objc/imap/MCOIMAPSearchOperation.h
+objc/imap/MCOIMAPIdleOperation.h
+objc/imap/MCOIMAPFetchNamespaceOperation.h
+objc/imap/MCOIMAPIdentityOperation.h
+objc/imap/MCOIMAPCapabilityOperation.h
+objc/imap/MCOIMAPSearchExpression.h
+objc/imap/MCOIMAPMessageRenderingOperation.h
+objc/rfc822/MCORFC822.h
+objc/rfc822/MCOAttachment.h
+objc/rfc822/MCOMessageBuilder.h
+objc/rfc822/MCOMessageParser.h
+objc/rfc822/MCOMessagePart.h
+objc/rfc822/MCOMultipart.h
+objc/pop/MCOPOP.h
+objc/pop/MCOPOPSession.h
+objc/pop/MCOPOPOperation.h
+objc/pop/MCOPOPFetchHeaderOperation.h
+objc/pop/MCOPOPFetchMessageOperation.h
+objc/pop/MCOPOPFetchMessagesOperation.h
+objc/pop/MCOPOPMessageInfo.h
+objc/smtp/MCOSMTP.h
+objc/smtp/MCOSMTPSession.h
+objc/smtp/MCOSMTPSendOperation.h
+objc/smtp/MCOSMTPOperation.h
+objc/provider/MCOProvider.h
+objc/provider/MCONetService.h
+objc/provider/MCOMailProvider.h
+objc/provider/MCOMailProvidersManager.h
+)
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index 9e1b46b7..4949bb95 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -213,6 +213,14 @@ namespace mailcore {
         PartTypeMultipartRelated,
         PartTypeMultipartAlternative,
     };
+    
+    // Private type - It should not be used directly.
+    enum IMAPMessageRenderingType {
+        IMAPMessageRenderingTypeHTML,
+        IMAPMessageRenderingTypeHTMLBody,
+        IMAPMessageRenderingTypePlainText,
+        IMAPMessageRenderingTypePlainTextBody
+    };
 }
 
 #endif
diff --git a/src/core/abstract/MCMessageConstantsPrivate.h b/src/core/abstract/MCMessageConstantsPrivate.h
deleted file mode 100644
index 39312025..00000000
--- a/src/core/abstract/MCMessageConstantsPrivate.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  MCMessageConstantsPrivate.h
-//  mailcore2
-//
-//  Created by Paul Young on 10/07/2013.
-//  Copyright (c) 2013 MailCore. All rights reserved.
-//
-
-#ifndef __MAILCORE_MCMESSAGECONSTANTSPRIVATE_H_
-#define __MAILCORE_MCMESSAGECONSTANTSPRIVATE_H_
-
-#ifdef __cplusplus
-
-namespace mailcore {
-    
-    typedef enum {
-        IMAPMessageRenderingTypeHTML,
-        IMAPMessageRenderingTypeHTMLBody,
-        IMAPMessageRenderingTypePlainText,
-        IMAPMessageRenderingTypePlainTextBody
-    } IMAPMessageRenderingType;
-    
-}
-
-#endif
-
-#endif
diff --git a/src/core/basetypes/MCLibetpan.cc b/src/core/basetypes/MCLibetpan.cc
index c8258cc2..5da4452b 100644
--- a/src/core/basetypes/MCLibetpan.cc
+++ b/src/core/basetypes/MCLibetpan.cc
@@ -12,5 +12,6 @@
 
 __attribute__((constructor))
 static void initialize() {
+    // It will enable CFStream on platforms that supports it.
     mailstream_cfstream_enabled = 1;
 }
diff --git a/src/core/smtp/MCSMTPSession.cc b/src/core/smtp/MCSMTPSession.cc
index 0febf66e..f9c4932b 100644
--- a/src/core/smtp/MCSMTPSession.cc
+++ b/src/core/smtp/MCSMTPSession.cc
@@ -532,7 +532,7 @@ void SMTPSession::checkAccount(Address * from, ErrorCode * pError)
         return;
     }
     
-    r = mailsmtp_rcpt(mSmtp, "email@invalid");
+    r = mailsmtp_rcpt(mSmtp, "email@invalid.com");
     if (r == MAILSMTP_ERROR_STREAM) {
         * pError = ErrorConnection;
         return;