diff --git a/README.md b/README.md
deleted file mode 100644
index 54dcbc175594c4656fa66d449c06aab9c4987dec..0000000000000000000000000000000000000000
--- a/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Coding Style
-
-Please try to adhere to the [Github Swift Style Guide](https://github.com/github/swift-style-guide).
-
-(If you want it super specific, there is also the very deep [Ray Wenderlich Guide](https://github.com/raywenderlich/swift-style-guide))
-
-You can use the [Swimat Plugin](https://github.com/Jintin/Swimat) to do parts of that automatically.
\ No newline at end of file
diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 9168188c09e8c7412fed66076b294cb210f5236b..2cee841f47b9a37d696da4f6316ba66a45f02d01 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -9,243 +9,6 @@
 /* Begin PBXBuildFile section */
 		4725C4F61EDDADA10068235E /* bob-private.gpg in Resources */ = {isa = PBXBuildFile; fileRef = 4725C4F41EDDADA10068235E /* bob-private.gpg */; };
 		4725C4F71EDDADA10068235E /* bob-public.gpg in Resources */ = {isa = PBXBuildFile; fileRef = 4725C4F51EDDADA10068235E /* bob-public.gpg */; };
-		472C1D911EEBD32A003D55A7 /* AUTHORS in Resources */ = {isa = PBXBuildFile; fileRef = 472C1AD11EEBD329003D55A7 /* AUTHORS */; };
-		472C1D921EEBD32A003D55A7 /* ChangeLog in Resources */ = {isa = PBXBuildFile; fileRef = 472C1AD21EEBD329003D55A7 /* ChangeLog */; };
-		472C1D931EEBD32A003D55A7 /* COPYRIGHT in Resources */ = {isa = PBXBuildFile; fileRef = 472C1AD31EEBD329003D55A7 /* COPYRIGHT */; };
-		472C1D941EEBD32A003D55A7 /* NEWS in Resources */ = {isa = PBXBuildFile; fileRef = 472C1B7A1EEBD329003D55A7 /* NEWS */; };
-		472C1D951EEBD32A003D55A7 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B7B1EEBD329003D55A7 /* README.md */; };
-		472C1D961EEBD32A003D55A7 /* getopt.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B7E1EEBD329003D55A7 /* getopt.c */; };
-		472C1D971EEBD32A003D55A7 /* getopt_long.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B801EEBD329003D55A7 /* getopt_long.c */; };
-		472C1D981EEBD32A003D55A7 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B821EEBD329003D55A7 /* base64.c */; };
-		472C1D991EEBD32A003D55A7 /* carray.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B841EEBD329003D55A7 /* carray.c */; };
-		472C1D9A1EEBD32A003D55A7 /* charconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B861EEBD329003D55A7 /* charconv.c */; };
-		472C1D9B1EEBD32A003D55A7 /* chash.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B881EEBD329003D55A7 /* chash.c */; };
-		472C1D9C1EEBD32A003D55A7 /* clist.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B8A1EEBD329003D55A7 /* clist.c */; };
-		472C1D9D1EEBD32A003D55A7 /* connect.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B8C1EEBD329003D55A7 /* connect.c */; };
-		472C1D9E1EEBD32A003D55A7 /* mail_cache_db.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B901EEBD329003D55A7 /* mail_cache_db.c */; };
-		472C1D9F1EEBD32A003D55A7 /* maillock.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B931EEBD329003D55A7 /* maillock.c */; };
-		472C1DA01EEBD32A003D55A7 /* mailsasl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B951EEBD329003D55A7 /* mailsasl.c */; };
-		472C1DA11EEBD32A003D55A7 /* mailsem.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B981EEBD329003D55A7 /* mailsem.c */; };
-		472C1DA21EEBD32A003D55A7 /* mailstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B9A1EEBD329003D55A7 /* mailstream.c */; };
-		472C1DA31EEBD32A003D55A7 /* mailstream_cancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B9C1EEBD329003D55A7 /* mailstream_cancel.c */; };
-		472C1DA41EEBD32A003D55A7 /* mailstream_cfstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1B9F1EEBD329003D55A7 /* mailstream_cfstream.c */; };
-		472C1DA51EEBD32A003D55A7 /* mailstream_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BA11EEBD329003D55A7 /* mailstream_compress.c */; };
-		472C1DA61EEBD32A003D55A7 /* mailstream_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BA31EEBD329003D55A7 /* mailstream_helper.c */; };
-		472C1DA71EEBD32A003D55A7 /* mailstream_low.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BA51EEBD329003D55A7 /* mailstream_low.c */; };
-		472C1DA81EEBD32A003D55A7 /* mailstream_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BA71EEBD329003D55A7 /* mailstream_socket.c */; };
-		472C1DA91EEBD32A003D55A7 /* mailstream_ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BA91EEBD329003D55A7 /* mailstream_ssl.c */; };
-		472C1DAA1EEBD32A003D55A7 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BAD1EEBD329003D55A7 /* md5.c */; };
-		472C1DAB1EEBD32A003D55A7 /* mmapstring.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BB11EEBD329003D55A7 /* mmapstring.c */; };
-		472C1DAC1EEBD32A003D55A7 /* timeutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BB41EEBD329003D55A7 /* timeutils.c */; };
-		472C1DAD1EEBD32A003D55A7 /* data_message_driver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BB91EEBD329003D55A7 /* data_message_driver.c */; };
-		472C1DAE1EEBD32A003D55A7 /* dbdriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BBC1EEBD329003D55A7 /* dbdriver.c */; };
-		472C1DAF1EEBD32A003D55A7 /* dbdriver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BBE1EEBD329003D55A7 /* dbdriver_message.c */; };
-		472C1DB01EEBD32A003D55A7 /* dbstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BC11EEBD329003D55A7 /* dbstorage.c */; };
-		472C1DB11EEBD32A003D55A7 /* feeddriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BC41EEBD329003D55A7 /* feeddriver.c */; };
-		472C1DB21EEBD32A003D55A7 /* feeddriver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BC61EEBD329003D55A7 /* feeddriver_message.c */; };
-		472C1DB31EEBD32A003D55A7 /* feedstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BC91EEBD329003D55A7 /* feedstorage.c */; };
-		472C1DB41EEBD32A003D55A7 /* hotmailstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BCC1EEBD329003D55A7 /* hotmailstorage.c */; };
-		472C1DB51EEBD32A003D55A7 /* imapdriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BCF1EEBD329003D55A7 /* imapdriver.c */; };
-		472C1DB61EEBD32A003D55A7 /* imapdriver_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BD11EEBD329003D55A7 /* imapdriver_cached.c */; };
-		472C1DB71EEBD32A003D55A7 /* imapdriver_cached_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BD31EEBD329003D55A7 /* imapdriver_cached_message.c */; };
-		472C1DB81EEBD32A003D55A7 /* imapdriver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BD51EEBD329003D55A7 /* imapdriver_message.c */; };
-		472C1DB91EEBD32A003D55A7 /* imapdriver_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BD71EEBD329003D55A7 /* imapdriver_tools.c */; };
-		472C1DBA1EEBD32A003D55A7 /* imapstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BDB1EEBD329003D55A7 /* imapstorage.c */; };
-		472C1DBB1EEBD32A003D55A7 /* maildirdriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BDE1EEBD329003D55A7 /* maildirdriver.c */; };
-		472C1DBC1EEBD32A003D55A7 /* maildirdriver_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BE01EEBD329003D55A7 /* maildirdriver_cached.c */; };
-		472C1DBD1EEBD32A003D55A7 /* maildirdriver_cached_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BE21EEBD329003D55A7 /* maildirdriver_cached_message.c */; };
-		472C1DBE1EEBD32A003D55A7 /* maildirdriver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BE41EEBD329003D55A7 /* maildirdriver_message.c */; };
-		472C1DBF1EEBD32A003D55A7 /* maildirdriver_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BE61EEBD329003D55A7 /* maildirdriver_tools.c */; };
-		472C1DC01EEBD32A003D55A7 /* maildirstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BE91EEBD329003D55A7 /* maildirstorage.c */; };
-		472C1DC11EEBD32A003D55A7 /* mboxdriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BEC1EEBD329003D55A7 /* mboxdriver.c */; };
-		472C1DC21EEBD32A003D55A7 /* mboxdriver_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BEE1EEBD329003D55A7 /* mboxdriver_cached.c */; };
-		472C1DC31EEBD32A003D55A7 /* mboxdriver_cached_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BF01EEBD329003D55A7 /* mboxdriver_cached_message.c */; };
-		472C1DC41EEBD32A003D55A7 /* mboxdriver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BF21EEBD329003D55A7 /* mboxdriver_message.c */; };
-		472C1DC51EEBD32A003D55A7 /* mboxdriver_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BF41EEBD329003D55A7 /* mboxdriver_tools.c */; };
-		472C1DC61EEBD32A003D55A7 /* mboxstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BF71EEBD329003D55A7 /* mboxstorage.c */; };
-		472C1DC71EEBD32A003D55A7 /* mhdriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BFA1EEBD329003D55A7 /* mhdriver.c */; };
-		472C1DC81EEBD32A003D55A7 /* mhdriver_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BFC1EEBD329003D55A7 /* mhdriver_cached.c */; };
-		472C1DC91EEBD32A003D55A7 /* mhdriver_cached_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1BFE1EEBD329003D55A7 /* mhdriver_cached_message.c */; };
-		472C1DCA1EEBD32A003D55A7 /* mhdriver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C001EEBD329003D55A7 /* mhdriver_message.c */; };
-		472C1DCB1EEBD32A003D55A7 /* mhdriver_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C021EEBD329003D55A7 /* mhdriver_tools.c */; };
-		472C1DCC1EEBD32A003D55A7 /* mhstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C051EEBD329003D55A7 /* mhstorage.c */; };
-		472C1DCD1EEBD32A003D55A7 /* mime_message_driver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C081EEBD329003D55A7 /* mime_message_driver.c */; };
-		472C1DCE1EEBD32A003D55A7 /* nntpdriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C0B1EEBD329003D55A7 /* nntpdriver.c */; };
-		472C1DCF1EEBD32A003D55A7 /* nntpdriver_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C0D1EEBD329003D55A7 /* nntpdriver_cached.c */; };
-		472C1DD01EEBD32A003D55A7 /* nntpdriver_cached_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C0F1EEBD329003D55A7 /* nntpdriver_cached_message.c */; };
-		472C1DD11EEBD32A003D55A7 /* nntpdriver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C111EEBD329003D55A7 /* nntpdriver_message.c */; };
-		472C1DD21EEBD32A003D55A7 /* nntpdriver_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C131EEBD329003D55A7 /* nntpdriver_tools.c */; };
-		472C1DD31EEBD32A003D55A7 /* nntpstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C161EEBD329003D55A7 /* nntpstorage.c */; };
-		472C1DD41EEBD32A003D55A7 /* pop3driver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C191EEBD329003D55A7 /* pop3driver.c */; };
-		472C1DD51EEBD32A003D55A7 /* pop3driver_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C1B1EEBD329003D55A7 /* pop3driver_cached.c */; };
-		472C1DD61EEBD32A003D55A7 /* pop3driver_cached_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C1D1EEBD329003D55A7 /* pop3driver_cached_message.c */; };
-		472C1DD71EEBD32A003D55A7 /* pop3driver_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C1F1EEBD329003D55A7 /* pop3driver_message.c */; };
-		472C1DD81EEBD32A003D55A7 /* pop3driver_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C211EEBD329003D55A7 /* pop3driver_tools.c */; };
-		472C1DD91EEBD32A003D55A7 /* pop3storage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C241EEBD329003D55A7 /* pop3storage.c */; };
-		472C1DDA1EEBD32A003D55A7 /* maildriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C271EEBD329003D55A7 /* maildriver.c */; };
-		472C1DDB1EEBD32A003D55A7 /* maildriver_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C2A1EEBD329003D55A7 /* maildriver_tools.c */; };
-		472C1DDC1EEBD32A003D55A7 /* maildriver_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C2C1EEBD329003D55A7 /* maildriver_types.c */; };
-		472C1DDD1EEBD32A003D55A7 /* maildriver_types_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C2E1EEBD329003D55A7 /* maildriver_types_helper.c */; };
-		472C1DDE1EEBD32A003D55A7 /* mailfolder.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C301EEBD329003D55A7 /* mailfolder.c */; };
-		472C1DDF1EEBD32A003D55A7 /* mailmessage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C321EEBD329003D55A7 /* mailmessage.c */; };
-		472C1DE01EEBD32A003D55A7 /* mailmessage_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C341EEBD329003D55A7 /* mailmessage_tools.c */; };
-		472C1DE11EEBD32A003D55A7 /* mailmessage_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C361EEBD329003D55A7 /* mailmessage_types.c */; };
-		472C1DE21EEBD32A003D55A7 /* mailstorage.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C381EEBD329003D55A7 /* mailstorage.c */; };
-		472C1DE31EEBD32A003D55A7 /* mailstorage_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C3A1EEBD329003D55A7 /* mailstorage_tools.c */; };
-		472C1DE41EEBD32A003D55A7 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 472C1C3D1EEBD329003D55A7 /* TODO */; };
-		472C1DE51EEBD32A003D55A7 /* generic_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C3F1EEBD329003D55A7 /* generic_cache.c */; };
-		472C1DE61EEBD32A003D55A7 /* imfcache.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C421EEBD329003D55A7 /* imfcache.c */; };
-		472C1DE71EEBD32A003D55A7 /* mailthread.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C441EEBD329003D55A7 /* mailthread.c */; };
-		472C1DE81EEBD32A003D55A7 /* mailthread_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C461EEBD329003D55A7 /* mailthread_types.c */; };
-		472C1DE91EEBD32A003D55A7 /* mailengine.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C491EEBD329003D55A7 /* mailengine.c */; };
-		472C1DEA1EEBD32A003D55A7 /* mailprivacy.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C4B1EEBD329003D55A7 /* mailprivacy.c */; };
-		472C1DEB1EEBD32A003D55A7 /* mailprivacy_gnupg.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C4D1EEBD329003D55A7 /* mailprivacy_gnupg.c */; };
-		472C1DEC1EEBD32A003D55A7 /* mailprivacy_smime.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C4F1EEBD329003D55A7 /* mailprivacy_smime.c */; };
-		472C1DED1EEBD32A003D55A7 /* mailprivacy_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C511EEBD329003D55A7 /* mailprivacy_tools.c */; };
-		472C1DEE1EEBD32A003D55A7 /* date.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C571EEBD329003D55A7 /* date.c */; };
-		472C1DEF1EEBD32A003D55A7 /* newsfeed.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C591EEBD329003D55A7 /* newsfeed.c */; };
-		472C1DF01EEBD32A003D55A7 /* newsfeed_item.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C5B1EEBD329003D55A7 /* newsfeed_item.c */; };
-		472C1DF11EEBD32A003D55A7 /* newsfeed_item_enclosure.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C5D1EEBD329003D55A7 /* newsfeed_item_enclosure.c */; };
-		472C1DF21EEBD32A003D55A7 /* newsfeed_private.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C5F1EEBD329003D55A7 /* newsfeed_private.c */; };
-		472C1DF31EEBD32A003D55A7 /* parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C621EEBD329003D55A7 /* parser.c */; };
-		472C1DF41EEBD32A003D55A7 /* parser_atom03.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C641EEBD329003D55A7 /* parser_atom03.c */; };
-		472C1DF51EEBD32A003D55A7 /* parser_atom10.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C661EEBD329003D55A7 /* parser_atom10.c */; };
-		472C1DF61EEBD32A003D55A7 /* parser_rdf.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C681EEBD329003D55A7 /* parser_rdf.c */; };
-		472C1DF71EEBD32A003D55A7 /* parser_rss20.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C6A1EEBD329003D55A7 /* parser_rss20.c */; };
-		472C1DF81EEBD32A003D55A7 /* acl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C6D1EEBD329003D55A7 /* acl.c */; };
-		472C1DF91EEBD32A003D55A7 /* acl_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C6F1EEBD329003D55A7 /* acl_parser.c */; };
-		472C1DFA1EEBD32A003D55A7 /* acl_sender.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C711EEBD329003D55A7 /* acl_sender.c */; };
-		472C1DFB1EEBD32A003D55A7 /* acl_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C731EEBD329003D55A7 /* acl_types.c */; };
-		472C1DFC1EEBD32A003D55A7 /* annotatemore.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C751EEBD329003D55A7 /* annotatemore.c */; };
-		472C1DFD1EEBD32A003D55A7 /* annotatemore_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C771EEBD329003D55A7 /* annotatemore_parser.c */; };
-		472C1DFE1EEBD32A003D55A7 /* annotatemore_sender.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C791EEBD329003D55A7 /* annotatemore_sender.c */; };
-		472C1DFF1EEBD32A003D55A7 /* annotatemore_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C7B1EEBD329003D55A7 /* annotatemore_types.c */; };
-		472C1E001EEBD32A003D55A7 /* condstore.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C7D1EEBD329003D55A7 /* condstore.c */; };
-		472C1E011EEBD32A003D55A7 /* condstore_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C801EEBD329003D55A7 /* condstore_types.c */; };
-		472C1E021EEBD32A003D55A7 /* enable.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C821EEBD329003D55A7 /* enable.c */; };
-		472C1E031EEBD32A003D55A7 /* idle.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C841EEBD329003D55A7 /* idle.c */; };
-		472C1E041EEBD32A003D55A7 /* mailimap.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C861EEBD329003D55A7 /* mailimap.c */; };
-		472C1E051EEBD32A003D55A7 /* mailimap_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C881EEBD329003D55A7 /* mailimap_compress.c */; };
-		472C1E061EEBD32A003D55A7 /* mailimap_extension.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C8A1EEBD329003D55A7 /* mailimap_extension.c */; };
-		472C1E071EEBD32A003D55A7 /* mailimap_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C8D1EEBD329003D55A7 /* mailimap_helper.c */; };
-		472C1E081EEBD32A003D55A7 /* mailimap_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C8F1EEBD329003D55A7 /* mailimap_id.c */; };
-		472C1E091EEBD32A003D55A7 /* mailimap_id_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C911EEBD329003D55A7 /* mailimap_id_parser.c */; };
-		472C1E0A1EEBD32A003D55A7 /* mailimap_id_sender.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C931EEBD329003D55A7 /* mailimap_id_sender.c */; };
-		472C1E0B1EEBD32A003D55A7 /* mailimap_id_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C951EEBD329003D55A7 /* mailimap_id_types.c */; };
-		472C1E0C1EEBD32A003D55A7 /* mailimap_keywords.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C971EEBD329003D55A7 /* mailimap_keywords.c */; };
-		472C1E0D1EEBD32A003D55A7 /* mailimap_oauth2.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C991EEBD329003D55A7 /* mailimap_oauth2.c */; };
-		472C1E0E1EEBD32A003D55A7 /* mailimap_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C9B1EEBD329003D55A7 /* mailimap_parser.c */; };
-		472C1E0F1EEBD32A003D55A7 /* mailimap_print.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C9D1EEBD329003D55A7 /* mailimap_print.c */; };
-		472C1E101EEBD32A003D55A7 /* mailimap_sender.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1C9F1EEBD329003D55A7 /* mailimap_sender.c */; };
-		472C1E111EEBD32A003D55A7 /* mailimap_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CA11EEBD329003D55A7 /* mailimap_socket.c */; };
-		472C1E121EEBD32A003D55A7 /* mailimap_sort.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CA31EEBD329003D55A7 /* mailimap_sort.c */; };
-		472C1E131EEBD32A003D55A7 /* mailimap_sort_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CA51EEBD329003D55A7 /* mailimap_sort_types.c */; };
-		472C1E141EEBD32A003D55A7 /* mailimap_ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CA71EEBD329003D55A7 /* mailimap_ssl.c */; };
-		472C1E151EEBD32A003D55A7 /* mailimap_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CA91EEBD329003D55A7 /* mailimap_types.c */; };
-		472C1E161EEBD32A003D55A7 /* mailimap_types_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CAB1EEBD329003D55A7 /* mailimap_types_helper.c */; };
-		472C1E171EEBD32A003D55A7 /* namespace.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CAD1EEBD329003D55A7 /* namespace.c */; };
-		472C1E181EEBD32A003D55A7 /* namespace_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CAF1EEBD329003D55A7 /* namespace_parser.c */; };
-		472C1E191EEBD32A003D55A7 /* namespace_sender.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CB11EEBD329003D55A7 /* namespace_sender.c */; };
-		472C1E1A1EEBD32A003D55A7 /* namespace_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CB31EEBD329003D55A7 /* namespace_types.c */; };
-		472C1E1B1EEBD32A003D55A7 /* qresync.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CB51EEBD329003D55A7 /* qresync.c */; };
-		472C1E1C1EEBD32A003D55A7 /* qresync_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CB81EEBD329003D55A7 /* qresync_types.c */; };
-		472C1E1D1EEBD32A003D55A7 /* quota.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CBA1EEBD329003D55A7 /* quota.c */; };
-		472C1E1E1EEBD32A003D55A7 /* quota_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CBC1EEBD329003D55A7 /* quota_parser.c */; };
-		472C1E1F1EEBD32A003D55A7 /* quota_sender.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CBE1EEBD329003D55A7 /* quota_sender.c */; };
-		472C1E201EEBD32A003D55A7 /* quota_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CC01EEBD329003D55A7 /* quota_types.c */; };
-		472C1E211EEBD32A003D55A7 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 472C1CC21EEBD329003D55A7 /* TODO */; };
-		472C1E221EEBD32A003D55A7 /* uidplus.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CC31EEBD329003D55A7 /* uidplus.c */; };
-		472C1E231EEBD32A003D55A7 /* uidplus_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CC51EEBD329003D55A7 /* uidplus_parser.c */; };
-		472C1E241EEBD32A003D55A7 /* uidplus_sender.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CC71EEBD329003D55A7 /* uidplus_sender.c */; };
-		472C1E251EEBD32A003D55A7 /* uidplus_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CC91EEBD329003D55A7 /* uidplus_types.c */; };
-		472C1E261EEBD32A003D55A7 /* xgmlabels.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CCB1EEBD329003D55A7 /* xgmlabels.c */; };
-		472C1E271EEBD32A003D55A7 /* xgmmsgid.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CCD1EEBD329003D55A7 /* xgmmsgid.c */; };
-		472C1E281EEBD32A003D55A7 /* xgmthrid.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CCF1EEBD329003D55A7 /* xgmthrid.c */; };
-		472C1E291EEBD32A003D55A7 /* xlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CD11EEBD329003D55A7 /* xlist.c */; };
-		472C1E2A1EEBD32A003D55A7 /* mailimf.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CD41EEBD329003D55A7 /* mailimf.c */; };
-		472C1E2B1EEBD32A003D55A7 /* mailimf_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CD61EEBD329003D55A7 /* mailimf_types.c */; };
-		472C1E2C1EEBD32A003D55A7 /* mailimf_types_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CD81EEBD329003D55A7 /* mailimf_types_helper.c */; };
-		472C1E2D1EEBD32A003D55A7 /* mailimf_write_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CDB1EEBD329003D55A7 /* mailimf_write_file.c */; };
-		472C1E2E1EEBD32A003D55A7 /* mailimf_write_generic.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CDD1EEBD329003D55A7 /* mailimf_write_generic.c */; };
-		472C1E2F1EEBD32A003D55A7 /* mailimf_write_mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CDF1EEBD329003D55A7 /* mailimf_write_mem.c */; };
-		472C1E301EEBD32A003D55A7 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 472C1CE11EEBD329003D55A7 /* TODO */; };
-		472C1E311EEBD32A003D55A7 /* maildir.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CE31EEBD329003D55A7 /* maildir.c */; };
-		472C1E321EEBD32A003D55A7 /* mailmbox.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CE71EEBD329003D55A7 /* mailmbox.c */; };
-		472C1E331EEBD32A003D55A7 /* mailmbox_parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CE91EEBD329003D55A7 /* mailmbox_parse.c */; };
-		472C1E341EEBD32A003D55A7 /* mailmbox_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CEB1EEBD329003D55A7 /* mailmbox_types.c */; };
-		472C1E351EEBD32A003D55A7 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 472C1CED1EEBD329003D55A7 /* TODO */; };
-		472C1E361EEBD32A003D55A7 /* mailmh.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CEF1EEBD329003D55A7 /* mailmh.c */; };
-		472C1E371EEBD32A003D55A7 /* mailmime.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CF21EEBD329003D55A7 /* mailmime.c */; };
-		472C1E381EEBD32A003D55A7 /* mailmime_content.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CF41EEBD329003D55A7 /* mailmime_content.c */; };
-		472C1E391EEBD32A003D55A7 /* mailmime_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CF61EEBD329003D55A7 /* mailmime_decode.c */; };
-		472C1E3A1EEBD32A003D55A7 /* mailmime_disposition.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CF81EEBD329003D55A7 /* mailmime_disposition.c */; };
-		472C1E3B1EEBD32A003D55A7 /* mailmime_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CFA1EEBD329003D55A7 /* mailmime_types.c */; };
-		472C1E3C1EEBD32A003D55A7 /* mailmime_types_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CFC1EEBD329003D55A7 /* mailmime_types_helper.c */; };
-		472C1E3D1EEBD32A003D55A7 /* mailmime_write_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1CFF1EEBD329003D55A7 /* mailmime_write_file.c */; };
-		472C1E3E1EEBD32A003D55A7 /* mailmime_write_generic.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D011EEBD329003D55A7 /* mailmime_write_generic.c */; };
-		472C1E3F1EEBD32A003D55A7 /* mailmime_write_mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D031EEBD329003D55A7 /* mailmime_write_mem.c */; };
-		472C1E401EEBD32A003D55A7 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 472C1D051EEBD329003D55A7 /* TODO */; };
-		472C1E411EEBD32A003D55A7 /* newsnntp.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D071EEBD329003D55A7 /* newsnntp.c */; };
-		472C1E421EEBD32A003D55A7 /* newsnntp_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D091EEBD329003D55A7 /* newsnntp_socket.c */; };
-		472C1E431EEBD32A003D55A7 /* newsnntp_ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D0B1EEBD329003D55A7 /* newsnntp_ssl.c */; };
-		472C1E441EEBD32A003D55A7 /* mailpop3.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D0F1EEBD329003D55A7 /* mailpop3.c */; };
-		472C1E451EEBD32A003D55A7 /* mailpop3_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D111EEBD329003D55A7 /* mailpop3_helper.c */; };
-		472C1E461EEBD32A003D55A7 /* mailpop3_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D131EEBD329003D55A7 /* mailpop3_socket.c */; };
-		472C1E471EEBD32A003D55A7 /* mailpop3_ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D151EEBD329003D55A7 /* mailpop3_ssl.c */; };
-		472C1E481EEBD32A003D55A7 /* mailsmtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D191EEBD329003D55A7 /* mailsmtp.c */; };
-		472C1E491EEBD32A003D55A7 /* mailsmtp_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D1B1EEBD329003D55A7 /* mailsmtp_helper.c */; };
-		472C1E4A1EEBD32A003D55A7 /* mailsmtp_oauth2.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D1D1EEBD329003D55A7 /* mailsmtp_oauth2.c */; };
-		472C1E4B1EEBD32A003D55A7 /* mailsmtp_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D201EEBD329003D55A7 /* mailsmtp_socket.c */; };
-		472C1E4C1EEBD32A003D55A7 /* mailsmtp_ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D221EEBD329003D55A7 /* mailsmtp_ssl.c */; };
-		472C1E4D1EEBD32A003D55A7 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 472C1D251EEBD329003D55A7 /* TODO */; };
-		472C1E4E1EEBD32A003D55A7 /* libetpan_version.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D281EEBD329003D55A7 /* libetpan_version.c */; };
-		472C1E4F1EEBD32A003D55A7 /* libetpan_version.h.in in Resources */ = {isa = PBXBuildFile; fileRef = 472C1D2A1EEBD329003D55A7 /* libetpan_version.h.in */; };
-		472C1E501EEBD32A003D55A7 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D461EEBD329003D55A7 /* compress.c */; };
-		472C1E511EEBD32A003D55A7 /* create.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D471EEBD329003D55A7 /* create.c */; };
-		472C1E521EEBD32A003D55A7 /* crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D481EEBD329003D55A7 /* crypto.c */; };
-		472C1E531EEBD32A003D55A7 /* keyring.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D491EEBD329003D55A7 /* keyring.c */; };
-		472C1E541EEBD32A003D55A7 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D4A1EEBD329003D55A7 /* misc.c */; };
-		472C1E551EEBD32A003D55A7 /* openssl_crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D4B1EEBD329003D55A7 /* openssl_crypto.c */; };
-		472C1E561EEBD32A003D55A7 /* packet-parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D4C1EEBD329003D55A7 /* packet-parse.c */; };
-		472C1E571EEBD32A003D55A7 /* packet-show.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D4D1EEBD329003D55A7 /* packet-show.c */; };
-		472C1E581EEBD32A003D55A7 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D4E1EEBD329003D55A7 /* reader.c */; };
-		472C1E591EEBD32A003D55A7 /* signature.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D4F1EEBD329003D55A7 /* signature.c */; };
-		472C1E5A1EEBD32A003D55A7 /* symmetric.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D501EEBD329003D55A7 /* symmetric.c */; };
-		472C1E5B1EEBD32A003D55A7 /* validate.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D511EEBD329003D55A7 /* validate.c */; };
-		472C1E5C1EEBD32A003D55A7 /* writer.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D521EEBD32A003D55A7 /* writer.c */; };
-		472C1E5D1EEBD32A003D55A7 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D531EEBD32A003D55A7 /* README.md */; };
-		472C1E5E1EEBD32A003D55A7 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D551EEBD32A003D55A7 /* sqlite3.c */; };
-		472C1E5F1EEBD32A003D55A7 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 472C1D571EEBD32A003D55A7 /* LICENSE */; };
-		472C1E601EEBD32A003D55A7 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D591EEBD32A003D55A7 /* main.c */; };
-		472C1E611EEBD32A003D55A7 /* mraheader.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D5A1EEBD32A003D55A7 /* mraheader.c */; };
-		472C1E621EEBD32A003D55A7 /* mrapeerstate.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D5C1EEBD32A003D55A7 /* mrapeerstate.c */; };
-		472C1E631EEBD32A003D55A7 /* mrchat.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D5E1EEBD32A003D55A7 /* mrchat.c */; };
-		472C1E641EEBD32A003D55A7 /* mrchatlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D601EEBD32A003D55A7 /* mrchatlist.c */; };
-		472C1E651EEBD32A003D55A7 /* mrcmdline.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D621EEBD32A003D55A7 /* mrcmdline.c */; };
-		472C1E661EEBD32A003D55A7 /* mrcontact.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D641EEBD32A003D55A7 /* mrcontact.c */; };
-		472C1E671EEBD32A003D55A7 /* mre2ee.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D661EEBD32A003D55A7 /* mre2ee.c */; };
-		472C1E681EEBD32A003D55A7 /* mre2ee_driver_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D691EEBD32A003D55A7 /* mre2ee_driver_openssl.c */; };
-		472C1E691EEBD32A003D55A7 /* mrimap.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D6A1EEBD32A003D55A7 /* mrimap.c */; };
-		472C1E6A1EEBD32A003D55A7 /* mrjob.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D6C1EEBD32A003D55A7 /* mrjob.c */; };
-		472C1E6B1EEBD32A003D55A7 /* mrkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D6E1EEBD32A003D55A7 /* mrkey.c */; };
-		472C1E6C1EEBD32A003D55A7 /* mrkeyring.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D701EEBD32A003D55A7 /* mrkeyring.c */; };
-		472C1E6D1EEBD32A003D55A7 /* mrloginparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D721EEBD32A003D55A7 /* mrloginparam.c */; };
-		472C1E6E1EEBD32A003D55A7 /* mrmailbox.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D741EEBD32A003D55A7 /* mrmailbox.c */; };
-		472C1E6F1EEBD32A003D55A7 /* mrmailbox_configure.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D761EEBD32A003D55A7 /* mrmailbox_configure.c */; };
-		472C1E701EEBD32A003D55A7 /* mrmailbox_imex.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D771EEBD32A003D55A7 /* mrmailbox_imex.c */; };
-		472C1E711EEBD32A003D55A7 /* mrmailbox_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D781EEBD32A003D55A7 /* mrmailbox_log.c */; };
-		472C1E721EEBD32A003D55A7 /* mrmimeparser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D791EEBD32A003D55A7 /* mrmimeparser.c */; };
-		472C1E731EEBD32A003D55A7 /* mrmsg.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D7B1EEBD32A003D55A7 /* mrmsg.c */; };
-		472C1E741EEBD32A003D55A7 /* mrosnative.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D7D1EEBD32A003D55A7 /* mrosnative.c */; };
-		472C1E751EEBD32A003D55A7 /* mrparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D7F1EEBD32A003D55A7 /* mrparam.c */; };
-		472C1E761EEBD32A003D55A7 /* mrpoortext.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D811EEBD32A003D55A7 /* mrpoortext.c */; };
-		472C1E771EEBD32A003D55A7 /* mrsaxparser.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D831EEBD32A003D55A7 /* mrsaxparser.c */; };
-		472C1E781EEBD32A003D55A7 /* mrsimplify.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D851EEBD32A003D55A7 /* mrsimplify.c */; };
-		472C1E791EEBD32A003D55A7 /* mrsmtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D871EEBD32A003D55A7 /* mrsmtp.c */; };
-		472C1E7A1EEBD32A003D55A7 /* mrsqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D891EEBD32A003D55A7 /* mrsqlite3.c */; };
-		472C1E7B1EEBD32A003D55A7 /* mrstock.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D8B1EEBD32A003D55A7 /* mrstock.c */; };
-		472C1E7C1EEBD32A003D55A7 /* mrtools.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D8D1EEBD32A003D55A7 /* mrtools.c */; };
-		472C1E7D1EEBD32A003D55A7 /* stress.c in Sources */ = {isa = PBXBuildFile; fileRef = 472C1D8F1EEBD32A003D55A7 /* stress.c */; };
 		472F392A1E1277D2009260FB /* EnzevalosContact+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F39261E1277D2009260FB /* EnzevalosContact+CoreDataClass.swift */; };
 		472F392C1E1277D2009260FB /* PersistentMail +CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F39281E1277D2009260FB /* PersistentMail +CoreDataClass.swift */; };
 		472F396E1E14F384009260FB /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 472F396D1E14F384009260FB /* CoreData.framework */; };
@@ -262,11 +25,26 @@
 		472F398C1E2519C8009260FB /* CNContactExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F398B1E2519C8009260FB /* CNContactExtension.swift */; };
 		472F398E1E251B8D009260FB /* MailAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F398D1E251B8D009260FB /* MailAddress.swift */; };
 		472F39901E252470009260FB /* CNMailAddressesExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F398F1E252470009260FB /* CNMailAddressesExtension.swift */; };
+		472FC12C1EEFC55E00585D38 /* autocryptgen.c in Sources */ = {isa = PBXBuildFile; fileRef = 472FC12A1EEFC55E00585D38 /* autocryptgen.c */; };
+		472FC12E1EEFC5E200585D38 /* PGPKeyGeneration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472FC12D1EEFC5E200585D38 /* PGPKeyGeneration.swift */; };
 		476142081E07E52B00FD5E4F /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 476142071E07E52B00FD5E4F /* Theme.swift */; };
 		4761420A1E082F9C00FD5E4F /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 476142091E082F9C00FD5E4F /* Settings.bundle */; };
 		476373C21E09BA88004D5EFE /* UserData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 476373C11E09BA88004D5EFE /* UserData.swift */; };
 		47691A8A1ECB56D1004BCFC5 /* Mail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47691A891ECB56D1004BCFC5 /* Mail.swift */; };
 		47691A8C1ECC3EC7004BCFC5 /* EphemeralMail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47691A8B1ECC3EC7004BCFC5 /* EphemeralMail.swift */; };
+		47F9638F1EEFC36F00460308 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F963651EEFC36F00460308 /* compress.c */; };
+		47F963901EEFC36F00460308 /* create.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F963661EEFC36F00460308 /* create.c */; };
+		47F963911EEFC36F00460308 /* crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F963671EEFC36F00460308 /* crypto.c */; };
+		47F963931EEFC36F00460308 /* keyring.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F9636A1EEFC36F00460308 /* keyring.c */; };
+		47F963941EEFC36F00460308 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F9636B1EEFC36F00460308 /* misc.c */; };
+		47F963951EEFC36F00460308 /* openssl_crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F963841EEFC36F00460308 /* openssl_crypto.c */; };
+		47F963961EEFC36F00460308 /* packet-parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F963851EEFC36F00460308 /* packet-parse.c */; };
+		47F963971EEFC36F00460308 /* packet-show.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F963861EEFC36F00460308 /* packet-show.c */; };
+		47F9639A1EEFC36F00460308 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F963891EEFC36F00460308 /* reader.c */; };
+		47F9639B1EEFC36F00460308 /* signature.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F9638A1EEFC36F00460308 /* signature.c */; };
+		47F9639C1EEFC36F00460308 /* symmetric.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F9638B1EEFC36F00460308 /* symmetric.c */; };
+		47F9639D1EEFC36F00460308 /* validate.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F9638C1EEFC36F00460308 /* validate.c */; };
+		47F9639E1EEFC36F00460308 /* writer.c in Sources */ = {isa = PBXBuildFile; fileRef = 47F9638D1EEFC36F00460308 /* writer.c */; };
 		9935BC866A86C4A4B9819F35 /* Pods_enzevalos_iphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AE42F42E91A1BFBF1D5BF6A /* Pods_enzevalos_iphone.framework */; };
 		9C1FA3A01B089C653802A88C /* Pods_enzevalos_iphoneUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48FB10FF406523D174F4202A /* Pods_enzevalos_iphoneUITests.framework */; };
 		A102AA8A1EDDB4F40024B457 /* videoOnboarding2.m4v in Resources */ = {isa = PBXBuildFile; fileRef = A102AA891EDDB4E80024B457 /* videoOnboarding2.m4v */; };
@@ -399,671 +177,6 @@
 		411EB2B85F99B48FFD36F966 /* Pods-enzevalos_iphoneTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphoneTests.debug.xcconfig"; path = "../workspace/Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.debug.xcconfig"; sourceTree = "<group>"; };
 		4725C4F41EDDADA10068235E /* bob-private.gpg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "bob-private.gpg"; path = "keys/bob-private.gpg"; sourceTree = "<group>"; };
 		4725C4F51EDDADA10068235E /* bob-public.gpg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "bob-public.gpg"; path = "keys/bob-public.gpg"; sourceTree = "<group>"; };
-		472C1AD11EEBD329003D55A7 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = "<group>"; };
-		472C1AD21EEBD329003D55A7 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
-		472C1AD31EEBD329003D55A7 /* COPYRIGHT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYRIGHT; sourceTree = "<group>"; };
-		472C1AD61EEBD329003D55A7 /* acl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acl.h; sourceTree = "<group>"; };
-		472C1AD71EEBD329003D55A7 /* acl_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acl_types.h; sourceTree = "<group>"; };
-		472C1AD81EEBD329003D55A7 /* annotatemore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = annotatemore.h; sourceTree = "<group>"; };
-		472C1AD91EEBD329003D55A7 /* annotatemore_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = annotatemore_types.h; sourceTree = "<group>"; };
-		472C1ADA1EEBD329003D55A7 /* carray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = carray.h; sourceTree = "<group>"; };
-		472C1ADB1EEBD329003D55A7 /* charconv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charconv.h; sourceTree = "<group>"; };
-		472C1ADC1EEBD329003D55A7 /* chash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chash.h; sourceTree = "<group>"; };
-		472C1ADD1EEBD329003D55A7 /* clist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clist.h; sourceTree = "<group>"; };
-		472C1ADE1EEBD329003D55A7 /* condstore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condstore.h; sourceTree = "<group>"; };
-		472C1ADF1EEBD329003D55A7 /* condstore_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condstore_types.h; sourceTree = "<group>"; };
-		472C1AE01EEBD329003D55A7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		472C1AE11EEBD329003D55A7 /* data_message_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = data_message_driver.h; sourceTree = "<group>"; };
-		472C1AE21EEBD329003D55A7 /* dbdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbdriver.h; sourceTree = "<group>"; };
-		472C1AE31EEBD329003D55A7 /* dbdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbdriver_message.h; sourceTree = "<group>"; };
-		472C1AE41EEBD329003D55A7 /* dbdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbdriver_types.h; sourceTree = "<group>"; };
-		472C1AE51EEBD329003D55A7 /* dbstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbstorage.h; sourceTree = "<group>"; };
-		472C1AE61EEBD329003D55A7 /* enable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enable.h; sourceTree = "<group>"; };
-		472C1AE71EEBD329003D55A7 /* feeddriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeddriver.h; sourceTree = "<group>"; };
-		472C1AE81EEBD329003D55A7 /* feeddriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeddriver_message.h; sourceTree = "<group>"; };
-		472C1AE91EEBD329003D55A7 /* feeddriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeddriver_types.h; sourceTree = "<group>"; };
-		472C1AEA1EEBD329003D55A7 /* feedstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feedstorage.h; sourceTree = "<group>"; };
-		472C1AEB1EEBD329003D55A7 /* generic_cache_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generic_cache_types.h; sourceTree = "<group>"; };
-		472C1AEC1EEBD329003D55A7 /* hotmailstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotmailstorage.h; sourceTree = "<group>"; };
-		472C1AED1EEBD329003D55A7 /* idle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idle.h; sourceTree = "<group>"; };
-		472C1AEE1EEBD329003D55A7 /* imapdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver.h; sourceTree = "<group>"; };
-		472C1AEF1EEBD329003D55A7 /* imapdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_cached.h; sourceTree = "<group>"; };
-		472C1AF01EEBD329003D55A7 /* imapdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1AF11EEBD329003D55A7 /* imapdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_message.h; sourceTree = "<group>"; };
-		472C1AF21EEBD329003D55A7 /* imapdriver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_tools.h; sourceTree = "<group>"; };
-		472C1AF31EEBD329003D55A7 /* imapdriver_tools_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_tools_private.h; sourceTree = "<group>"; };
-		472C1AF41EEBD329003D55A7 /* imapdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_types.h; sourceTree = "<group>"; };
-		472C1AF51EEBD329003D55A7 /* imapstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapstorage.h; sourceTree = "<group>"; };
-		472C1AF61EEBD329003D55A7 /* libetpan-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "libetpan-config.h"; sourceTree = "<group>"; };
-		472C1AF71EEBD329003D55A7 /* libetpan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libetpan.h; sourceTree = "<group>"; };
-		472C1AF81EEBD329003D55A7 /* libetpan_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libetpan_version.h; sourceTree = "<group>"; };
-		472C1AF91EEBD329003D55A7 /* mail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mail.h; sourceTree = "<group>"; };
-		472C1AFA1EEBD329003D55A7 /* maildir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildir.h; sourceTree = "<group>"; };
-		472C1AFB1EEBD329003D55A7 /* maildir_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildir_types.h; sourceTree = "<group>"; };
-		472C1AFC1EEBD329003D55A7 /* maildirdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver.h; sourceTree = "<group>"; };
-		472C1AFD1EEBD329003D55A7 /* maildirdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_cached.h; sourceTree = "<group>"; };
-		472C1AFE1EEBD329003D55A7 /* maildirdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1AFF1EEBD329003D55A7 /* maildirdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_message.h; sourceTree = "<group>"; };
-		472C1B001EEBD329003D55A7 /* maildirdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_types.h; sourceTree = "<group>"; };
-		472C1B011EEBD329003D55A7 /* maildirstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirstorage.h; sourceTree = "<group>"; };
-		472C1B021EEBD329003D55A7 /* maildriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver.h; sourceTree = "<group>"; };
-		472C1B031EEBD329003D55A7 /* maildriver_errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver_errors.h; sourceTree = "<group>"; };
-		472C1B041EEBD329003D55A7 /* maildriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver_types.h; sourceTree = "<group>"; };
-		472C1B051EEBD329003D55A7 /* maildriver_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver_types_helper.h; sourceTree = "<group>"; };
-		472C1B061EEBD329003D55A7 /* mailengine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailengine.h; sourceTree = "<group>"; };
-		472C1B071EEBD329003D55A7 /* mailfolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailfolder.h; sourceTree = "<group>"; };
-		472C1B081EEBD329003D55A7 /* mailimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap.h; sourceTree = "<group>"; };
-		472C1B091EEBD329003D55A7 /* mailimap_compress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_compress.h; sourceTree = "<group>"; };
-		472C1B0A1EEBD329003D55A7 /* mailimap_extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_extension.h; sourceTree = "<group>"; };
-		472C1B0B1EEBD329003D55A7 /* mailimap_extension_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_extension_types.h; sourceTree = "<group>"; };
-		472C1B0C1EEBD329003D55A7 /* mailimap_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_helper.h; sourceTree = "<group>"; };
-		472C1B0D1EEBD329003D55A7 /* mailimap_id.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_id.h; sourceTree = "<group>"; };
-		472C1B0E1EEBD329003D55A7 /* mailimap_id_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_id_types.h; sourceTree = "<group>"; };
-		472C1B0F1EEBD329003D55A7 /* mailimap_oauth2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_oauth2.h; sourceTree = "<group>"; };
-		472C1B101EEBD329003D55A7 /* mailimap_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_socket.h; sourceTree = "<group>"; };
-		472C1B111EEBD329003D55A7 /* mailimap_sort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_sort.h; sourceTree = "<group>"; };
-		472C1B121EEBD329003D55A7 /* mailimap_sort_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_sort_types.h; sourceTree = "<group>"; };
-		472C1B131EEBD329003D55A7 /* mailimap_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_ssl.h; sourceTree = "<group>"; };
-		472C1B141EEBD329003D55A7 /* mailimap_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_types.h; sourceTree = "<group>"; };
-		472C1B151EEBD329003D55A7 /* mailimap_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_types_helper.h; sourceTree = "<group>"; };
-		472C1B161EEBD329003D55A7 /* mailimf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf.h; sourceTree = "<group>"; };
-		472C1B171EEBD329003D55A7 /* mailimf_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_types.h; sourceTree = "<group>"; };
-		472C1B181EEBD329003D55A7 /* mailimf_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_types_helper.h; sourceTree = "<group>"; };
-		472C1B191EEBD329003D55A7 /* mailimf_write_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_write_file.h; sourceTree = "<group>"; };
-		472C1B1A1EEBD329003D55A7 /* mailimf_write_generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_write_generic.h; sourceTree = "<group>"; };
-		472C1B1B1EEBD329003D55A7 /* mailimf_write_mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_write_mem.h; sourceTree = "<group>"; };
-		472C1B1C1EEBD329003D55A7 /* maillock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maillock.h; sourceTree = "<group>"; };
-		472C1B1D1EEBD329003D55A7 /* mailmbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmbox.h; sourceTree = "<group>"; };
-		472C1B1E1EEBD329003D55A7 /* mailmbox_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmbox_types.h; sourceTree = "<group>"; };
-		472C1B1F1EEBD329003D55A7 /* mailmessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmessage.h; sourceTree = "<group>"; };
-		472C1B201EEBD329003D55A7 /* mailmessage_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmessage_types.h; sourceTree = "<group>"; };
-		472C1B211EEBD329003D55A7 /* mailmh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmh.h; sourceTree = "<group>"; };
-		472C1B221EEBD329003D55A7 /* mailmime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime.h; sourceTree = "<group>"; };
-		472C1B231EEBD329003D55A7 /* mailmime_content.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_content.h; sourceTree = "<group>"; };
-		472C1B241EEBD329003D55A7 /* mailmime_decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_decode.h; sourceTree = "<group>"; };
-		472C1B251EEBD329003D55A7 /* mailmime_disposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_disposition.h; sourceTree = "<group>"; };
-		472C1B261EEBD329003D55A7 /* mailmime_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_types.h; sourceTree = "<group>"; };
-		472C1B271EEBD329003D55A7 /* mailmime_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_types_helper.h; sourceTree = "<group>"; };
-		472C1B281EEBD329003D55A7 /* mailmime_write_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_write_file.h; sourceTree = "<group>"; };
-		472C1B291EEBD329003D55A7 /* mailmime_write_generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_write_generic.h; sourceTree = "<group>"; };
-		472C1B2A1EEBD329003D55A7 /* mailmime_write_mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_write_mem.h; sourceTree = "<group>"; };
-		472C1B2B1EEBD329003D55A7 /* mailpop3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3.h; sourceTree = "<group>"; };
-		472C1B2C1EEBD329003D55A7 /* mailpop3_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_helper.h; sourceTree = "<group>"; };
-		472C1B2D1EEBD329003D55A7 /* mailpop3_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_socket.h; sourceTree = "<group>"; };
-		472C1B2E1EEBD329003D55A7 /* mailpop3_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_ssl.h; sourceTree = "<group>"; };
-		472C1B2F1EEBD329003D55A7 /* mailpop3_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_types.h; sourceTree = "<group>"; };
-		472C1B301EEBD329003D55A7 /* mailprivacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy.h; sourceTree = "<group>"; };
-		472C1B311EEBD329003D55A7 /* mailprivacy_gnupg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_gnupg.h; sourceTree = "<group>"; };
-		472C1B321EEBD329003D55A7 /* mailprivacy_smime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_smime.h; sourceTree = "<group>"; };
-		472C1B331EEBD329003D55A7 /* mailprivacy_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_tools.h; sourceTree = "<group>"; };
-		472C1B341EEBD329003D55A7 /* mailprivacy_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_types.h; sourceTree = "<group>"; };
-		472C1B351EEBD329003D55A7 /* mailsem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsem.h; sourceTree = "<group>"; };
-		472C1B361EEBD329003D55A7 /* mailsmtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp.h; sourceTree = "<group>"; };
-		472C1B371EEBD329003D55A7 /* mailsmtp_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_helper.h; sourceTree = "<group>"; };
-		472C1B381EEBD329003D55A7 /* mailsmtp_oauth2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_oauth2.h; sourceTree = "<group>"; };
-		472C1B391EEBD329003D55A7 /* mailsmtp_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_socket.h; sourceTree = "<group>"; };
-		472C1B3A1EEBD329003D55A7 /* mailsmtp_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_ssl.h; sourceTree = "<group>"; };
-		472C1B3B1EEBD329003D55A7 /* mailsmtp_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_types.h; sourceTree = "<group>"; };
-		472C1B3C1EEBD329003D55A7 /* mailstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstorage.h; sourceTree = "<group>"; };
-		472C1B3D1EEBD329003D55A7 /* mailstorage_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstorage_types.h; sourceTree = "<group>"; };
-		472C1B3E1EEBD329003D55A7 /* mailstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream.h; sourceTree = "<group>"; };
-		472C1B3F1EEBD329003D55A7 /* mailstream_cfstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_cfstream.h; sourceTree = "<group>"; };
-		472C1B401EEBD329003D55A7 /* mailstream_compress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_compress.h; sourceTree = "<group>"; };
-		472C1B411EEBD329003D55A7 /* mailstream_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_helper.h; sourceTree = "<group>"; };
-		472C1B421EEBD329003D55A7 /* mailstream_low.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_low.h; sourceTree = "<group>"; };
-		472C1B431EEBD329003D55A7 /* mailstream_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_socket.h; sourceTree = "<group>"; };
-		472C1B441EEBD329003D55A7 /* mailstream_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_ssl.h; sourceTree = "<group>"; };
-		472C1B451EEBD329003D55A7 /* mailstream_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_types.h; sourceTree = "<group>"; };
-		472C1B461EEBD329003D55A7 /* mailthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailthread.h; sourceTree = "<group>"; };
-		472C1B471EEBD329003D55A7 /* mailthread_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailthread_types.h; sourceTree = "<group>"; };
-		472C1B481EEBD329003D55A7 /* mboxdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver.h; sourceTree = "<group>"; };
-		472C1B491EEBD329003D55A7 /* mboxdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_cached.h; sourceTree = "<group>"; };
-		472C1B4A1EEBD329003D55A7 /* mboxdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1B4B1EEBD329003D55A7 /* mboxdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_message.h; sourceTree = "<group>"; };
-		472C1B4C1EEBD329003D55A7 /* mboxdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_types.h; sourceTree = "<group>"; };
-		472C1B4D1EEBD329003D55A7 /* mboxstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxstorage.h; sourceTree = "<group>"; };
-		472C1B4E1EEBD329003D55A7 /* mhdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver.h; sourceTree = "<group>"; };
-		472C1B4F1EEBD329003D55A7 /* mhdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_cached.h; sourceTree = "<group>"; };
-		472C1B501EEBD329003D55A7 /* mhdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1B511EEBD329003D55A7 /* mhdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_message.h; sourceTree = "<group>"; };
-		472C1B521EEBD329003D55A7 /* mhdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_types.h; sourceTree = "<group>"; };
-		472C1B531EEBD329003D55A7 /* mhstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhstorage.h; sourceTree = "<group>"; };
-		472C1B541EEBD329003D55A7 /* mime_message_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mime_message_driver.h; sourceTree = "<group>"; };
-		472C1B551EEBD329003D55A7 /* mmapstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mmapstring.h; sourceTree = "<group>"; };
-		472C1B561EEBD329003D55A7 /* namespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace.h; sourceTree = "<group>"; };
-		472C1B571EEBD329003D55A7 /* namespace_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace_parser.h; sourceTree = "<group>"; };
-		472C1B581EEBD329003D55A7 /* namespace_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace_sender.h; sourceTree = "<group>"; };
-		472C1B591EEBD329003D55A7 /* namespace_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace_types.h; sourceTree = "<group>"; };
-		472C1B5A1EEBD329003D55A7 /* newsfeed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed.h; sourceTree = "<group>"; };
-		472C1B5B1EEBD329003D55A7 /* newsfeed_item.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed_item.h; sourceTree = "<group>"; };
-		472C1B5C1EEBD329003D55A7 /* newsfeed_item_enclosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed_item_enclosure.h; sourceTree = "<group>"; };
-		472C1B5D1EEBD329003D55A7 /* newsfeed_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed_types.h; sourceTree = "<group>"; };
-		472C1B5E1EEBD329003D55A7 /* newsnntp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp.h; sourceTree = "<group>"; };
-		472C1B5F1EEBD329003D55A7 /* newsnntp_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp_socket.h; sourceTree = "<group>"; };
-		472C1B601EEBD329003D55A7 /* newsnntp_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp_ssl.h; sourceTree = "<group>"; };
-		472C1B611EEBD329003D55A7 /* newsnntp_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp_types.h; sourceTree = "<group>"; };
-		472C1B621EEBD329003D55A7 /* nntpdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver.h; sourceTree = "<group>"; };
-		472C1B631EEBD329003D55A7 /* nntpdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_cached.h; sourceTree = "<group>"; };
-		472C1B641EEBD329003D55A7 /* nntpdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1B651EEBD329003D55A7 /* nntpdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_message.h; sourceTree = "<group>"; };
-		472C1B661EEBD329003D55A7 /* nntpdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_types.h; sourceTree = "<group>"; };
-		472C1B671EEBD329003D55A7 /* nntpstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpstorage.h; sourceTree = "<group>"; };
-		472C1B681EEBD329003D55A7 /* pop3driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver.h; sourceTree = "<group>"; };
-		472C1B691EEBD329003D55A7 /* pop3driver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_cached.h; sourceTree = "<group>"; };
-		472C1B6A1EEBD329003D55A7 /* pop3driver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_cached_message.h; sourceTree = "<group>"; };
-		472C1B6B1EEBD329003D55A7 /* pop3driver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_message.h; sourceTree = "<group>"; };
-		472C1B6C1EEBD329003D55A7 /* pop3driver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_types.h; sourceTree = "<group>"; };
-		472C1B6D1EEBD329003D55A7 /* pop3storage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3storage.h; sourceTree = "<group>"; };
-		472C1B6E1EEBD329003D55A7 /* qresync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qresync.h; sourceTree = "<group>"; };
-		472C1B6F1EEBD329003D55A7 /* qresync_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qresync_types.h; sourceTree = "<group>"; };
-		472C1B701EEBD329003D55A7 /* quota.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota.h; sourceTree = "<group>"; };
-		472C1B711EEBD329003D55A7 /* quota_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota_parser.h; sourceTree = "<group>"; };
-		472C1B721EEBD329003D55A7 /* quota_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota_sender.h; sourceTree = "<group>"; };
-		472C1B731EEBD329003D55A7 /* quota_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota_types.h; sourceTree = "<group>"; };
-		472C1B741EEBD329003D55A7 /* uidplus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uidplus.h; sourceTree = "<group>"; };
-		472C1B751EEBD329003D55A7 /* uidplus_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uidplus_types.h; sourceTree = "<group>"; };
-		472C1B761EEBD329003D55A7 /* xgmlabels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xgmlabels.h; sourceTree = "<group>"; };
-		472C1B771EEBD329003D55A7 /* xgmmsgid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xgmmsgid.h; sourceTree = "<group>"; };
-		472C1B781EEBD329003D55A7 /* xgmthrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xgmthrid.h; sourceTree = "<group>"; };
-		472C1B791EEBD329003D55A7 /* xlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xlist.h; sourceTree = "<group>"; };
-		472C1B7A1EEBD329003D55A7 /* NEWS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NEWS; sourceTree = "<group>"; };
-		472C1B7B1EEBD329003D55A7 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		472C1B7E1EEBD329003D55A7 /* getopt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = getopt.c; sourceTree = "<group>"; };
-		472C1B7F1EEBD329003D55A7 /* getopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getopt.h; sourceTree = "<group>"; };
-		472C1B801EEBD329003D55A7 /* getopt_long.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = getopt_long.c; sourceTree = "<group>"; };
-		472C1B821EEBD329003D55A7 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
-		472C1B831EEBD329003D55A7 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = "<group>"; };
-		472C1B841EEBD329003D55A7 /* carray.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = carray.c; sourceTree = "<group>"; };
-		472C1B851EEBD329003D55A7 /* carray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = carray.h; sourceTree = "<group>"; };
-		472C1B861EEBD329003D55A7 /* charconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = charconv.c; sourceTree = "<group>"; };
-		472C1B871EEBD329003D55A7 /* charconv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charconv.h; sourceTree = "<group>"; };
-		472C1B881EEBD329003D55A7 /* chash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chash.c; sourceTree = "<group>"; };
-		472C1B891EEBD329003D55A7 /* chash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chash.h; sourceTree = "<group>"; };
-		472C1B8A1EEBD329003D55A7 /* clist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = clist.c; sourceTree = "<group>"; };
-		472C1B8B1EEBD329003D55A7 /* clist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clist.h; sourceTree = "<group>"; };
-		472C1B8C1EEBD329003D55A7 /* connect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = connect.c; sourceTree = "<group>"; };
-		472C1B8D1EEBD329003D55A7 /* connect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = connect.h; sourceTree = "<group>"; };
-		472C1B8E1EEBD329003D55A7 /* hmac-md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "hmac-md5.h"; sourceTree = "<group>"; };
-		472C1B8F1EEBD329003D55A7 /* mail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mail.h; sourceTree = "<group>"; };
-		472C1B901EEBD329003D55A7 /* mail_cache_db.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mail_cache_db.c; sourceTree = "<group>"; };
-		472C1B911EEBD329003D55A7 /* mail_cache_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mail_cache_db.h; sourceTree = "<group>"; };
-		472C1B921EEBD329003D55A7 /* mail_cache_db_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mail_cache_db_types.h; sourceTree = "<group>"; };
-		472C1B931EEBD329003D55A7 /* maillock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maillock.c; sourceTree = "<group>"; };
-		472C1B941EEBD329003D55A7 /* maillock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maillock.h; sourceTree = "<group>"; };
-		472C1B951EEBD329003D55A7 /* mailsasl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailsasl.c; sourceTree = "<group>"; };
-		472C1B961EEBD329003D55A7 /* mailsasl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsasl.h; sourceTree = "<group>"; };
-		472C1B971EEBD329003D55A7 /* mailsasl_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsasl_private.h; sourceTree = "<group>"; };
-		472C1B981EEBD329003D55A7 /* mailsem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailsem.c; sourceTree = "<group>"; };
-		472C1B991EEBD329003D55A7 /* mailsem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsem.h; sourceTree = "<group>"; };
-		472C1B9A1EEBD329003D55A7 /* mailstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream.c; sourceTree = "<group>"; };
-		472C1B9B1EEBD329003D55A7 /* mailstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream.h; sourceTree = "<group>"; };
-		472C1B9C1EEBD329003D55A7 /* mailstream_cancel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_cancel.c; sourceTree = "<group>"; };
-		472C1B9D1EEBD329003D55A7 /* mailstream_cancel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_cancel.h; sourceTree = "<group>"; };
-		472C1B9E1EEBD329003D55A7 /* mailstream_cancel_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_cancel_types.h; sourceTree = "<group>"; };
-		472C1B9F1EEBD329003D55A7 /* mailstream_cfstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_cfstream.c; sourceTree = "<group>"; };
-		472C1BA01EEBD329003D55A7 /* mailstream_cfstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_cfstream.h; sourceTree = "<group>"; };
-		472C1BA11EEBD329003D55A7 /* mailstream_compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_compress.c; sourceTree = "<group>"; };
-		472C1BA21EEBD329003D55A7 /* mailstream_compress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_compress.h; sourceTree = "<group>"; };
-		472C1BA31EEBD329003D55A7 /* mailstream_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_helper.c; sourceTree = "<group>"; };
-		472C1BA41EEBD329003D55A7 /* mailstream_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_helper.h; sourceTree = "<group>"; };
-		472C1BA51EEBD329003D55A7 /* mailstream_low.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_low.c; sourceTree = "<group>"; };
-		472C1BA61EEBD329003D55A7 /* mailstream_low.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_low.h; sourceTree = "<group>"; };
-		472C1BA71EEBD329003D55A7 /* mailstream_socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_socket.c; sourceTree = "<group>"; };
-		472C1BA81EEBD329003D55A7 /* mailstream_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_socket.h; sourceTree = "<group>"; };
-		472C1BA91EEBD329003D55A7 /* mailstream_ssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_ssl.c; sourceTree = "<group>"; };
-		472C1BAA1EEBD329003D55A7 /* mailstream_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_ssl.h; sourceTree = "<group>"; };
-		472C1BAB1EEBD329003D55A7 /* mailstream_ssl_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_ssl_private.h; sourceTree = "<group>"; };
-		472C1BAC1EEBD329003D55A7 /* mailstream_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_types.h; sourceTree = "<group>"; };
-		472C1BAD1EEBD329003D55A7 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md5.c; sourceTree = "<group>"; };
-		472C1BAE1EEBD329003D55A7 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = "<group>"; };
-		472C1BAF1EEBD329003D55A7 /* md5global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5global.h; sourceTree = "<group>"; };
-		472C1BB01EEBD329003D55A7 /* md5namespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5namespace.h; sourceTree = "<group>"; };
-		472C1BB11EEBD329003D55A7 /* mmapstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mmapstring.c; sourceTree = "<group>"; };
-		472C1BB21EEBD329003D55A7 /* mmapstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mmapstring.h; sourceTree = "<group>"; };
-		472C1BB31EEBD329003D55A7 /* mmapstring_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mmapstring_private.h; sourceTree = "<group>"; };
-		472C1BB41EEBD329003D55A7 /* timeutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = timeutils.c; sourceTree = "<group>"; };
-		472C1BB51EEBD329003D55A7 /* timeutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timeutils.h; sourceTree = "<group>"; };
-		472C1BB91EEBD329003D55A7 /* data_message_driver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = data_message_driver.c; sourceTree = "<group>"; };
-		472C1BBA1EEBD329003D55A7 /* data_message_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = data_message_driver.h; sourceTree = "<group>"; };
-		472C1BBC1EEBD329003D55A7 /* dbdriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dbdriver.c; sourceTree = "<group>"; };
-		472C1BBD1EEBD329003D55A7 /* dbdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbdriver.h; sourceTree = "<group>"; };
-		472C1BBE1EEBD329003D55A7 /* dbdriver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dbdriver_message.c; sourceTree = "<group>"; };
-		472C1BBF1EEBD329003D55A7 /* dbdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbdriver_message.h; sourceTree = "<group>"; };
-		472C1BC01EEBD329003D55A7 /* dbdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbdriver_types.h; sourceTree = "<group>"; };
-		472C1BC11EEBD329003D55A7 /* dbstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dbstorage.c; sourceTree = "<group>"; };
-		472C1BC21EEBD329003D55A7 /* dbstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbstorage.h; sourceTree = "<group>"; };
-		472C1BC41EEBD329003D55A7 /* feeddriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeddriver.c; sourceTree = "<group>"; };
-		472C1BC51EEBD329003D55A7 /* feeddriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeddriver.h; sourceTree = "<group>"; };
-		472C1BC61EEBD329003D55A7 /* feeddriver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeddriver_message.c; sourceTree = "<group>"; };
-		472C1BC71EEBD329003D55A7 /* feeddriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeddriver_message.h; sourceTree = "<group>"; };
-		472C1BC81EEBD329003D55A7 /* feeddriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeddriver_types.h; sourceTree = "<group>"; };
-		472C1BC91EEBD329003D55A7 /* feedstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feedstorage.c; sourceTree = "<group>"; };
-		472C1BCA1EEBD329003D55A7 /* feedstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feedstorage.h; sourceTree = "<group>"; };
-		472C1BCC1EEBD329003D55A7 /* hotmailstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hotmailstorage.c; sourceTree = "<group>"; };
-		472C1BCD1EEBD329003D55A7 /* hotmailstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotmailstorage.h; sourceTree = "<group>"; };
-		472C1BCF1EEBD329003D55A7 /* imapdriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imapdriver.c; sourceTree = "<group>"; };
-		472C1BD01EEBD329003D55A7 /* imapdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver.h; sourceTree = "<group>"; };
-		472C1BD11EEBD329003D55A7 /* imapdriver_cached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imapdriver_cached.c; sourceTree = "<group>"; };
-		472C1BD21EEBD329003D55A7 /* imapdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_cached.h; sourceTree = "<group>"; };
-		472C1BD31EEBD329003D55A7 /* imapdriver_cached_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imapdriver_cached_message.c; sourceTree = "<group>"; };
-		472C1BD41EEBD329003D55A7 /* imapdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1BD51EEBD329003D55A7 /* imapdriver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imapdriver_message.c; sourceTree = "<group>"; };
-		472C1BD61EEBD329003D55A7 /* imapdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_message.h; sourceTree = "<group>"; };
-		472C1BD71EEBD329003D55A7 /* imapdriver_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imapdriver_tools.c; sourceTree = "<group>"; };
-		472C1BD81EEBD329003D55A7 /* imapdriver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_tools.h; sourceTree = "<group>"; };
-		472C1BD91EEBD329003D55A7 /* imapdriver_tools_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_tools_private.h; sourceTree = "<group>"; };
-		472C1BDA1EEBD329003D55A7 /* imapdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapdriver_types.h; sourceTree = "<group>"; };
-		472C1BDB1EEBD329003D55A7 /* imapstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imapstorage.c; sourceTree = "<group>"; };
-		472C1BDC1EEBD329003D55A7 /* imapstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imapstorage.h; sourceTree = "<group>"; };
-		472C1BDE1EEBD329003D55A7 /* maildirdriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildirdriver.c; sourceTree = "<group>"; };
-		472C1BDF1EEBD329003D55A7 /* maildirdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver.h; sourceTree = "<group>"; };
-		472C1BE01EEBD329003D55A7 /* maildirdriver_cached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildirdriver_cached.c; sourceTree = "<group>"; };
-		472C1BE11EEBD329003D55A7 /* maildirdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_cached.h; sourceTree = "<group>"; };
-		472C1BE21EEBD329003D55A7 /* maildirdriver_cached_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildirdriver_cached_message.c; sourceTree = "<group>"; };
-		472C1BE31EEBD329003D55A7 /* maildirdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1BE41EEBD329003D55A7 /* maildirdriver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildirdriver_message.c; sourceTree = "<group>"; };
-		472C1BE51EEBD329003D55A7 /* maildirdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_message.h; sourceTree = "<group>"; };
-		472C1BE61EEBD329003D55A7 /* maildirdriver_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildirdriver_tools.c; sourceTree = "<group>"; };
-		472C1BE71EEBD329003D55A7 /* maildirdriver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_tools.h; sourceTree = "<group>"; };
-		472C1BE81EEBD329003D55A7 /* maildirdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirdriver_types.h; sourceTree = "<group>"; };
-		472C1BE91EEBD329003D55A7 /* maildirstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildirstorage.c; sourceTree = "<group>"; };
-		472C1BEA1EEBD329003D55A7 /* maildirstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildirstorage.h; sourceTree = "<group>"; };
-		472C1BEC1EEBD329003D55A7 /* mboxdriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mboxdriver.c; sourceTree = "<group>"; };
-		472C1BED1EEBD329003D55A7 /* mboxdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver.h; sourceTree = "<group>"; };
-		472C1BEE1EEBD329003D55A7 /* mboxdriver_cached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mboxdriver_cached.c; sourceTree = "<group>"; };
-		472C1BEF1EEBD329003D55A7 /* mboxdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_cached.h; sourceTree = "<group>"; };
-		472C1BF01EEBD329003D55A7 /* mboxdriver_cached_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mboxdriver_cached_message.c; sourceTree = "<group>"; };
-		472C1BF11EEBD329003D55A7 /* mboxdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1BF21EEBD329003D55A7 /* mboxdriver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mboxdriver_message.c; sourceTree = "<group>"; };
-		472C1BF31EEBD329003D55A7 /* mboxdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_message.h; sourceTree = "<group>"; };
-		472C1BF41EEBD329003D55A7 /* mboxdriver_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mboxdriver_tools.c; sourceTree = "<group>"; };
-		472C1BF51EEBD329003D55A7 /* mboxdriver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_tools.h; sourceTree = "<group>"; };
-		472C1BF61EEBD329003D55A7 /* mboxdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxdriver_types.h; sourceTree = "<group>"; };
-		472C1BF71EEBD329003D55A7 /* mboxstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mboxstorage.c; sourceTree = "<group>"; };
-		472C1BF81EEBD329003D55A7 /* mboxstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mboxstorage.h; sourceTree = "<group>"; };
-		472C1BFA1EEBD329003D55A7 /* mhdriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mhdriver.c; sourceTree = "<group>"; };
-		472C1BFB1EEBD329003D55A7 /* mhdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver.h; sourceTree = "<group>"; };
-		472C1BFC1EEBD329003D55A7 /* mhdriver_cached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mhdriver_cached.c; sourceTree = "<group>"; };
-		472C1BFD1EEBD329003D55A7 /* mhdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_cached.h; sourceTree = "<group>"; };
-		472C1BFE1EEBD329003D55A7 /* mhdriver_cached_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mhdriver_cached_message.c; sourceTree = "<group>"; };
-		472C1BFF1EEBD329003D55A7 /* mhdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1C001EEBD329003D55A7 /* mhdriver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mhdriver_message.c; sourceTree = "<group>"; };
-		472C1C011EEBD329003D55A7 /* mhdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_message.h; sourceTree = "<group>"; };
-		472C1C021EEBD329003D55A7 /* mhdriver_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mhdriver_tools.c; sourceTree = "<group>"; };
-		472C1C031EEBD329003D55A7 /* mhdriver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_tools.h; sourceTree = "<group>"; };
-		472C1C041EEBD329003D55A7 /* mhdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhdriver_types.h; sourceTree = "<group>"; };
-		472C1C051EEBD329003D55A7 /* mhstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mhstorage.c; sourceTree = "<group>"; };
-		472C1C061EEBD329003D55A7 /* mhstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mhstorage.h; sourceTree = "<group>"; };
-		472C1C081EEBD329003D55A7 /* mime_message_driver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mime_message_driver.c; sourceTree = "<group>"; };
-		472C1C091EEBD329003D55A7 /* mime_message_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mime_message_driver.h; sourceTree = "<group>"; };
-		472C1C0B1EEBD329003D55A7 /* nntpdriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nntpdriver.c; sourceTree = "<group>"; };
-		472C1C0C1EEBD329003D55A7 /* nntpdriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver.h; sourceTree = "<group>"; };
-		472C1C0D1EEBD329003D55A7 /* nntpdriver_cached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nntpdriver_cached.c; sourceTree = "<group>"; };
-		472C1C0E1EEBD329003D55A7 /* nntpdriver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_cached.h; sourceTree = "<group>"; };
-		472C1C0F1EEBD329003D55A7 /* nntpdriver_cached_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nntpdriver_cached_message.c; sourceTree = "<group>"; };
-		472C1C101EEBD329003D55A7 /* nntpdriver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_cached_message.h; sourceTree = "<group>"; };
-		472C1C111EEBD329003D55A7 /* nntpdriver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nntpdriver_message.c; sourceTree = "<group>"; };
-		472C1C121EEBD329003D55A7 /* nntpdriver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_message.h; sourceTree = "<group>"; };
-		472C1C131EEBD329003D55A7 /* nntpdriver_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nntpdriver_tools.c; sourceTree = "<group>"; };
-		472C1C141EEBD329003D55A7 /* nntpdriver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_tools.h; sourceTree = "<group>"; };
-		472C1C151EEBD329003D55A7 /* nntpdriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpdriver_types.h; sourceTree = "<group>"; };
-		472C1C161EEBD329003D55A7 /* nntpstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nntpstorage.c; sourceTree = "<group>"; };
-		472C1C171EEBD329003D55A7 /* nntpstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nntpstorage.h; sourceTree = "<group>"; };
-		472C1C191EEBD329003D55A7 /* pop3driver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pop3driver.c; sourceTree = "<group>"; };
-		472C1C1A1EEBD329003D55A7 /* pop3driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver.h; sourceTree = "<group>"; };
-		472C1C1B1EEBD329003D55A7 /* pop3driver_cached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pop3driver_cached.c; sourceTree = "<group>"; };
-		472C1C1C1EEBD329003D55A7 /* pop3driver_cached.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_cached.h; sourceTree = "<group>"; };
-		472C1C1D1EEBD329003D55A7 /* pop3driver_cached_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pop3driver_cached_message.c; sourceTree = "<group>"; };
-		472C1C1E1EEBD329003D55A7 /* pop3driver_cached_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_cached_message.h; sourceTree = "<group>"; };
-		472C1C1F1EEBD329003D55A7 /* pop3driver_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pop3driver_message.c; sourceTree = "<group>"; };
-		472C1C201EEBD329003D55A7 /* pop3driver_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_message.h; sourceTree = "<group>"; };
-		472C1C211EEBD329003D55A7 /* pop3driver_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pop3driver_tools.c; sourceTree = "<group>"; };
-		472C1C221EEBD329003D55A7 /* pop3driver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_tools.h; sourceTree = "<group>"; };
-		472C1C231EEBD329003D55A7 /* pop3driver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3driver_types.h; sourceTree = "<group>"; };
-		472C1C241EEBD329003D55A7 /* pop3storage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pop3storage.c; sourceTree = "<group>"; };
-		472C1C251EEBD329003D55A7 /* pop3storage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pop3storage.h; sourceTree = "<group>"; };
-		472C1C271EEBD329003D55A7 /* maildriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildriver.c; sourceTree = "<group>"; };
-		472C1C281EEBD329003D55A7 /* maildriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver.h; sourceTree = "<group>"; };
-		472C1C291EEBD329003D55A7 /* maildriver_errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver_errors.h; sourceTree = "<group>"; };
-		472C1C2A1EEBD329003D55A7 /* maildriver_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildriver_tools.c; sourceTree = "<group>"; };
-		472C1C2B1EEBD329003D55A7 /* maildriver_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver_tools.h; sourceTree = "<group>"; };
-		472C1C2C1EEBD329003D55A7 /* maildriver_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildriver_types.c; sourceTree = "<group>"; };
-		472C1C2D1EEBD329003D55A7 /* maildriver_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver_types.h; sourceTree = "<group>"; };
-		472C1C2E1EEBD329003D55A7 /* maildriver_types_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildriver_types_helper.c; sourceTree = "<group>"; };
-		472C1C2F1EEBD329003D55A7 /* maildriver_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildriver_types_helper.h; sourceTree = "<group>"; };
-		472C1C301EEBD329003D55A7 /* mailfolder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailfolder.c; sourceTree = "<group>"; };
-		472C1C311EEBD329003D55A7 /* mailfolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailfolder.h; sourceTree = "<group>"; };
-		472C1C321EEBD329003D55A7 /* mailmessage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmessage.c; sourceTree = "<group>"; };
-		472C1C331EEBD329003D55A7 /* mailmessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmessage.h; sourceTree = "<group>"; };
-		472C1C341EEBD329003D55A7 /* mailmessage_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmessage_tools.c; sourceTree = "<group>"; };
-		472C1C351EEBD329003D55A7 /* mailmessage_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmessage_tools.h; sourceTree = "<group>"; };
-		472C1C361EEBD329003D55A7 /* mailmessage_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmessage_types.c; sourceTree = "<group>"; };
-		472C1C371EEBD329003D55A7 /* mailmessage_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmessage_types.h; sourceTree = "<group>"; };
-		472C1C381EEBD329003D55A7 /* mailstorage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstorage.c; sourceTree = "<group>"; };
-		472C1C391EEBD329003D55A7 /* mailstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstorage.h; sourceTree = "<group>"; };
-		472C1C3A1EEBD329003D55A7 /* mailstorage_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstorage_tools.c; sourceTree = "<group>"; };
-		472C1C3B1EEBD329003D55A7 /* mailstorage_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstorage_tools.h; sourceTree = "<group>"; };
-		472C1C3C1EEBD329003D55A7 /* mailstorage_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstorage_types.h; sourceTree = "<group>"; };
-		472C1C3D1EEBD329003D55A7 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
-		472C1C3F1EEBD329003D55A7 /* generic_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = generic_cache.c; sourceTree = "<group>"; };
-		472C1C401EEBD329003D55A7 /* generic_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generic_cache.h; sourceTree = "<group>"; };
-		472C1C411EEBD329003D55A7 /* generic_cache_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generic_cache_types.h; sourceTree = "<group>"; };
-		472C1C421EEBD329003D55A7 /* imfcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imfcache.c; sourceTree = "<group>"; };
-		472C1C431EEBD329003D55A7 /* imfcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imfcache.h; sourceTree = "<group>"; };
-		472C1C441EEBD329003D55A7 /* mailthread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailthread.c; sourceTree = "<group>"; };
-		472C1C451EEBD329003D55A7 /* mailthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailthread.h; sourceTree = "<group>"; };
-		472C1C461EEBD329003D55A7 /* mailthread_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailthread_types.c; sourceTree = "<group>"; };
-		472C1C471EEBD329003D55A7 /* mailthread_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailthread_types.h; sourceTree = "<group>"; };
-		472C1C491EEBD329003D55A7 /* mailengine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailengine.c; sourceTree = "<group>"; };
-		472C1C4A1EEBD329003D55A7 /* mailengine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailengine.h; sourceTree = "<group>"; };
-		472C1C4B1EEBD329003D55A7 /* mailprivacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailprivacy.c; sourceTree = "<group>"; };
-		472C1C4C1EEBD329003D55A7 /* mailprivacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy.h; sourceTree = "<group>"; };
-		472C1C4D1EEBD329003D55A7 /* mailprivacy_gnupg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailprivacy_gnupg.c; sourceTree = "<group>"; };
-		472C1C4E1EEBD329003D55A7 /* mailprivacy_gnupg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_gnupg.h; sourceTree = "<group>"; };
-		472C1C4F1EEBD329003D55A7 /* mailprivacy_smime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailprivacy_smime.c; sourceTree = "<group>"; };
-		472C1C501EEBD329003D55A7 /* mailprivacy_smime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_smime.h; sourceTree = "<group>"; };
-		472C1C511EEBD329003D55A7 /* mailprivacy_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailprivacy_tools.c; sourceTree = "<group>"; };
-		472C1C521EEBD329003D55A7 /* mailprivacy_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_tools.h; sourceTree = "<group>"; };
-		472C1C531EEBD329003D55A7 /* mailprivacy_tools_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_tools_private.h; sourceTree = "<group>"; };
-		472C1C541EEBD329003D55A7 /* mailprivacy_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailprivacy_types.h; sourceTree = "<group>"; };
-		472C1C571EEBD329003D55A7 /* date.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = date.c; sourceTree = "<group>"; };
-		472C1C581EEBD329003D55A7 /* date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = date.h; sourceTree = "<group>"; };
-		472C1C591EEBD329003D55A7 /* newsfeed.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = newsfeed.c; sourceTree = "<group>"; };
-		472C1C5A1EEBD329003D55A7 /* newsfeed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed.h; sourceTree = "<group>"; };
-		472C1C5B1EEBD329003D55A7 /* newsfeed_item.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = newsfeed_item.c; sourceTree = "<group>"; };
-		472C1C5C1EEBD329003D55A7 /* newsfeed_item.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed_item.h; sourceTree = "<group>"; };
-		472C1C5D1EEBD329003D55A7 /* newsfeed_item_enclosure.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = newsfeed_item_enclosure.c; sourceTree = "<group>"; };
-		472C1C5E1EEBD329003D55A7 /* newsfeed_item_enclosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed_item_enclosure.h; sourceTree = "<group>"; };
-		472C1C5F1EEBD329003D55A7 /* newsfeed_private.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = newsfeed_private.c; sourceTree = "<group>"; };
-		472C1C601EEBD329003D55A7 /* newsfeed_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed_private.h; sourceTree = "<group>"; };
-		472C1C611EEBD329003D55A7 /* newsfeed_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsfeed_types.h; sourceTree = "<group>"; };
-		472C1C621EEBD329003D55A7 /* parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parser.c; sourceTree = "<group>"; };
-		472C1C631EEBD329003D55A7 /* parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser.h; sourceTree = "<group>"; };
-		472C1C641EEBD329003D55A7 /* parser_atom03.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parser_atom03.c; sourceTree = "<group>"; };
-		472C1C651EEBD329003D55A7 /* parser_atom03.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser_atom03.h; sourceTree = "<group>"; };
-		472C1C661EEBD329003D55A7 /* parser_atom10.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parser_atom10.c; sourceTree = "<group>"; };
-		472C1C671EEBD329003D55A7 /* parser_atom10.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser_atom10.h; sourceTree = "<group>"; };
-		472C1C681EEBD329003D55A7 /* parser_rdf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parser_rdf.c; sourceTree = "<group>"; };
-		472C1C691EEBD329003D55A7 /* parser_rdf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser_rdf.h; sourceTree = "<group>"; };
-		472C1C6A1EEBD329003D55A7 /* parser_rss20.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parser_rss20.c; sourceTree = "<group>"; };
-		472C1C6B1EEBD329003D55A7 /* parser_rss20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser_rss20.h; sourceTree = "<group>"; };
-		472C1C6D1EEBD329003D55A7 /* acl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = acl.c; sourceTree = "<group>"; };
-		472C1C6E1EEBD329003D55A7 /* acl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acl.h; sourceTree = "<group>"; };
-		472C1C6F1EEBD329003D55A7 /* acl_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = acl_parser.c; sourceTree = "<group>"; };
-		472C1C701EEBD329003D55A7 /* acl_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acl_parser.h; sourceTree = "<group>"; };
-		472C1C711EEBD329003D55A7 /* acl_sender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = acl_sender.c; sourceTree = "<group>"; };
-		472C1C721EEBD329003D55A7 /* acl_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acl_sender.h; sourceTree = "<group>"; };
-		472C1C731EEBD329003D55A7 /* acl_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = acl_types.c; sourceTree = "<group>"; };
-		472C1C741EEBD329003D55A7 /* acl_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acl_types.h; sourceTree = "<group>"; };
-		472C1C751EEBD329003D55A7 /* annotatemore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = annotatemore.c; sourceTree = "<group>"; };
-		472C1C761EEBD329003D55A7 /* annotatemore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = annotatemore.h; sourceTree = "<group>"; };
-		472C1C771EEBD329003D55A7 /* annotatemore_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = annotatemore_parser.c; sourceTree = "<group>"; };
-		472C1C781EEBD329003D55A7 /* annotatemore_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = annotatemore_parser.h; sourceTree = "<group>"; };
-		472C1C791EEBD329003D55A7 /* annotatemore_sender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = annotatemore_sender.c; sourceTree = "<group>"; };
-		472C1C7A1EEBD329003D55A7 /* annotatemore_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = annotatemore_sender.h; sourceTree = "<group>"; };
-		472C1C7B1EEBD329003D55A7 /* annotatemore_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = annotatemore_types.c; sourceTree = "<group>"; };
-		472C1C7C1EEBD329003D55A7 /* annotatemore_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = annotatemore_types.h; sourceTree = "<group>"; };
-		472C1C7D1EEBD329003D55A7 /* condstore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = condstore.c; sourceTree = "<group>"; };
-		472C1C7E1EEBD329003D55A7 /* condstore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condstore.h; sourceTree = "<group>"; };
-		472C1C7F1EEBD329003D55A7 /* condstore_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condstore_private.h; sourceTree = "<group>"; };
-		472C1C801EEBD329003D55A7 /* condstore_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = condstore_types.c; sourceTree = "<group>"; };
-		472C1C811EEBD329003D55A7 /* condstore_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condstore_types.h; sourceTree = "<group>"; };
-		472C1C821EEBD329003D55A7 /* enable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = enable.c; sourceTree = "<group>"; };
-		472C1C831EEBD329003D55A7 /* enable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enable.h; sourceTree = "<group>"; };
-		472C1C841EEBD329003D55A7 /* idle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = idle.c; sourceTree = "<group>"; };
-		472C1C851EEBD329003D55A7 /* idle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idle.h; sourceTree = "<group>"; };
-		472C1C861EEBD329003D55A7 /* mailimap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap.c; sourceTree = "<group>"; };
-		472C1C871EEBD329003D55A7 /* mailimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap.h; sourceTree = "<group>"; };
-		472C1C881EEBD329003D55A7 /* mailimap_compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_compress.c; sourceTree = "<group>"; };
-		472C1C891EEBD329003D55A7 /* mailimap_compress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_compress.h; sourceTree = "<group>"; };
-		472C1C8A1EEBD329003D55A7 /* mailimap_extension.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_extension.c; sourceTree = "<group>"; };
-		472C1C8B1EEBD329003D55A7 /* mailimap_extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_extension.h; sourceTree = "<group>"; };
-		472C1C8C1EEBD329003D55A7 /* mailimap_extension_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_extension_types.h; sourceTree = "<group>"; };
-		472C1C8D1EEBD329003D55A7 /* mailimap_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_helper.c; sourceTree = "<group>"; };
-		472C1C8E1EEBD329003D55A7 /* mailimap_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_helper.h; sourceTree = "<group>"; };
-		472C1C8F1EEBD329003D55A7 /* mailimap_id.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_id.c; sourceTree = "<group>"; };
-		472C1C901EEBD329003D55A7 /* mailimap_id.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_id.h; sourceTree = "<group>"; };
-		472C1C911EEBD329003D55A7 /* mailimap_id_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_id_parser.c; sourceTree = "<group>"; };
-		472C1C921EEBD329003D55A7 /* mailimap_id_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_id_parser.h; sourceTree = "<group>"; };
-		472C1C931EEBD329003D55A7 /* mailimap_id_sender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_id_sender.c; sourceTree = "<group>"; };
-		472C1C941EEBD329003D55A7 /* mailimap_id_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_id_sender.h; sourceTree = "<group>"; };
-		472C1C951EEBD329003D55A7 /* mailimap_id_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_id_types.c; sourceTree = "<group>"; };
-		472C1C961EEBD329003D55A7 /* mailimap_id_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_id_types.h; sourceTree = "<group>"; };
-		472C1C971EEBD329003D55A7 /* mailimap_keywords.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_keywords.c; sourceTree = "<group>"; };
-		472C1C981EEBD329003D55A7 /* mailimap_keywords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_keywords.h; sourceTree = "<group>"; };
-		472C1C991EEBD329003D55A7 /* mailimap_oauth2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_oauth2.c; sourceTree = "<group>"; };
-		472C1C9A1EEBD329003D55A7 /* mailimap_oauth2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_oauth2.h; sourceTree = "<group>"; };
-		472C1C9B1EEBD329003D55A7 /* mailimap_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_parser.c; sourceTree = "<group>"; };
-		472C1C9C1EEBD329003D55A7 /* mailimap_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_parser.h; sourceTree = "<group>"; };
-		472C1C9D1EEBD329003D55A7 /* mailimap_print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_print.c; sourceTree = "<group>"; };
-		472C1C9E1EEBD329003D55A7 /* mailimap_print.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_print.h; sourceTree = "<group>"; };
-		472C1C9F1EEBD329003D55A7 /* mailimap_sender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_sender.c; sourceTree = "<group>"; };
-		472C1CA01EEBD329003D55A7 /* mailimap_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_sender.h; sourceTree = "<group>"; };
-		472C1CA11EEBD329003D55A7 /* mailimap_socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_socket.c; sourceTree = "<group>"; };
-		472C1CA21EEBD329003D55A7 /* mailimap_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_socket.h; sourceTree = "<group>"; };
-		472C1CA31EEBD329003D55A7 /* mailimap_sort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_sort.c; sourceTree = "<group>"; };
-		472C1CA41EEBD329003D55A7 /* mailimap_sort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_sort.h; sourceTree = "<group>"; };
-		472C1CA51EEBD329003D55A7 /* mailimap_sort_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_sort_types.c; sourceTree = "<group>"; };
-		472C1CA61EEBD329003D55A7 /* mailimap_sort_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_sort_types.h; sourceTree = "<group>"; };
-		472C1CA71EEBD329003D55A7 /* mailimap_ssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_ssl.c; sourceTree = "<group>"; };
-		472C1CA81EEBD329003D55A7 /* mailimap_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_ssl.h; sourceTree = "<group>"; };
-		472C1CA91EEBD329003D55A7 /* mailimap_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_types.c; sourceTree = "<group>"; };
-		472C1CAA1EEBD329003D55A7 /* mailimap_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_types.h; sourceTree = "<group>"; };
-		472C1CAB1EEBD329003D55A7 /* mailimap_types_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimap_types_helper.c; sourceTree = "<group>"; };
-		472C1CAC1EEBD329003D55A7 /* mailimap_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimap_types_helper.h; sourceTree = "<group>"; };
-		472C1CAD1EEBD329003D55A7 /* namespace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = namespace.c; sourceTree = "<group>"; };
-		472C1CAE1EEBD329003D55A7 /* namespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace.h; sourceTree = "<group>"; };
-		472C1CAF1EEBD329003D55A7 /* namespace_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = namespace_parser.c; sourceTree = "<group>"; };
-		472C1CB01EEBD329003D55A7 /* namespace_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace_parser.h; sourceTree = "<group>"; };
-		472C1CB11EEBD329003D55A7 /* namespace_sender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = namespace_sender.c; sourceTree = "<group>"; };
-		472C1CB21EEBD329003D55A7 /* namespace_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace_sender.h; sourceTree = "<group>"; };
-		472C1CB31EEBD329003D55A7 /* namespace_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = namespace_types.c; sourceTree = "<group>"; };
-		472C1CB41EEBD329003D55A7 /* namespace_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namespace_types.h; sourceTree = "<group>"; };
-		472C1CB51EEBD329003D55A7 /* qresync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qresync.c; sourceTree = "<group>"; };
-		472C1CB61EEBD329003D55A7 /* qresync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qresync.h; sourceTree = "<group>"; };
-		472C1CB71EEBD329003D55A7 /* qresync_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qresync_private.h; sourceTree = "<group>"; };
-		472C1CB81EEBD329003D55A7 /* qresync_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qresync_types.c; sourceTree = "<group>"; };
-		472C1CB91EEBD329003D55A7 /* qresync_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qresync_types.h; sourceTree = "<group>"; };
-		472C1CBA1EEBD329003D55A7 /* quota.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = quota.c; sourceTree = "<group>"; };
-		472C1CBB1EEBD329003D55A7 /* quota.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota.h; sourceTree = "<group>"; };
-		472C1CBC1EEBD329003D55A7 /* quota_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = quota_parser.c; sourceTree = "<group>"; };
-		472C1CBD1EEBD329003D55A7 /* quota_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota_parser.h; sourceTree = "<group>"; };
-		472C1CBE1EEBD329003D55A7 /* quota_sender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = quota_sender.c; sourceTree = "<group>"; };
-		472C1CBF1EEBD329003D55A7 /* quota_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota_sender.h; sourceTree = "<group>"; };
-		472C1CC01EEBD329003D55A7 /* quota_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = quota_types.c; sourceTree = "<group>"; };
-		472C1CC11EEBD329003D55A7 /* quota_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quota_types.h; sourceTree = "<group>"; };
-		472C1CC21EEBD329003D55A7 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
-		472C1CC31EEBD329003D55A7 /* uidplus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uidplus.c; sourceTree = "<group>"; };
-		472C1CC41EEBD329003D55A7 /* uidplus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uidplus.h; sourceTree = "<group>"; };
-		472C1CC51EEBD329003D55A7 /* uidplus_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uidplus_parser.c; sourceTree = "<group>"; };
-		472C1CC61EEBD329003D55A7 /* uidplus_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uidplus_parser.h; sourceTree = "<group>"; };
-		472C1CC71EEBD329003D55A7 /* uidplus_sender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uidplus_sender.c; sourceTree = "<group>"; };
-		472C1CC81EEBD329003D55A7 /* uidplus_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uidplus_sender.h; sourceTree = "<group>"; };
-		472C1CC91EEBD329003D55A7 /* uidplus_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uidplus_types.c; sourceTree = "<group>"; };
-		472C1CCA1EEBD329003D55A7 /* uidplus_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uidplus_types.h; sourceTree = "<group>"; };
-		472C1CCB1EEBD329003D55A7 /* xgmlabels.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xgmlabels.c; sourceTree = "<group>"; };
-		472C1CCC1EEBD329003D55A7 /* xgmlabels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xgmlabels.h; sourceTree = "<group>"; };
-		472C1CCD1EEBD329003D55A7 /* xgmmsgid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xgmmsgid.c; sourceTree = "<group>"; };
-		472C1CCE1EEBD329003D55A7 /* xgmmsgid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xgmmsgid.h; sourceTree = "<group>"; };
-		472C1CCF1EEBD329003D55A7 /* xgmthrid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xgmthrid.c; sourceTree = "<group>"; };
-		472C1CD01EEBD329003D55A7 /* xgmthrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xgmthrid.h; sourceTree = "<group>"; };
-		472C1CD11EEBD329003D55A7 /* xlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xlist.c; sourceTree = "<group>"; };
-		472C1CD21EEBD329003D55A7 /* xlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xlist.h; sourceTree = "<group>"; };
-		472C1CD41EEBD329003D55A7 /* mailimf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimf.c; sourceTree = "<group>"; };
-		472C1CD51EEBD329003D55A7 /* mailimf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf.h; sourceTree = "<group>"; };
-		472C1CD61EEBD329003D55A7 /* mailimf_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimf_types.c; sourceTree = "<group>"; };
-		472C1CD71EEBD329003D55A7 /* mailimf_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_types.h; sourceTree = "<group>"; };
-		472C1CD81EEBD329003D55A7 /* mailimf_types_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimf_types_helper.c; sourceTree = "<group>"; };
-		472C1CD91EEBD329003D55A7 /* mailimf_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_types_helper.h; sourceTree = "<group>"; };
-		472C1CDA1EEBD329003D55A7 /* mailimf_write.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_write.h; sourceTree = "<group>"; };
-		472C1CDB1EEBD329003D55A7 /* mailimf_write_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimf_write_file.c; sourceTree = "<group>"; };
-		472C1CDC1EEBD329003D55A7 /* mailimf_write_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_write_file.h; sourceTree = "<group>"; };
-		472C1CDD1EEBD329003D55A7 /* mailimf_write_generic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimf_write_generic.c; sourceTree = "<group>"; };
-		472C1CDE1EEBD329003D55A7 /* mailimf_write_generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_write_generic.h; sourceTree = "<group>"; };
-		472C1CDF1EEBD329003D55A7 /* mailimf_write_mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailimf_write_mem.c; sourceTree = "<group>"; };
-		472C1CE01EEBD329003D55A7 /* mailimf_write_mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailimf_write_mem.h; sourceTree = "<group>"; };
-		472C1CE11EEBD329003D55A7 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
-		472C1CE31EEBD329003D55A7 /* maildir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maildir.c; sourceTree = "<group>"; };
-		472C1CE41EEBD329003D55A7 /* maildir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildir.h; sourceTree = "<group>"; };
-		472C1CE51EEBD329003D55A7 /* maildir_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maildir_types.h; sourceTree = "<group>"; };
-		472C1CE71EEBD329003D55A7 /* mailmbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmbox.c; sourceTree = "<group>"; };
-		472C1CE81EEBD329003D55A7 /* mailmbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmbox.h; sourceTree = "<group>"; };
-		472C1CE91EEBD329003D55A7 /* mailmbox_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmbox_parse.c; sourceTree = "<group>"; };
-		472C1CEA1EEBD329003D55A7 /* mailmbox_parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmbox_parse.h; sourceTree = "<group>"; };
-		472C1CEB1EEBD329003D55A7 /* mailmbox_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmbox_types.c; sourceTree = "<group>"; };
-		472C1CEC1EEBD329003D55A7 /* mailmbox_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmbox_types.h; sourceTree = "<group>"; };
-		472C1CED1EEBD329003D55A7 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
-		472C1CEF1EEBD329003D55A7 /* mailmh.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmh.c; sourceTree = "<group>"; };
-		472C1CF01EEBD329003D55A7 /* mailmh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmh.h; sourceTree = "<group>"; };
-		472C1CF21EEBD329003D55A7 /* mailmime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime.c; sourceTree = "<group>"; };
-		472C1CF31EEBD329003D55A7 /* mailmime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime.h; sourceTree = "<group>"; };
-		472C1CF41EEBD329003D55A7 /* mailmime_content.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_content.c; sourceTree = "<group>"; };
-		472C1CF51EEBD329003D55A7 /* mailmime_content.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_content.h; sourceTree = "<group>"; };
-		472C1CF61EEBD329003D55A7 /* mailmime_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_decode.c; sourceTree = "<group>"; };
-		472C1CF71EEBD329003D55A7 /* mailmime_decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_decode.h; sourceTree = "<group>"; };
-		472C1CF81EEBD329003D55A7 /* mailmime_disposition.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_disposition.c; sourceTree = "<group>"; };
-		472C1CF91EEBD329003D55A7 /* mailmime_disposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_disposition.h; sourceTree = "<group>"; };
-		472C1CFA1EEBD329003D55A7 /* mailmime_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_types.c; sourceTree = "<group>"; };
-		472C1CFB1EEBD329003D55A7 /* mailmime_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_types.h; sourceTree = "<group>"; };
-		472C1CFC1EEBD329003D55A7 /* mailmime_types_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_types_helper.c; sourceTree = "<group>"; };
-		472C1CFD1EEBD329003D55A7 /* mailmime_types_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_types_helper.h; sourceTree = "<group>"; };
-		472C1CFE1EEBD329003D55A7 /* mailmime_write.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_write.h; sourceTree = "<group>"; };
-		472C1CFF1EEBD329003D55A7 /* mailmime_write_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_write_file.c; sourceTree = "<group>"; };
-		472C1D001EEBD329003D55A7 /* mailmime_write_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_write_file.h; sourceTree = "<group>"; };
-		472C1D011EEBD329003D55A7 /* mailmime_write_generic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_write_generic.c; sourceTree = "<group>"; };
-		472C1D021EEBD329003D55A7 /* mailmime_write_generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_write_generic.h; sourceTree = "<group>"; };
-		472C1D031EEBD329003D55A7 /* mailmime_write_mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailmime_write_mem.c; sourceTree = "<group>"; };
-		472C1D041EEBD329003D55A7 /* mailmime_write_mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailmime_write_mem.h; sourceTree = "<group>"; };
-		472C1D051EEBD329003D55A7 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
-		472C1D071EEBD329003D55A7 /* newsnntp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = newsnntp.c; sourceTree = "<group>"; };
-		472C1D081EEBD329003D55A7 /* newsnntp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp.h; sourceTree = "<group>"; };
-		472C1D091EEBD329003D55A7 /* newsnntp_socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = newsnntp_socket.c; sourceTree = "<group>"; };
-		472C1D0A1EEBD329003D55A7 /* newsnntp_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp_socket.h; sourceTree = "<group>"; };
-		472C1D0B1EEBD329003D55A7 /* newsnntp_ssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = newsnntp_ssl.c; sourceTree = "<group>"; };
-		472C1D0C1EEBD329003D55A7 /* newsnntp_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp_ssl.h; sourceTree = "<group>"; };
-		472C1D0D1EEBD329003D55A7 /* newsnntp_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newsnntp_types.h; sourceTree = "<group>"; };
-		472C1D0F1EEBD329003D55A7 /* mailpop3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailpop3.c; sourceTree = "<group>"; };
-		472C1D101EEBD329003D55A7 /* mailpop3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3.h; sourceTree = "<group>"; };
-		472C1D111EEBD329003D55A7 /* mailpop3_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailpop3_helper.c; sourceTree = "<group>"; };
-		472C1D121EEBD329003D55A7 /* mailpop3_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_helper.h; sourceTree = "<group>"; };
-		472C1D131EEBD329003D55A7 /* mailpop3_socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailpop3_socket.c; sourceTree = "<group>"; };
-		472C1D141EEBD329003D55A7 /* mailpop3_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_socket.h; sourceTree = "<group>"; };
-		472C1D151EEBD329003D55A7 /* mailpop3_ssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailpop3_ssl.c; sourceTree = "<group>"; };
-		472C1D161EEBD329003D55A7 /* mailpop3_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_ssl.h; sourceTree = "<group>"; };
-		472C1D171EEBD329003D55A7 /* mailpop3_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailpop3_types.h; sourceTree = "<group>"; };
-		472C1D191EEBD329003D55A7 /* mailsmtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailsmtp.c; sourceTree = "<group>"; };
-		472C1D1A1EEBD329003D55A7 /* mailsmtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp.h; sourceTree = "<group>"; };
-		472C1D1B1EEBD329003D55A7 /* mailsmtp_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailsmtp_helper.c; sourceTree = "<group>"; };
-		472C1D1C1EEBD329003D55A7 /* mailsmtp_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_helper.h; sourceTree = "<group>"; };
-		472C1D1D1EEBD329003D55A7 /* mailsmtp_oauth2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailsmtp_oauth2.c; sourceTree = "<group>"; };
-		472C1D1E1EEBD329003D55A7 /* mailsmtp_oauth2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_oauth2.h; sourceTree = "<group>"; };
-		472C1D1F1EEBD329003D55A7 /* mailsmtp_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_private.h; sourceTree = "<group>"; };
-		472C1D201EEBD329003D55A7 /* mailsmtp_socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailsmtp_socket.c; sourceTree = "<group>"; };
-		472C1D211EEBD329003D55A7 /* mailsmtp_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_socket.h; sourceTree = "<group>"; };
-		472C1D221EEBD329003D55A7 /* mailsmtp_ssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailsmtp_ssl.c; sourceTree = "<group>"; };
-		472C1D231EEBD329003D55A7 /* mailsmtp_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_ssl.h; sourceTree = "<group>"; };
-		472C1D241EEBD329003D55A7 /* mailsmtp_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailsmtp_types.h; sourceTree = "<group>"; };
-		472C1D251EEBD329003D55A7 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
-		472C1D271EEBD329003D55A7 /* libetpan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libetpan.h; sourceTree = "<group>"; };
-		472C1D281EEBD329003D55A7 /* libetpan_version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libetpan_version.c; sourceTree = "<group>"; };
-		472C1D291EEBD329003D55A7 /* libetpan_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libetpan_version.h; sourceTree = "<group>"; };
-		472C1D2A1EEBD329003D55A7 /* libetpan_version.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = libetpan_version.h.in; sourceTree = "<group>"; };
-		472C1D2E1EEBD329003D55A7 /* config-netpgp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-netpgp.h"; sourceTree = "<group>"; };
-		472C1D2F1EEBD329003D55A7 /* config-original-as-configured-for-ubuntu-16.04-64bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-original-as-configured-for-ubuntu-16.04-64bit.h"; sourceTree = "<group>"; };
-		472C1D301EEBD329003D55A7 /* config-pep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-pep.h"; sourceTree = "<group>"; };
-		472C1D311EEBD329003D55A7 /* create.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = create.h; sourceTree = "<group>"; };
-		472C1D321EEBD329003D55A7 /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto.h; sourceTree = "<group>"; };
-		472C1D331EEBD329003D55A7 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };
-		472C1D341EEBD329003D55A7 /* errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = errors.h; sourceTree = "<group>"; };
-		472C1D351EEBD329003D55A7 /* keyring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyring.h; sourceTree = "<group>"; };
-		472C1D361EEBD329003D55A7 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
-		472C1D371EEBD329003D55A7 /* netpgpdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netpgpdefs.h; sourceTree = "<group>"; };
-		472C1D381EEBD329003D55A7 /* netpgpdigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netpgpdigest.h; sourceTree = "<group>"; };
-		472C1D391EEBD329003D55A7 /* netpgpsdk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netpgpsdk.h; sourceTree = "<group>"; };
-		472C1D3A1EEBD329003D55A7 /* openssl11stub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = openssl11stub.h; sourceTree = "<group>"; };
-		472C1D3B1EEBD329003D55A7 /* packet-parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "packet-parse.h"; sourceTree = "<group>"; };
-		472C1D3C1EEBD329003D55A7 /* packet-show.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "packet-show.h"; sourceTree = "<group>"; };
-		472C1D3D1EEBD329003D55A7 /* packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = packet.h; sourceTree = "<group>"; };
-		472C1D3E1EEBD329003D55A7 /* readerwriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = readerwriter.h; sourceTree = "<group>"; };
-		472C1D3F1EEBD329003D55A7 /* signature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = signature.h; sourceTree = "<group>"; };
-		472C1D401EEBD329003D55A7 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
-		472C1D411EEBD329003D55A7 /* validate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = validate.h; sourceTree = "<group>"; };
-		472C1D421EEBD329003D55A7 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		472C1D431EEBD329003D55A7 /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = "<group>"; };
-		472C1D441EEBD329003D55A7 /* netpgp-extra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "netpgp-extra.h"; sourceTree = "<group>"; };
-		472C1D461EEBD329003D55A7 /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; };
-		472C1D471EEBD329003D55A7 /* create.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = create.c; sourceTree = "<group>"; };
-		472C1D481EEBD329003D55A7 /* crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypto.c; sourceTree = "<group>"; };
-		472C1D491EEBD329003D55A7 /* keyring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keyring.c; sourceTree = "<group>"; };
-		472C1D4A1EEBD329003D55A7 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
-		472C1D4B1EEBD329003D55A7 /* openssl_crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openssl_crypto.c; sourceTree = "<group>"; };
-		472C1D4C1EEBD329003D55A7 /* packet-parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "packet-parse.c"; sourceTree = "<group>"; };
-		472C1D4D1EEBD329003D55A7 /* packet-show.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "packet-show.c"; sourceTree = "<group>"; };
-		472C1D4E1EEBD329003D55A7 /* reader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reader.c; sourceTree = "<group>"; };
-		472C1D4F1EEBD329003D55A7 /* signature.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = signature.c; sourceTree = "<group>"; };
-		472C1D501EEBD329003D55A7 /* symmetric.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = symmetric.c; sourceTree = "<group>"; };
-		472C1D511EEBD329003D55A7 /* validate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = validate.c; sourceTree = "<group>"; };
-		472C1D521EEBD32A003D55A7 /* writer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = writer.c; sourceTree = "<group>"; };
-		472C1D531EEBD32A003D55A7 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		472C1D551EEBD32A003D55A7 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = "<group>"; };
-		472C1D561EEBD32A003D55A7 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = "<group>"; };
-		472C1D571EEBD32A003D55A7 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = "deltachat-core/LICENSE"; sourceTree = SOURCE_ROOT; };
-		472C1D591EEBD32A003D55A7 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
-		472C1D5A1EEBD32A003D55A7 /* mraheader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mraheader.c; sourceTree = "<group>"; };
-		472C1D5B1EEBD32A003D55A7 /* mraheader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mraheader.h; sourceTree = "<group>"; };
-		472C1D5C1EEBD32A003D55A7 /* mrapeerstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrapeerstate.c; sourceTree = "<group>"; };
-		472C1D5D1EEBD32A003D55A7 /* mrapeerstate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrapeerstate.h; sourceTree = "<group>"; };
-		472C1D5E1EEBD32A003D55A7 /* mrchat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrchat.c; sourceTree = "<group>"; };
-		472C1D5F1EEBD32A003D55A7 /* mrchat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrchat.h; sourceTree = "<group>"; };
-		472C1D601EEBD32A003D55A7 /* mrchatlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrchatlist.c; sourceTree = "<group>"; };
-		472C1D611EEBD32A003D55A7 /* mrchatlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrchatlist.h; sourceTree = "<group>"; };
-		472C1D621EEBD32A003D55A7 /* mrcmdline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrcmdline.c; sourceTree = "<group>"; };
-		472C1D631EEBD32A003D55A7 /* mrcmdline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrcmdline.h; sourceTree = "<group>"; };
-		472C1D641EEBD32A003D55A7 /* mrcontact.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrcontact.c; sourceTree = "<group>"; };
-		472C1D651EEBD32A003D55A7 /* mrcontact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrcontact.h; sourceTree = "<group>"; };
-		472C1D661EEBD32A003D55A7 /* mre2ee.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mre2ee.c; sourceTree = "<group>"; };
-		472C1D671EEBD32A003D55A7 /* mre2ee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mre2ee.h; sourceTree = "<group>"; };
-		472C1D681EEBD32A003D55A7 /* mre2ee_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mre2ee_driver.h; sourceTree = "<group>"; };
-		472C1D691EEBD32A003D55A7 /* mre2ee_driver_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mre2ee_driver_openssl.c; sourceTree = "<group>"; };
-		472C1D6A1EEBD32A003D55A7 /* mrimap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrimap.c; sourceTree = "<group>"; };
-		472C1D6B1EEBD32A003D55A7 /* mrimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrimap.h; sourceTree = "<group>"; };
-		472C1D6C1EEBD32A003D55A7 /* mrjob.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrjob.c; sourceTree = "<group>"; };
-		472C1D6D1EEBD32A003D55A7 /* mrjob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrjob.h; sourceTree = "<group>"; };
-		472C1D6E1EEBD32A003D55A7 /* mrkey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrkey.c; sourceTree = "<group>"; };
-		472C1D6F1EEBD32A003D55A7 /* mrkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrkey.h; sourceTree = "<group>"; };
-		472C1D701EEBD32A003D55A7 /* mrkeyring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrkeyring.c; sourceTree = "<group>"; };
-		472C1D711EEBD32A003D55A7 /* mrkeyring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrkeyring.h; sourceTree = "<group>"; };
-		472C1D721EEBD32A003D55A7 /* mrloginparam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrloginparam.c; sourceTree = "<group>"; };
-		472C1D731EEBD32A003D55A7 /* mrloginparam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrloginparam.h; sourceTree = "<group>"; };
-		472C1D741EEBD32A003D55A7 /* mrmailbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrmailbox.c; sourceTree = "<group>"; };
-		472C1D751EEBD32A003D55A7 /* mrmailbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrmailbox.h; sourceTree = "<group>"; };
-		472C1D761EEBD32A003D55A7 /* mrmailbox_configure.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrmailbox_configure.c; sourceTree = "<group>"; };
-		472C1D771EEBD32A003D55A7 /* mrmailbox_imex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrmailbox_imex.c; sourceTree = "<group>"; };
-		472C1D781EEBD32A003D55A7 /* mrmailbox_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrmailbox_log.c; sourceTree = "<group>"; };
-		472C1D791EEBD32A003D55A7 /* mrmimeparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrmimeparser.c; sourceTree = "<group>"; };
-		472C1D7A1EEBD32A003D55A7 /* mrmimeparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrmimeparser.h; sourceTree = "<group>"; };
-		472C1D7B1EEBD32A003D55A7 /* mrmsg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrmsg.c; sourceTree = "<group>"; };
-		472C1D7C1EEBD32A003D55A7 /* mrmsg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrmsg.h; sourceTree = "<group>"; };
-		472C1D7D1EEBD32A003D55A7 /* mrosnative.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrosnative.c; sourceTree = "<group>"; };
-		472C1D7E1EEBD32A003D55A7 /* mrosnative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrosnative.h; sourceTree = "<group>"; };
-		472C1D7F1EEBD32A003D55A7 /* mrparam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrparam.c; sourceTree = "<group>"; };
-		472C1D801EEBD32A003D55A7 /* mrparam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrparam.h; sourceTree = "<group>"; };
-		472C1D811EEBD32A003D55A7 /* mrpoortext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrpoortext.c; sourceTree = "<group>"; };
-		472C1D821EEBD32A003D55A7 /* mrpoortext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrpoortext.h; sourceTree = "<group>"; };
-		472C1D831EEBD32A003D55A7 /* mrsaxparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrsaxparser.c; sourceTree = "<group>"; };
-		472C1D841EEBD32A003D55A7 /* mrsaxparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrsaxparser.h; sourceTree = "<group>"; };
-		472C1D851EEBD32A003D55A7 /* mrsimplify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrsimplify.c; sourceTree = "<group>"; };
-		472C1D861EEBD32A003D55A7 /* mrsimplify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrsimplify.h; sourceTree = "<group>"; };
-		472C1D871EEBD32A003D55A7 /* mrsmtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrsmtp.c; sourceTree = "<group>"; };
-		472C1D881EEBD32A003D55A7 /* mrsmtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrsmtp.h; sourceTree = "<group>"; };
-		472C1D891EEBD32A003D55A7 /* mrsqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrsqlite3.c; sourceTree = "<group>"; };
-		472C1D8A1EEBD32A003D55A7 /* mrsqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrsqlite3.h; sourceTree = "<group>"; };
-		472C1D8B1EEBD32A003D55A7 /* mrstock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrstock.c; sourceTree = "<group>"; };
-		472C1D8C1EEBD32A003D55A7 /* mrstock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrstock.h; sourceTree = "<group>"; };
-		472C1D8D1EEBD32A003D55A7 /* mrtools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrtools.c; sourceTree = "<group>"; };
-		472C1D8E1EEBD32A003D55A7 /* mrtools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mrtools.h; sourceTree = "<group>"; };
-		472C1D8F1EEBD32A003D55A7 /* stress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stress.c; sourceTree = "<group>"; };
-		472C1D901EEBD32A003D55A7 /* stress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stress.h; sourceTree = "<group>"; };
 		472F39261E1277D2009260FB /* EnzevalosContact+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "EnzevalosContact+CoreDataClass.swift"; path = "../EnzevalosContact+CoreDataClass.swift"; sourceTree = "<group>"; };
 		472F39281E1277D2009260FB /* PersistentMail +CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "PersistentMail +CoreDataClass.swift"; path = "../PersistentMail +CoreDataClass.swift"; sourceTree = "<group>"; };
 		472F396D1E14F384009260FB /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -1080,11 +193,50 @@
 		472F398B1E2519C8009260FB /* CNContactExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNContactExtension.swift; sourceTree = "<group>"; };
 		472F398D1E251B8D009260FB /* MailAddress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MailAddress.swift; sourceTree = "<group>"; };
 		472F398F1E252470009260FB /* CNMailAddressesExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNMailAddressesExtension.swift; sourceTree = "<group>"; };
+		472FC12A1EEFC55E00585D38 /* autocryptgen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = autocryptgen.c; sourceTree = "<group>"; };
+		472FC12B1EEFC55E00585D38 /* autocryptgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autocryptgen.h; sourceTree = "<group>"; };
+		472FC12D1EEFC5E200585D38 /* PGPKeyGeneration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PGPKeyGeneration.swift; sourceTree = "<group>"; };
 		476142071E07E52B00FD5E4F /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
 		476142091E082F9C00FD5E4F /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		476373C11E09BA88004D5EFE /* UserData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserData.swift; sourceTree = "<group>"; };
 		47691A891ECB56D1004BCFC5 /* Mail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mail.swift; sourceTree = "<group>"; };
 		47691A8B1ECC3EC7004BCFC5 /* EphemeralMail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EphemeralMail.swift; sourceTree = "<group>"; };
+		47F963651EEFC36F00460308 /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; };
+		47F963661EEFC36F00460308 /* create.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = create.c; sourceTree = "<group>"; };
+		47F963671EEFC36F00460308 /* crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypto.c; sourceTree = "<group>"; };
+		47F9636A1EEFC36F00460308 /* keyring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keyring.c; sourceTree = "<group>"; };
+		47F9636B1EEFC36F00460308 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
+		47F9636D1EEFC36F00460308 /* config-netpgp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-netpgp.h"; sourceTree = "<group>"; };
+		47F9636E1EEFC36F00460308 /* config-original-as-configured-for-ubuntu-16.04-64bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-original-as-configured-for-ubuntu-16.04-64bit.h"; sourceTree = "<group>"; };
+		47F9636F1EEFC36F00460308 /* config-pep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-pep.h"; sourceTree = "<group>"; };
+		47F963701EEFC36F00460308 /* create.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = create.h; sourceTree = "<group>"; };
+		47F963711EEFC36F00460308 /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto.h; sourceTree = "<group>"; };
+		47F963721EEFC36F00460308 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };
+		47F963731EEFC36F00460308 /* errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = errors.h; sourceTree = "<group>"; };
+		47F963741EEFC36F00460308 /* keyring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyring.h; sourceTree = "<group>"; };
+		47F963751EEFC36F00460308 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
+		47F963761EEFC36F00460308 /* netpgpdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netpgpdefs.h; sourceTree = "<group>"; };
+		47F963771EEFC36F00460308 /* netpgpdigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netpgpdigest.h; sourceTree = "<group>"; };
+		47F963781EEFC36F00460308 /* netpgpsdk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netpgpsdk.h; sourceTree = "<group>"; };
+		47F963791EEFC36F00460308 /* openssl11stub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = openssl11stub.h; sourceTree = "<group>"; };
+		47F9637A1EEFC36F00460308 /* packet-parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "packet-parse.h"; sourceTree = "<group>"; };
+		47F9637B1EEFC36F00460308 /* packet-show.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "packet-show.h"; sourceTree = "<group>"; };
+		47F9637C1EEFC36F00460308 /* packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = packet.h; sourceTree = "<group>"; };
+		47F9637D1EEFC36F00460308 /* readerwriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = readerwriter.h; sourceTree = "<group>"; };
+		47F9637E1EEFC36F00460308 /* signature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = signature.h; sourceTree = "<group>"; };
+		47F9637F1EEFC36F00460308 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+		47F963801EEFC36F00460308 /* validate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = validate.h; sourceTree = "<group>"; };
+		47F963811EEFC36F00460308 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
+		47F963821EEFC36F00460308 /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = "<group>"; };
+		47F963831EEFC36F00460308 /* netpgp-extra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "netpgp-extra.h"; sourceTree = "<group>"; };
+		47F963841EEFC36F00460308 /* openssl_crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openssl_crypto.c; sourceTree = "<group>"; };
+		47F963851EEFC36F00460308 /* packet-parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "packet-parse.c"; sourceTree = "<group>"; };
+		47F963861EEFC36F00460308 /* packet-show.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "packet-show.c"; sourceTree = "<group>"; };
+		47F963891EEFC36F00460308 /* reader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reader.c; sourceTree = "<group>"; };
+		47F9638A1EEFC36F00460308 /* signature.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = signature.c; sourceTree = "<group>"; };
+		47F9638B1EEFC36F00460308 /* symmetric.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = symmetric.c; sourceTree = "<group>"; };
+		47F9638C1EEFC36F00460308 /* validate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = validate.c; sourceTree = "<group>"; };
+		47F9638D1EEFC36F00460308 /* writer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = writer.c; sourceTree = "<group>"; };
 		48FB10FF406523D174F4202A /* Pods_enzevalos_iphoneUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_enzevalos_iphoneUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4AE42F42E91A1BFBF1D5BF6A /* Pods_enzevalos_iphone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_enzevalos_iphone.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		796D16D79BED5D60B580E602 /* Pods-enzevalos_iphoneUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphoneUITests.release.xcconfig"; path = "../workspace/Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests.release.xcconfig"; sourceTree = "<group>"; };
@@ -1297,998 +449,6 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
-		472C1ACF1EEBD329003D55A7 /* libs */ = {
-			isa = PBXGroup;
-			children = (
-				472C1AD01EEBD329003D55A7 /* libetpan */,
-				472C1D2B1EEBD329003D55A7 /* netpgp */,
-				472C1D531EEBD32A003D55A7 /* README.md */,
-				472C1D541EEBD32A003D55A7 /* sqlite */,
-			);
-			name = libs;
-			path = "deltachat-core/libs";
-			sourceTree = SOURCE_ROOT;
-		};
-		472C1AD01EEBD329003D55A7 /* libetpan */ = {
-			isa = PBXGroup;
-			children = (
-				472C1AD11EEBD329003D55A7 /* AUTHORS */,
-				472C1AD21EEBD329003D55A7 /* ChangeLog */,
-				472C1AD31EEBD329003D55A7 /* COPYRIGHT */,
-				472C1AD41EEBD329003D55A7 /* include */,
-				472C1B7A1EEBD329003D55A7 /* NEWS */,
-				472C1B7B1EEBD329003D55A7 /* README.md */,
-				472C1B7C1EEBD329003D55A7 /* src */,
-			);
-			path = libetpan;
-			sourceTree = "<group>";
-		};
-		472C1AD41EEBD329003D55A7 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				472C1AD51EEBD329003D55A7 /* libetpan */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		472C1AD51EEBD329003D55A7 /* libetpan */ = {
-			isa = PBXGroup;
-			children = (
-				472C1AD61EEBD329003D55A7 /* acl.h */,
-				472C1AD71EEBD329003D55A7 /* acl_types.h */,
-				472C1AD81EEBD329003D55A7 /* annotatemore.h */,
-				472C1AD91EEBD329003D55A7 /* annotatemore_types.h */,
-				472C1ADA1EEBD329003D55A7 /* carray.h */,
-				472C1ADB1EEBD329003D55A7 /* charconv.h */,
-				472C1ADC1EEBD329003D55A7 /* chash.h */,
-				472C1ADD1EEBD329003D55A7 /* clist.h */,
-				472C1ADE1EEBD329003D55A7 /* condstore.h */,
-				472C1ADF1EEBD329003D55A7 /* condstore_types.h */,
-				472C1AE01EEBD329003D55A7 /* config.h */,
-				472C1AE11EEBD329003D55A7 /* data_message_driver.h */,
-				472C1AE21EEBD329003D55A7 /* dbdriver.h */,
-				472C1AE31EEBD329003D55A7 /* dbdriver_message.h */,
-				472C1AE41EEBD329003D55A7 /* dbdriver_types.h */,
-				472C1AE51EEBD329003D55A7 /* dbstorage.h */,
-				472C1AE61EEBD329003D55A7 /* enable.h */,
-				472C1AE71EEBD329003D55A7 /* feeddriver.h */,
-				472C1AE81EEBD329003D55A7 /* feeddriver_message.h */,
-				472C1AE91EEBD329003D55A7 /* feeddriver_types.h */,
-				472C1AEA1EEBD329003D55A7 /* feedstorage.h */,
-				472C1AEB1EEBD329003D55A7 /* generic_cache_types.h */,
-				472C1AEC1EEBD329003D55A7 /* hotmailstorage.h */,
-				472C1AED1EEBD329003D55A7 /* idle.h */,
-				472C1AEE1EEBD329003D55A7 /* imapdriver.h */,
-				472C1AEF1EEBD329003D55A7 /* imapdriver_cached.h */,
-				472C1AF01EEBD329003D55A7 /* imapdriver_cached_message.h */,
-				472C1AF11EEBD329003D55A7 /* imapdriver_message.h */,
-				472C1AF21EEBD329003D55A7 /* imapdriver_tools.h */,
-				472C1AF31EEBD329003D55A7 /* imapdriver_tools_private.h */,
-				472C1AF41EEBD329003D55A7 /* imapdriver_types.h */,
-				472C1AF51EEBD329003D55A7 /* imapstorage.h */,
-				472C1AF61EEBD329003D55A7 /* libetpan-config.h */,
-				472C1AF71EEBD329003D55A7 /* libetpan.h */,
-				472C1AF81EEBD329003D55A7 /* libetpan_version.h */,
-				472C1AF91EEBD329003D55A7 /* mail.h */,
-				472C1AFA1EEBD329003D55A7 /* maildir.h */,
-				472C1AFB1EEBD329003D55A7 /* maildir_types.h */,
-				472C1AFC1EEBD329003D55A7 /* maildirdriver.h */,
-				472C1AFD1EEBD329003D55A7 /* maildirdriver_cached.h */,
-				472C1AFE1EEBD329003D55A7 /* maildirdriver_cached_message.h */,
-				472C1AFF1EEBD329003D55A7 /* maildirdriver_message.h */,
-				472C1B001EEBD329003D55A7 /* maildirdriver_types.h */,
-				472C1B011EEBD329003D55A7 /* maildirstorage.h */,
-				472C1B021EEBD329003D55A7 /* maildriver.h */,
-				472C1B031EEBD329003D55A7 /* maildriver_errors.h */,
-				472C1B041EEBD329003D55A7 /* maildriver_types.h */,
-				472C1B051EEBD329003D55A7 /* maildriver_types_helper.h */,
-				472C1B061EEBD329003D55A7 /* mailengine.h */,
-				472C1B071EEBD329003D55A7 /* mailfolder.h */,
-				472C1B081EEBD329003D55A7 /* mailimap.h */,
-				472C1B091EEBD329003D55A7 /* mailimap_compress.h */,
-				472C1B0A1EEBD329003D55A7 /* mailimap_extension.h */,
-				472C1B0B1EEBD329003D55A7 /* mailimap_extension_types.h */,
-				472C1B0C1EEBD329003D55A7 /* mailimap_helper.h */,
-				472C1B0D1EEBD329003D55A7 /* mailimap_id.h */,
-				472C1B0E1EEBD329003D55A7 /* mailimap_id_types.h */,
-				472C1B0F1EEBD329003D55A7 /* mailimap_oauth2.h */,
-				472C1B101EEBD329003D55A7 /* mailimap_socket.h */,
-				472C1B111EEBD329003D55A7 /* mailimap_sort.h */,
-				472C1B121EEBD329003D55A7 /* mailimap_sort_types.h */,
-				472C1B131EEBD329003D55A7 /* mailimap_ssl.h */,
-				472C1B141EEBD329003D55A7 /* mailimap_types.h */,
-				472C1B151EEBD329003D55A7 /* mailimap_types_helper.h */,
-				472C1B161EEBD329003D55A7 /* mailimf.h */,
-				472C1B171EEBD329003D55A7 /* mailimf_types.h */,
-				472C1B181EEBD329003D55A7 /* mailimf_types_helper.h */,
-				472C1B191EEBD329003D55A7 /* mailimf_write_file.h */,
-				472C1B1A1EEBD329003D55A7 /* mailimf_write_generic.h */,
-				472C1B1B1EEBD329003D55A7 /* mailimf_write_mem.h */,
-				472C1B1C1EEBD329003D55A7 /* maillock.h */,
-				472C1B1D1EEBD329003D55A7 /* mailmbox.h */,
-				472C1B1E1EEBD329003D55A7 /* mailmbox_types.h */,
-				472C1B1F1EEBD329003D55A7 /* mailmessage.h */,
-				472C1B201EEBD329003D55A7 /* mailmessage_types.h */,
-				472C1B211EEBD329003D55A7 /* mailmh.h */,
-				472C1B221EEBD329003D55A7 /* mailmime.h */,
-				472C1B231EEBD329003D55A7 /* mailmime_content.h */,
-				472C1B241EEBD329003D55A7 /* mailmime_decode.h */,
-				472C1B251EEBD329003D55A7 /* mailmime_disposition.h */,
-				472C1B261EEBD329003D55A7 /* mailmime_types.h */,
-				472C1B271EEBD329003D55A7 /* mailmime_types_helper.h */,
-				472C1B281EEBD329003D55A7 /* mailmime_write_file.h */,
-				472C1B291EEBD329003D55A7 /* mailmime_write_generic.h */,
-				472C1B2A1EEBD329003D55A7 /* mailmime_write_mem.h */,
-				472C1B2B1EEBD329003D55A7 /* mailpop3.h */,
-				472C1B2C1EEBD329003D55A7 /* mailpop3_helper.h */,
-				472C1B2D1EEBD329003D55A7 /* mailpop3_socket.h */,
-				472C1B2E1EEBD329003D55A7 /* mailpop3_ssl.h */,
-				472C1B2F1EEBD329003D55A7 /* mailpop3_types.h */,
-				472C1B301EEBD329003D55A7 /* mailprivacy.h */,
-				472C1B311EEBD329003D55A7 /* mailprivacy_gnupg.h */,
-				472C1B321EEBD329003D55A7 /* mailprivacy_smime.h */,
-				472C1B331EEBD329003D55A7 /* mailprivacy_tools.h */,
-				472C1B341EEBD329003D55A7 /* mailprivacy_types.h */,
-				472C1B351EEBD329003D55A7 /* mailsem.h */,
-				472C1B361EEBD329003D55A7 /* mailsmtp.h */,
-				472C1B371EEBD329003D55A7 /* mailsmtp_helper.h */,
-				472C1B381EEBD329003D55A7 /* mailsmtp_oauth2.h */,
-				472C1B391EEBD329003D55A7 /* mailsmtp_socket.h */,
-				472C1B3A1EEBD329003D55A7 /* mailsmtp_ssl.h */,
-				472C1B3B1EEBD329003D55A7 /* mailsmtp_types.h */,
-				472C1B3C1EEBD329003D55A7 /* mailstorage.h */,
-				472C1B3D1EEBD329003D55A7 /* mailstorage_types.h */,
-				472C1B3E1EEBD329003D55A7 /* mailstream.h */,
-				472C1B3F1EEBD329003D55A7 /* mailstream_cfstream.h */,
-				472C1B401EEBD329003D55A7 /* mailstream_compress.h */,
-				472C1B411EEBD329003D55A7 /* mailstream_helper.h */,
-				472C1B421EEBD329003D55A7 /* mailstream_low.h */,
-				472C1B431EEBD329003D55A7 /* mailstream_socket.h */,
-				472C1B441EEBD329003D55A7 /* mailstream_ssl.h */,
-				472C1B451EEBD329003D55A7 /* mailstream_types.h */,
-				472C1B461EEBD329003D55A7 /* mailthread.h */,
-				472C1B471EEBD329003D55A7 /* mailthread_types.h */,
-				472C1B481EEBD329003D55A7 /* mboxdriver.h */,
-				472C1B491EEBD329003D55A7 /* mboxdriver_cached.h */,
-				472C1B4A1EEBD329003D55A7 /* mboxdriver_cached_message.h */,
-				472C1B4B1EEBD329003D55A7 /* mboxdriver_message.h */,
-				472C1B4C1EEBD329003D55A7 /* mboxdriver_types.h */,
-				472C1B4D1EEBD329003D55A7 /* mboxstorage.h */,
-				472C1B4E1EEBD329003D55A7 /* mhdriver.h */,
-				472C1B4F1EEBD329003D55A7 /* mhdriver_cached.h */,
-				472C1B501EEBD329003D55A7 /* mhdriver_cached_message.h */,
-				472C1B511EEBD329003D55A7 /* mhdriver_message.h */,
-				472C1B521EEBD329003D55A7 /* mhdriver_types.h */,
-				472C1B531EEBD329003D55A7 /* mhstorage.h */,
-				472C1B541EEBD329003D55A7 /* mime_message_driver.h */,
-				472C1B551EEBD329003D55A7 /* mmapstring.h */,
-				472C1B561EEBD329003D55A7 /* namespace.h */,
-				472C1B571EEBD329003D55A7 /* namespace_parser.h */,
-				472C1B581EEBD329003D55A7 /* namespace_sender.h */,
-				472C1B591EEBD329003D55A7 /* namespace_types.h */,
-				472C1B5A1EEBD329003D55A7 /* newsfeed.h */,
-				472C1B5B1EEBD329003D55A7 /* newsfeed_item.h */,
-				472C1B5C1EEBD329003D55A7 /* newsfeed_item_enclosure.h */,
-				472C1B5D1EEBD329003D55A7 /* newsfeed_types.h */,
-				472C1B5E1EEBD329003D55A7 /* newsnntp.h */,
-				472C1B5F1EEBD329003D55A7 /* newsnntp_socket.h */,
-				472C1B601EEBD329003D55A7 /* newsnntp_ssl.h */,
-				472C1B611EEBD329003D55A7 /* newsnntp_types.h */,
-				472C1B621EEBD329003D55A7 /* nntpdriver.h */,
-				472C1B631EEBD329003D55A7 /* nntpdriver_cached.h */,
-				472C1B641EEBD329003D55A7 /* nntpdriver_cached_message.h */,
-				472C1B651EEBD329003D55A7 /* nntpdriver_message.h */,
-				472C1B661EEBD329003D55A7 /* nntpdriver_types.h */,
-				472C1B671EEBD329003D55A7 /* nntpstorage.h */,
-				472C1B681EEBD329003D55A7 /* pop3driver.h */,
-				472C1B691EEBD329003D55A7 /* pop3driver_cached.h */,
-				472C1B6A1EEBD329003D55A7 /* pop3driver_cached_message.h */,
-				472C1B6B1EEBD329003D55A7 /* pop3driver_message.h */,
-				472C1B6C1EEBD329003D55A7 /* pop3driver_types.h */,
-				472C1B6D1EEBD329003D55A7 /* pop3storage.h */,
-				472C1B6E1EEBD329003D55A7 /* qresync.h */,
-				472C1B6F1EEBD329003D55A7 /* qresync_types.h */,
-				472C1B701EEBD329003D55A7 /* quota.h */,
-				472C1B711EEBD329003D55A7 /* quota_parser.h */,
-				472C1B721EEBD329003D55A7 /* quota_sender.h */,
-				472C1B731EEBD329003D55A7 /* quota_types.h */,
-				472C1B741EEBD329003D55A7 /* uidplus.h */,
-				472C1B751EEBD329003D55A7 /* uidplus_types.h */,
-				472C1B761EEBD329003D55A7 /* xgmlabels.h */,
-				472C1B771EEBD329003D55A7 /* xgmmsgid.h */,
-				472C1B781EEBD329003D55A7 /* xgmthrid.h */,
-				472C1B791EEBD329003D55A7 /* xlist.h */,
-			);
-			path = libetpan;
-			sourceTree = "<group>";
-		};
-		472C1B7C1EEBD329003D55A7 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				472C1B7D1EEBD329003D55A7 /* bsd */,
-				472C1B811EEBD329003D55A7 /* data-types */,
-				472C1BB61EEBD329003D55A7 /* driver */,
-				472C1C481EEBD329003D55A7 /* engine */,
-				472C1C551EEBD329003D55A7 /* low-level */,
-				472C1D261EEBD329003D55A7 /* main */,
-			);
-			path = src;
-			sourceTree = "<group>";
-		};
-		472C1B7D1EEBD329003D55A7 /* bsd */ = {
-			isa = PBXGroup;
-			children = (
-				472C1B7E1EEBD329003D55A7 /* getopt.c */,
-				472C1B7F1EEBD329003D55A7 /* getopt.h */,
-				472C1B801EEBD329003D55A7 /* getopt_long.c */,
-			);
-			path = bsd;
-			sourceTree = "<group>";
-		};
-		472C1B811EEBD329003D55A7 /* data-types */ = {
-			isa = PBXGroup;
-			children = (
-				472C1B821EEBD329003D55A7 /* base64.c */,
-				472C1B831EEBD329003D55A7 /* base64.h */,
-				472C1B841EEBD329003D55A7 /* carray.c */,
-				472C1B851EEBD329003D55A7 /* carray.h */,
-				472C1B861EEBD329003D55A7 /* charconv.c */,
-				472C1B871EEBD329003D55A7 /* charconv.h */,
-				472C1B881EEBD329003D55A7 /* chash.c */,
-				472C1B891EEBD329003D55A7 /* chash.h */,
-				472C1B8A1EEBD329003D55A7 /* clist.c */,
-				472C1B8B1EEBD329003D55A7 /* clist.h */,
-				472C1B8C1EEBD329003D55A7 /* connect.c */,
-				472C1B8D1EEBD329003D55A7 /* connect.h */,
-				472C1B8E1EEBD329003D55A7 /* hmac-md5.h */,
-				472C1B8F1EEBD329003D55A7 /* mail.h */,
-				472C1B901EEBD329003D55A7 /* mail_cache_db.c */,
-				472C1B911EEBD329003D55A7 /* mail_cache_db.h */,
-				472C1B921EEBD329003D55A7 /* mail_cache_db_types.h */,
-				472C1B931EEBD329003D55A7 /* maillock.c */,
-				472C1B941EEBD329003D55A7 /* maillock.h */,
-				472C1B951EEBD329003D55A7 /* mailsasl.c */,
-				472C1B961EEBD329003D55A7 /* mailsasl.h */,
-				472C1B971EEBD329003D55A7 /* mailsasl_private.h */,
-				472C1B981EEBD329003D55A7 /* mailsem.c */,
-				472C1B991EEBD329003D55A7 /* mailsem.h */,
-				472C1B9A1EEBD329003D55A7 /* mailstream.c */,
-				472C1B9B1EEBD329003D55A7 /* mailstream.h */,
-				472C1B9C1EEBD329003D55A7 /* mailstream_cancel.c */,
-				472C1B9D1EEBD329003D55A7 /* mailstream_cancel.h */,
-				472C1B9E1EEBD329003D55A7 /* mailstream_cancel_types.h */,
-				472C1B9F1EEBD329003D55A7 /* mailstream_cfstream.c */,
-				472C1BA01EEBD329003D55A7 /* mailstream_cfstream.h */,
-				472C1BA11EEBD329003D55A7 /* mailstream_compress.c */,
-				472C1BA21EEBD329003D55A7 /* mailstream_compress.h */,
-				472C1BA31EEBD329003D55A7 /* mailstream_helper.c */,
-				472C1BA41EEBD329003D55A7 /* mailstream_helper.h */,
-				472C1BA51EEBD329003D55A7 /* mailstream_low.c */,
-				472C1BA61EEBD329003D55A7 /* mailstream_low.h */,
-				472C1BA71EEBD329003D55A7 /* mailstream_socket.c */,
-				472C1BA81EEBD329003D55A7 /* mailstream_socket.h */,
-				472C1BA91EEBD329003D55A7 /* mailstream_ssl.c */,
-				472C1BAA1EEBD329003D55A7 /* mailstream_ssl.h */,
-				472C1BAB1EEBD329003D55A7 /* mailstream_ssl_private.h */,
-				472C1BAC1EEBD329003D55A7 /* mailstream_types.h */,
-				472C1BAD1EEBD329003D55A7 /* md5.c */,
-				472C1BAE1EEBD329003D55A7 /* md5.h */,
-				472C1BAF1EEBD329003D55A7 /* md5global.h */,
-				472C1BB01EEBD329003D55A7 /* md5namespace.h */,
-				472C1BB11EEBD329003D55A7 /* mmapstring.c */,
-				472C1BB21EEBD329003D55A7 /* mmapstring.h */,
-				472C1BB31EEBD329003D55A7 /* mmapstring_private.h */,
-				472C1BB41EEBD329003D55A7 /* timeutils.c */,
-				472C1BB51EEBD329003D55A7 /* timeutils.h */,
-			);
-			path = "data-types";
-			sourceTree = "<group>";
-		};
-		472C1BB61EEBD329003D55A7 /* driver */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BB71EEBD329003D55A7 /* implementation */,
-				472C1C261EEBD329003D55A7 /* interface */,
-				472C1C3D1EEBD329003D55A7 /* TODO */,
-				472C1C3E1EEBD329003D55A7 /* tools */,
-			);
-			path = driver;
-			sourceTree = "<group>";
-		};
-		472C1BB71EEBD329003D55A7 /* implementation */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BB81EEBD329003D55A7 /* data-message */,
-				472C1BBB1EEBD329003D55A7 /* db */,
-				472C1BC31EEBD329003D55A7 /* feed */,
-				472C1BCB1EEBD329003D55A7 /* hotmail */,
-				472C1BCE1EEBD329003D55A7 /* imap */,
-				472C1BDD1EEBD329003D55A7 /* maildir */,
-				472C1BEB1EEBD329003D55A7 /* mbox */,
-				472C1BF91EEBD329003D55A7 /* mh */,
-				472C1C071EEBD329003D55A7 /* mime-message */,
-				472C1C0A1EEBD329003D55A7 /* nntp */,
-				472C1C181EEBD329003D55A7 /* pop3 */,
-			);
-			path = implementation;
-			sourceTree = "<group>";
-		};
-		472C1BB81EEBD329003D55A7 /* data-message */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BB91EEBD329003D55A7 /* data_message_driver.c */,
-				472C1BBA1EEBD329003D55A7 /* data_message_driver.h */,
-			);
-			path = "data-message";
-			sourceTree = "<group>";
-		};
-		472C1BBB1EEBD329003D55A7 /* db */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BBC1EEBD329003D55A7 /* dbdriver.c */,
-				472C1BBD1EEBD329003D55A7 /* dbdriver.h */,
-				472C1BBE1EEBD329003D55A7 /* dbdriver_message.c */,
-				472C1BBF1EEBD329003D55A7 /* dbdriver_message.h */,
-				472C1BC01EEBD329003D55A7 /* dbdriver_types.h */,
-				472C1BC11EEBD329003D55A7 /* dbstorage.c */,
-				472C1BC21EEBD329003D55A7 /* dbstorage.h */,
-			);
-			path = db;
-			sourceTree = "<group>";
-		};
-		472C1BC31EEBD329003D55A7 /* feed */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BC41EEBD329003D55A7 /* feeddriver.c */,
-				472C1BC51EEBD329003D55A7 /* feeddriver.h */,
-				472C1BC61EEBD329003D55A7 /* feeddriver_message.c */,
-				472C1BC71EEBD329003D55A7 /* feeddriver_message.h */,
-				472C1BC81EEBD329003D55A7 /* feeddriver_types.h */,
-				472C1BC91EEBD329003D55A7 /* feedstorage.c */,
-				472C1BCA1EEBD329003D55A7 /* feedstorage.h */,
-			);
-			path = feed;
-			sourceTree = "<group>";
-		};
-		472C1BCB1EEBD329003D55A7 /* hotmail */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BCC1EEBD329003D55A7 /* hotmailstorage.c */,
-				472C1BCD1EEBD329003D55A7 /* hotmailstorage.h */,
-			);
-			path = hotmail;
-			sourceTree = "<group>";
-		};
-		472C1BCE1EEBD329003D55A7 /* imap */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BCF1EEBD329003D55A7 /* imapdriver.c */,
-				472C1BD01EEBD329003D55A7 /* imapdriver.h */,
-				472C1BD11EEBD329003D55A7 /* imapdriver_cached.c */,
-				472C1BD21EEBD329003D55A7 /* imapdriver_cached.h */,
-				472C1BD31EEBD329003D55A7 /* imapdriver_cached_message.c */,
-				472C1BD41EEBD329003D55A7 /* imapdriver_cached_message.h */,
-				472C1BD51EEBD329003D55A7 /* imapdriver_message.c */,
-				472C1BD61EEBD329003D55A7 /* imapdriver_message.h */,
-				472C1BD71EEBD329003D55A7 /* imapdriver_tools.c */,
-				472C1BD81EEBD329003D55A7 /* imapdriver_tools.h */,
-				472C1BD91EEBD329003D55A7 /* imapdriver_tools_private.h */,
-				472C1BDA1EEBD329003D55A7 /* imapdriver_types.h */,
-				472C1BDB1EEBD329003D55A7 /* imapstorage.c */,
-				472C1BDC1EEBD329003D55A7 /* imapstorage.h */,
-			);
-			path = imap;
-			sourceTree = "<group>";
-		};
-		472C1BDD1EEBD329003D55A7 /* maildir */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BDE1EEBD329003D55A7 /* maildirdriver.c */,
-				472C1BDF1EEBD329003D55A7 /* maildirdriver.h */,
-				472C1BE01EEBD329003D55A7 /* maildirdriver_cached.c */,
-				472C1BE11EEBD329003D55A7 /* maildirdriver_cached.h */,
-				472C1BE21EEBD329003D55A7 /* maildirdriver_cached_message.c */,
-				472C1BE31EEBD329003D55A7 /* maildirdriver_cached_message.h */,
-				472C1BE41EEBD329003D55A7 /* maildirdriver_message.c */,
-				472C1BE51EEBD329003D55A7 /* maildirdriver_message.h */,
-				472C1BE61EEBD329003D55A7 /* maildirdriver_tools.c */,
-				472C1BE71EEBD329003D55A7 /* maildirdriver_tools.h */,
-				472C1BE81EEBD329003D55A7 /* maildirdriver_types.h */,
-				472C1BE91EEBD329003D55A7 /* maildirstorage.c */,
-				472C1BEA1EEBD329003D55A7 /* maildirstorage.h */,
-			);
-			path = maildir;
-			sourceTree = "<group>";
-		};
-		472C1BEB1EEBD329003D55A7 /* mbox */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BEC1EEBD329003D55A7 /* mboxdriver.c */,
-				472C1BED1EEBD329003D55A7 /* mboxdriver.h */,
-				472C1BEE1EEBD329003D55A7 /* mboxdriver_cached.c */,
-				472C1BEF1EEBD329003D55A7 /* mboxdriver_cached.h */,
-				472C1BF01EEBD329003D55A7 /* mboxdriver_cached_message.c */,
-				472C1BF11EEBD329003D55A7 /* mboxdriver_cached_message.h */,
-				472C1BF21EEBD329003D55A7 /* mboxdriver_message.c */,
-				472C1BF31EEBD329003D55A7 /* mboxdriver_message.h */,
-				472C1BF41EEBD329003D55A7 /* mboxdriver_tools.c */,
-				472C1BF51EEBD329003D55A7 /* mboxdriver_tools.h */,
-				472C1BF61EEBD329003D55A7 /* mboxdriver_types.h */,
-				472C1BF71EEBD329003D55A7 /* mboxstorage.c */,
-				472C1BF81EEBD329003D55A7 /* mboxstorage.h */,
-			);
-			path = mbox;
-			sourceTree = "<group>";
-		};
-		472C1BF91EEBD329003D55A7 /* mh */ = {
-			isa = PBXGroup;
-			children = (
-				472C1BFA1EEBD329003D55A7 /* mhdriver.c */,
-				472C1BFB1EEBD329003D55A7 /* mhdriver.h */,
-				472C1BFC1EEBD329003D55A7 /* mhdriver_cached.c */,
-				472C1BFD1EEBD329003D55A7 /* mhdriver_cached.h */,
-				472C1BFE1EEBD329003D55A7 /* mhdriver_cached_message.c */,
-				472C1BFF1EEBD329003D55A7 /* mhdriver_cached_message.h */,
-				472C1C001EEBD329003D55A7 /* mhdriver_message.c */,
-				472C1C011EEBD329003D55A7 /* mhdriver_message.h */,
-				472C1C021EEBD329003D55A7 /* mhdriver_tools.c */,
-				472C1C031EEBD329003D55A7 /* mhdriver_tools.h */,
-				472C1C041EEBD329003D55A7 /* mhdriver_types.h */,
-				472C1C051EEBD329003D55A7 /* mhstorage.c */,
-				472C1C061EEBD329003D55A7 /* mhstorage.h */,
-			);
-			path = mh;
-			sourceTree = "<group>";
-		};
-		472C1C071EEBD329003D55A7 /* mime-message */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C081EEBD329003D55A7 /* mime_message_driver.c */,
-				472C1C091EEBD329003D55A7 /* mime_message_driver.h */,
-			);
-			path = "mime-message";
-			sourceTree = "<group>";
-		};
-		472C1C0A1EEBD329003D55A7 /* nntp */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C0B1EEBD329003D55A7 /* nntpdriver.c */,
-				472C1C0C1EEBD329003D55A7 /* nntpdriver.h */,
-				472C1C0D1EEBD329003D55A7 /* nntpdriver_cached.c */,
-				472C1C0E1EEBD329003D55A7 /* nntpdriver_cached.h */,
-				472C1C0F1EEBD329003D55A7 /* nntpdriver_cached_message.c */,
-				472C1C101EEBD329003D55A7 /* nntpdriver_cached_message.h */,
-				472C1C111EEBD329003D55A7 /* nntpdriver_message.c */,
-				472C1C121EEBD329003D55A7 /* nntpdriver_message.h */,
-				472C1C131EEBD329003D55A7 /* nntpdriver_tools.c */,
-				472C1C141EEBD329003D55A7 /* nntpdriver_tools.h */,
-				472C1C151EEBD329003D55A7 /* nntpdriver_types.h */,
-				472C1C161EEBD329003D55A7 /* nntpstorage.c */,
-				472C1C171EEBD329003D55A7 /* nntpstorage.h */,
-			);
-			path = nntp;
-			sourceTree = "<group>";
-		};
-		472C1C181EEBD329003D55A7 /* pop3 */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C191EEBD329003D55A7 /* pop3driver.c */,
-				472C1C1A1EEBD329003D55A7 /* pop3driver.h */,
-				472C1C1B1EEBD329003D55A7 /* pop3driver_cached.c */,
-				472C1C1C1EEBD329003D55A7 /* pop3driver_cached.h */,
-				472C1C1D1EEBD329003D55A7 /* pop3driver_cached_message.c */,
-				472C1C1E1EEBD329003D55A7 /* pop3driver_cached_message.h */,
-				472C1C1F1EEBD329003D55A7 /* pop3driver_message.c */,
-				472C1C201EEBD329003D55A7 /* pop3driver_message.h */,
-				472C1C211EEBD329003D55A7 /* pop3driver_tools.c */,
-				472C1C221EEBD329003D55A7 /* pop3driver_tools.h */,
-				472C1C231EEBD329003D55A7 /* pop3driver_types.h */,
-				472C1C241EEBD329003D55A7 /* pop3storage.c */,
-				472C1C251EEBD329003D55A7 /* pop3storage.h */,
-			);
-			path = pop3;
-			sourceTree = "<group>";
-		};
-		472C1C261EEBD329003D55A7 /* interface */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C271EEBD329003D55A7 /* maildriver.c */,
-				472C1C281EEBD329003D55A7 /* maildriver.h */,
-				472C1C291EEBD329003D55A7 /* maildriver_errors.h */,
-				472C1C2A1EEBD329003D55A7 /* maildriver_tools.c */,
-				472C1C2B1EEBD329003D55A7 /* maildriver_tools.h */,
-				472C1C2C1EEBD329003D55A7 /* maildriver_types.c */,
-				472C1C2D1EEBD329003D55A7 /* maildriver_types.h */,
-				472C1C2E1EEBD329003D55A7 /* maildriver_types_helper.c */,
-				472C1C2F1EEBD329003D55A7 /* maildriver_types_helper.h */,
-				472C1C301EEBD329003D55A7 /* mailfolder.c */,
-				472C1C311EEBD329003D55A7 /* mailfolder.h */,
-				472C1C321EEBD329003D55A7 /* mailmessage.c */,
-				472C1C331EEBD329003D55A7 /* mailmessage.h */,
-				472C1C341EEBD329003D55A7 /* mailmessage_tools.c */,
-				472C1C351EEBD329003D55A7 /* mailmessage_tools.h */,
-				472C1C361EEBD329003D55A7 /* mailmessage_types.c */,
-				472C1C371EEBD329003D55A7 /* mailmessage_types.h */,
-				472C1C381EEBD329003D55A7 /* mailstorage.c */,
-				472C1C391EEBD329003D55A7 /* mailstorage.h */,
-				472C1C3A1EEBD329003D55A7 /* mailstorage_tools.c */,
-				472C1C3B1EEBD329003D55A7 /* mailstorage_tools.h */,
-				472C1C3C1EEBD329003D55A7 /* mailstorage_types.h */,
-			);
-			path = interface;
-			sourceTree = "<group>";
-		};
-		472C1C3E1EEBD329003D55A7 /* tools */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C3F1EEBD329003D55A7 /* generic_cache.c */,
-				472C1C401EEBD329003D55A7 /* generic_cache.h */,
-				472C1C411EEBD329003D55A7 /* generic_cache_types.h */,
-				472C1C421EEBD329003D55A7 /* imfcache.c */,
-				472C1C431EEBD329003D55A7 /* imfcache.h */,
-				472C1C441EEBD329003D55A7 /* mailthread.c */,
-				472C1C451EEBD329003D55A7 /* mailthread.h */,
-				472C1C461EEBD329003D55A7 /* mailthread_types.c */,
-				472C1C471EEBD329003D55A7 /* mailthread_types.h */,
-			);
-			path = tools;
-			sourceTree = "<group>";
-		};
-		472C1C481EEBD329003D55A7 /* engine */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C491EEBD329003D55A7 /* mailengine.c */,
-				472C1C4A1EEBD329003D55A7 /* mailengine.h */,
-				472C1C4B1EEBD329003D55A7 /* mailprivacy.c */,
-				472C1C4C1EEBD329003D55A7 /* mailprivacy.h */,
-				472C1C4D1EEBD329003D55A7 /* mailprivacy_gnupg.c */,
-				472C1C4E1EEBD329003D55A7 /* mailprivacy_gnupg.h */,
-				472C1C4F1EEBD329003D55A7 /* mailprivacy_smime.c */,
-				472C1C501EEBD329003D55A7 /* mailprivacy_smime.h */,
-				472C1C511EEBD329003D55A7 /* mailprivacy_tools.c */,
-				472C1C521EEBD329003D55A7 /* mailprivacy_tools.h */,
-				472C1C531EEBD329003D55A7 /* mailprivacy_tools_private.h */,
-				472C1C541EEBD329003D55A7 /* mailprivacy_types.h */,
-			);
-			path = engine;
-			sourceTree = "<group>";
-		};
-		472C1C551EEBD329003D55A7 /* low-level */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C561EEBD329003D55A7 /* feed */,
-				472C1C6C1EEBD329003D55A7 /* imap */,
-				472C1CD31EEBD329003D55A7 /* imf */,
-				472C1CE21EEBD329003D55A7 /* maildir */,
-				472C1CE61EEBD329003D55A7 /* mbox */,
-				472C1CEE1EEBD329003D55A7 /* mh */,
-				472C1CF11EEBD329003D55A7 /* mime */,
-				472C1D061EEBD329003D55A7 /* nntp */,
-				472C1D0E1EEBD329003D55A7 /* pop3 */,
-				472C1D181EEBD329003D55A7 /* smtp */,
-			);
-			path = "low-level";
-			sourceTree = "<group>";
-		};
-		472C1C561EEBD329003D55A7 /* feed */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C571EEBD329003D55A7 /* date.c */,
-				472C1C581EEBD329003D55A7 /* date.h */,
-				472C1C591EEBD329003D55A7 /* newsfeed.c */,
-				472C1C5A1EEBD329003D55A7 /* newsfeed.h */,
-				472C1C5B1EEBD329003D55A7 /* newsfeed_item.c */,
-				472C1C5C1EEBD329003D55A7 /* newsfeed_item.h */,
-				472C1C5D1EEBD329003D55A7 /* newsfeed_item_enclosure.c */,
-				472C1C5E1EEBD329003D55A7 /* newsfeed_item_enclosure.h */,
-				472C1C5F1EEBD329003D55A7 /* newsfeed_private.c */,
-				472C1C601EEBD329003D55A7 /* newsfeed_private.h */,
-				472C1C611EEBD329003D55A7 /* newsfeed_types.h */,
-				472C1C621EEBD329003D55A7 /* parser.c */,
-				472C1C631EEBD329003D55A7 /* parser.h */,
-				472C1C641EEBD329003D55A7 /* parser_atom03.c */,
-				472C1C651EEBD329003D55A7 /* parser_atom03.h */,
-				472C1C661EEBD329003D55A7 /* parser_atom10.c */,
-				472C1C671EEBD329003D55A7 /* parser_atom10.h */,
-				472C1C681EEBD329003D55A7 /* parser_rdf.c */,
-				472C1C691EEBD329003D55A7 /* parser_rdf.h */,
-				472C1C6A1EEBD329003D55A7 /* parser_rss20.c */,
-				472C1C6B1EEBD329003D55A7 /* parser_rss20.h */,
-			);
-			path = feed;
-			sourceTree = "<group>";
-		};
-		472C1C6C1EEBD329003D55A7 /* imap */ = {
-			isa = PBXGroup;
-			children = (
-				472C1C6D1EEBD329003D55A7 /* acl.c */,
-				472C1C6E1EEBD329003D55A7 /* acl.h */,
-				472C1C6F1EEBD329003D55A7 /* acl_parser.c */,
-				472C1C701EEBD329003D55A7 /* acl_parser.h */,
-				472C1C711EEBD329003D55A7 /* acl_sender.c */,
-				472C1C721EEBD329003D55A7 /* acl_sender.h */,
-				472C1C731EEBD329003D55A7 /* acl_types.c */,
-				472C1C741EEBD329003D55A7 /* acl_types.h */,
-				472C1C751EEBD329003D55A7 /* annotatemore.c */,
-				472C1C761EEBD329003D55A7 /* annotatemore.h */,
-				472C1C771EEBD329003D55A7 /* annotatemore_parser.c */,
-				472C1C781EEBD329003D55A7 /* annotatemore_parser.h */,
-				472C1C791EEBD329003D55A7 /* annotatemore_sender.c */,
-				472C1C7A1EEBD329003D55A7 /* annotatemore_sender.h */,
-				472C1C7B1EEBD329003D55A7 /* annotatemore_types.c */,
-				472C1C7C1EEBD329003D55A7 /* annotatemore_types.h */,
-				472C1C7D1EEBD329003D55A7 /* condstore.c */,
-				472C1C7E1EEBD329003D55A7 /* condstore.h */,
-				472C1C7F1EEBD329003D55A7 /* condstore_private.h */,
-				472C1C801EEBD329003D55A7 /* condstore_types.c */,
-				472C1C811EEBD329003D55A7 /* condstore_types.h */,
-				472C1C821EEBD329003D55A7 /* enable.c */,
-				472C1C831EEBD329003D55A7 /* enable.h */,
-				472C1C841EEBD329003D55A7 /* idle.c */,
-				472C1C851EEBD329003D55A7 /* idle.h */,
-				472C1C861EEBD329003D55A7 /* mailimap.c */,
-				472C1C871EEBD329003D55A7 /* mailimap.h */,
-				472C1C881EEBD329003D55A7 /* mailimap_compress.c */,
-				472C1C891EEBD329003D55A7 /* mailimap_compress.h */,
-				472C1C8A1EEBD329003D55A7 /* mailimap_extension.c */,
-				472C1C8B1EEBD329003D55A7 /* mailimap_extension.h */,
-				472C1C8C1EEBD329003D55A7 /* mailimap_extension_types.h */,
-				472C1C8D1EEBD329003D55A7 /* mailimap_helper.c */,
-				472C1C8E1EEBD329003D55A7 /* mailimap_helper.h */,
-				472C1C8F1EEBD329003D55A7 /* mailimap_id.c */,
-				472C1C901EEBD329003D55A7 /* mailimap_id.h */,
-				472C1C911EEBD329003D55A7 /* mailimap_id_parser.c */,
-				472C1C921EEBD329003D55A7 /* mailimap_id_parser.h */,
-				472C1C931EEBD329003D55A7 /* mailimap_id_sender.c */,
-				472C1C941EEBD329003D55A7 /* mailimap_id_sender.h */,
-				472C1C951EEBD329003D55A7 /* mailimap_id_types.c */,
-				472C1C961EEBD329003D55A7 /* mailimap_id_types.h */,
-				472C1C971EEBD329003D55A7 /* mailimap_keywords.c */,
-				472C1C981EEBD329003D55A7 /* mailimap_keywords.h */,
-				472C1C991EEBD329003D55A7 /* mailimap_oauth2.c */,
-				472C1C9A1EEBD329003D55A7 /* mailimap_oauth2.h */,
-				472C1C9B1EEBD329003D55A7 /* mailimap_parser.c */,
-				472C1C9C1EEBD329003D55A7 /* mailimap_parser.h */,
-				472C1C9D1EEBD329003D55A7 /* mailimap_print.c */,
-				472C1C9E1EEBD329003D55A7 /* mailimap_print.h */,
-				472C1C9F1EEBD329003D55A7 /* mailimap_sender.c */,
-				472C1CA01EEBD329003D55A7 /* mailimap_sender.h */,
-				472C1CA11EEBD329003D55A7 /* mailimap_socket.c */,
-				472C1CA21EEBD329003D55A7 /* mailimap_socket.h */,
-				472C1CA31EEBD329003D55A7 /* mailimap_sort.c */,
-				472C1CA41EEBD329003D55A7 /* mailimap_sort.h */,
-				472C1CA51EEBD329003D55A7 /* mailimap_sort_types.c */,
-				472C1CA61EEBD329003D55A7 /* mailimap_sort_types.h */,
-				472C1CA71EEBD329003D55A7 /* mailimap_ssl.c */,
-				472C1CA81EEBD329003D55A7 /* mailimap_ssl.h */,
-				472C1CA91EEBD329003D55A7 /* mailimap_types.c */,
-				472C1CAA1EEBD329003D55A7 /* mailimap_types.h */,
-				472C1CAB1EEBD329003D55A7 /* mailimap_types_helper.c */,
-				472C1CAC1EEBD329003D55A7 /* mailimap_types_helper.h */,
-				472C1CAD1EEBD329003D55A7 /* namespace.c */,
-				472C1CAE1EEBD329003D55A7 /* namespace.h */,
-				472C1CAF1EEBD329003D55A7 /* namespace_parser.c */,
-				472C1CB01EEBD329003D55A7 /* namespace_parser.h */,
-				472C1CB11EEBD329003D55A7 /* namespace_sender.c */,
-				472C1CB21EEBD329003D55A7 /* namespace_sender.h */,
-				472C1CB31EEBD329003D55A7 /* namespace_types.c */,
-				472C1CB41EEBD329003D55A7 /* namespace_types.h */,
-				472C1CB51EEBD329003D55A7 /* qresync.c */,
-				472C1CB61EEBD329003D55A7 /* qresync.h */,
-				472C1CB71EEBD329003D55A7 /* qresync_private.h */,
-				472C1CB81EEBD329003D55A7 /* qresync_types.c */,
-				472C1CB91EEBD329003D55A7 /* qresync_types.h */,
-				472C1CBA1EEBD329003D55A7 /* quota.c */,
-				472C1CBB1EEBD329003D55A7 /* quota.h */,
-				472C1CBC1EEBD329003D55A7 /* quota_parser.c */,
-				472C1CBD1EEBD329003D55A7 /* quota_parser.h */,
-				472C1CBE1EEBD329003D55A7 /* quota_sender.c */,
-				472C1CBF1EEBD329003D55A7 /* quota_sender.h */,
-				472C1CC01EEBD329003D55A7 /* quota_types.c */,
-				472C1CC11EEBD329003D55A7 /* quota_types.h */,
-				472C1CC21EEBD329003D55A7 /* TODO */,
-				472C1CC31EEBD329003D55A7 /* uidplus.c */,
-				472C1CC41EEBD329003D55A7 /* uidplus.h */,
-				472C1CC51EEBD329003D55A7 /* uidplus_parser.c */,
-				472C1CC61EEBD329003D55A7 /* uidplus_parser.h */,
-				472C1CC71EEBD329003D55A7 /* uidplus_sender.c */,
-				472C1CC81EEBD329003D55A7 /* uidplus_sender.h */,
-				472C1CC91EEBD329003D55A7 /* uidplus_types.c */,
-				472C1CCA1EEBD329003D55A7 /* uidplus_types.h */,
-				472C1CCB1EEBD329003D55A7 /* xgmlabels.c */,
-				472C1CCC1EEBD329003D55A7 /* xgmlabels.h */,
-				472C1CCD1EEBD329003D55A7 /* xgmmsgid.c */,
-				472C1CCE1EEBD329003D55A7 /* xgmmsgid.h */,
-				472C1CCF1EEBD329003D55A7 /* xgmthrid.c */,
-				472C1CD01EEBD329003D55A7 /* xgmthrid.h */,
-				472C1CD11EEBD329003D55A7 /* xlist.c */,
-				472C1CD21EEBD329003D55A7 /* xlist.h */,
-			);
-			path = imap;
-			sourceTree = "<group>";
-		};
-		472C1CD31EEBD329003D55A7 /* imf */ = {
-			isa = PBXGroup;
-			children = (
-				472C1CD41EEBD329003D55A7 /* mailimf.c */,
-				472C1CD51EEBD329003D55A7 /* mailimf.h */,
-				472C1CD61EEBD329003D55A7 /* mailimf_types.c */,
-				472C1CD71EEBD329003D55A7 /* mailimf_types.h */,
-				472C1CD81EEBD329003D55A7 /* mailimf_types_helper.c */,
-				472C1CD91EEBD329003D55A7 /* mailimf_types_helper.h */,
-				472C1CDA1EEBD329003D55A7 /* mailimf_write.h */,
-				472C1CDB1EEBD329003D55A7 /* mailimf_write_file.c */,
-				472C1CDC1EEBD329003D55A7 /* mailimf_write_file.h */,
-				472C1CDD1EEBD329003D55A7 /* mailimf_write_generic.c */,
-				472C1CDE1EEBD329003D55A7 /* mailimf_write_generic.h */,
-				472C1CDF1EEBD329003D55A7 /* mailimf_write_mem.c */,
-				472C1CE01EEBD329003D55A7 /* mailimf_write_mem.h */,
-				472C1CE11EEBD329003D55A7 /* TODO */,
-			);
-			path = imf;
-			sourceTree = "<group>";
-		};
-		472C1CE21EEBD329003D55A7 /* maildir */ = {
-			isa = PBXGroup;
-			children = (
-				472C1CE31EEBD329003D55A7 /* maildir.c */,
-				472C1CE41EEBD329003D55A7 /* maildir.h */,
-				472C1CE51EEBD329003D55A7 /* maildir_types.h */,
-			);
-			path = maildir;
-			sourceTree = "<group>";
-		};
-		472C1CE61EEBD329003D55A7 /* mbox */ = {
-			isa = PBXGroup;
-			children = (
-				472C1CE71EEBD329003D55A7 /* mailmbox.c */,
-				472C1CE81EEBD329003D55A7 /* mailmbox.h */,
-				472C1CE91EEBD329003D55A7 /* mailmbox_parse.c */,
-				472C1CEA1EEBD329003D55A7 /* mailmbox_parse.h */,
-				472C1CEB1EEBD329003D55A7 /* mailmbox_types.c */,
-				472C1CEC1EEBD329003D55A7 /* mailmbox_types.h */,
-				472C1CED1EEBD329003D55A7 /* TODO */,
-			);
-			path = mbox;
-			sourceTree = "<group>";
-		};
-		472C1CEE1EEBD329003D55A7 /* mh */ = {
-			isa = PBXGroup;
-			children = (
-				472C1CEF1EEBD329003D55A7 /* mailmh.c */,
-				472C1CF01EEBD329003D55A7 /* mailmh.h */,
-			);
-			path = mh;
-			sourceTree = "<group>";
-		};
-		472C1CF11EEBD329003D55A7 /* mime */ = {
-			isa = PBXGroup;
-			children = (
-				472C1CF21EEBD329003D55A7 /* mailmime.c */,
-				472C1CF31EEBD329003D55A7 /* mailmime.h */,
-				472C1CF41EEBD329003D55A7 /* mailmime_content.c */,
-				472C1CF51EEBD329003D55A7 /* mailmime_content.h */,
-				472C1CF61EEBD329003D55A7 /* mailmime_decode.c */,
-				472C1CF71EEBD329003D55A7 /* mailmime_decode.h */,
-				472C1CF81EEBD329003D55A7 /* mailmime_disposition.c */,
-				472C1CF91EEBD329003D55A7 /* mailmime_disposition.h */,
-				472C1CFA1EEBD329003D55A7 /* mailmime_types.c */,
-				472C1CFB1EEBD329003D55A7 /* mailmime_types.h */,
-				472C1CFC1EEBD329003D55A7 /* mailmime_types_helper.c */,
-				472C1CFD1EEBD329003D55A7 /* mailmime_types_helper.h */,
-				472C1CFE1EEBD329003D55A7 /* mailmime_write.h */,
-				472C1CFF1EEBD329003D55A7 /* mailmime_write_file.c */,
-				472C1D001EEBD329003D55A7 /* mailmime_write_file.h */,
-				472C1D011EEBD329003D55A7 /* mailmime_write_generic.c */,
-				472C1D021EEBD329003D55A7 /* mailmime_write_generic.h */,
-				472C1D031EEBD329003D55A7 /* mailmime_write_mem.c */,
-				472C1D041EEBD329003D55A7 /* mailmime_write_mem.h */,
-				472C1D051EEBD329003D55A7 /* TODO */,
-			);
-			path = mime;
-			sourceTree = "<group>";
-		};
-		472C1D061EEBD329003D55A7 /* nntp */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D071EEBD329003D55A7 /* newsnntp.c */,
-				472C1D081EEBD329003D55A7 /* newsnntp.h */,
-				472C1D091EEBD329003D55A7 /* newsnntp_socket.c */,
-				472C1D0A1EEBD329003D55A7 /* newsnntp_socket.h */,
-				472C1D0B1EEBD329003D55A7 /* newsnntp_ssl.c */,
-				472C1D0C1EEBD329003D55A7 /* newsnntp_ssl.h */,
-				472C1D0D1EEBD329003D55A7 /* newsnntp_types.h */,
-			);
-			path = nntp;
-			sourceTree = "<group>";
-		};
-		472C1D0E1EEBD329003D55A7 /* pop3 */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D0F1EEBD329003D55A7 /* mailpop3.c */,
-				472C1D101EEBD329003D55A7 /* mailpop3.h */,
-				472C1D111EEBD329003D55A7 /* mailpop3_helper.c */,
-				472C1D121EEBD329003D55A7 /* mailpop3_helper.h */,
-				472C1D131EEBD329003D55A7 /* mailpop3_socket.c */,
-				472C1D141EEBD329003D55A7 /* mailpop3_socket.h */,
-				472C1D151EEBD329003D55A7 /* mailpop3_ssl.c */,
-				472C1D161EEBD329003D55A7 /* mailpop3_ssl.h */,
-				472C1D171EEBD329003D55A7 /* mailpop3_types.h */,
-			);
-			path = pop3;
-			sourceTree = "<group>";
-		};
-		472C1D181EEBD329003D55A7 /* smtp */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D191EEBD329003D55A7 /* mailsmtp.c */,
-				472C1D1A1EEBD329003D55A7 /* mailsmtp.h */,
-				472C1D1B1EEBD329003D55A7 /* mailsmtp_helper.c */,
-				472C1D1C1EEBD329003D55A7 /* mailsmtp_helper.h */,
-				472C1D1D1EEBD329003D55A7 /* mailsmtp_oauth2.c */,
-				472C1D1E1EEBD329003D55A7 /* mailsmtp_oauth2.h */,
-				472C1D1F1EEBD329003D55A7 /* mailsmtp_private.h */,
-				472C1D201EEBD329003D55A7 /* mailsmtp_socket.c */,
-				472C1D211EEBD329003D55A7 /* mailsmtp_socket.h */,
-				472C1D221EEBD329003D55A7 /* mailsmtp_ssl.c */,
-				472C1D231EEBD329003D55A7 /* mailsmtp_ssl.h */,
-				472C1D241EEBD329003D55A7 /* mailsmtp_types.h */,
-				472C1D251EEBD329003D55A7 /* TODO */,
-			);
-			path = smtp;
-			sourceTree = "<group>";
-		};
-		472C1D261EEBD329003D55A7 /* main */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D271EEBD329003D55A7 /* libetpan.h */,
-				472C1D281EEBD329003D55A7 /* libetpan_version.c */,
-				472C1D291EEBD329003D55A7 /* libetpan_version.h */,
-				472C1D2A1EEBD329003D55A7 /* libetpan_version.h.in */,
-			);
-			path = main;
-			sourceTree = "<group>";
-		};
-		472C1D2B1EEBD329003D55A7 /* netpgp */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D2C1EEBD329003D55A7 /* include */,
-				472C1D451EEBD329003D55A7 /* src */,
-			);
-			path = netpgp;
-			sourceTree = "<group>";
-		};
-		472C1D2C1EEBD329003D55A7 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D2D1EEBD329003D55A7 /* netpgp */,
-				472C1D441EEBD329003D55A7 /* netpgp-extra.h */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		472C1D2D1EEBD329003D55A7 /* netpgp */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D2E1EEBD329003D55A7 /* config-netpgp.h */,
-				472C1D2F1EEBD329003D55A7 /* config-original-as-configured-for-ubuntu-16.04-64bit.h */,
-				472C1D301EEBD329003D55A7 /* config-pep.h */,
-				472C1D311EEBD329003D55A7 /* create.h */,
-				472C1D321EEBD329003D55A7 /* crypto.h */,
-				472C1D331EEBD329003D55A7 /* defs.h */,
-				472C1D341EEBD329003D55A7 /* errors.h */,
-				472C1D351EEBD329003D55A7 /* keyring.h */,
-				472C1D361EEBD329003D55A7 /* memory.h */,
-				472C1D371EEBD329003D55A7 /* netpgpdefs.h */,
-				472C1D381EEBD329003D55A7 /* netpgpdigest.h */,
-				472C1D391EEBD329003D55A7 /* netpgpsdk.h */,
-				472C1D3A1EEBD329003D55A7 /* openssl11stub.h */,
-				472C1D3B1EEBD329003D55A7 /* packet-parse.h */,
-				472C1D3C1EEBD329003D55A7 /* packet-show.h */,
-				472C1D3D1EEBD329003D55A7 /* packet.h */,
-				472C1D3E1EEBD329003D55A7 /* readerwriter.h */,
-				472C1D3F1EEBD329003D55A7 /* signature.h */,
-				472C1D401EEBD329003D55A7 /* types.h */,
-				472C1D411EEBD329003D55A7 /* validate.h */,
-				472C1D421EEBD329003D55A7 /* version.h */,
-				472C1D431EEBD329003D55A7 /* writer.h */,
-			);
-			path = netpgp;
-			sourceTree = "<group>";
-		};
-		472C1D451EEBD329003D55A7 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D461EEBD329003D55A7 /* compress.c */,
-				472C1D471EEBD329003D55A7 /* create.c */,
-				472C1D481EEBD329003D55A7 /* crypto.c */,
-				472C1D491EEBD329003D55A7 /* keyring.c */,
-				472C1D4A1EEBD329003D55A7 /* misc.c */,
-				472C1D4B1EEBD329003D55A7 /* openssl_crypto.c */,
-				472C1D4C1EEBD329003D55A7 /* packet-parse.c */,
-				472C1D4D1EEBD329003D55A7 /* packet-show.c */,
-				472C1D4E1EEBD329003D55A7 /* reader.c */,
-				472C1D4F1EEBD329003D55A7 /* signature.c */,
-				472C1D501EEBD329003D55A7 /* symmetric.c */,
-				472C1D511EEBD329003D55A7 /* validate.c */,
-				472C1D521EEBD32A003D55A7 /* writer.c */,
-			);
-			path = src;
-			sourceTree = "<group>";
-		};
-		472C1D541EEBD32A003D55A7 /* sqlite */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D551EEBD32A003D55A7 /* sqlite3.c */,
-				472C1D561EEBD32A003D55A7 /* sqlite3.h */,
-			);
-			path = sqlite;
-			sourceTree = "<group>";
-		};
-		472C1D581EEBD32A003D55A7 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				472C1D591EEBD32A003D55A7 /* main.c */,
-				472C1D5A1EEBD32A003D55A7 /* mraheader.c */,
-				472C1D5B1EEBD32A003D55A7 /* mraheader.h */,
-				472C1D5C1EEBD32A003D55A7 /* mrapeerstate.c */,
-				472C1D5D1EEBD32A003D55A7 /* mrapeerstate.h */,
-				472C1D5E1EEBD32A003D55A7 /* mrchat.c */,
-				472C1D5F1EEBD32A003D55A7 /* mrchat.h */,
-				472C1D601EEBD32A003D55A7 /* mrchatlist.c */,
-				472C1D611EEBD32A003D55A7 /* mrchatlist.h */,
-				472C1D621EEBD32A003D55A7 /* mrcmdline.c */,
-				472C1D631EEBD32A003D55A7 /* mrcmdline.h */,
-				472C1D641EEBD32A003D55A7 /* mrcontact.c */,
-				472C1D651EEBD32A003D55A7 /* mrcontact.h */,
-				472C1D661EEBD32A003D55A7 /* mre2ee.c */,
-				472C1D671EEBD32A003D55A7 /* mre2ee.h */,
-				472C1D681EEBD32A003D55A7 /* mre2ee_driver.h */,
-				472C1D691EEBD32A003D55A7 /* mre2ee_driver_openssl.c */,
-				472C1D6A1EEBD32A003D55A7 /* mrimap.c */,
-				472C1D6B1EEBD32A003D55A7 /* mrimap.h */,
-				472C1D6C1EEBD32A003D55A7 /* mrjob.c */,
-				472C1D6D1EEBD32A003D55A7 /* mrjob.h */,
-				472C1D6E1EEBD32A003D55A7 /* mrkey.c */,
-				472C1D6F1EEBD32A003D55A7 /* mrkey.h */,
-				472C1D701EEBD32A003D55A7 /* mrkeyring.c */,
-				472C1D711EEBD32A003D55A7 /* mrkeyring.h */,
-				472C1D721EEBD32A003D55A7 /* mrloginparam.c */,
-				472C1D731EEBD32A003D55A7 /* mrloginparam.h */,
-				472C1D741EEBD32A003D55A7 /* mrmailbox.c */,
-				472C1D751EEBD32A003D55A7 /* mrmailbox.h */,
-				472C1D761EEBD32A003D55A7 /* mrmailbox_configure.c */,
-				472C1D771EEBD32A003D55A7 /* mrmailbox_imex.c */,
-				472C1D781EEBD32A003D55A7 /* mrmailbox_log.c */,
-				472C1D791EEBD32A003D55A7 /* mrmimeparser.c */,
-				472C1D7A1EEBD32A003D55A7 /* mrmimeparser.h */,
-				472C1D7B1EEBD32A003D55A7 /* mrmsg.c */,
-				472C1D7C1EEBD32A003D55A7 /* mrmsg.h */,
-				472C1D7D1EEBD32A003D55A7 /* mrosnative.c */,
-				472C1D7E1EEBD32A003D55A7 /* mrosnative.h */,
-				472C1D7F1EEBD32A003D55A7 /* mrparam.c */,
-				472C1D801EEBD32A003D55A7 /* mrparam.h */,
-				472C1D811EEBD32A003D55A7 /* mrpoortext.c */,
-				472C1D821EEBD32A003D55A7 /* mrpoortext.h */,
-				472C1D831EEBD32A003D55A7 /* mrsaxparser.c */,
-				472C1D841EEBD32A003D55A7 /* mrsaxparser.h */,
-				472C1D851EEBD32A003D55A7 /* mrsimplify.c */,
-				472C1D861EEBD32A003D55A7 /* mrsimplify.h */,
-				472C1D871EEBD32A003D55A7 /* mrsmtp.c */,
-				472C1D881EEBD32A003D55A7 /* mrsmtp.h */,
-				472C1D891EEBD32A003D55A7 /* mrsqlite3.c */,
-				472C1D8A1EEBD32A003D55A7 /* mrsqlite3.h */,
-				472C1D8B1EEBD32A003D55A7 /* mrstock.c */,
-				472C1D8C1EEBD32A003D55A7 /* mrstock.h */,
-				472C1D8D1EEBD32A003D55A7 /* mrtools.c */,
-				472C1D8E1EEBD32A003D55A7 /* mrtools.h */,
-				472C1D8F1EEBD32A003D55A7 /* stress.c */,
-				472C1D901EEBD32A003D55A7 /* stress.h */,
-			);
-			name = src;
-			path = "deltachat-core/src";
-			sourceTree = SOURCE_ROOT;
-		};
 		472F39921E279792009260FB /* protocols */ = {
 			isa = PBXGroup;
 			children = (
@@ -2300,16 +460,6 @@
 			name = protocols;
 			sourceTree = "<group>";
 		};
-		478A4D1A1EEBCB150097FCC0 /* deltachat */ = {
-			isa = PBXGroup;
-			children = (
-				472C1ACF1EEBD329003D55A7 /* libs */,
-				472C1D571EEBD32A003D55A7 /* LICENSE */,
-				472C1D581EEBD32A003D55A7 /* src */,
-			);
-			name = deltachat;
-			sourceTree = "<group>";
-		};
 		47B91AC01EC0C1CF000AE3EE /* coredata */ = {
 			isa = PBXGroup;
 			children = (
@@ -2340,6 +490,61 @@
 			name = data;
 			sourceTree = "<group>";
 		};
+		47F963621EEFC36F00460308 /* netpgp */ = {
+			isa = PBXGroup;
+			children = (
+				472FC12D1EEFC5E200585D38 /* PGPKeyGeneration.swift */,
+				472FC12A1EEFC55E00585D38 /* autocryptgen.c */,
+				472FC12B1EEFC55E00585D38 /* autocryptgen.h */,
+				47F963651EEFC36F00460308 /* compress.c */,
+				47F963661EEFC36F00460308 /* create.c */,
+				47F963671EEFC36F00460308 /* crypto.c */,
+				47F9636A1EEFC36F00460308 /* keyring.c */,
+				47F9636B1EEFC36F00460308 /* misc.c */,
+				47F9636C1EEFC36F00460308 /* netpgp */,
+				47F963831EEFC36F00460308 /* netpgp-extra.h */,
+				47F963841EEFC36F00460308 /* openssl_crypto.c */,
+				47F963851EEFC36F00460308 /* packet-parse.c */,
+				47F963861EEFC36F00460308 /* packet-show.c */,
+				47F963891EEFC36F00460308 /* reader.c */,
+				47F9638A1EEFC36F00460308 /* signature.c */,
+				47F9638B1EEFC36F00460308 /* symmetric.c */,
+				47F9638C1EEFC36F00460308 /* validate.c */,
+				47F9638D1EEFC36F00460308 /* writer.c */,
+			);
+			name = netpgp;
+			path = ../netpgp;
+			sourceTree = "<group>";
+		};
+		47F9636C1EEFC36F00460308 /* netpgp */ = {
+			isa = PBXGroup;
+			children = (
+				47F9636D1EEFC36F00460308 /* config-netpgp.h */,
+				47F9636E1EEFC36F00460308 /* config-original-as-configured-for-ubuntu-16.04-64bit.h */,
+				47F9636F1EEFC36F00460308 /* config-pep.h */,
+				47F963701EEFC36F00460308 /* create.h */,
+				47F963711EEFC36F00460308 /* crypto.h */,
+				47F963721EEFC36F00460308 /* defs.h */,
+				47F963731EEFC36F00460308 /* errors.h */,
+				47F963741EEFC36F00460308 /* keyring.h */,
+				47F963751EEFC36F00460308 /* memory.h */,
+				47F963761EEFC36F00460308 /* netpgpdefs.h */,
+				47F963771EEFC36F00460308 /* netpgpdigest.h */,
+				47F963781EEFC36F00460308 /* netpgpsdk.h */,
+				47F963791EEFC36F00460308 /* openssl11stub.h */,
+				47F9637A1EEFC36F00460308 /* packet-parse.h */,
+				47F9637B1EEFC36F00460308 /* packet-show.h */,
+				47F9637C1EEFC36F00460308 /* packet.h */,
+				47F9637D1EEFC36F00460308 /* readerwriter.h */,
+				47F9637E1EEFC36F00460308 /* signature.h */,
+				47F9637F1EEFC36F00460308 /* types.h */,
+				47F963801EEFC36F00460308 /* validate.h */,
+				47F963811EEFC36F00460308 /* version.h */,
+				47F963821EEFC36F00460308 /* writer.h */,
+			);
+			path = netpgp;
+			sourceTree = "<group>";
+		};
 		78280F99990BFF65543B7F0B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -2402,7 +607,7 @@
 		A13526771D955BDF00D3BFE1 /* enzevalos_iphone */ = {
 			isa = PBXGroup;
 			children = (
-				478A4D1A1EEBCB150097FCC0 /* deltachat */,
+				47F963621EEFC36F00460308 /* netpgp */,
 				47B91AC11EC0C1FB000AE3EE /* data */,
 				F19B29011E02DCAC00B29DD1 /* enzevalos_iphone.entitlements */,
 				A135CEB61DD4BDA2007E3C29 /* ObjectivePGP */,
@@ -2751,44 +956,32 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				472C1E351EEBD32A003D55A7 /* TODO in Resources */,
 				A102AA8A1EDDB4F40024B457 /* videoOnboarding2.m4v in Resources */,
 				A1F992391DA7DD2E0073BF1B /* InboxTableViewCell.xib in Resources */,
 				A1EB058A1D956890008659C1 /* ContactCell.xib in Resources */,
 				4761420A1E082F9C00FD5E4F /* Settings.bundle in Resources */,
 				A19C12471DE602FF007F72E7 /* jabo.asc in Resources */,
-				472C1D921EEBD32A003D55A7 /* ChangeLog in Resources */,
-				472C1DE41EEBD32A003D55A7 /* TODO in Resources */,
 				A16BA2121E0439B6005E29E3 /* providers.json in Resources */,
 				F189C17F1ED59FEF00BAE9B3 /* idsolutions-private.gpg in Resources */,
 				F14D189D1ED880680080515D /* nchr-public.gpg in Resources */,
-				472C1E401EEBD32A003D55A7 /* TODO in Resources */,
 				F14D189C1ED880680080515D /* nchr-private.gpg in Resources */,
 				F189C1801ED59FEF00BAE9B3 /* idsolutions-public.gpg in Resources */,
-				472C1E301EEBD32A003D55A7 /* TODO in Resources */,
 				F14D189E1ED880680080515D /* ncpayroll-private.gpg in Resources */,
 				4725C4F71EDDADA10068235E /* bob-public.gpg in Resources */,
 				A1123E6A1DA682850069551C /* Localizable.strings in Resources */,
 				A1F992291DA7C9100073BF1B /* Main.storyboard in Resources */,
 				F14D18A21ED8811F0080515D /* ullimuelle-private.gpg in Resources */,
-				472C1E4F1EEBD32A003D55A7 /* libetpan_version.h.in in Resources */,
 				F14D18A31ED8811F0080515D /* ullimuelle-public.gpg in Resources */,
 				A1BE3FF61E9664660040114B /* InfoPlist.strings in Resources */,
 				A17A18F91DDCCF370058D934 /* JakobBode.asc in Resources */,
-				472C1D941EEBD32A003D55A7 /* NEWS in Resources */,
-				472C1D911EEBD32A003D55A7 /* AUTHORS in Resources */,
 				F14D189F1ED880680080515D /* ncpayroll-public.gpg in Resources */,
 				A1C09FC61DF04D650006B783 /* alice2005-private.gpg in Resources */,
 				A13526861D955BDF00D3BFE1 /* LaunchScreen.storyboard in Resources */,
 				A1EB05A41D956E32008659C1 /* Assets.xcassets in Resources */,
-				472C1E5F1EEBD32A003D55A7 /* LICENSE in Resources */,
-				472C1E211EEBD32A003D55A7 /* TODO in Resources */,
-				472C1E4D1EEBD32A003D55A7 /* TODO in Resources */,
 				A1FA3F6C1E78565B0093C0B6 /* alice2005-public.gpg in Resources */,
 				A1EB058C1D9568AB008659C1 /* FrequentCell.xib in Resources */,
 				4725C4F61EDDADA10068235E /* bob-private.gpg in Resources */,
 				A1B8C01A1DD5D9B10044A358 /* alice2005-2.gpg in Resources */,
-				472C1D931EEBD32A003D55A7 /* COPYRIGHT in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2951,325 +1144,115 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				472C1E191EEBD32A003D55A7 /* namespace_sender.c in Sources */,
-				472C1DEF1EEBD32A003D55A7 /* newsfeed.c in Sources */,
 				47691A8A1ECB56D1004BCFC5 /* Mail.swift in Sources */,
 				472F398A1E251787009260FB /* Contact.swift in Sources */,
-				472C1E711EEBD32A003D55A7 /* mrmailbox_log.c in Sources */,
-				472C1E7D1EEBD32A003D55A7 /* stress.c in Sources */,
 				472F39861E1FA34E009260FB /* Record.swift in Sources */,
-				472C1DFA1EEBD32A003D55A7 /* acl_sender.c in Sources */,
 				A1C3270E1DB907D900CE2ED5 /* TextFormatter.swift in Sources */,
 				A17BEB391E55E3DD00403EBE /* PGPTemporaryDecryptionObject.m in Sources */,
-				472C1E251EEBD32A003D55A7 /* uidplus_types.c in Sources */,
-				472C1D991EEBD32A003D55A7 /* carray.c in Sources */,
-				472C1DE61EEBD32A003D55A7 /* imfcache.c in Sources */,
-				472C1E321EEBD32A003D55A7 /* mailmbox.c in Sources */,
 				A1F2A5691E85586300320275 /* Providers.swift in Sources */,
-				472C1E5B1EEBD32A003D55A7 /* validate.c in Sources */,
 				F12041FD1DA409A5002E4940 /* ListViewCell.swift in Sources */,
 				A1EB059C1D956957008659C1 /* NSDateCompare.swift in Sources */,
-				472C1E541EEBD32A003D55A7 /* misc.c in Sources */,
 				A15B7BE61E2931AD0024E499 /* KeyWrapper.swift in Sources */,
-				472C1DE31EEBD32A003D55A7 /* mailstorage_tools.c in Sources */,
-				472C1E161EEBD32A003D55A7 /* mailimap_types_helper.c in Sources */,
-				472C1DF71EEBD32A003D55A7 /* parser_rss20.c in Sources */,
 				A1EB05941D956931008659C1 /* InboxCellDelegator.swift in Sources */,
-				472C1DD41EEBD32A003D55A7 /* pop3driver.c in Sources */,
-				472C1DC21EEBD32A003D55A7 /* mboxdriver_cached.c in Sources */,
-				472C1E451EEBD32A003D55A7 /* mailpop3_helper.c in Sources */,
-				472C1E0E1EEBD32A003D55A7 /* mailimap_parser.c in Sources */,
-				472C1E311EEBD32A003D55A7 /* maildir.c in Sources */,
-				472C1DB91EEBD32A003D55A7 /* imapdriver_tools.c in Sources */,
-				472C1DBC1EEBD32A003D55A7 /* maildirdriver_cached.c in Sources */,
 				A135CF121DD4BDD1007E3C29 /* PGPPacketFactory.m in Sources */,
-				472C1DA21EEBD32A003D55A7 /* mailstream.c in Sources */,
-				472C1DEE1EEBD32A003D55A7 /* date.c in Sources */,
-				472C1E141EEBD32A003D55A7 /* mailimap_ssl.c in Sources */,
 				A135CF111DD4BDD1007E3C29 /* PGPPacket.m in Sources */,
 				472F39811E1E5347009260FB /* Mail_Address+CoreDataClass.swift in Sources */,
+				47F9638F1EEFC36F00460308 /* compress.c in Sources */,
 				A1EB05821D95685B008659C1 /* CollectionDataDelegate.swift in Sources */,
-				472C1E601EEBD32A003D55A7 /* main.c in Sources */,
-				472C1E651EEBD32A003D55A7 /* mrcmdline.c in Sources */,
-				472C1DB61EEBD32A003D55A7 /* imapdriver_cached.c in Sources */,
-				472C1E571EEBD32A003D55A7 /* packet-show.c in Sources */,
-				472C1E781EEBD32A003D55A7 /* mrsimplify.c in Sources */,
-				472C1DDF1EEBD32A003D55A7 /* mailmessage.c in Sources */,
-				472C1E641EEBD32A003D55A7 /* mrchatlist.c in Sources */,
 				A17C04841DC6504E00F66EDB /* LogHandler.swift in Sources */,
-				472C1E241EEBD32A003D55A7 /* uidplus_sender.c in Sources */,
 				A1EB05801D956851008659C1 /* SendViewController.swift in Sources */,
-				472C1E391EEBD32A003D55A7 /* mailmime_decode.c in Sources */,
 				47691A8C1ECC3EC7004BCFC5 /* EphemeralMail.swift in Sources */,
 				A135CF231DD4BDD1007E3C29 /* PGPUserAttributePacket.m in Sources */,
-				472C1D951EEBD32A003D55A7 /* README.md in Sources */,
-				472C1E1C1EEBD32A003D55A7 /* qresync_types.c in Sources */,
-				472C1DA11EEBD32A003D55A7 /* mailsem.c in Sources */,
 				A1230BD71E2F8818006642C7 /* PGPEncryption.swift in Sources */,
 				A1EB05981D956947008659C1 /* InboxViewController.swift in Sources */,
 				F1984D721E1D327200804E1E /* IconsStyleKit.swift in Sources */,
 				A135CF221DD4BDD1007E3C29 /* PGPUser.m in Sources */,
-				472C1E6B1EEBD32A003D55A7 /* mrkey.c in Sources */,
 				A135CF031DD4BDD1007E3C29 /* NSData+PGPUtils.m in Sources */,
-				472C1E2B1EEBD32A003D55A7 /* mailimf_types.c in Sources */,
-				472C1E7B1EEBD32A003D55A7 /* mrstock.c in Sources */,
-				472C1D9B1EEBD32A003D55A7 /* chash.c in Sources */,
 				472F398C1E2519C8009260FB /* CNContactExtension.swift in Sources */,
 				A135CF171DD4BDD1007E3C29 /* PGPPublicKeyRSA.m in Sources */,
-				472C1E5C1EEBD32A003D55A7 /* writer.c in Sources */,
-				472C1DA61EEBD32A003D55A7 /* mailstream_helper.c in Sources */,
-				472C1DCF1EEBD32A003D55A7 /* nntpdriver_cached.c in Sources */,
 				F18B44601E704C550080C041 /* ReplaceSegue.swift in Sources */,
-				472C1E751EEBD32A003D55A7 /* mrparam.c in Sources */,
-				472C1E281EEBD32A003D55A7 /* xgmthrid.c in Sources */,
 				A135CF181DD4BDD1007E3C29 /* PGPPublicSubKeyPacket.m in Sources */,
 				472F39881E1FA377009260FB /* KeyRecord.swift in Sources */,
 				A135CF141DD4BDD1007E3C29 /* PGPPKCSEmsa.m in Sources */,
-				472C1DFF1EEBD32A003D55A7 /* annotatemore_types.c in Sources */,
-				472C1E5D1EEBD32A003D55A7 /* README.md in Sources */,
-				472C1E611EEBD32A003D55A7 /* mraheader.c in Sources */,
-				472C1E4A1EEBD32A003D55A7 /* mailsmtp_oauth2.c in Sources */,
 				A135CF051DD4BDD1007E3C29 /* ObjectivePGP.m in Sources */,
-				472C1DB41EEBD32A003D55A7 /* hotmailstorage.c in Sources */,
 				F1ACF21C1E0C1C6800C1B843 /* ContactViewController.swift in Sources */,
 				A1EB057E1D956848008659C1 /* VENDataDelegate.swift in Sources */,
-				472C1DC91EEBD32A003D55A7 /* mhdriver_cached_message.c in Sources */,
-				472C1DAF1EEBD32A003D55A7 /* dbdriver_message.c in Sources */,
-				472C1E2F1EEBD32A003D55A7 /* mailimf_write_mem.c in Sources */,
 				A1E81B671DCA296200535F98 /* UIViewResolver.swift in Sources */,
-				472C1E531EEBD32A003D55A7 /* keyring.c in Sources */,
-				472C1DF81EEBD32A003D55A7 /* acl.c in Sources */,
-				472C1E731EEBD32A003D55A7 /* mrmsg.c in Sources */,
-				472C1E231EEBD32A003D55A7 /* uidplus_parser.c in Sources */,
-				472C1DDE1EEBD32A003D55A7 /* mailfolder.c in Sources */,
-				472C1DE11EEBD32A003D55A7 /* mailmessage_types.c in Sources */,
 				A135CF0F1DD4BDD1007E3C29 /* PGPMPI.m in Sources */,
-				472C1DBF1EEBD32A003D55A7 /* maildirdriver_tools.c in Sources */,
-				472C1DF01EEBD32A003D55A7 /* newsfeed_item.c in Sources */,
 				472F392A1E1277D2009260FB /* EnzevalosContact+CoreDataClass.swift in Sources */,
-				472C1E2C1EEBD32A003D55A7 /* mailimf_types_helper.c in Sources */,
-				472C1E021EEBD32A003D55A7 /* enable.c in Sources */,
-				472C1DCB1EEBD32A003D55A7 /* mhdriver_tools.c in Sources */,
-				472C1E051EEBD32A003D55A7 /* mailimap_compress.c in Sources */,
-				472C1E441EEBD32A003D55A7 /* mailpop3.c in Sources */,
-				472C1DFD1EEBD32A003D55A7 /* annotatemore_parser.c in Sources */,
 				F1AF938F1E2D04BA00755128 /* CustomCells.swift in Sources */,
-				472C1D9E1EEBD32A003D55A7 /* mail_cache_db.c in Sources */,
+				47F963951EEFC36F00460308 /* openssl_crypto.c in Sources */,
 				A135CF191DD4BDD1007E3C29 /* PGPS2K.m in Sources */,
-				472C1DAC1EEBD32A003D55A7 /* timeutils.c in Sources */,
-				472C1E361EEBD32A003D55A7 /* mailmh.c in Sources */,
-				472C1E561EEBD32A003D55A7 /* packet-parse.c in Sources */,
 				A135CF061DD4BDD1007E3C29 /* PGPArmor.m in Sources */,
-				472C1E2A1EEBD32A003D55A7 /* mailimf.c in Sources */,
-				472C1DCA1EEBD32A003D55A7 /* mhdriver_message.c in Sources */,
 				A135CF251DD4BDD1007E3C29 /* PGPUserIDPacket.m in Sources */,
-				472C1DB71EEBD32A003D55A7 /* imapdriver_cached_message.c in Sources */,
-				472C1E071EEBD32A003D55A7 /* mailimap_helper.c in Sources */,
-				472C1D9D1EEBD32A003D55A7 /* connect.c in Sources */,
-				472C1DFB1EEBD32A003D55A7 /* acl_types.c in Sources */,
 				A135CF0C1DD4BDD1007E3C29 /* PGPKeyID.m in Sources */,
-				472C1E4B1EEBD32A003D55A7 /* mailsmtp_socket.c in Sources */,
 				A135CF021DD4BDD1007E3C29 /* NSData+compression.m in Sources */,
-				472C1D9F1EEBD32A003D55A7 /* maillock.c in Sources */,
-				472C1E721EEBD32A003D55A7 /* mrmimeparser.c in Sources */,
-				472C1DD11EEBD32A003D55A7 /* nntpdriver_message.c in Sources */,
+				47F963971EEFC36F00460308 /* packet-show.c in Sources */,
 				476142081E07E52B00FD5E4F /* Theme.swift in Sources */,
 				A1EB057A1D956829008659C1 /* ContactCell.swift in Sources */,
-				472C1DDD1EEBD32A003D55A7 /* maildriver_types_helper.c in Sources */,
-				472C1E421EEBD32A003D55A7 /* newsnntp_socket.c in Sources */,
 				A135CF1E1DD4BDD1007E3C29 /* PGPSubKey.m in Sources */,
 				472F392C1E1277D2009260FB /* PersistentMail +CoreDataClass.swift in Sources */,
-				472C1E431EEBD32A003D55A7 /* newsnntp_ssl.c in Sources */,
-				472C1D971EEBD32A003D55A7 /* getopt_long.c in Sources */,
-				472C1E671EEBD32A003D55A7 /* mre2ee.c in Sources */,
-				472C1DD71EEBD32A003D55A7 /* pop3driver_message.c in Sources */,
+				47F963961EEFC36F00460308 /* packet-parse.c in Sources */,
 				A135CF0D1DD4BDD1007E3C29 /* PGPLiteralPacket.m in Sources */,
-				472C1E131EEBD32A003D55A7 /* mailimap_sort_types.c in Sources */,
-				472C1E791EEBD32A003D55A7 /* mrsmtp.c in Sources */,
-				472C1E221EEBD32A003D55A7 /* uidplus.c in Sources */,
-				472C1E581EEBD32A003D55A7 /* reader.c in Sources */,
-				472C1E661EEBD32A003D55A7 /* mrcontact.c in Sources */,
 				A135CF1D1DD4BDD1007E3C29 /* PGPSignatureSubpacket.m in Sources */,
-				472C1DE01EEBD32A003D55A7 /* mailmessage_tools.c in Sources */,
 				F119D2901E364B59001D732A /* AnimatedSendIcon.swift in Sources */,
-				472C1DC61EEBD32A003D55A7 /* mboxstorage.c in Sources */,
-				472C1DDB1EEBD32A003D55A7 /* maildriver_tools.c in Sources */,
-				472C1DA31EEBD32A003D55A7 /* mailstream_cancel.c in Sources */,
-				472C1DC51EEBD32A003D55A7 /* mboxdriver_tools.c in Sources */,
-				472C1E0A1EEBD32A003D55A7 /* mailimap_id_sender.c in Sources */,
 				A135CF041DD4BDD1007E3C29 /* NSValue+PGPUtils.m in Sources */,
-				472C1E331EEBD32A003D55A7 /* mailmbox_parse.c in Sources */,
 				F12060801DA540FE00F6EF37 /* RefreshControlExtension.swift in Sources */,
 				A135CF0A1DD4BDD1007E3C29 /* PGPFingerprint.m in Sources */,
-				472C1E7A1EEBD32A003D55A7 /* mrsqlite3.c in Sources */,
 				A13526811D955BDF00D3BFE1 /* enzevalos_iphone.xcdatamodeld in Sources */,
 				A1416C191E268EFB001809F3 /* EncryptionHandler.swift in Sources */,
-				472C1DAB1EEBD32A003D55A7 /* mmapstring.c in Sources */,
-				472C1E6A1EEBD32A003D55A7 /* mrjob.c in Sources */,
+				47F963941EEFC36F00460308 /* misc.c in Sources */,
 				A135CF1C1DD4BDD1007E3C29 /* PGPSignaturePacket.m in Sources */,
-				472C1E591EEBD32A003D55A7 /* signature.c in Sources */,
-				472C1DEC1EEBD32A003D55A7 /* mailprivacy_smime.c in Sources */,
 				A135CF1F1DD4BDD1007E3C29 /* PGPSymmetricallyEncryptedDataPacket.m in Sources */,
-				472C1DF41EEBD32A003D55A7 /* parser_atom03.c in Sources */,
 				A135CF211DD4BDD1007E3C29 /* PGPTrustPacket.m in Sources */,
-				472C1DA91EEBD32A003D55A7 /* mailstream_ssl.c in Sources */,
-				472C1DAA1EEBD32A003D55A7 /* md5.c in Sources */,
-				472C1E001EEBD32A003D55A7 /* condstore.c in Sources */,
 				472F39821E1E5347009260FB /* Mail_Address+CoreDataProperties.swift in Sources */,
 				476373C21E09BA88004D5EFE /* UserData.swift in Sources */,
-				472C1E3A1EEBD32A003D55A7 /* mailmime_disposition.c in Sources */,
-				472C1DF91EEBD32A003D55A7 /* acl_parser.c in Sources */,
-				472C1E761EEBD32A003D55A7 /* mrpoortext.c in Sources */,
-				472C1E1A1EEBD32A003D55A7 /* namespace_types.c in Sources */,
-				472C1DC11EEBD32A003D55A7 /* mboxdriver.c in Sources */,
-				472C1E061EEBD32A003D55A7 /* mailimap_extension.c in Sources */,
-				472C1DCE1EEBD32A003D55A7 /* nntpdriver.c in Sources */,
 				A1EB05A01D95696C008659C1 /* MessageBodyTableViewCell.swift in Sources */,
-				472C1DB51EEBD32A003D55A7 /* imapdriver.c in Sources */,
 				F18B44621E73286C0080C041 /* ReadVENDelegate.swift in Sources */,
-				472C1DA51EEBD32A003D55A7 /* mailstream_compress.c in Sources */,
-				472C1DC31EEBD32A003D55A7 /* mboxdriver_cached_message.c in Sources */,
-				472C1DE51EEBD32A003D55A7 /* generic_cache.c in Sources */,
-				472C1D981EEBD32A003D55A7 /* base64.c in Sources */,
 				A17A18F71DDCBE530058D934 /* PGPKeyWrapper.swift in Sources */,
 				A1D5076F1E80257A00B68B38 /* KeyViewController.swift in Sources */,
 				472F39901E252470009260FB /* CNMailAddressesExtension.swift in Sources */,
-				472C1E091EEBD32A003D55A7 /* mailimap_id_parser.c in Sources */,
-				472C1DC01EEBD32A003D55A7 /* maildirstorage.c in Sources */,
-				472C1DB11EEBD32A003D55A7 /* feeddriver.c in Sources */,
-				472C1E4E1EEBD32A003D55A7 /* libetpan_version.c in Sources */,
-				472C1E201EEBD32A003D55A7 /* quota_types.c in Sources */,
 				472F39731E1D09C4009260FB /* State+CoreDataClass.swift in Sources */,
-				472C1E4C1EEBD32A003D55A7 /* mailsmtp_ssl.c in Sources */,
-				472C1DAD1EEBD32A003D55A7 /* data_message_driver.c in Sources */,
+				47F9639B1EEFC36F00460308 /* signature.c in Sources */,
 				A135CF081DD4BDD1007E3C29 /* PGPCryptoCFB.m in Sources */,
-				472C1E101EEBD32A003D55A7 /* mailimap_sender.c in Sources */,
+				47F9639C1EEFC36F00460308 /* symmetric.c in Sources */,
 				A1416C1B1E268F1A001809F3 /* Encryption.swift in Sources */,
-				472C1E681EEBD32A003D55A7 /* mre2ee_driver_openssl.c in Sources */,
-				472C1DF11EEBD32A003D55A7 /* newsfeed_item_enclosure.c in Sources */,
 				A1EB05841D956867008659C1 /* TableViewDataDelegate.swift in Sources */,
-				472C1E5A1EEBD32A003D55A7 /* symmetric.c in Sources */,
-				472C1E471EEBD32A003D55A7 /* mailpop3_ssl.c in Sources */,
-				472C1E2D1EEBD32A003D55A7 /* mailimf_write_file.c in Sources */,
-				472C1E291EEBD32A003D55A7 /* xlist.c in Sources */,
 				A15B7BE41E29306D0024E499 /* EnzevalosEncryptionHandler.swift in Sources */,
-				472C1DB81EEBD32A003D55A7 /* imapdriver_message.c in Sources */,
-				472C1DB01EEBD32A003D55A7 /* dbstorage.c in Sources */,
-				472C1DB31EEBD32A003D55A7 /* feedstorage.c in Sources */,
-				472C1DC71EEBD32A003D55A7 /* mhdriver.c in Sources */,
-				472C1E1B1EEBD32A003D55A7 /* qresync.c in Sources */,
-				472C1DD81EEBD32A003D55A7 /* pop3driver_tools.c in Sources */,
-				472C1E3E1EEBD32A003D55A7 /* mailmime_write_generic.c in Sources */,
-				472C1E381EEBD32A003D55A7 /* mailmime_content.c in Sources */,
 				472F397C1E1D0B0B009260FB /* PersistentMail +CoreDataProperties.swift in Sources */,
-				472C1DF51EEBD32A003D55A7 /* parser_atom10.c in Sources */,
-				472C1DFE1EEBD32A003D55A7 /* annotatemore_sender.c in Sources */,
 				A1EB05961D956939008659C1 /* InboxTableViewCell.swift in Sources */,
-				472C1DDA1EEBD32A003D55A7 /* maildriver.c in Sources */,
-				472C1E041EEBD32A003D55A7 /* mailimap.c in Sources */,
-				472C1E3F1EEBD32A003D55A7 /* mailmime_write_mem.c in Sources */,
-				472C1DE71EEBD32A003D55A7 /* mailthread.c in Sources */,
 				A135CF131DD4BDD1007E3C29 /* PGPPKCSEme.m in Sources */,
-				472C1E7C1EEBD32A003D55A7 /* mrtools.c in Sources */,
-				472C1DAE1EEBD32A003D55A7 /* dbdriver.c in Sources */,
-				472C1E1F1EEBD32A003D55A7 /* quota_sender.c in Sources */,
-				472C1E181EEBD32A003D55A7 /* namespace_parser.c in Sources */,
-				472C1D9A1EEBD32A003D55A7 /* charconv.c in Sources */,
-				472C1DD01EEBD32A003D55A7 /* nntpdriver_cached_message.c in Sources */,
-				472C1E481EEBD32A003D55A7 /* mailsmtp.c in Sources */,
-				472C1E6E1EEBD32A003D55A7 /* mrmailbox.c in Sources */,
+				47F9639D1EEFC36F00460308 /* validate.c in Sources */,
 				A135CF241DD4BDD1007E3C29 /* PGPUserAttributeSubpacket.m in Sources */,
 				A135CF151DD4BDD1007E3C29 /* PGPPublicKeyEncryptedSessionKeyPacket.m in Sources */,
+				472FC12E1EEFC5E200585D38 /* PGPKeyGeneration.swift in Sources */,
 				A1083A541E8BFEA6003666B7 /* Onboarding.swift in Sources */,
+				47F9639A1EEFC36F00460308 /* reader.c in Sources */,
 				472F39741E1D09C4009260FB /* State+CoreDataProperties.swift in Sources */,
-				472C1E491EEBD32A003D55A7 /* mailsmtp_helper.c in Sources */,
-				472C1E011EEBD32A003D55A7 /* condstore_types.c in Sources */,
-				472C1DC81EEBD32A003D55A7 /* mhdriver_cached.c in Sources */,
-				472C1D961EEBD32A003D55A7 /* getopt.c in Sources */,
-				472C1E121EEBD32A003D55A7 /* mailimap_sort.c in Sources */,
+				47F963901EEFC36F00460308 /* create.c in Sources */,
 				A13526791D955BDF00D3BFE1 /* AppDelegate.swift in Sources */,
-				472C1DD31EEBD32A003D55A7 /* nntpstorage.c in Sources */,
-				472C1E771EEBD32A003D55A7 /* mrsaxparser.c in Sources */,
-				472C1E3D1EEBD32A003D55A7 /* mailmime_write_file.c in Sources */,
-				472C1E1D1EEBD32A003D55A7 /* quota.c in Sources */,
 				A135CF0E1DD4BDD1007E3C29 /* PGPModificationDetectionCodePacket.m in Sources */,
-				472C1E741EEBD32A003D55A7 /* mrosnative.c in Sources */,
-				472C1E371EEBD32A003D55A7 /* mailmime.c in Sources */,
-				472C1E501EEBD32A003D55A7 /* compress.c in Sources */,
 				A1EB057C1D956838008659C1 /* MailHandler.swift in Sources */,
-				472C1E3C1EEBD32A003D55A7 /* mailmime_types_helper.c in Sources */,
-				472C1DE81EEBD32A003D55A7 /* mailthread_types.c in Sources */,
-				472C1E0C1EEBD32A003D55A7 /* mailimap_keywords.c in Sources */,
-				472C1E271EEBD32A003D55A7 /* xgmmsgid.c in Sources */,
 				A135CF161DD4BDD1007E3C29 /* PGPPublicKeyPacket.m in Sources */,
+				47F963911EEFC36F00460308 /* crypto.c in Sources */,
 				A135CF0B1DD4BDD1007E3C29 /* PGPKey.m in Sources */,
-				472C1E5E1EEBD32A003D55A7 /* sqlite3.c in Sources */,
 				A1182C571E30F45C0024D389 /* PGPKeyManagement.swift in Sources */,
-				472C1DD61EEBD32A003D55A7 /* pop3driver_cached_message.c in Sources */,
-				472C1E511EEBD32A003D55A7 /* create.c in Sources */,
 				A1EB05881D956879008659C1 /* AddressHandler.swift in Sources */,
 				472F39701E14F75C009260FB /* DataHandler.swift in Sources */,
-				472C1E6D1EEBD32A003D55A7 /* mrloginparam.c in Sources */,
-				472C1DDC1EEBD32A003D55A7 /* maildriver_types.c in Sources */,
-				472C1E151EEBD32A003D55A7 /* mailimap_types.c in Sources */,
+				472FC12C1EEFC55E00585D38 /* autocryptgen.c in Sources */,
 				A1EB05901D956923008659C1 /* ReadViewController.swift in Sources */,
-				472C1E521EEBD32A003D55A7 /* crypto.c in Sources */,
-				472C1DFC1EEBD32A003D55A7 /* annotatemore.c in Sources */,
-				472C1E341EEBD32A003D55A7 /* mailmbox_types.c in Sources */,
 				A1C3DEEC1E0AB15300EB7D02 /* InitViewController.swift in Sources */,
-				472C1DEA1EEBD32A003D55A7 /* mailprivacy.c in Sources */,
-				472C1E6C1EEBD32A003D55A7 /* mrkeyring.c in Sources */,
-				472C1E081EEBD32A003D55A7 /* mailimap_id.c in Sources */,
 				472F398E1E251B8D009260FB /* MailAddress.swift in Sources */,
-				472C1DD91EEBD32A003D55A7 /* pop3storage.c in Sources */,
-				472C1E691EEBD32A003D55A7 /* mrimap.c in Sources */,
 				A135CF101DD4BDD1007E3C29 /* PGPOnePassSignaturePacket.m in Sources */,
-				472C1DBA1EEBD32A003D55A7 /* imapstorage.c in Sources */,
-				472C1E461EEBD32A003D55A7 /* mailpop3_socket.c in Sources */,
-				472C1E031EEBD32A003D55A7 /* idle.c in Sources */,
-				472C1DA01EEBD32A003D55A7 /* mailsasl.c in Sources */,
-				472C1DF31EEBD32A003D55A7 /* parser.c in Sources */,
 				F12060821DA552FC00F6EF37 /* MailHandlerDelegator.swift in Sources */,
+				47F9639E1EEFC36F00460308 /* writer.c in Sources */,
 				F1984D741E1E92B300804E1E /* LabelStyleKit.swift in Sources */,
-				472C1E261EEBD32A003D55A7 /* xgmlabels.c in Sources */,
-				472C1DE91EEBD32A003D55A7 /* mailengine.c in Sources */,
-				472C1DF21EEBD32A003D55A7 /* newsfeed_private.c in Sources */,
-				472C1E701EEBD32A003D55A7 /* mrmailbox_imex.c in Sources */,
 				A15B7BE81E2934CB0024E499 /* EncryptionType.swift in Sources */,
-				472C1E631EEBD32A003D55A7 /* mrchat.c in Sources */,
-				472C1DBE1EEBD32A003D55A7 /* maildirdriver_message.c in Sources */,
 				A1EB05861D956872008659C1 /* FrequentCell.swift in Sources */,
-				472C1E0B1EEBD32A003D55A7 /* mailimap_id_types.c in Sources */,
-				472C1E171EEBD32A003D55A7 /* namespace.c in Sources */,
-				472C1DCC1EEBD32A003D55A7 /* mhstorage.c in Sources */,
-				472C1DA81EEBD32A003D55A7 /* mailstream_socket.c in Sources */,
-				472C1E551EEBD32A003D55A7 /* openssl_crypto.c in Sources */,
-				472C1DF61EEBD32A003D55A7 /* parser_rdf.c in Sources */,
-				472C1DB21EEBD32A003D55A7 /* feeddriver_message.c in Sources */,
-				472C1E0F1EEBD32A003D55A7 /* mailimap_print.c in Sources */,
-				472C1DA41EEBD32A003D55A7 /* mailstream_cfstream.c in Sources */,
-				472C1DBB1EEBD32A003D55A7 /* maildirdriver.c in Sources */,
-				472C1E2E1EEBD32A003D55A7 /* mailimf_write_generic.c in Sources */,
-				472C1DC41EEBD32A003D55A7 /* mboxdriver_message.c in Sources */,
-				472C1DEB1EEBD32A003D55A7 /* mailprivacy_gnupg.c in Sources */,
-				472C1E0D1EEBD32A003D55A7 /* mailimap_oauth2.c in Sources */,
-				472C1DE21EEBD32A003D55A7 /* mailstorage.c in Sources */,
-				472C1DBD1EEBD32A003D55A7 /* maildirdriver_cached_message.c in Sources */,
 				A135CF091DD4BDD1007E3C29 /* PGPCryptoUtils.m in Sources */,
-				472C1D9C1EEBD32A003D55A7 /* clist.c in Sources */,
-				472C1E621EEBD32A003D55A7 /* mrapeerstate.c in Sources */,
-				472C1DD21EEBD32A003D55A7 /* nntpdriver_tools.c in Sources */,
-				472C1E411EEBD32A003D55A7 /* newsnntp.c in Sources */,
-				472C1DCD1EEBD32A003D55A7 /* mime_message_driver.c in Sources */,
-				472C1E3B1EEBD32A003D55A7 /* mailmime_types.c in Sources */,
-				472C1E6F1EEBD32A003D55A7 /* mrmailbox_configure.c in Sources */,
-				472C1E111EEBD32A003D55A7 /* mailimap_socket.c in Sources */,
-				472C1E1E1EEBD32A003D55A7 /* quota_parser.c in Sources */,
-				472C1DA71EEBD32A003D55A7 /* mailstream_low.c in Sources */,
+				47F963931EEFC36F00460308 /* keyring.c in Sources */,
 				A135CF1A1DD4BDD1007E3C29 /* PGPSecretKeyPacket.m in Sources */,
-				472C1DD51EEBD32A003D55A7 /* pop3driver_cached.c in Sources */,
 				F12041FB1DA3FBF7002E4940 /* ListViewController.swift in Sources */,
-				472C1DED1EEBD32A003D55A7 /* mailprivacy_tools.c in Sources */,
 				F18B445E1E7044B70080C041 /* FlipTransition.swift in Sources */,
 				A135CF201DD4BDD1007E3C29 /* PGPSymmetricallyEncryptedIntegrityProtectedDataPacket.m in Sources */,
 				472F397E1E1D0B0B009260FB /* EnzevalosContact+CoreDataProperties.swift in Sources */,
@@ -3387,6 +1370,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3438,6 +1422,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3473,9 +1458,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"${PODS_ROOT}/OpenSSL-Universal/lib-ios\"",
 					"$(inherited)",
-					"\"${PODS_ROOT}/mailcore2-ios/lib\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -3523,9 +1506,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"${PODS_ROOT}/OpenSSL-Universal/lib-ios\"",
 					"$(inherited)",
-					"\"${PODS_ROOT}/mailcore2-ios/lib\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/netpgp/KeyGen.c b/netpgp/KeyGen.c
deleted file mode 100644
index 5c40618faf40707bcb6017d0040c3f48094c4f83..0000000000000000000000000000000000000000
--- a/netpgp/KeyGen.c
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-//  KeyGen.c
-//  enzevalos_iphone
-//
-//  Created by Oliver Wiese on 11.06.17.
-//  Copyright © 2017 fu-berlin. All rights reserved.
-//
-
-#include "KeyGen.h"
-#include "netpgp-extra.h"
-
-/*******************************************************************************
- * Key generatation
- ******************************************************************************/
-
-
-static unsigned add_key_prefs(pgp_create_sig_t *sig)
-{
-    /* similar to pgp_add_key_prefs(), Mimic of GPG default settings, limited to supported algos */
-    return
-    /* Symmetric algo prefs */
-    pgp_write_ss_header(sig->output, 6, PGP_PTAG_SS_PREFERRED_SKA) &&
-    pgp_write_scalar(sig->output, PGP_SA_AES_256, 1) &&
-    pgp_write_scalar(sig->output, PGP_SA_AES_128, 1) &&
-    pgp_write_scalar(sig->output, PGP_SA_CAST5, 1) &&
-    pgp_write_scalar(sig->output, PGP_SA_TRIPLEDES, 1) &&
-    pgp_write_scalar(sig->output, PGP_SA_IDEA, 1) &&
-    
-    /* Hash algo prefs, the first algo is the preferred algo */
-    pgp_write_ss_header(sig->output, 6, PGP_PTAG_SS_PREFERRED_HASH) &&
-    pgp_write_scalar(sig->output, PGP_HASH_SHA256, 1) &&
-    pgp_write_scalar(sig->output, PGP_HASH_SHA384, 1) &&
-    pgp_write_scalar(sig->output, PGP_HASH_SHA512, 1) &&
-    pgp_write_scalar(sig->output, PGP_HASH_SHA224, 1) &&
-    pgp_write_scalar(sig->output, PGP_HASH_SHA1, 1) && /* Edit for Autocrypt/Delta Chat: due to the weak SHA1, it should not be preferred */
-    
-    /* Compression algo prefs */
-    pgp_write_ss_header(sig->output, 2/*1+number of following items*/, PGP_PTAG_SS_PREF_COMPRESS) &&
-    pgp_write_scalar(sig->output, PGP_C_ZLIB, 1) /*&& -- not sure if Delta Chat will support bzip2 on all platforms, however, this is not that important as typical files are compressed themselves and text is not that big
-                                                  pgp_write_scalar(sig->output, PGP_C_BZIP2, 1) -- if you re-enable this, do not forget to modifiy the header count*/;
-}
-
-
-static void add_selfsigned_userid(pgp_key_t *skey, pgp_key_t *pkey, const uint8_t *userid, time_t key_expiry)
-{
-    /* similar to pgp_add_selfsigned_userid() which, however, uses different key flags */
-    pgp_create_sig_t	*sig;
-    pgp_subpacket_t	 sigpacket;
-    pgp_memory_t		*mem_sig = NULL;
-    pgp_output_t		*sigoutput = NULL;
-    
-    /* create sig for this pkt */
-    sig = pgp_create_sig_new();
-    pgp_sig_start_key_sig(sig, &skey->key.seckey.pubkey, NULL, userid, PGP_CERT_POSITIVE);
-    
-    pgp_add_creation_time(sig, time(NULL));
-    pgp_add_key_expiration_time(sig, key_expiry);
-    pgp_add_primary_userid(sig, 1);
-    pgp_add_key_flags(sig, PGP_KEYFLAG_SIGN_DATA|PGP_KEYFLAG_CERT_KEYS);
-    add_key_prefs(sig);
-    pgp_add_key_features(sig); /* will add 0x01 - modification detection */
-    
-    pgp_end_hashed_subpkts(sig);
-    
-    pgp_add_issuer_keyid(sig, skey->pubkeyid); /* the issuer keyid is not hashed by definition */
-    
-    pgp_setup_memory_write(&sigoutput, &mem_sig, 128);
-    pgp_write_sig(sigoutput, sig, &skey->key.seckey.pubkey, &skey->key.seckey);
-    
-    /* add this packet to key */
-    sigpacket.length = pgp_mem_len(mem_sig);
-    sigpacket.raw = pgp_mem_data(mem_sig);
-    
-    /* add user id and signature to key */
-    pgp_update_userid(skey, userid, &sigpacket, &sig->sig.info);
-    if(pkey) {
-        pgp_update_userid(pkey, userid, &sigpacket, &sig->sig.info);
-    }
-    
-    /* cleanup */
-    pgp_create_sig_delete(sig);
-    pgp_output_delete(sigoutput);
-    pgp_memory_free(mem_sig);
-}
-
-
-static void add_subkey_binding_signature(pgp_subkeysig_t* p, pgp_key_t* primarykey, pgp_key_t* subkey, pgp_key_t* seckey)
-{
-    /*add "0x18: Subkey Binding Signature" packet, PGP_SIG_SUBKEY */
-    pgp_create_sig_t* sig;
-    pgp_output_t*     sigoutput = NULL;
-    pgp_memory_t*     mem_sig = NULL;
-    
-    sig = pgp_create_sig_new();
-    pgp_sig_start_key_sig(sig, &primarykey->key.pubkey, &subkey->key.pubkey, NULL, PGP_SIG_SUBKEY);
-    
-    pgp_add_creation_time(sig, time(NULL));
-    pgp_add_key_expiration_time(sig, 0);
-    pgp_add_key_flags(sig, PGP_KEYFLAG_ENC_STORAGE|PGP_KEYFLAG_ENC_COMM); /* NB: algo/hash/compression preferences are not added to subkeys */
-    
-    pgp_end_hashed_subpkts(sig);
-    
-    pgp_add_issuer_keyid(sig, seckey->pubkeyid); /* the issuer keyid is not hashed by definition */
-    
-    pgp_setup_memory_write(&sigoutput, &mem_sig, 128);
-    pgp_write_sig(sigoutput, sig, &seckey->key.seckey.pubkey, &seckey->key.seckey);
-    
-    p->subkey         = primarykey->subkeyc-1; /* index of subkey in array */
-    p->packet.length  = mem_sig->length;
-    p->packet.raw     = mem_sig->buf; mem_sig->buf = NULL; /* move ownership to packet */
-    copy_sig_info(&p->siginfo, &sig->sig.info); /* not sure, if this is okay, however, siginfo should be set up, otherwise we get "bad info-type" errors */
-    
-    pgp_create_sig_delete(sig);
-    pgp_output_delete(sigoutput);
-    free(mem_sig); /* do not use pgp_memory_free() as this would also free mem_sig->buf which is owned by the packet */
-}
-
-
-int mre2ee_driver_create_keypair(const char* addr)
-{
-    int              success = 0;
-    pgp_key_t        seckey, pubkey, subkey;
-    uint8_t          subkeyid[PGP_KEY_ID_SIZE];
-    uint8_t*         user_id = NULL;
-    pgp_memory_t     *pubmem = pgp_memory_new(), *secmem = pgp_memory_new();
-    pgp_output_t     *pubout = pgp_output_new(), *secout = pgp_output_new();
-    
-    memset(&seckey, 0, sizeof(pgp_key_t));
-    memset(&pubkey, 0, sizeof(pgp_key_t));
-    memset(&subkey, 0, sizeof(pgp_key_t));
-    
-    if( addr==NULL || pubmem==NULL || secmem==NULL || pubout==NULL || secout==NULL ) {
-        goto cleanup;
-    }
-    
-    /* Generate User ID.  For convention, use the same address as given in `Autocrypt: to=...` in angle brackets
-     (RFC 2822 grammar angle-addr, see also https://autocrypt.org/en/latest/level0.html#type-p-openpgp-based-key-data )
-     We do not add the name to the ID for the following reasons:
-     - privacy
-     - the name may be changed
-     - shorter keys
-     - the name is already taken from From:
-     - not Autocrypt:-standard */
-    user_id = (uint8_t*) printf("<%s>", addr);
-    
-    /* generate two keypairs */
-    if( !pgp_rsa_generate_keypair(&seckey, 2048/*bits*/, 65537UL/*e*/, NULL, NULL, NULL, 0)
-       || !pgp_rsa_generate_keypair(&subkey, 2048/*bits*/, 65537UL/*e*/, NULL, NULL, NULL, 0) ) {
-        goto cleanup;
-    }
-    
-    
-    /* Create public key, bind public subkey to public key
-     ------------------------------------------------------------------------ */
-    
-    pubkey.type = PGP_PTAG_CT_PUBLIC_KEY;
-    pgp_pubkey_dup(&pubkey.key.pubkey, &seckey.key.pubkey);
-    memcpy(pubkey.pubkeyid, seckey.pubkeyid, PGP_KEY_ID_SIZE);
-    pgp_fingerprint(&pubkey.pubkeyfpr, &seckey.key.pubkey, 0);
-    add_selfsigned_userid(&seckey, &pubkey, (const uint8_t*)user_id, 0/*never expire*/);
-    
-    EXPAND_ARRAY((&pubkey), subkey);
-    {
-        pgp_subkey_t* p = &pubkey.subkeys[pubkey.subkeyc++];
-        pgp_pubkey_dup(&p->key.pubkey, &subkey.key.pubkey);
-        pgp_keyid(subkeyid, PGP_KEY_ID_SIZE, &pubkey.key.pubkey, PGP_HASH_SHA1);
-        memcpy(p->id, subkeyid, PGP_KEY_ID_SIZE);
-    }
-    
-    EXPAND_ARRAY((&pubkey), subkeysig);
-    add_subkey_binding_signature(&pubkey.subkeysigs[pubkey.subkeysigc++], &pubkey, &subkey, &seckey);
-    
-    
-    /* Create secret key, bind secret subkey to secret key
-     ------------------------------------------------------------------------ */
-    
-    EXPAND_ARRAY((&seckey), subkey);
-    {
-        pgp_subkey_t* p = &seckey.subkeys[seckey.subkeyc++];
-        pgp_seckey_dup(&p->key.seckey, &subkey.key.seckey);
-        pgp_keyid(subkeyid, PGP_KEY_ID_SIZE, &seckey.key.pubkey, PGP_HASH_SHA1);
-        memcpy(p->id, subkeyid, PGP_KEY_ID_SIZE);
-    }
-    
-    EXPAND_ARRAY((&seckey), subkeysig);
-    add_subkey_binding_signature(&seckey.subkeysigs[seckey.subkeysigc++], &seckey, &subkey, &seckey);
-    
-    
-    /* Done with key generation, write binary keys to memory
-     ------------------------------------------------------------------------ */
-    
-    pgp_writer_set_memory(pubout, pubmem);
-    if( !pgp_write_xfer_key(pubout, &pubkey, 0/*armored*/)
-       || pubmem->buf == NULL || pubmem->length <= 0 ) {
-        goto cleanup;
-    }
-    
-    pgp_writer_set_memory(secout, secmem);
-    if( !pgp_write_xfer_key(secout, &seckey, 0/*armored*/)
-       || secmem->buf == NULL || secmem->length <= 0 ) {
-        goto cleanup;
-    }
-    
-    //mrkey_set_from_raw(ret_public_key, pubmem->buf, pubmem->length, MR_PUBLIC);
-    //mrkey_set_from_raw(ret_private_key, secmem->buf, secmem->length, MR_PRIVATE);
-    
-    success = 1;
-    
-cleanup:
-    if( pubout ) { pgp_output_delete(pubout); }
-    if( secout ) { pgp_output_delete(secout); }
-    if( pubmem ) { pgp_memory_free(pubmem); }
-    if( secmem ) { pgp_memory_free(secmem); }
-    pgp_key_free(&seckey); /* not: pgp_keydata_free() which will also free the pointer itself (we created it on the stack) */
-    pgp_key_free(&pubkey);
-    pgp_key_free(&subkey);
-    free(user_id);
-    return success;
-}
-
-
diff --git a/netpgp/KeyGen.h b/netpgp/KeyGen.h
deleted file mode 100644
index 4a2ca2b79c5f9a7dbf9d6448b903a63725b9fac2..0000000000000000000000000000000000000000
--- a/netpgp/KeyGen.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  KeyGen.h
-//  enzevalos_iphone
-//
-//  Created by Oliver Wiese on 11.06.17.
-//  Copyright © 2017 fu-berlin. All rights reserved.
-//
-
-#ifndef KeyGen_h
-#define KeyGen_h
-
-int mre2ee_driver_create_keypair(const char* addr)
-#endif /* KeyGen_h */
diff --git a/netpgp/PGPKeyGen.m b/netpgp/PGPKeyGen.m
deleted file mode 100644
index d72fe0999ddfc4ed2eb83278a7d05217ccbd709a..0000000000000000000000000000000000000000
--- a/netpgp/PGPKeyGen.m
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-//  PGPKeyGen.m
-//  enzevalos_iphone
-//
-//  Created by Oliver Wiese on 12.06.17.
-//  Copyright © 2017 fu-berlin. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
diff --git a/netpgp/PGPKeyGeneration.swift b/netpgp/PGPKeyGeneration.swift
index d09ab75d37804abc02dbceb2a3acab4a5d5e59a8..b95d4bb698271d3e1d75cf47d0ff49183e81d4cd 100644
--- a/netpgp/PGPKeyGeneration.swift
+++ b/netpgp/PGPKeyGeneration.swift
@@ -13,64 +13,18 @@ public func createKey(userID:String){
     var adr: UInt8
     adr = 8
    var pk: Array<CChar> = Array(repeating: 32, count: 4048)
-   var sk: Array<CChar> = Array(repeating: 32, count: 4048)
+   //var sk: Array<CChar> = Array(repeating: 32, count: 4048)
    
-    print("CreateKey")
-    mre2ee_driver_create_keypair(&adr, &pk, &sk)
-    print("###########")
-    
-    
-    
-}
-
-public func generateAutocryptSecretKey(userID: String){
-    var secretKey = pgp_key_t()
-    var subKey = pgp_key_t()
-    var publicKey = pgp_key_t()
+    var sk: pgp_key_t = generateSecretKey(&adr)
     
-    memset(&secretKey, 0, MemoryLayout<pgp_key_t>.size)
-    memset(&subKey, 0, MemoryLayout<pgp_key_t>.size)
-    memset(&publicKey, 0, MemoryLayout<pgp_key_t>.size)
-
-    pgp_rsa_generate_keypair(&secretKey, 2048, 65537, nil, nil, nil, 0)
-    pgp_rsa_generate_keypair(&subKey, 2048, 65537, nil, nil, nil, 0)
-    
-    publicKey.type = PGP_PTAG_CT_PUBLIC_KEY
-    publicKey.key.pubkey = secretKey.key.pubkey
-
-    pgp_fingerprint(&publicKey.pubkeyfpr, &secretKey.key.pubkey, PGP_HASH_SHA256)
-    
-    bindSigKey(key: &publicKey, sigKey: &subKey, secKey: &secretKey)
-    
-    print("PK: \(publicKey.key.pubkey.birthtime)")
-    
-}
-
-
-private func bindSigKey( key: inout pgp_key_t, sigKey: inout pgp_key_t, secKey: inout pgp_key_t){
-    var primKey = key
-    var subKey = sigKey
-    var signature = pgp_create_sig_new()
-    var resultSig: UnsafeMutablePointer<pgp_output_t>?
+    print("CreateKey")
+    mre2ee_driver_create_keypair(&adr, &pk, &pk)
     
-    var mem: UnsafeMutablePointer<pgp_memory_t>?
     
-    pgp_sig_start_key_sig(signature, &primKey.key.pubkey, &subKey.key.pubkey, nil, PGP_SIG_SUBKEY)
-    pgp_add_creation_time(signature, time(nil))
-    pgp_add_key_expiration_time(signature, 0)
-    pgp_add_key_flags(signature,UInt8(PGP_KEYFLAG_ENC_COMM.rawValue)) // add  PGP_KEYFLAG_ENC_STORAGE ???
+    print("###########")
     
-    pgp_end_hashed_subpkts(signature)
-    pgp_add_issuer_keyid(signature, &secKey.pubkeyid.0)
     
-    pgp_setup_memory_write(&resultSig, &mem, 128)
-    pgp_write_sig(resultSig, signature, &secKey.key.seckey.pubkey, &secKey.key.seckey)
-
-    //TODO: Consider pk???
     
-    pgp_create_sig_delete(signature)
-    pgp_output_delete(resultSig)
-    free(mem)
 }
 
 
diff --git a/netpgp/autocryptgen.c b/netpgp/autocryptgen.c
index c040aeae001081070a4c4688b0c1376ca8b1c1b5..600c890a66b8101a1178235739375b9a43ed6e36 100644
--- a/netpgp/autocryptgen.c
+++ b/netpgp/autocryptgen.c
@@ -8,10 +8,23 @@
 
 #include "autocryptgen.h"
 
+pgp_key_t
+generateSecretKey(uint8_t* adr)
+{
+    pgp_key_t        seckey;
+    uint8_t*         user_id = NULL;
+    
+    memset(&seckey, 0, sizeof(pgp_key_t));
+    user_id = adr;
+    /* generate two keypairs */
+    pgp_rsa_generate_keypair(&seckey, 2048/*bits*/, 65537UL/*e*/, NULL, NULL, NULL, 0);
+    return seckey;
+    
+}
+
 
-/* portable replacement for strdup(3) */
 char *
-netpgp_strdup(const char *s)
+netpgp2_strdup(const char *s)
 {
     size_t	 len;
     char	*cp;
@@ -26,13 +39,12 @@ netpgp_strdup(const char *s)
 
 
 char *
-pgp_export_key(pgp_io_t *io, const pgp_key_t *keydata, uint8_t *passphrase)
+pgp_export_my_key(pgp_io_t *io, const pgp_key_t *keydata, uint8_t *passphrase)
 {
     pgp_output_t	*output;
     pgp_memory_t	*mem;
     char		*cp;
     
-    //__PGP_USED(io);
     pgp_setup_memory_write(&output, &mem, 128);
     pgp_write_xfer_key(output, keydata, 1);
     
@@ -40,13 +52,13 @@ pgp_export_key(pgp_io_t *io, const pgp_key_t *keydata, uint8_t *passphrase)
      pgp_write_xfer_seckey(output, keydata, passphrase,
 					strlen((char *)passphrase), 1);
      */
-    cp = netpgp_strdup(pgp_mem_data(mem));
+    cp = netpgp2_strdup(pgp_mem_data(mem));
     pgp_teardown_memory_write(output, mem);
+    printf("CP: %s \n",cp);
     return cp;
 }
 
 
-
 /*******************************************************************************
  * Key generatation
  ******************************************************************************/
@@ -228,6 +240,8 @@ int mre2ee_driver_create_keypair(uint8_t* adr, char* pk, char* sk)//const char*
     /* Done with key generation, write binary keys to memory
      ------------------------------------------------------------------------ */
     
+    printf("Write in mem \n");
+    
     pgp_writer_set_memory(pubout, pubmem);
     if( !pgp_write_xfer_key(pubout, &pubkey, 1/*armored*/)
        || pubmem->buf == NULL || pubmem->length <= 0 ) {
@@ -240,30 +254,30 @@ int mre2ee_driver_create_keypair(uint8_t* adr, char* pk, char* sk)//const char*
         goto cleanup;
     }
     
+    
+    
     //pgp_filewrite(pk,  pubmem->buf, pubmem->length, 1);
     //pgp_filewrite(sk,  secmem->buf, secmem->length, 1);
-
-    char s [5000];
-    for (int i = 0; i < 5000; i++) {
-        s[i] = i;
-    }
-    pgp_write(pubout, s, 1);
     
-    printf("My new key %s \n", s);
 
-    printf("My key??? %s \n",pgp_mem_data(pubmem));
+    printf("\n My key??? %s \n",pgp_mem_data(pubmem));
     
     pgp_io_t s_io;
 
     memset(&s_io, 0, sizeof(pgp_io_t));
     s_io.outs = stdout;
-    s_io.errs = stderr;
-    s_io.res  = stderr;
-    
-    //memcpy(pk, pubout, pubmem->length);
-   // memcpy(sk, secout, secmem->length);
-    pgp_export_key(&s_io, &pubkey, NULL);
+    s_io.errs = stdout;
+    s_io.res  = stdout;
+    
+    // memcpy(pk, pubout, pubmem->length);
+    // memcpy(sk, secout, secmem->length);
+    printf("before export\n");
+    sk = pgp_export_my_key(&s_io, &pubkey, NULL);
+    printf("after export\n");
 
+    
+    
+    
     success = 1;
     
 cleanup:
diff --git a/netpgp/autocryptgen.h b/netpgp/autocryptgen.h
index df109384346b133b9bc24f5c6eb6f0d0416c0fe8..00e318394fa5d4d5d1e6e7e224f1b2527d25240a 100644
--- a/netpgp/autocryptgen.h
+++ b/netpgp/autocryptgen.h
@@ -14,5 +14,6 @@
 
 
 int mre2ee_driver_create_keypair(uint8_t* adr, char* pk, char* sk);//const char* addr);
+pgp_key_t generateSecretKey(uint8_t* adr);
 
 #endif /* autocryptgen_h */