diff --git a/build-windows/libetpan/libetpan.vcxproj b/build-windows/libetpan/libetpan.vcxproj
index 14ce292..beec889 100644
--- a/build-windows/libetpan/libetpan.vcxproj
+++ b/build-windows/libetpan/libetpan.vcxproj
@@ -402,8 +402,205 @@ build_headers.bat
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\data-types\base64.h" />
+    <ClInclude Include="..\..\src\data-types\carray.h" />
+    <ClInclude Include="..\..\src\data-types\charconv.h" />
+    <ClInclude Include="..\..\src\data-types\chash.h" />
+    <ClInclude Include="..\..\src\data-types\clist.h" />
+    <ClInclude Include="..\..\src\data-types\connect.h" />
+    <ClInclude Include="..\..\src\data-types\hmac-md5.h" />
+    <ClInclude Include="..\..\src\data-types\mail.h" />
+    <ClInclude Include="..\..\src\data-types\maillock.h" />
+    <ClInclude Include="..\..\src\data-types\mailsasl.h" />
+    <ClInclude Include="..\..\src\data-types\mailsasl_private.h" />
     <ClInclude Include="..\..\src\data-types\mailsem.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_cancel.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_cancel_types.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_cfstream.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_compress.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_helper.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_low.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_socket.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_ssl.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_ssl_private.h" />
+    <ClInclude Include="..\..\src\data-types\mailstream_types.h" />
+    <ClInclude Include="..\..\src\data-types\mail_cache_db.h" />
+    <ClInclude Include="..\..\src\data-types\mail_cache_db_types.h" />
+    <ClInclude Include="..\..\src\data-types\md5.h" />
+    <ClInclude Include="..\..\src\data-types\md5global.h" />
+    <ClInclude Include="..\..\src\data-types\mmapstring.h" />
+    <ClInclude Include="..\..\src\data-types\mmapstring_private.h" />
+    <ClInclude Include="..\..\src\data-types\timeutils.h" />
+    <ClInclude Include="..\..\src\driver\implementation\data-message\data_message_driver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\feed\feeddriver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\feed\feeddriver_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\feed\feeddriver_types.h" />
+    <ClInclude Include="..\..\src\driver\implementation\feed\feedstorage.h" />
+    <ClInclude Include="..\..\src\driver\implementation\hotmail\hotmailstorage.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_cached.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_cached_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_tools.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_tools_private.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_types.h" />
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapstorage.h" />
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_cached.h" />
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_cached_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_tools.h" />
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_types.h" />
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirstorage.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_cached.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_cached_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_tools.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_types.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxstorage.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_cached.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_cached_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_tools.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_types.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhstorage.h" />
+    <ClInclude Include="..\..\src\driver\implementation\mime-message\mime_message_driver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_cached.h" />
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_cached_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_tools.h" />
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_types.h" />
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpstorage.h" />
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver.h" />
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_cached.h" />
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_cached_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_message.h" />
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_tools.h" />
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_types.h" />
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3storage.h" />
+    <ClInclude Include="..\..\src\driver\interface\maildriver.h" />
+    <ClInclude Include="..\..\src\driver\interface\maildriver_errors.h" />
+    <ClInclude Include="..\..\src\driver\interface\maildriver_tools.h" />
+    <ClInclude Include="..\..\src\driver\interface\maildriver_types.h" />
+    <ClInclude Include="..\..\src\driver\interface\maildriver_types_helper.h" />
+    <ClInclude Include="..\..\src\driver\interface\mailfolder.h" />
+    <ClInclude Include="..\..\src\driver\interface\mailmessage.h" />
+    <ClInclude Include="..\..\src\driver\interface\mailmessage_tools.h" />
+    <ClInclude Include="..\..\src\driver\interface\mailmessage_types.h" />
+    <ClInclude Include="..\..\src\driver\interface\mailstorage.h" />
+    <ClInclude Include="..\..\src\driver\interface\mailstorage_tools.h" />
+    <ClInclude Include="..\..\src\driver\interface\mailstorage_types.h" />
+    <ClInclude Include="..\..\src\driver\tools\generic_cache.h" />
+    <ClInclude Include="..\..\src\driver\tools\generic_cache_types.h" />
+    <ClInclude Include="..\..\src\driver\tools\imfcache.h" />
+    <ClInclude Include="..\..\src\driver\tools\mailthread.h" />
+    <ClInclude Include="..\..\src\driver\tools\mailthread_types.h" />
+    <ClInclude Include="..\..\src\low-level\feed\date.h" />
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed.h" />
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_item.h" />
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_item_enclosure.h" />
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_private.h" />
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_types.h" />
+    <ClInclude Include="..\..\src\low-level\feed\parser.h" />
+    <ClInclude Include="..\..\src\low-level\feed\parser_atom03.h" />
+    <ClInclude Include="..\..\src\low-level\feed\parser_atom10.h" />
+    <ClInclude Include="..\..\src\low-level\feed\parser_rdf.h" />
+    <ClInclude Include="..\..\src\low-level\feed\parser_rss20.h" />
+    <ClInclude Include="..\..\src\low-level\imap\acl.h" />
+    <ClInclude Include="..\..\src\low-level\imap\acl_parser.h" />
+    <ClInclude Include="..\..\src\low-level\imap\acl_sender.h" />
+    <ClInclude Include="..\..\src\low-level\imap\acl_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore.h" />
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore_parser.h" />
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore_sender.h" />
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\condstore.h" />
+    <ClInclude Include="..\..\src\low-level\imap\condstore_private.h" />
+    <ClInclude Include="..\..\src\low-level\imap\condstore_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\enable.h" />
+    <ClInclude Include="..\..\src\low-level\imap\idle.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_compress.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_extension.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_extension_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_helper.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id_parser.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id_sender.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_keywords.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_oauth2.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_parser.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_print.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_sender.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_socket.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_sort.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_sort_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_ssl.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_types_helper.h" />
+    <ClInclude Include="..\..\src\low-level\imap\namespace.h" />
+    <ClInclude Include="..\..\src\low-level\imap\namespace_parser.h" />
+    <ClInclude Include="..\..\src\low-level\imap\namespace_sender.h" />
+    <ClInclude Include="..\..\src\low-level\imap\namespace_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\qresync.h" />
+    <ClInclude Include="..\..\src\low-level\imap\qresync_private.h" />
+    <ClInclude Include="..\..\src\low-level\imap\qresync_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\quota.h" />
+    <ClInclude Include="..\..\src\low-level\imap\quota_parser.h" />
+    <ClInclude Include="..\..\src\low-level\imap\quota_sender.h" />
+    <ClInclude Include="..\..\src\low-level\imap\quota_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\uidplus.h" />
+    <ClInclude Include="..\..\src\low-level\imap\uidplus_parser.h" />
+    <ClInclude Include="..\..\src\low-level\imap\uidplus_sender.h" />
+    <ClInclude Include="..\..\src\low-level\imap\uidplus_types.h" />
+    <ClInclude Include="..\..\src\low-level\imap\xgmlabels.h" />
+    <ClInclude Include="..\..\src\low-level\imap\xgmmsgid.h" />
+    <ClInclude Include="..\..\src\low-level\imap\xgmthrid.h" />
+    <ClInclude Include="..\..\src\low-level\imap\xlist.h" />
+    <ClInclude Include="..\..\src\low-level\imf\mailimf.h" />
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_types.h" />
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_types_helper.h" />
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write.h" />
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write_file.h" />
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write_generic.h" />
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write_mem.h" />
+    <ClInclude Include="..\..\src\low-level\maildir\maildir.h" />
+    <ClInclude Include="..\..\src\low-level\maildir\maildir_types.h" />
+    <ClInclude Include="..\..\src\low-level\mbox\mailmbox.h" />
+    <ClInclude Include="..\..\src\low-level\mbox\mailmbox_parse.h" />
+    <ClInclude Include="..\..\src\low-level\mbox\mailmbox_types.h" />
+    <ClInclude Include="..\..\src\low-level\mh\mailmh.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_content.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_decode.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_disposition.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_types.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_types_helper.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write_file.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write_generic.h" />
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write_mem.h" />
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp.h" />
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp_socket.h" />
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp_ssl.h" />
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp_types.h" />
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3.h" />
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_helper.h" />
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_socket.h" />
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_ssl.h" />
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_types.h" />
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp.h" />
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_helper.h" />
     <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_oauth2.h" />
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_private.h" />
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_socket.h" />
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_ssl.h" />
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_types.h" />
     <ClInclude Include="..\..\src\windows\win_etpan.h" />
     <ClInclude Include="..\libetpan-config.h" />
     <ClInclude Include="..\libetpan_version.h" />
@@ -412,4 +609,4 @@ build_headers.bat
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build-windows/libetpan/libetpan.vcxproj.filters b/build-windows/libetpan/libetpan.vcxproj.filters
index 858e9b0..74dd953 100644
--- a/build-windows/libetpan/libetpan.vcxproj.filters
+++ b/build-windows/libetpan/libetpan.vcxproj.filters
@@ -638,6 +638,597 @@
     <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_oauth2.h">
       <Filter>Source Files\low-level\smtp</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\data-types\base64.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\carray.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\charconv.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\chash.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\clist.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\connect.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\hmac-md5.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mail.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mail_cache_db.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mail_cache_db_types.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\maillock.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailsasl.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailsasl_private.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_cancel.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_cancel_types.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_cfstream.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_compress.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_helper.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_low.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_socket.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_ssl.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_ssl_private.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mailstream_types.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\md5.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\md5global.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mmapstring.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\mmapstring_private.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\data-types\timeutils.h">
+      <Filter>Source Files\datatypes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\data-message\data_message_driver.h">
+      <Filter>Source Files\driver\implementation\data-message</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\feed\feeddriver.h">
+      <Filter>Source Files\driver\implementation\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\feed\feeddriver_message.h">
+      <Filter>Source Files\driver\implementation\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\feed\feeddriver_types.h">
+      <Filter>Source Files\driver\implementation\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\feed\feedstorage.h">
+      <Filter>Source Files\driver\implementation\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\hotmail\hotmailstorage.h">
+      <Filter>Source Files\driver\implementation\hotmail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_cached.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_cached_message.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_message.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_tools.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_tools_private.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapdriver_types.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\imap\imapstorage.h">
+      <Filter>Source Files\driver\implementation\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver.h">
+      <Filter>Source Files\driver\implementation\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_cached.h">
+      <Filter>Source Files\driver\implementation\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_cached_message.h">
+      <Filter>Source Files\driver\implementation\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_message.h">
+      <Filter>Source Files\driver\implementation\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_tools.h">
+      <Filter>Source Files\driver\implementation\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirdriver_types.h">
+      <Filter>Source Files\driver\implementation\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\maildir\maildirstorage.h">
+      <Filter>Source Files\driver\implementation\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver.h">
+      <Filter>Source Files\driver\implementation\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_cached.h">
+      <Filter>Source Files\driver\implementation\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_cached_message.h">
+      <Filter>Source Files\driver\implementation\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_message.h">
+      <Filter>Source Files\driver\implementation\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_tools.h">
+      <Filter>Source Files\driver\implementation\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxdriver_types.h">
+      <Filter>Source Files\driver\implementation\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mbox\mboxstorage.h">
+      <Filter>Source Files\driver\implementation\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver.h">
+      <Filter>Source Files\driver\implementation\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_cached.h">
+      <Filter>Source Files\driver\implementation\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_cached_message.h">
+      <Filter>Source Files\driver\implementation\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_message.h">
+      <Filter>Source Files\driver\implementation\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_tools.h">
+      <Filter>Source Files\driver\implementation\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhdriver_types.h">
+      <Filter>Source Files\driver\implementation\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mh\mhstorage.h">
+      <Filter>Source Files\driver\implementation\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\mime-message\mime_message_driver.h">
+      <Filter>Source Files\driver\implementation\mime-message</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver.h">
+      <Filter>Source Files\driver\implementation\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_cached.h">
+      <Filter>Source Files\driver\implementation\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_cached_message.h">
+      <Filter>Source Files\driver\implementation\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_message.h">
+      <Filter>Source Files\driver\implementation\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_tools.h">
+      <Filter>Source Files\driver\implementation\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpdriver_types.h">
+      <Filter>Source Files\driver\implementation\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\nntp\nntpstorage.h">
+      <Filter>Source Files\driver\implementation\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver.h">
+      <Filter>Source Files\driver\implementation\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_cached.h">
+      <Filter>Source Files\driver\implementation\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_cached_message.h">
+      <Filter>Source Files\driver\implementation\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_message.h">
+      <Filter>Source Files\driver\implementation\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_tools.h">
+      <Filter>Source Files\driver\implementation\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3driver_types.h">
+      <Filter>Source Files\driver\implementation\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\implementation\pop3\pop3storage.h">
+      <Filter>Source Files\driver\implementation\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\maildriver.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\maildriver_errors.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\maildriver_tools.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\maildriver_types.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\maildriver_types_helper.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\mailfolder.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\mailmessage.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\mailmessage_tools.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\mailmessage_types.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\mailstorage.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\mailstorage_tools.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\interface\mailstorage_types.h">
+      <Filter>Source Files\driver\interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\tools\generic_cache.h">
+      <Filter>Source Files\driver\tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\tools\generic_cache_types.h">
+      <Filter>Source Files\driver\tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\tools\imfcache.h">
+      <Filter>Source Files\driver\tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\tools\mailthread.h">
+      <Filter>Source Files\driver\tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\driver\tools\mailthread_types.h">
+      <Filter>Source Files\driver\tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\date.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_item.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_item_enclosure.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_private.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\newsfeed_types.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\parser.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\parser_atom03.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\parser_atom10.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\parser_rdf.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\feed\parser_rss20.h">
+      <Filter>Source Files\low-level\feed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\acl.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\acl_parser.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\acl_sender.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\acl_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore_parser.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore_sender.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\annotatemore_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\condstore.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\condstore_private.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\condstore_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\enable.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\idle.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_compress.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_extension.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_extension_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_helper.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id_parser.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id_sender.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_id_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_keywords.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_oauth2.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_parser.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_print.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_sender.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_socket.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_sort.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_sort_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_ssl.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\mailimap_types_helper.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\namespace.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\namespace_parser.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\namespace_sender.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\namespace_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\qresync.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\qresync_private.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\qresync_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\quota.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\quota_parser.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\quota_sender.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\quota_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\uidplus.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\uidplus_parser.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\uidplus_sender.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\uidplus_types.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\xgmlabels.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\xgmmsgid.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\xgmthrid.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imap\xlist.h">
+      <Filter>Source Files\low-level\imap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imf\mailimf.h">
+      <Filter>Source Files\low-level\imf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_types.h">
+      <Filter>Source Files\low-level\imf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_types_helper.h">
+      <Filter>Source Files\low-level\imf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write.h">
+      <Filter>Source Files\low-level\imf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write_file.h">
+      <Filter>Source Files\low-level\imf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write_generic.h">
+      <Filter>Source Files\low-level\imf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\imf\mailimf_write_mem.h">
+      <Filter>Source Files\low-level\imf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\maildir\maildir.h">
+      <Filter>Source Files\low-level\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\maildir\maildir_types.h">
+      <Filter>Source Files\low-level\maildir</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mbox\mailmbox.h">
+      <Filter>Source Files\low-level\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mbox\mailmbox_parse.h">
+      <Filter>Source Files\low-level\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mbox\mailmbox_types.h">
+      <Filter>Source Files\low-level\mbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mh\mailmh.h">
+      <Filter>Source Files\low-level\mh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_content.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_decode.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_disposition.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_types.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_types_helper.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write_file.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write_generic.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\mime\mailmime_write_mem.h">
+      <Filter>Source Files\low-level\mime</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp.h">
+      <Filter>Source Files\low-level\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp_socket.h">
+      <Filter>Source Files\low-level\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp_ssl.h">
+      <Filter>Source Files\low-level\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\nntp\newsnntp_types.h">
+      <Filter>Source Files\low-level\nntp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3.h">
+      <Filter>Source Files\low-level\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_helper.h">
+      <Filter>Source Files\low-level\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_socket.h">
+      <Filter>Source Files\low-level\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_ssl.h">
+      <Filter>Source Files\low-level\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\pop3\mailpop3_types.h">
+      <Filter>Source Files\low-level\pop3</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp.h">
+      <Filter>Source Files\low-level\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_helper.h">
+      <Filter>Source Files\low-level\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_private.h">
+      <Filter>Source Files\low-level\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_socket.h">
+      <Filter>Source Files\low-level\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_ssl.h">
+      <Filter>Source Files\low-level\smtp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\low-level\smtp\mailsmtp_types.h">
+      <Filter>Source Files\low-level\smtp</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\build_headers.list">