Fixed build on win32

8 files changed, 1597 insertions, 707 deletions

diff --git a/build-windows/mailcore2/mailcore2.sln b/build-windows/mailcore2/mailcore2.sln
index eb63263b..1c696388 100644
--- a/build-windows/mailcore2/mailcore2.sln
+++ b/build-windows/mailcore2/mailcore2.sln
@@ -1,39 +1,41 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mailcore2", "mailcore2", "{035C0960-7BEB-418A-91EF-02BAD3906CDE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mailcore2", "mailcore2\mailcore2.vcxproj", "{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mailcore2.Windows", "mailcore2\mailcore2.Windows\mailcore2.Windows.vcxproj", "{610B06B9-FFB5-4ED3-8910-62D2C53D6768}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829} = {AAD35E01-77E4-43CB-BBB4-F7F6692EA829}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release|ARM = Release|ARM
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Debug|ARM.ActiveCfg = Debug|ARM
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Debug|ARM.Build.0 = Debug|ARM
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Debug|Win32.ActiveCfg = Debug|Win32
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Debug|Win32.Build.0 = Debug|Win32
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Debug|x64.ActiveCfg = Debug|x64
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Debug|x64.Build.0 = Debug|x64
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Release|ARM.ActiveCfg = Release|ARM
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Release|ARM.Build.0 = Release|ARM
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Release|Win32.ActiveCfg = Release|Win32
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Release|Win32.Build.0 = Release|Win32
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Release|x64.ActiveCfg = Release|x64
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768}.Release|x64.Build.0 = Release|x64
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Debug|Win32.Build.0 = Debug|Win32
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Debug|x64.ActiveCfg = Debug|x64
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Debug|x64.Build.0 = Debug|x64
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Release|Win32.ActiveCfg = Release|Win32
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Release|Win32.Build.0 = Release|Win32
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Release|x64.ActiveCfg = Release|x64
+		{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}.Release|x64.Build.0 = Release|x64
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Debug|Win32.Build.0 = Debug|Win32
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Debug|x64.ActiveCfg = Debug|x64
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Debug|x64.Build.0 = Debug|x64
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Release|Win32.ActiveCfg = Release|Win32
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Release|Win32.Build.0 = Release|Win32
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Release|x64.ActiveCfg = Release|x64
+		{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{610B06B9-FFB5-4ED3-8910-62D2C53D6768} = {035C0960-7BEB-418A-91EF-02BAD3906CDE}
-	EndGlobalSection
 EndGlobal
diff --git a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj
deleted file mode 100644
index a04b7c46..00000000
--- a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPAppendMessageOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPAsyncConnection.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCapabilityOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPConnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCreateFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPExpungeOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchContentOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFolderInfoOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFolderStatusOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPIdentityOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPIdleOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPNoopOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPQuotaOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPRenameFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPSearchOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPFetchHeaderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPFetchMessageOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPFetchMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPNoopOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPLoginOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPNoopOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractMessage.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractMessagePart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractMultipart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractPart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAddress.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCMessageHeader.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\ConvertUTF.c" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCArray.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCAssert.c" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCAutoreleasePool.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCBase64.c" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCConnectionLoggerUtils.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCData.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCHash.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCHashMap.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCHTMLCleaner.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCIndexSet.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCJSON.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCJSONParser.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCLibetpan.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCLog.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCMainThreadWin32.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCMD5.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCNull.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCObject.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCOperationQueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCRange.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCSet.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCString.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCStringWin32.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCValue.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCWin32.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPFolder.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPFolderStatus.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPIdentity.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPMessage.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPMessagePart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPMultipart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPNamespace.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPNamespaceItem.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPPart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPSearchExpression.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPSyncResult.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\nntp\MCNNTPGroupInfo.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\nntp\MCNNTPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\pop\MCPOPMessageInfo.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\pop\MCPOPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\provider\MCMailProvider.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\provider\MCMailProvidersManager.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\provider\MCNetService.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCAddressDisplay.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCDateFormatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLRenderer.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLRendererCallback.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCSizeFormatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCAttachment.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMessageBuilder.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMessageParser.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMessagePart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMultipart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\security\MCCertificateUtils.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\smtp\MCSMTPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MCZip.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\ioapi.c" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\iowin32.c" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\unzip.c" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\zip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\async\imap\MCAsyncIMAP.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPAppendMessageOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPAsyncConnection.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCapabilityOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPConnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCreateFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPExpungeOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchContentOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFolderInfoOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFolderStatusOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPIdentityOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPIdleOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPNoopOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPQuotaOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPRenameFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPSearchOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCAsyncNNTP.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCAsyncPOP.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPFetchHeaderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPFetchMessageOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPFetchMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPNoopOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCAsyncSMTP.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPLoginOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPNoopOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstract.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractMessage.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractMessagePart.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractMultipart.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractPart.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAddress.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCMessageConstants.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCMessageHeader.h" />
-    <ClInclude Include="..\..\..\..\src\core\basetypes\MCWin32.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAP.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPFolder.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPFolderStatus.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPIdentity.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPMessage.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPMessagePart.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPMultipart.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPNamespace.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPNamespaceItem.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPPart.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPSearchExpression.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPSession.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPSyncResult.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTP.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTPGroupInfo.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTPSession.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOP.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOPMessageInfo.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOPSession.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCMailProvider.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCMailProvidersManager.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCNetService.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCProvider.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCAddressDisplay.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCDateFormatter.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLRenderer.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLRendererCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCRenderer.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCSizeFormatter.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCAttachment.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMessageBuilder.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMessageParser.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMessagePart.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMultipart.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCRFC822.h" />
-    <ClInclude Include="..\..\..\..\src\core\security\MCCertificateUtils.h" />
-    <ClInclude Include="..\..\..\..\src\core\smtp\MCSMTP.h" />
-    <ClInclude Include="..\..\..\..\src\core\smtp\MCSMTPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\smtp\MCSMTPSession.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MCZip.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\ioapi.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\iowin32.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\unzip.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\zip.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\src\core\rfc822\MCMessageParserMac.mm" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{610b06b9-ffb5-4ed3-8910-62d2c53d6768}</ProjectGuid>
-    <RootNamespace>mailcore2</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-    <ConvergedProjectType>CodeSharingDll</ConvergedProjectType>
-    <ProjectName>mailcore2</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\Externals\lib;..\..\..\..\Externals\lib\x86</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\Externals\lib;..\..\..\..\Externals\lib\x86</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\Externals\lib64;..\..\..\..\Externals\lib\x64</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\Externals\lib64;..\..\..\..\Externals\lib\x64</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.filters b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.filters
deleted file mode 100644
index 60dc3457..00000000
--- a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.filters
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\core\basetypes\ConvertUTF.c" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCArray.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCAssert.c" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCAutoreleasePool.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCBase64.c" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCConnectionLoggerUtils.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCData.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCHash.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCHashMap.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCHTMLCleaner.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCIndexSet.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCJSON.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCJSONParser.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCLibetpan.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCMD5.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCNull.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCObject.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCOperationQueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCRange.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCSet.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCString.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCValue.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractMessage.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractMessagePart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractMultipart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAbstractPart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCAddress.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\abstract\MCMessageHeader.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\unzip.c" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\zip.c" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MCZip.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPFolder.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPFolderStatus.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPIdentity.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPMessage.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPMessagePart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPMultipart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPNamespace.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPNamespaceItem.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPPart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPSearchExpression.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\imap\MCIMAPSyncResult.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCAttachment.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMessageBuilder.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMessageParser.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMessagePart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\rfc822\MCMultipart.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCAddressDisplay.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCDateFormatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLRenderer.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLRendererCallback.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\renderer\MCSizeFormatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\nntp\MCNNTPGroupInfo.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\nntp\MCNNTPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\pop\MCPOPMessageInfo.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\pop\MCPOPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\provider\MCMailProvider.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\provider\MCMailProvidersManager.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\provider\MCNetService.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\security\MCCertificateUtils.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\smtp\MCSMTPSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPAppendMessageOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPAsyncConnection.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCapabilityOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPConnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPCreateFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPExpungeOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchContentOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFolderInfoOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPFolderStatusOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPIdentityOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPIdleOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPNoopOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPQuotaOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPRenameFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPSearchOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\nntp\MCNNTPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPFetchHeaderOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPFetchMessageOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPFetchMessagesOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPNoopOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\pop\MCPOPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPAsyncSession.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPDisconnectOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPLoginOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPNoopOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCStringWin32.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCLog.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\ioapi.c" />
-    <ClCompile Include="..\..\..\..\src\core\zip\MiniZip\iowin32.c" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCMainThreadWin32.cpp" />
-    <ClCompile Include="..\..\..\..\src\core\basetypes\MCWin32.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstract.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractMessage.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractMessagePart.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractMultipart.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAbstractPart.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCAddress.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCMessageConstants.h" />
-    <ClInclude Include="..\..\..\..\src\core\abstract\MCMessageHeader.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\ioapi.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\unzip.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\zip.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MCZip.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAP.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPFolder.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPFolderStatus.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPIdentity.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPMessage.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPMessagePart.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPMultipart.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPNamespace.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPNamespaceItem.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPPart.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPSearchExpression.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPSession.h" />
-    <ClInclude Include="..\..\..\..\src\core\imap\MCIMAPSyncResult.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCAttachment.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMessageBuilder.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMessageParser.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMessagePart.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCMultipart.h" />
-    <ClInclude Include="..\..\..\..\src\core\rfc822\MCRFC822.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCAddressDisplay.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCDateFormatter.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLRenderer.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLRendererCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCRenderer.h" />
-    <ClInclude Include="..\..\..\..\src\core\renderer\MCSizeFormatter.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTP.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTPGroupInfo.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\nntp\MCNNTPSession.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOP.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOPMessageInfo.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\pop\MCPOPSession.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCMailProvider.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCMailProvidersManager.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCNetService.h" />
-    <ClInclude Include="..\..\..\..\src\core\provider\MCProvider.h" />
-    <ClInclude Include="..\..\..\..\src\core\security\MCCertificateUtils.h" />
-    <ClInclude Include="..\..\..\..\src\core\smtp\MCSMTP.h" />
-    <ClInclude Include="..\..\..\..\src\core\smtp\MCSMTPProgressCallback.h" />
-    <ClInclude Include="..\..\..\..\src\core\smtp\MCSMTPSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCAsyncIMAP.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPAppendMessageOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPAsyncConnection.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCapabilityOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPConnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPCreateFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPExpungeOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchContentOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFolderInfoOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPFolderStatusOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPIdentityOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPIdleOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPNoopOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPQuotaOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPRenameFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPSearchOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCAsyncNNTP.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\nntp\MCNNTPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCAsyncPOP.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPFetchHeaderOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPFetchMessageOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPFetchMessagesOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPNoopOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\pop\MCPOPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCAsyncSMTP.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPAsyncSession.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPDisconnectOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPLoginOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPNoopOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPOperation.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPOperationCallback.h" />
-    <ClInclude Include="..\..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.h" />
-    <ClInclude Include="..\..\..\..\src\core\zip\MiniZip\iowin32.h" />
-    <ClInclude Include="..\..\..\..\src\core\basetypes\MCWin32.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\src\core\rfc822\MCMessageParserMac.mm" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build-windows/mailcore2/mailcore2/mailcore2.vcxproj b/build-windows/mailcore2/mailcore2/mailcore2.vcxproj
new file mode 100644
index 00000000..fc15edba
--- /dev/null
+++ b/build-windows/mailcore2/mailcore2/mailcore2.vcxproj
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\async\imap\MCAsyncIMAP.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPAppendMessageOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPAsyncConnection.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPAsyncSession.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCapabilityOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCheckAccountOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPConnectOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCreateFolderOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPDisconnectOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPExpungeOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchContentOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFolderInfoOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFolderStatusOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPIdentityOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPIdleOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPNoopOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPOperationCallback.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPQuotaOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPRenameFolderOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPSearchOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.h" />
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCAsyncNNTP.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPAsyncSession.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPDisconnectOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPOperation.h" />
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPOperationCallback.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCAsyncPOP.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPAsyncSession.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPCheckAccountOperation.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPFetchHeaderOperation.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPFetchMessageOperation.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPFetchMessagesOperation.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPNoopOperation.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPOperation.h" />
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPOperationCallback.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCAsyncSMTP.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPAsyncSession.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPDisconnectOperation.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPLoginOperation.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPNoopOperation.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPOperation.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPOperationCallback.h" />
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstract.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractMessage.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractMessagePart.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractMultipart.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractPart.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCAddress.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCMessageConstants.h" />
+    <ClInclude Include="..\..\..\src\core\abstract\MCMessageHeader.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\ConvertUTF.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCArray.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCAssert.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCAutoreleasePool.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCBase64.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCBaseTypes.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCConnectionLogger.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCConnectionLoggerUtils.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCData.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCDefines.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCHash.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCHashMap.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCHTMLCleaner.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCICUTypes.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCIndexSet.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCIterator.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCJSON.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCJSONParser.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCLibetpan.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCLibetpanTypes.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCLog.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCMainThread.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCMD5.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCNull.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCObject.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperation.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperationCallback.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperationQueue.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperationQueueCallback.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCRange.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCSet.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCString.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCUtils.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCValue.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCValuePrivate.h" />
+    <ClInclude Include="..\..\..\src\core\basetypes\MCWin32.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAP.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPFolder.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPFolderStatus.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPIdentity.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPMessage.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPMessagePart.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPMultipart.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPNamespace.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPNamespaceItem.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPPart.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPProgressCallback.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPSearchExpression.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPSession.h" />
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPSyncResult.h" />
+    <ClInclude Include="..\..\..\src\core\MCCore.h" />
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTP.h" />
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTPGroupInfo.h" />
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTPProgressCallback.h" />
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTPSession.h" />
+    <ClInclude Include="..\..\..\src\core\pop\MCPOP.h" />
+    <ClInclude Include="..\..\..\src\core\pop\MCPOPMessageInfo.h" />
+    <ClInclude Include="..\..\..\src\core\pop\MCPOPProgressCallback.h" />
+    <ClInclude Include="..\..\..\src\core\pop\MCPOPSession.h" />
+    <ClInclude Include="..\..\..\src\core\provider\MCMailProvider.h" />
+    <ClInclude Include="..\..\..\src\core\provider\MCMailProvidersManager.h" />
+    <ClInclude Include="..\..\..\src\core\provider\MCNetService.h" />
+    <ClInclude Include="..\..\..\src\core\provider\MCProvider.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCAddressDisplay.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCDateFormatter.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLRenderer.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLRendererCallback.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCRenderer.h" />
+    <ClInclude Include="..\..\..\src\core\renderer\MCSizeFormatter.h" />
+    <ClInclude Include="..\..\..\src\core\rfc822\MCAttachment.h" />
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMessageBuilder.h" />
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMessageParser.h" />
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMessagePart.h" />
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMultipart.h" />
+    <ClInclude Include="..\..\..\src\core\rfc822\MCRFC822.h" />
+    <ClInclude Include="..\..\..\src\core\security\MCCertificateUtils.h" />
+    <ClInclude Include="..\..\..\src\core\smtp\MCSMTP.h" />
+    <ClInclude Include="..\..\..\src\core\smtp\MCSMTPProgressCallback.h" />
+    <ClInclude Include="..\..\..\src\core\smtp\MCSMTPSession.h" />
+    <ClInclude Include="..\..\..\src\core\zip\MCZip.h" />
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\crypt.h" />
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\ioapi.h" />
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\iowin32.h" />
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\unzip.h" />
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\zip.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPAppendMessageOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPAsyncConnection.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPAsyncSession.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCapabilityOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCheckAccountOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPConnectOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCreateFolderOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPDisconnectOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPExpungeOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchContentOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFolderInfoOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFolderStatusOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPIdentityOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPIdleOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPNoopOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPQuotaOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPRenameFolderOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPSearchOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPAsyncSession.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPDisconnectOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPAsyncSession.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPCheckAccountOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPFetchHeaderOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPFetchMessageOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPFetchMessagesOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPNoopOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPAsyncSession.cpp" />
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPDisconnectOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPLoginOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPNoopOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPOperation.cpp" />
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.cpp" />
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractMessage.cpp" />
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractMessagePart.cpp" />
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractMultipart.cpp" />
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractPart.cpp" />
+    <ClCompile Include="..\..\..\src\core\abstract\MCAddress.cpp" />
+    <ClCompile Include="..\..\..\src\core\abstract\MCMessageHeader.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\ConvertUTF.c" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCArray.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCAssert.c" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCAutoreleasePool.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCBase64.c" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCConnectionLoggerUtils.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCData.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCHash.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCHashMap.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCHTMLCleaner.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCIndexSet.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCJSON.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCJSONParser.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCLibetpan.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCLog.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCMainThreadWin32.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCMD5.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCNull.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCObject.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCOperation.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCOperationQueue.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCRange.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCSet.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCString.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCStringWin32.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCValue.cpp" />
+    <ClCompile Include="..\..\..\src\core\basetypes\MCWin32.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPFolder.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPFolderStatus.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPIdentity.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPMessage.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPMessagePart.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPMultipart.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPNamespace.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPNamespaceItem.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPPart.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPSearchExpression.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPSession.cpp" />
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPSyncResult.cpp" />
+    <ClCompile Include="..\..\..\src\core\nntp\MCNNTPGroupInfo.cpp" />
+    <ClCompile Include="..\..\..\src\core\nntp\MCNNTPSession.cpp" />
+    <ClCompile Include="..\..\..\src\core\pop\MCPOPMessageInfo.cpp" />
+    <ClCompile Include="..\..\..\src\core\pop\MCPOPSession.cpp" />
+    <ClCompile Include="..\..\..\src\core\provider\MCMailProvider.cpp" />
+    <ClCompile Include="..\..\..\src\core\provider\MCMailProvidersManager.cpp" />
+    <ClCompile Include="..\..\..\src\core\provider\MCNetService.cpp" />
+    <ClCompile Include="..\..\..\src\core\renderer\MCAddressDisplay.cpp" />
+    <ClCompile Include="..\..\..\src\core\renderer\MCDateFormatter.cpp" />
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.cpp" />
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLRenderer.cpp" />
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLRendererCallback.cpp" />
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.cpp" />
+    <ClCompile Include="..\..\..\src\core\renderer\MCSizeFormatter.cpp" />
+    <ClCompile Include="..\..\..\src\core\rfc822\MCAttachment.cpp" />
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMessageBuilder.cpp" />
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMessageParser.cpp" />
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMessagePart.cpp" />
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMultipart.cpp" />
+    <ClCompile Include="..\..\..\src\core\security\MCCertificateUtils.cpp" />
+    <ClCompile Include="..\..\..\src\core\smtp\MCSMTPSession.cpp" />
+    <ClCompile Include="..\..\..\src\core\zip\MCZip.cpp" />
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\ioapi.c" />
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\iowin32.c" />
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\unzip.c" />
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\zip.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\src\core\rfc822\MCMessageParserMac.mm" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AAD35E01-77E4-43CB-BBB4-F7F6692EA829}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>mailcore2</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>MAILCORE_DLL;ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\include;..\..\..\Externals\include;..\..\..\src\core\basetypes;..\..\..\src\core\zip;..\..\..\src\core\zip\minizip;..\..\..\src\core\renderer;..\..\..\src\core/rfc822;..\..\..\src\core/imap;..\..\..\src\core\abstract;..\..\..\src\core\security;..\..\..\src\core\imap;..\..\..\src\core\pop;..\..\..\src\core\nntp;..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib;..\..\..\Externals\lib\x86</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>MAILCORE_DLL;ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\include;..\..\..\Externals\include;..\..\..\src\core\basetypes;..\..\..\src\core\zip;..\..\..\src\core\zip\minizip;..\..\..\src\core\renderer;..\..\..\src\core/rfc822;..\..\..\src\core/imap;..\..\..\src\core\abstract;..\..\..\src\core\security;..\..\..\src\core\imap;..\..\..\src\core\pop;..\..\..\src\core\nntp;..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib64;..\..\..\Externals\lib\x64</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>MAILCORE_DLL;ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\include;..\..\..\Externals\include;..\..\..\src\core\basetypes;..\..\..\src\core\zip;..\..\..\src\core\zip\minizip;..\..\..\src\core\renderer;..\..\..\src\core/rfc822;..\..\..\src\core/imap;..\..\..\src\core\abstract;..\..\..\src\core\security;..\..\..\src\core\imap;..\..\..\src\core\pop;..\..\..\src\core\nntp;..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib;..\..\..\Externals\lib\x86</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>MAILCORE_DLL;ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\include;..\..\..\Externals\include;..\..\..\src\core\basetypes;..\..\..\src\core\zip;..\..\..\src\core\zip\minizip;..\..\..\src\core\renderer;..\..\..\src\core/rfc822;..\..\..\src\core/imap;..\..\..\src\core\abstract;..\..\..\src\core\security;..\..\..\src\core\imap;..\..\..\src\core\pop;..\..\..\src\core\nntp;..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib64;..\..\..\Externals\lib\x64</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build-windows/mailcore2/mailcore2/mailcore2.vcxproj.filters b/build-windows/mailcore2/mailcore2/mailcore2.vcxproj.filters
new file mode 100644
index 00000000..c055296a
--- /dev/null
+++ b/build-windows/mailcore2/mailcore2/mailcore2.vcxproj.filters
@@ -0,0 +1,929 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\core">
+      <UniqueIdentifier>{1826bc5c-297b-4ba7-96f8-051ae4b5e7e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\abstract">
+      <UniqueIdentifier>{ed15cbb1-0930-42ca-9c90-d3d2af7f86e1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\basetypes">
+      <UniqueIdentifier>{71537cef-6ee0-4bcc-aedd-1715ffb4310c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\imap">
+      <UniqueIdentifier>{4f57c1aa-4ddb-4983-ae38-c12aa493a473}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\smtp">
+      <UniqueIdentifier>{e3b641cb-08cf-411d-bbfd-12d497f28cf9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\nntp">
+      <UniqueIdentifier>{cd9399c6-90ef-4383-833c-5054a21ccb71}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\pop">
+      <UniqueIdentifier>{8074348e-f4c8-44fd-85b1-80bba2057f4a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\provider">
+      <UniqueIdentifier>{07aa6807-c3fa-4d17-ac67-1baff0947b3e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\renderer">
+      <UniqueIdentifier>{51a582cb-0aeb-4156-a6e0-a7228566fbb8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\rfc822">
+      <UniqueIdentifier>{9dfe3068-b318-4143-b718-94df738d2a26}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\security">
+      <UniqueIdentifier>{a9cda156-07be-4771-bcbe-6912ad902d1a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\core\zip">
+      <UniqueIdentifier>{6f34a2b3-0c43-42c3-ae71-f17ef9206c5e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\async">
+      <UniqueIdentifier>{114ac68e-a7f0-48b3-8fee-eca0cf2c8e30}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\async\imap">
+      <UniqueIdentifier>{7bcac4dc-e0b6-4a2a-b867-3502e8cb7b82}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\async\nntp">
+      <UniqueIdentifier>{a5bb3047-fe25-477e-8f97-73c1be099ad7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\async\smtp">
+      <UniqueIdentifier>{b6501fb9-8395-478e-8955-538cd13a5e0a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\async\pop">
+      <UniqueIdentifier>{a9e89d80-bf19-41f6-a5c8-b73ead0d6c7e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstract.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractMessage.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractMessagePart.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractMultipart.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\abstract\MCAbstractPart.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\abstract\MCAddress.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\MCCore.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\abstract\MCMessageConstants.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\abstract\MCMessageHeader.h">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\ConvertUTF.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCArray.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCAssert.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCAutoreleasePool.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCBase64.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCBaseTypes.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCConnectionLogger.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCConnectionLoggerUtils.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCData.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCDefines.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCHash.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCHashMap.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCHTMLCleaner.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCICUTypes.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCIndexSet.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCIterator.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCJSON.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCJSONParser.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCLibetpan.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCLibetpanTypes.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCLog.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCMainThread.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCMD5.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCNull.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCObject.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperation.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperationCallback.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperationQueue.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCOperationQueueCallback.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCRange.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCSet.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCString.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCUtils.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCValue.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCValuePrivate.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\basetypes\MCWin32.h">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAP.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPFolder.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPFolderStatus.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPIdentity.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPMessage.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPMessagePart.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPMultipart.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPNamespace.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPNamespaceItem.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPPart.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPProgressCallback.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPSearchExpression.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPSession.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\imap\MCIMAPSyncResult.h">
+      <Filter>Source Files\core\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\smtp\MCSMTP.h">
+      <Filter>Source Files\core\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\smtp\MCSMTPProgressCallback.h">
+      <Filter>Source Files\core\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\smtp\MCSMTPSession.h">
+      <Filter>Source Files\core\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTP.h">
+      <Filter>Source Files\core\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTPGroupInfo.h">
+      <Filter>Source Files\core\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTPProgressCallback.h">
+      <Filter>Source Files\core\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\nntp\MCNNTPSession.h">
+      <Filter>Source Files\core\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\provider\MCMailProvider.h">
+      <Filter>Source Files\core\provider</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\provider\MCMailProvidersManager.h">
+      <Filter>Source Files\core\provider</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\provider\MCNetService.h">
+      <Filter>Source Files\core\provider</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\provider\MCProvider.h">
+      <Filter>Source Files\core\provider</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\rfc822\MCAttachment.h">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMessageBuilder.h">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMessageParser.h">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMessagePart.h">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\rfc822\MCMultipart.h">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\rfc822\MCRFC822.h">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCAddressDisplay.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCDateFormatter.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLRenderer.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLRendererCallback.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCRenderer.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\renderer\MCSizeFormatter.h">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\pop\MCPOP.h">
+      <Filter>Source Files\core\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\pop\MCPOPMessageInfo.h">
+      <Filter>Source Files\core\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\pop\MCPOPProgressCallback.h">
+      <Filter>Source Files\core\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\pop\MCPOPSession.h">
+      <Filter>Source Files\core\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\zip\MCZip.h">
+      <Filter>Source Files\core\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\crypt.h">
+      <Filter>Source Files\core\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\ioapi.h">
+      <Filter>Source Files\core\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\iowin32.h">
+      <Filter>Source Files\core\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\unzip.h">
+      <Filter>Source Files\core\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\zip\MiniZip\zip.h">
+      <Filter>Source Files\core\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\core\security\MCCertificateUtils.h">
+      <Filter>Source Files\core\security</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCAsyncIMAP.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPAppendMessageOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPAsyncConnection.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPAsyncSession.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCapabilityOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCheckAccountOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPConnectOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPCreateFolderOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPDisconnectOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPExpungeOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchContentOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFolderInfoOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPFolderStatusOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPIdentityOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPIdleOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPNoopOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPOperationCallback.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPQuotaOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPRenameFolderOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPSearchOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.h">
+      <Filter>Source Files\async\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCAsyncPOP.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPAsyncSession.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPCheckAccountOperation.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPFetchHeaderOperation.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPFetchMessageOperation.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPFetchMessagesOperation.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPNoopOperation.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPOperation.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\pop\MCPOPOperationCallback.h">
+      <Filter>Source Files\async\pop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCAsyncSMTP.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPAsyncSession.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPDisconnectOperation.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPLoginOperation.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPNoopOperation.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPOperation.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPOperationCallback.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.h">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCAsyncNNTP.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPAsyncSession.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPDisconnectOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPOperation.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\async\nntp\MCNNTPOperationCallback.h">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractMessage.cpp">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractMessagePart.cpp">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractMultipart.cpp">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\abstract\MCAbstractPart.cpp">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\abstract\MCAddress.cpp">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\abstract\MCMessageHeader.cpp">
+      <Filter>Source Files\core\abstract</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\ConvertUTF.c">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCArray.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCAssert.c">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCAutoreleasePool.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCBase64.c">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCConnectionLoggerUtils.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCData.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCHash.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCHashMap.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCHTMLCleaner.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCIndexSet.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCJSON.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCJSONParser.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCLibetpan.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCLog.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCMainThreadWin32.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCMD5.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCNull.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCObject.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCOperation.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCOperationQueue.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCRange.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCSet.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCString.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCStringWin32.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCValue.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\basetypes\MCWin32.cpp">
+      <Filter>Source Files\core\basetypes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPFolder.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPFolderStatus.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPIdentity.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPMessage.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPMessagePart.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPMultipart.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPNamespace.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPNamespaceItem.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPPart.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPSearchExpression.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPSession.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\imap\MCIMAPSyncResult.cpp">
+      <Filter>Source Files\core\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\smtp\MCSMTPSession.cpp">
+      <Filter>Source Files\core\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\nntp\MCNNTPGroupInfo.cpp">
+      <Filter>Source Files\core\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\nntp\MCNNTPSession.cpp">
+      <Filter>Source Files\core\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\provider\MCMailProvider.cpp">
+      <Filter>Source Files\core\provider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\provider\MCMailProvidersManager.cpp">
+      <Filter>Source Files\core\provider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\provider\MCNetService.cpp">
+      <Filter>Source Files\core\provider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\rfc822\MCAttachment.cpp">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMessageBuilder.cpp">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMessageParser.cpp">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMessagePart.cpp">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\rfc822\MCMultipart.cpp">
+      <Filter>Source Files\core\rfc822</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\renderer\MCAddressDisplay.cpp">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\renderer\MCDateFormatter.cpp">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLBodyRendererTemplateCallback.cpp">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLRenderer.cpp">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLRendererCallback.cpp">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\renderer\MCHTMLRendererIMAPDataCallback.cpp">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\renderer\MCSizeFormatter.cpp">
+      <Filter>Source Files\core\renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\pop\MCPOPMessageInfo.cpp">
+      <Filter>Source Files\core\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\pop\MCPOPSession.cpp">
+      <Filter>Source Files\core\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\zip\MCZip.cpp">
+      <Filter>Source Files\core\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\ioapi.c">
+      <Filter>Source Files\core\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\iowin32.c">
+      <Filter>Source Files\core\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\unzip.c">
+      <Filter>Source Files\core\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\zip\MiniZip\zip.c">
+      <Filter>Source Files\core\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\core\security\MCCertificateUtils.cpp">
+      <Filter>Source Files\core\security</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPAppendMessageOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPAsyncConnection.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPAsyncSession.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCapabilityOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCheckAccountOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPConnectOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCopyMessagesOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPCreateFolderOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPDeleteFolderOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPDisconnectOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPExpungeOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchContentOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchFoldersOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchMessagesOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchNamespaceOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFetchParsedContentOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFolderInfoOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPFolderStatusOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPIdentityOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPIdleOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPMessageRenderingOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPMultiDisconnectOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPNoopOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPQuotaOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPRenameFolderOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPSearchOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPStoreFlagsOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPStoreLabelsOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\imap\MCIMAPSubscribeFolderOperation.cpp">
+      <Filter>Source Files\async\imap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPAsyncSession.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPCheckAccountOperation.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPDeleteMessagesOperation.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPFetchHeaderOperation.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPFetchMessageOperation.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPFetchMessagesOperation.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPNoopOperation.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\pop\MCPOPOperation.cpp">
+      <Filter>Source Files\async\pop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPAsyncSession.cpp">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPCheckAccountOperation.cpp">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPDisconnectOperation.cpp">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPLoginOperation.cpp">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPNoopOperation.cpp">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPOperation.cpp">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\smtp\MCSMTPSendWithDataOperation.cpp">
+      <Filter>Source Files\async\smtp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPAsyncSession.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPCheckAccountOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPDisconnectOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchAllArticlesOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchArticleOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchHeaderOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchOverviewOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPFetchServerTimeOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPListNewsgroupsOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\async\nntp\MCNNTPOperation.cpp">
+      <Filter>Source Files\async\nntp</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\src\core\rfc822\MCMessageParserMac.mm">
+      <Filter>Source Files\core\rfc822</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build-windows/mailcore2/test/test.vcxproj b/build-windows/mailcore2/test/test.vcxproj
new file mode 100644
index 00000000..5aa3d7ee
--- /dev/null
+++ b/build-windows/mailcore2/test/test.vcxproj
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{99C4CB64-C4BB-45CA-B66B-CD0A22B93BE4}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>test</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\Externals\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libetpan.lib;mailcore2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib;..\..\..\Externals\lib\x86</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\Externals\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libetpan.lib;mailcore2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib64;..\..\..\Externals\lib\x64</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\Externals\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>libetpan.lib;mailcore2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib;..\..\..\Externals\lib\x86</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\Externals\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>libetpan.lib;mailcore2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Externals\lib64;..\..\..\Externals\lib\x64</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\main.cpp" />
+    <ClCompile Include="..\..\..\tests\test-all.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\test-all.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build-windows/mailcore2/test/test.vcxproj.filters b/build-windows/mailcore2/test/test.vcxproj.filters
new file mode 100644
index 00000000..023dca12
--- /dev/null
+++ b/build-windows/mailcore2/test/test.vcxproj.filters
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tests\test-all.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\test-all.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.user b/build-windows/mailcore2/test/test.vcxproj.user
index 89d24524..89d24524 100644
--- a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.user
+++ b/build-windows/mailcore2/test/test.vcxproj.user