changelog

Update messenger-backend submodule.
bump copyright year
2026-07-03 14:05:24 +02:00 · 2018-01-18 17:45:55 +01:00 · 2018-01-18 17:37:05 +01:00 · 2018-01-18 17:36:42 +01:00 · 2018-01-18 17:27:06 +01:00 · 2018-01-18 17:12:58 +01:00
1176 changed files with 11312 additions and 454755 deletions
@@ -0,0 +1,25 @@
+# Thank you for contributing to Delta Chat.
+
+Delta Chat is divided in two parts: Android and [Core](https://github.com/deltachat/deltachat-core).
+
+In short, the Android part is about the User Interface. The Interface is translated using [Transifex](https://www.transifex.com/delta-chat/delta-chat-android). The Core part is about handling the connection to the mail server and the chat or e-mail messages as well as providing secure communication by using [Autocrypt](https://autocrypt.org/en/latest/).
+
+Delta Chat Core is used in the Android and in the [iOS](https://github.com/deltachat/deltachat-ios) version.
+
+Please try to create your issue to the respective Issue tracker: Here, or in [Core](https://github.com/deltachat/deltachat-core/issues). Don't worry, if you are not sure. The issue will be handled anyway.
+
+If you intend to create a **feature request** for Delta Chat, please check the exiting requests for
+* [Android](https://github.com/deltachat/deltachat-android/issues?q=is%3Aissue+label%3A%22feature+request%22+sort%3Aupdated-desc) and
+* [Core](https://github.com/deltachat/deltachat-core/issues?q=is%3Aissue+label%3A%22feature+request%22+sort%3Aupdated-desc) 
+
+first.
+
+If you intend to send a **bug report** for Delta Chat, search for bugs (including closed) in
+* [Android](https://github.com/deltachat/deltachat-android/issues?&q=is%3Aissue) and
+* [Core](https://github.com/deltachat/deltachat-core/issues?&q=is%3Aissue)
+
+A **bug** is a reproducable misbehaviour, when something happens but something else should happen instead. 
+
+Did you know there is a [Help](https://delta.chat/en/help) page for Delta Chat?
+
+To ask questions, you are invited to join our IRC channel **#deltachat** on [Freenode](https://webchat.freenode.net/?uio=MTE9MjA16a&channels=%23deltachat).
@@ -0,0 +1,34 @@
+_Please read the guidelines linked above, especially when you are a first time contributor. Remove this text and provide some basic informations below, if applicable. Remove template content that is not applicable._
+
+**Delta Chat version**
+
+See settings dialog …
+
+**Expected behavior**
+
+What is the expected output?
+
+**Actual behavior**
+
+What do you see instead?
+
+**Steps to reproduce the problem**
+
+1. …
+2. …
+
+**Screen snapshots**
+
+If applicable …
+
+**Debug logs**
+
+If applicable, debug logs can be copied from within the Delta Chat app: 
+
+Open the _Settings_ menu -> _About_ -> _version number|Info_.
+
+Alternatively from the Android system log:
+
+` adb logcat -v time -s DeltaChat `
+
+This log contains private data (e.g. mail address, provider information) which shall be removed or anonymised prior to posting.
@@ -9,3 +9,7 @@ libs/

 # ignore private scripts and directories, eg. local2github.prv.sh
 *.prv*
+
+# transifex temporary files
+tools/.tx/
+tools/translations/
@@ -1,5 +1,194 @@
 # Delta Chat Changelog

+## v0.13.0
+2018-01-18
+
+* Reply encrypted if the sender has enabled encryption manually (esp. useful when chatting with clients as K-9 or Enigmail)
+* Update welcome screen graphics
+* Update Norwegian, Russian and Turkish translations
+
+## v0.12.0
+2018-01-07
+
+* Gossip keys of other group members in the encrypted payload (will also be evaluated in one of the next versions)
+* Use SHA-256 instead of SHA-1 in signatures
+* Make the permanent notification clickable
+* Update permanent notification after import
+* Fix rendering of system messages
+* Various bug fixes
+* Update Albanian, French, Italian, Norwegian, Polish, Russian and Turkish translations
+
+## v0.11.4
+2017-12-17
+
+* Add option to initiate Autocrypt Key Transfer
+* Connect after importing a backup
+* Reading memory hole headers
+* Add Albanian translation
+* Update German, Italian, Polish, Portuguese, Russian, Turkish and Ukrainian translations
+
+## v0.10.0
+2017-11-29
+
+* Fix usage of multiple private keys
+* Fix various memory leaks
+* Update English, Portuguese and Turkish translations
+
+## v0.9.9
+2017-11-18
+
+* Alternate include order for F-Droid
+* Add Serbian translation
+* Update Catalan, Dutch, English, French, German, Hungarian, Italian, Polish, Portuguese, Russian, Spanish, Tamil, Telugu and Ukrainian translations
+
+## v0.9.8
+2017-11-15
+
+* Fix a bug that avoids chat creation under some circumstances (bug introduced in 0.9.7)
+
+## v0.9.7
+2017-11-14
+
+* Archive chats or delete chats by a long press
+* Notify the user in the chatlist about contact requests of known users or of other Delta Chat clients
+* Show messages only for explicitly wanted chats
+* Show more detailed reasons about failed end-to-end-encryptions
+* Explicit option to leave a group
+* Do not show the padlock if end-to-end-encryption is disabled by the user
+* Also import images from a backup when using a different device with different paths
+* Add copy-to-clipboard function for "About / Info"
+* Rework Emoji-code
+* Add Norwegian Bokmål translation
+* Add Tamil translation
+* Add Turkish translation
+* Update Catalan, German, French, Italian, Korean, Dutch, Polish, Portuguese, Russian, Telugu and Ukrainian translations
+
+## v0.9.6
+2017-10-18
+
+* Support keys generated with multiple subkeys eg. from K-9
+* Show PDFs and other attachments with bad names
+* Bug fixes
+
+## v0.9.5
+2017-10-08
+
+* Backup export and import function
+* Query password before export
+* Move replies from normal E-Mail-Clients to the "Chats" folder
+* Improve helping MUAs on showing chat threads
+* Improve onboarding
+* Add URL to default footer
+* Test a different approach for battery saving in this release
+* Update French, Italian, German, Polish, Portuguese, Russian and Ukrainian translations
+
+## v0.9.4
+2017-08-23
+
+* Introduce an editable "Status" field that is shown eg. in email footers
+* Editable and synchronized group images
+* Show the subject of messages that cannot be decrypted
+* Do not send "Read receipts" when decryption fails
+* Do not request "Read receipts" from normal MUAs as there are too many MUAs responding with weird, non-standard formats
+* Deleting a chat always deletes all messages from the device permanently
+* Ignore messages from mailing lists
+* Do not spread the original authors name nor address on forwarding
+* Encrypt mails send to SMTP and to IMAP the same way
+* Improve showing HTML-mails
+* Cleanup Android code
+* Remove badge counter on app restart
+* Add Ukrainian translation
+* Add Telugu translation
+* Add Catalan translation
+* Update German, Spanish, French, Hungarian, Italian, Polish, Portuguese and Russian translations
+
+## v0.9.3
+2017-07-13
+
+* Introduce "Read receipts" and avoid social pressure to leave it activated
+* Improve encryption dialog in profile
+* Fix marking messages as "seen" when opening the contact requests
+* Ignore signature.asc files of signed-only messages
+* Update Polish, Portuguese and Russian translations
+
+## v0.9.2
+2017-06-28
+
+* Encrypt group chats
+* Cryptographically sign messages
+* Validate signatures of incoming messages ("Info" shows the state)
+* Show a little lock beside end-to-end-encrypted messages with a validated signature
+* If end-to-end-encryption is available on sending time, guarantee the message not to be sent without end-to-end-encryption later
+* Show special characters in HTML-mails
+* Help MUAs on showing chat threads
+* Show attachments from multipart/alternative structures
+* Upgrade from Autocrypt Level 0 to Level 1; as the levels are not compatible, encryption on mixed setups does not happen
+* Update Polish, Portuguese, Spanish and French translations
+
+## v0.9.1
+2017-06-04
+
+* Profile: Improve encryption state dialog
+* Improved video quality of short clips
+* Make encryption-dialog localizable
+* Update Russian translation
+
+## v0.9.0
+2017-06-01
+
+* Add end-to-end-encrypting following the OpenPGP and Autocrypt standards
+* Add a function to compare keys
+* Profile: Add option to copy the email address to the clipboard
+* Pimp GUI
+
+## v0.1.36
+2017-05-04
+
+* Support camera on Android Nougat
+
+## v0.1.34
+2017-05-03
+
+* Link to new homepage https://delta.chat
+* Localizable Help-URLs
+
+## v0.1.33
+2017-04-29
+
+* Better support for right-to-left (RTL) languages, taking advantage of
+  Android 4.2 (Jelly Bean MR1, API level 17).
+* Send PNG files without resizing and converting to JPEG
+* If JPEG files are send without compression, they still appear as image, not as attached files
+* Raise-to-speak defaults to false
+* Unify long click behaviour
+* Support Android's system function "Delete data"
+* Replies to messages pop up automatically even if send from other email addresses (typical scenario for alias addresses)
+* Fix group-replies from normal email-clients. 
+
+## v0.1.32
+2017-04-22
+
+* Update Spanish and Portuguese translations
+* Update internal sqlite library to version 3.18.0, released on 2017-03-28
+* Remove more of the custom language handling, use Android's routines instead
+* General code cleanup
+* Play GIF files
+* Option to disable autoplaying GIF files
+* When sending contacts, only use the names the receivers have set themselves
+* Show some hints when long-pressing icons in the action bar
+
+## v0.1.29
+2017-04-19
+
+* Add Russian translation
+* For outgoing (group-)messages, only use the names the receivers have set themselves
+
+## v0.1.28
+2017-04-14
+
+* Pimp notifications
+* Bug fixes
+
 ## v0.1.27
 2017-04-12

@@ -24,15 +24,15 @@ tasks.withType(JavaCompile) {
 }

 dependencies {
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
    compile 'com.googlecode.mp4parser:isoparser:1.0.6'
    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
    compile fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
 }

 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 25       // should be ...
+    buildToolsVersion '25.0.2' // ... in sync unless you know exactly what you're doing

    useLibrary 'org.apache.http.legacy'
    defaultConfig.applicationId = "com.b44t.messenger"
@@ -48,7 +48,10 @@ android {

    signingConfigs {
        debug {
-            storeFile file("config/debug.keystore")
+            def debugKeystore = file("config/debug.keystore")
+            if (debugKeystore.exists()) {
+                storeFile debugKeystore
+            }
        }

        release {
@@ -76,13 +79,12 @@ android {
        }
    }

-    defaultConfig.versionCode = 27
-
    sourceSets.main {
        jniLibs.srcDir 'libs'
        jni.srcDirs = [] //disable automatic ndk-build call
    }

+    flavorDimensions "none"
    productFlavors {
        /*
        x86 {
@@ -105,18 +107,22 @@ android {
        }
        */
        fat {
-            versionCode = 3
+            dimension "none"
+            //versionCode = 3
        }
    }

-    applicationVariants.all { variant ->
+    /*applicationVariants.all { variant ->
        def abiVersion = variant.productFlavors.get(0).versionCode
        variant.mergedFlavor.versionCode = defaultConfig.versionCode * 10 + abiVersion;
-    }
+    }*/

    defaultConfig {
        minSdkVersion 14     // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun)
        targetSdkVersion 25  // 25: Nougat. CAVE: Do NOT target "Andoid O" without checking the background tasks carefully, see https://developer.android.com/preview/behavior-changes.html#back-all . As long as we target "Nougat", everything works as expected even for "Andoid O" or later
-        versionName "0.1.27" // do NOT forget to increase defaultConfig.versionCode!
+                             // in general, we should not change the target without reason; eg. after the switch to Nougat, the camera stops working (see https://inthecheesefactory.com/blog/how-to-share-access-to-file-with-fileprovider-on-android-nougat/en )
+
+        versionName "0.13.0" // do NOT forget to increase defaultConfig.versionCode!
+        versionCode 511
    }
 }
@@ -493,6 +493,19 @@ local_src_files := \
 	./openssl/crypto/buffer/buf_err.c \
 	./openssl/crypto/buffer/buf_str.c \
 	./openssl/crypto/buffer/buffer.c \
+	./openssl/crypto/camellia/camellia.c \
+	./openssl/crypto/camellia/cmll_cbc.c \
+	./openssl/crypto/camellia/cmll_cfb.c \
+	./openssl/crypto/camellia/cmll_ctr.c \
+	./openssl/crypto/camellia/cmll_ecb.c \
+	./openssl/crypto/camellia/cmll_misc.c \
+	./openssl/crypto/camellia/cmll_ofb.c \
+	./openssl/crypto/camellia/cmll_utl.c \
+	./openssl/crypto/cast/c_cfb64.c \
+	./openssl/crypto/cast/c_ecb.c \
+	./openssl/crypto/cast/c_enc.c \
+	./openssl/crypto/cast/c_ofb64.c \
+	./openssl/crypto/cast/c_skey.c \
 	./openssl/crypto/cmac/cm_ameth.c \
 	./openssl/crypto/cmac/cm_pmeth.c \
 	./openssl/crypto/cmac/cmac.c \
@@ -610,6 +623,8 @@ local_src_files := \
 	./openssl/crypto/evp/e_aes.c \
 	./openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
 	./openssl/crypto/evp/e_bf.c \
+	./openssl/crypto/evp/e_camellia.c \
+	./openssl/crypto/evp/e_cast.c \
 	./openssl/crypto/evp/e_des.c \
 	./openssl/crypto/evp/e_des3.c \
 	./openssl/crypto/evp/e_null.c \
@@ -961,88 +976,88 @@ include $(BUILD_STATIC_LIBRARY)
 ################################################################################


-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD -finline-functions -ffast-math -ffunction-sections -fdata-sections -Os
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/libwebp/src
-LOCAL_ARM_MODE := arm
-LOCAL_STATIC_LIBRARIES := cpufeatures
-LOCAL_MODULE := webp
-
-ifneq ($(findstring armeabi-v7a, $(TARGET_ARCH_ABI)),)
-  NEON := c.neon
-else
-  NEON := c
-endif
-
-LOCAL_SRC_FILES := \
-./libwebp/dec/alpha.c \
-./libwebp/dec/buffer.c \
-./libwebp/dec/frame.c \
-./libwebp/dec/idec.c \
-./libwebp/dec/io.c \
-./libwebp/dec/quant.c \
-./libwebp/dec/tree.c \
-./libwebp/dec/vp8.c \
-./libwebp/dec/vp8l.c \
-./libwebp/dec/webp.c \
-./libwebp/dsp/alpha_processing.c \
-./libwebp/dsp/alpha_processing_sse2.c \
-./libwebp/dsp/cpu.c \
-./libwebp/dsp/dec.c \
-./libwebp/dsp/dec_clip_tables.c \
-./libwebp/dsp/dec_mips32.c \
-./libwebp/dsp/dec_neon.$(NEON) \
-./libwebp/dsp/dec_sse2.c \
-./libwebp/dsp/enc.c \
-./libwebp/dsp/enc_avx2.c \
-./libwebp/dsp/enc_mips32.c \
-./libwebp/dsp/enc_neon.$(NEON) \
-./libwebp/dsp/enc_sse2.c \
-./libwebp/dsp/lossless.c \
-./libwebp/dsp/lossless_mips32.c \
-./libwebp/dsp/lossless_neon.$(NEON) \
-./libwebp/dsp/lossless_sse2.c \
-./libwebp/dsp/upsampling.c \
-./libwebp/dsp/upsampling_neon.$(NEON) \
-./libwebp/dsp/upsampling_sse2.c \
-./libwebp/dsp/yuv.c \
-./libwebp/dsp/yuv_mips32.c \
-./libwebp/dsp/yuv_sse2.c \
-./libwebp/enc/alpha.c \
-./libwebp/enc/analysis.c \
-./libwebp/enc/backward_references.c \
-./libwebp/enc/config.c \
-./libwebp/enc/cost.c \
-./libwebp/enc/filter.c \
-./libwebp/enc/frame.c \
-./libwebp/enc/histogram.c \
-./libwebp/enc/iterator.c \
-./libwebp/enc/picture.c \
-./libwebp/enc/picture_csp.c \
-./libwebp/enc/picture_psnr.c \
-./libwebp/enc/picture_rescale.c \
-./libwebp/enc/picture_tools.c \
-./libwebp/enc/quant.c \
-./libwebp/enc/syntax.c \
-./libwebp/enc/token.c \
-./libwebp/enc/tree.c \
-./libwebp/enc/vp8l.c \
-./libwebp/enc/webpenc.c \
-./libwebp/utils/bit_reader.c \
-./libwebp/utils/bit_writer.c \
-./libwebp/utils/color_cache.c \
-./libwebp/utils/filters.c \
-./libwebp/utils/huffman.c \
-./libwebp/utils/huffman_encode.c \
-./libwebp/utils/quant_levels.c \
-./libwebp/utils/quant_levels_dec.c \
-./libwebp/utils/random.c \
-./libwebp/utils/rescaler.c \
-./libwebp/utils/thread.c \
-./libwebp/utils/utils.c \
-
-include $(BUILD_STATIC_LIBRARY)
+#include $(CLEAR_VARS)
+#
+#LOCAL_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD -finline-functions -ffast-math -ffunction-sections -fdata-sections -Os
+#LOCAL_C_INCLUDES += $(LOCAL_PATH)/libwebp/src
+#LOCAL_ARM_MODE := arm
+#LOCAL_STATIC_LIBRARIES := cpufeatures
+#LOCAL_MODULE := webp
+#
+#ifneq ($(findstring armeabi-v7a, $(TARGET_ARCH_ABI)),)
+#  NEON := c.neon
+#else
+#  NEON := c
+#endif
+#
+#LOCAL_SRC_FILES := \
+#./libwebp/dec/alpha.c \
+#./libwebp/dec/buffer.c \
+#./libwebp/dec/frame.c \
+#./libwebp/dec/idec.c \
+#./libwebp/dec/io.c \
+#./libwebp/dec/quant.c \
+#./libwebp/dec/tree.c \
+#./libwebp/dec/vp8.c \
+#./libwebp/dec/vp8l.c \
+#./libwebp/dec/webp.c \
+#./libwebp/dsp/alpha_processing.c \
+#./libwebp/dsp/alpha_processing_sse2.c \
+#./libwebp/dsp/cpu.c \
+#./libwebp/dsp/dec.c \
+#./libwebp/dsp/dec_clip_tables.c \
+#./libwebp/dsp/dec_mips32.c \
+#./libwebp/dsp/dec_neon.$(NEON) \
+#./libwebp/dsp/dec_sse2.c \
+#./libwebp/dsp/enc.c \
+#./libwebp/dsp/enc_avx2.c \
+#./libwebp/dsp/enc_mips32.c \
+#./libwebp/dsp/enc_neon.$(NEON) \
+#./libwebp/dsp/enc_sse2.c \
+#./libwebp/dsp/lossless.c \
+#./libwebp/dsp/lossless_mips32.c \
+#./libwebp/dsp/lossless_neon.$(NEON) \
+#./libwebp/dsp/lossless_sse2.c \
+#./libwebp/dsp/upsampling.c \
+#./libwebp/dsp/upsampling_neon.$(NEON) \
+#./libwebp/dsp/upsampling_sse2.c \
+#./libwebp/dsp/yuv.c \
+#./libwebp/dsp/yuv_mips32.c \
+#./libwebp/dsp/yuv_sse2.c \
+#./libwebp/enc/alpha.c \
+#./libwebp/enc/analysis.c \
+#./libwebp/enc/backward_references.c \
+#./libwebp/enc/config.c \
+#./libwebp/enc/cost.c \
+#./libwebp/enc/filter.c \
+#./libwebp/enc/frame.c \
+#./libwebp/enc/histogram.c \
+#./libwebp/enc/iterator.c \
+#./libwebp/enc/picture.c \
+#./libwebp/enc/picture_csp.c \
+#./libwebp/enc/picture_psnr.c \
+#./libwebp/enc/picture_rescale.c \
+#./libwebp/enc/picture_tools.c \
+#./libwebp/enc/quant.c \
+#./libwebp/enc/syntax.c \
+#./libwebp/enc/token.c \
+#./libwebp/enc/tree.c \
+#./libwebp/enc/vp8l.c \
+#./libwebp/enc/webpenc.c \
+#./libwebp/utils/bit_reader.c \
+#./libwebp/utils/bit_writer.c \
+#./libwebp/utils/color_cache.c \
+#./libwebp/utils/filters.c \
+#./libwebp/utils/huffman.c \
+#./libwebp/utils/huffman_encode.c \
+#./libwebp/utils/quant_levels.c \
+#./libwebp/utils/quant_levels_dec.c \
+#./libwebp/utils/random.c \
+#./libwebp/utils/rescaler.c \
+#./libwebp/utils/thread.c \
+#./libwebp/utils/utils.c \
+#
+#include $(BUILD_STATIC_LIBRARY)


 ################################################################################
@@ -1093,130 +1108,128 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := etpan
 LOCAL_CFLAGS += -DHAVE_CONFIG_H=1 -DHAVE_ICONV=1
 LOCAL_SRC_FILES := \
-	./libetpan/src/data-types/base64.c \
-	./libetpan/src/data-types/carray.c \
-	./libetpan/src/data-types/charconv.c \
-	./libetpan/src/data-types/chash.c \
-	./libetpan/src/data-types/clist.c \
-	./libetpan/src/data-types/connect.c \
-	./libetpan/src/data-types/mail_cache_db.c \
-	./libetpan/src/data-types/maillock.c \
-	./libetpan/src/data-types/mailsasl.c \
-	./libetpan/src/data-types/mailsem.c \
-	./libetpan/src/data-types/mailstream.c \
-	./libetpan/src/data-types/mailstream_cancel.c \
-	./libetpan/src/data-types/mailstream_cfstream.c \
-	./libetpan/src/data-types/mailstream_compress.c \
-	./libetpan/src/data-types/mailstream_helper.c \
-	./libetpan/src/data-types/mailstream_low.c \
-	./libetpan/src/data-types/mailstream_socket.c \
-	./libetpan/src/data-types/mailstream_ssl.c \
-	./libetpan/src/data-types/md5.c \
-	./libetpan/src/data-types/mmapstring.c \
-	./libetpan/src/data-types/timeutils.c \
-	./libetpan/src/low-level/imap/acl.c \
-	./libetpan/src/low-level/imap/acl_parser.c \
-	./libetpan/src/low-level/imap/acl_sender.c \
-	./libetpan/src/low-level/imap/acl_types.c \
-	./libetpan/src/low-level/imap/annotatemore.c \
-	./libetpan/src/low-level/imap/annotatemore_parser.c \
-	./libetpan/src/low-level/imap/annotatemore_sender.c \
-	./libetpan/src/low-level/imap/annotatemore_types.c \
-	./libetpan/src/low-level/imap/condstore.c \
-	./libetpan/src/low-level/imap/condstore_types.c \
-	./libetpan/src/low-level/imap/enable.c \
-	./libetpan/src/low-level/imap/idle.c \
-	./libetpan/src/low-level/imap/mailimap.c \
-	./libetpan/src/low-level/imap/mailimap_compress.c \
-	./libetpan/src/low-level/imap/mailimap_extension.c \
-	./libetpan/src/low-level/imap/mailimap_helper.c \
-	./libetpan/src/low-level/imap/mailimap_id.c \
-	./libetpan/src/low-level/imap/mailimap_id_parser.c \
-	./libetpan/src/low-level/imap/mailimap_id_sender.c \
-	./libetpan/src/low-level/imap/mailimap_id_types.c \
-	./libetpan/src/low-level/imap/mailimap_keywords.c \
-	./libetpan/src/low-level/imap/mailimap_oauth2.c \
-	./libetpan/src/low-level/imap/mailimap_parser.c \
-	./libetpan/src/low-level/imap/mailimap_print.c \
-	./libetpan/src/low-level/imap/mailimap_sender.c \
-	./libetpan/src/low-level/imap/mailimap_socket.c \
-	./libetpan/src/low-level/imap/mailimap_sort.c \
-	./libetpan/src/low-level/imap/mailimap_sort_types.c \
-	./libetpan/src/low-level/imap/mailimap_ssl.c \
-	./libetpan/src/low-level/imap/mailimap_types.c \
-	./libetpan/src/low-level/imap/mailimap_types_helper.c \
-	./libetpan/src/low-level/imap/namespace.c \
-	./libetpan/src/low-level/imap/namespace_parser.c \
-	./libetpan/src/low-level/imap/namespace_sender.c \
-	./libetpan/src/low-level/imap/namespace_types.c \
-	./libetpan/src/low-level/imap/qresync.c \
-	./libetpan/src/low-level/imap/qresync_types.c \
-	./libetpan/src/low-level/imap/quota.c \
-	./libetpan/src/low-level/imap/quota_parser.c \
-	./libetpan/src/low-level/imap/quota_sender.c \
-	./libetpan/src/low-level/imap/quota_types.c \
-	./libetpan/src/low-level/imap/uidplus.c \
-	./libetpan/src/low-level/imap/uidplus_parser.c \
-	./libetpan/src/low-level/imap/uidplus_sender.c \
-	./libetpan/src/low-level/imap/uidplus_types.c \
-	./libetpan/src/low-level/imap/xgmlabels.c \
-	./libetpan/src/low-level/imap/xgmmsgid.c \
-	./libetpan/src/low-level/imap/xgmthrid.c \
-	./libetpan/src/low-level/imap/xlist.c \
-	./libetpan/src/low-level/imf/mailimf.c \
-	./libetpan/src/low-level/imf/mailimf_types.c \
-	./libetpan/src/low-level/imf/mailimf_types_helper.c \
-	./libetpan/src/low-level/imf/mailimf_write_file.c \
-	./libetpan/src/low-level/imf/mailimf_write_generic.c \
-	./libetpan/src/low-level/imf/mailimf_write_mem.c \
-	./libetpan/src/low-level/mime/mailmime.c \
-	./libetpan/src/low-level/mime/mailmime_content.c \
-	./libetpan/src/low-level/mime/mailmime_decode.c \
-	./libetpan/src/low-level/mime/mailmime_disposition.c \
-	./libetpan/src/low-level/mime/mailmime_types.c \
-	./libetpan/src/low-level/mime/mailmime_types_helper.c \
-	./libetpan/src/low-level/mime/mailmime_write_file.c \
-	./libetpan/src/low-level/mime/mailmime_write_generic.c \
-	./libetpan/src/low-level/mime/mailmime_write_mem.c \
-	./libetpan/src/low-level/nntp/newsnntp.c \
-	./libetpan/src/low-level/nntp/newsnntp_socket.c \
-	./libetpan/src/low-level/nntp/newsnntp_ssl.c \
-	./libetpan/src/low-level/pop3/mailpop3.c \
-	./libetpan/src/low-level/pop3/mailpop3_helper.c \
-	./libetpan/src/low-level/pop3/mailpop3_socket.c \
-	./libetpan/src/low-level/pop3/mailpop3_ssl.c \
-	./libetpan/src/low-level/smtp/mailsmtp.c \
-	./libetpan/src/low-level/smtp/mailsmtp_helper.c \
-	./libetpan/src/low-level/smtp/mailsmtp_oauth2.c \
-	./libetpan/src/low-level/smtp/mailsmtp_socket.c \
-	./libetpan/src/low-level/smtp/mailsmtp_ssl.c \
-	./libetpan/src/main/libetpan_version.c \
-	./libetpan/src/driver/implementation/data-message/data_message_driver.c \
-	./libetpan/src/driver/interface/maildriver.c \
-	./libetpan/src/driver/interface/maildriver_tools.c \
-	./libetpan/src/driver/interface/maildriver_types.c \
-	./libetpan/src/driver/interface/maildriver_types_helper.c \
-	./libetpan/src/driver/interface/mailfolder.c \
-	./libetpan/src/driver/interface/mailmessage.c \
-	./libetpan/src/driver/interface/mailmessage_tools.c \
-	./libetpan/src/driver/interface/mailmessage_types.c \
-	./libetpan/src/driver/interface/mailstorage.c \
-	./libetpan/src/driver/interface/mailstorage_tools.c
+	./messenger-backend/libs/libetpan/src/data-types/base64.c \
+	./messenger-backend/libs/libetpan/src/data-types/carray.c \
+	./messenger-backend/libs/libetpan/src/data-types/charconv.c \
+	./messenger-backend/libs/libetpan/src/data-types/chash.c \
+	./messenger-backend/libs/libetpan/src/data-types/clist.c \
+	./messenger-backend/libs/libetpan/src/data-types/connect.c \
+	./messenger-backend/libs/libetpan/src/data-types/mail_cache_db.c \
+	./messenger-backend/libs/libetpan/src/data-types/maillock.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailsasl.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailsem.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream_cancel.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream_cfstream.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream_compress.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream_helper.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream_low.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream_socket.c \
+	./messenger-backend/libs/libetpan/src/data-types/mailstream_ssl.c \
+	./messenger-backend/libs/libetpan/src/data-types/md5.c \
+	./messenger-backend/libs/libetpan/src/data-types/mmapstring.c \
+	./messenger-backend/libs/libetpan/src/data-types/timeutils.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/acl.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/acl_parser.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/acl_sender.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/acl_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/annotatemore.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/annotatemore_parser.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/annotatemore_sender.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/annotatemore_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/condstore.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/condstore_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/enable.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/idle.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_compress.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_extension.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_helper.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_id.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_id_parser.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_id_sender.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_id_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_keywords.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_oauth2.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_parser.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_print.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_sender.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_socket.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_sort.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_sort_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_ssl.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/mailimap_types_helper.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/namespace.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/namespace_parser.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/namespace_sender.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/namespace_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/qresync.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/qresync_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/quota.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/quota_parser.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/quota_sender.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/quota_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/uidplus.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/uidplus_parser.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/uidplus_sender.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/uidplus_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/xgmlabels.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/xgmmsgid.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/xgmthrid.c \
+	./messenger-backend/libs/libetpan/src/low-level/imap/xlist.c \
+	./messenger-backend/libs/libetpan/src/low-level/imf/mailimf.c \
+	./messenger-backend/libs/libetpan/src/low-level/imf/mailimf_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/imf/mailimf_types_helper.c \
+	./messenger-backend/libs/libetpan/src/low-level/imf/mailimf_write_file.c \
+	./messenger-backend/libs/libetpan/src/low-level/imf/mailimf_write_generic.c \
+	./messenger-backend/libs/libetpan/src/low-level/imf/mailimf_write_mem.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_content.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_decode.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_disposition.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_types.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_types_helper.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_write_file.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_write_generic.c \
+	./messenger-backend/libs/libetpan/src/low-level/mime/mailmime_write_mem.c \
+	./messenger-backend/libs/libetpan/src/low-level/nntp/newsnntp.c \
+	./messenger-backend/libs/libetpan/src/low-level/nntp/newsnntp_socket.c \
+	./messenger-backend/libs/libetpan/src/low-level/nntp/newsnntp_ssl.c \
+	./messenger-backend/libs/libetpan/src/low-level/smtp/mailsmtp.c \
+	./messenger-backend/libs/libetpan/src/low-level/smtp/mailsmtp_helper.c \
+	./messenger-backend/libs/libetpan/src/low-level/smtp/mailsmtp_oauth2.c \
+	./messenger-backend/libs/libetpan/src/low-level/smtp/mailsmtp_socket.c \
+	./messenger-backend/libs/libetpan/src/low-level/smtp/mailsmtp_ssl.c \
+	./messenger-backend/libs/libetpan/src/main/libetpan_version.c \
+	./messenger-backend/libs/libetpan/src/driver/implementation/data-message/data_message_driver.c \
+	./messenger-backend/libs/libetpan/src/driver/implementation/mime-message/mime_message_driver.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/maildriver.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/maildriver_tools.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/maildriver_types.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/maildriver_types_helper.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/mailfolder.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/mailmessage.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/mailmessage_tools.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/mailmessage_types.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage.c \
+	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage_tools.c \
+	./messenger-backend/libs/libetpan/src/engine/mailprivacy.c \
+	./messenger-backend/libs/libetpan/src/engine/mailprivacy_tools.c
 LOCAL_C_INCLUDES = \
-	$(LOCAL_PATH)/libetpan/src \
-	$(LOCAL_PATH)/libetpan/src/data-types \
-	$(LOCAL_PATH)/libetpan/src/low-level \
-	$(LOCAL_PATH)/libetpan/src/low-level/imap \
-	$(LOCAL_PATH)/libetpan/src/low-level/imf \
-	$(LOCAL_PATH)/libetpan/src/low-level/mime \
-	$(LOCAL_PATH)/libetpan/src/low-level/nntp \
-	$(LOCAL_PATH)/libetpan/src/low-level/pop3 \
-	$(LOCAL_PATH)/libetpan/src/low-level/smtp \
-	$(LOCAL_PATH)/libetpan/src/main \
-	$(LOCAL_PATH)/libetpan/src/driver/implementation/data-message \
-	$(LOCAL_PATH)/libetpan/src/driver/interface \
-	$(LOCAL_PATH)/libetpan/include \
-	$(LOCAL_PATH)/libetpan/include/libetpan \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/data-types \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/low-level \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/low-level/imap \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/low-level/imf \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/low-level/mime \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/low-level/nntp \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/low-level/smtp \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/main \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/driver/implementation/data-message \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/driver/interface \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/include \
+	$(LOCAL_PATH)/messenger-backend/libs/libetpan/include/libetpan \
 	$(LOCAL_PATH)/openssl/include \
 	$(LOCAL_PATH)/libiconv/include \
 	$(LOCAL_PATH)/cyrussasl/include \
@@ -1225,7 +1238,6 @@ LOCAL_C_INCLUDES = \
 include $(BUILD_STATIC_LIBRARY)


-
 ################################################################################
 # cyrus sasl
 ################################################################################
@@ -1298,9 +1310,11 @@ endif
 LOCAL_MODULE := sqlite
 LOCAL_CFLAGS 	:= -w -std=c11 -Os -DNULL=0 -DSOCKLEN_T=socklen_t -DLOCALE_NOT_USED -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -DHAVE_STRCHRNUL=0
+LOCAL_CFLAGS 	+= -DSQLITE_OMIT_LOAD_EXTENSION
+LOCAL_CFLAGS 	+= -DSQLITE_MAX_MMAP_SIZE=0 -DSQLITE_OMIT_WAL  # HACK: the defines are used to skip the pointer reference to mmap set in aSyscall[] - mmap seems to be a #define that cannot be used this way on Android - otherwise we get the error: 'mmap' undeclared here (not in a function)

 LOCAL_SRC_FILES     := \
-./sqlite/sqlite3.c
+./messenger-backend/libs/sqlite/sqlite3.c

 include $(BUILD_STATIC_LIBRARY)

@@ -1313,7 +1327,7 @@ LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -ffast-math -D__STDC_CONSTANT_MACROS
 LOCAL_CPPFLAGS 	:= -DBSD=1 -ffast-math -Os -funroll-loops -std=c++11
 LOCAL_LDLIBS 	:= -ljnigraphics -llog -lz -latomic
-LOCAL_STATIC_LIBRARIES :=  etpan sasl2 webp sqlite crypto avformat avcodec avutil libiconv
+LOCAL_STATIC_LIBRARIES :=  etpan sasl2 sqlite crypto avformat avcodec avutil libiconv
 # if you get "undefined reference" errors, the reason for this may be the _order_! Eg. libiconv as the first library does not work!
 # "breakpad" was placed after "crypto", NativeLoader.cpp after mrwrapper.c

@@ -1495,57 +1509,58 @@ $(LOCAL_PATH)/openssl/include \
 $(LOCAL_PATH)/breakpad/common/android/include \
 $(LOCAL_PATH)/breakpad \
 $(LOCAL_PATH)/ffmpeg \
-$(LOCAL_PATH)/libetpan/include \
-$(LOCAL_PATH)/sqlite
+$(LOCAL_PATH)/messenger-backend/libs/libetpan/include \
+$(LOCAL_PATH)/messenger-backend/libs/netpgp/include \
+$(LOCAL_PATH)/messenger-backend/libs/sqlite

-LOCAL_SRC_FILES     += \
-./libjpeg/jcapimin.c \
-./libjpeg/jcapistd.c \
-./libjpeg/armv6_idct.S \
-./libjpeg/jccoefct.c \
-./libjpeg/jccolor.c \
-./libjpeg/jcdctmgr.c \
-./libjpeg/jchuff.c \
-./libjpeg/jcinit.c \
-./libjpeg/jcmainct.c \
-./libjpeg/jcmarker.c \
-./libjpeg/jcmaster.c \
-./libjpeg/jcomapi.c \
-./libjpeg/jcparam.c \
-./libjpeg/jcphuff.c \
-./libjpeg/jcprepct.c \
-./libjpeg/jcsample.c \
-./libjpeg/jctrans.c \
-./libjpeg/jdapimin.c \
-./libjpeg/jdapistd.c \
-./libjpeg/jdatadst.c \
-./libjpeg/jdatasrc.c \
-./libjpeg/jdcoefct.c \
-./libjpeg/jdcolor.c \
-./libjpeg/jddctmgr.c \
-./libjpeg/jdhuff.c \
-./libjpeg/jdinput.c \
-./libjpeg/jdmainct.c \
-./libjpeg/jdmarker.c \
-./libjpeg/jdmaster.c \
-./libjpeg/jdmerge.c \
-./libjpeg/jdphuff.c \
-./libjpeg/jdpostct.c \
-./libjpeg/jdsample.c \
-./libjpeg/jdtrans.c \
-./libjpeg/jerror.c \
-./libjpeg/jfdctflt.c \
-./libjpeg/jfdctfst.c \
-./libjpeg/jfdctint.c \
-./libjpeg/jidctflt.c \
-./libjpeg/jidctfst.c \
-./libjpeg/jidctint.c \
-./libjpeg/jidctred.c \
-./libjpeg/jmemmgr.c \
-./libjpeg/jmemnobs.c \
-./libjpeg/jquant1.c \
-./libjpeg/jquant2.c \
-./libjpeg/jutils.c
+#LOCAL_SRC_FILES     += \
+#./libjpeg/jcapimin.c \
+#./libjpeg/jcapistd.c \
+#./libjpeg/armv6_idct.S \
+#./libjpeg/jccoefct.c \
+#./libjpeg/jccolor.c \
+#./libjpeg/jcdctmgr.c \
+#./libjpeg/jchuff.c \
+#./libjpeg/jcinit.c \
+#./libjpeg/jcmainct.c \
+#./libjpeg/jcmarker.c \
+#./libjpeg/jcmaster.c \
+#./libjpeg/jcomapi.c \
+#./libjpeg/jcparam.c \
+#./libjpeg/jcphuff.c \
+#./libjpeg/jcprepct.c \
+#./libjpeg/jcsample.c \
+#./libjpeg/jctrans.c \
+#./libjpeg/jdapimin.c \
+#./libjpeg/jdapistd.c \
+#./libjpeg/jdatadst.c \
+#./libjpeg/jdatasrc.c \
+#./libjpeg/jdcoefct.c \
+#./libjpeg/jdcolor.c \
+#./libjpeg/jddctmgr.c \
+#./libjpeg/jdhuff.c \
+#./libjpeg/jdinput.c \
+#./libjpeg/jdmainct.c \
+#./libjpeg/jdmarker.c \
+#./libjpeg/jdmaster.c \
+#./libjpeg/jdmerge.c \
+#./libjpeg/jdphuff.c \
+#./libjpeg/jdpostct.c \
+#./libjpeg/jdsample.c \
+#./libjpeg/jdtrans.c \
+#./libjpeg/jerror.c \
+#./libjpeg/jfdctflt.c \
+#./libjpeg/jfdctfst.c \
+#./libjpeg/jfdctint.c \
+#./libjpeg/jidctflt.c \
+#./libjpeg/jidctfst.c \
+#./libjpeg/jidctint.c \
+#./libjpeg/jidctred.c \
+#./libjpeg/jmemmgr.c \
+#./libjpeg/jmemnobs.c \
+#./libjpeg/jquant1.c \
+#./libjpeg/jquant2.c \
+#./libjpeg/jutils.c

 LOCAL_SRC_FILES     += \
 ./libyuv/source/compare_common.cc \
@@ -1603,28 +1618,51 @@ LOCAL_SRC_FILES     += \
 ./image.c \
 ./video.c \
 ./gifvideo.cpp \
+./messenger-backend/libs/netpgp/src/compress.c \
+./messenger-backend/libs/netpgp/src/create.c \
+./messenger-backend/libs/netpgp/src/crypto.c \
+./messenger-backend/libs/netpgp/src/keyring.c \
+./messenger-backend/libs/netpgp/src/misc.c \
+./messenger-backend/libs/netpgp/src/openssl_crypto.c \
+./messenger-backend/libs/netpgp/src/packet-parse.c \
+./messenger-backend/libs/netpgp/src/packet-show.c \
+./messenger-backend/libs/netpgp/src/reader.c \
+./messenger-backend/libs/netpgp/src/signature.c \
+./messenger-backend/libs/netpgp/src/symmetric.c \
+./messenger-backend/libs/netpgp/src/validate.c \
+./messenger-backend/libs/netpgp/src/writer.c \
+./messenger-backend/src/mraheader.c \
+./messenger-backend/src/mrapeerstate.c \
+./messenger-backend/src/mrarray.c \
 ./messenger-backend/src/mrchat.c \
 ./messenger-backend/src/mrchatlist.c \
-./messenger-backend/src/mrcmdline.c \
 ./messenger-backend/src/mrcontact.c \
-./messenger-backend/src/mre2ee.c \
+./messenger-backend/src/mrdehtml.c \
+./messenger-backend/src/mrhash.c \
 ./messenger-backend/src/mrimap.c \
 ./messenger-backend/src/mrjob.c \
+./messenger-backend/src/mrkey.c \
+./messenger-backend/src/mrkeyring.c \
 ./messenger-backend/src/mrloginparam.c \
+./messenger-backend/src/mrlot.c \
 ./messenger-backend/src/mrmailbox.c \
 ./messenger-backend/src/mrmailbox_configure.c \
+./messenger-backend/src/mrmailbox_e2ee.c \
+./messenger-backend/src/mrmailbox_imex.c \
 ./messenger-backend/src/mrmailbox_log.c \
+./messenger-backend/src/mrmailbox_tools.c \
+./messenger-backend/src/mrmimefactory.c \
 ./messenger-backend/src/mrmimeparser.c \
 ./messenger-backend/src/mrmsg.c \
-./messenger-backend/src/mrosnative.c \
 ./messenger-backend/src/mrparam.c \
-./messenger-backend/src/mrpoortext.c \
+./messenger-backend/src/mrpgp.c \
 ./messenger-backend/src/mrsaxparser.c \
 ./messenger-backend/src/mrsimplify.c \
 ./messenger-backend/src/mrsmtp.c \
 ./messenger-backend/src/mrsqlite3.c \
 ./messenger-backend/src/mrstock.c \
 ./messenger-backend/src/mrtools.c \
+./messenger-backend/cmdline/cmdline.c \
 ./mrwrapper.c

 include $(BUILD_SHARED_LIBRARY)
@@ -1,4 +1,4 @@
-APP_PLATFORM := android-9
+APP_PLATFORM := android-14
 APP_ABI := armeabi armeabi-v7a x86
 NDK_TOOLCHAIN_VERSION := 4.9
 APP_STL := gnustl_static
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -24,10 +24,10 @@
 #include <jni.h>
 #include <stdio.h>
 #include <setjmp.h>
-#include <libjpeg/jpeglib.h>
+/*#include <libjpeg/jpeglib.h>*/
 #include <android/bitmap.h>
-#include <libwebp/webp/decode.h>
-#include <libwebp/webp/encode.h>
+/*#include <libwebp/webp/decode.h>
+#include <libwebp/webp/encode.h>*/
 #include "mrjnimain.h"
 #include "image.h"

@@ -293,7 +293,7 @@ static void fastBlur(int imageWidth, int imageHeight, int imageStride, void *pix
    free(rgb);
 }

-typedef struct my_error_mgr {
+/*typedef struct my_error_mgr {
    struct jpeg_error_mgr pub;
    jmp_buf setjmp_buffer;
 } *my_error_ptr;
@@ -303,7 +303,7 @@ METHODDEF(void) my_jpeglib_error_exit(j_common_ptr cinfo) {
    my_error_ptr myerr = (my_error_ptr) cinfo->err;
    (*cinfo->err->output_message) (cinfo);
    longjmp(myerr->setjmp_buffer, 1);
-}
+}*/

 JNIEXPORT void Java_com_b44t_messenger_Utilities_blurBitmap(JNIEnv *env, jclass class, jobject bitmap, int radius, int unpin, int width, int height, int stride) {
    if (!bitmap) {
@@ -447,7 +447,7 @@ JNIEXPORT void Java_com_b44t_messenger_Utilities_unpinBitmap(JNIEnv *env, jclass
    AndroidBitmap_unlockPixels(env, bitmap);
 }

-JNIEXPORT void Java_com_b44t_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jobject bitmap, int scale, int width, int height, int stride) {
+/*JNIEXPORT void Java_com_b44t_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jobject bitmap, int scale, int width, int height, int stride) {
    
    AndroidBitmapInfo info;
    int i;
@@ -530,9 +530,9 @@ JNIEXPORT void Java_com_b44t_messenger_Utilities_loadBitmap(JNIEnv *env, jclass
    } else {
        throwException(env, "AndroidBitmap_getInfo() failed ! error=%d", i);
    }
-}
+}*/

-JNIEXPORT jboolean Java_com_b44t_messenger_Utilities_loadWebpImage(JNIEnv *env, jclass class, jobject outputBitmap, jobject buffer, jint len, jobject options, jboolean unpin) {
+/*JNIEXPORT jboolean Java_com_b44t_messenger_Utilities_loadWebpImage(JNIEnv *env, jclass class, jobject outputBitmap, jobject buffer, jint len, jobject options, jboolean unpin) {
    if (!buffer) {
        (*env)->ThrowNew(env, jclass_NullPointerException, "Input buffer can not be null");
        return 0;
@@ -582,4 +582,4 @@ JNIEXPORT jboolean Java_com_b44t_messenger_Utilities_loadWebpImage(JNIEnv *env,
    }
    
    return 1;
-}
+}*/
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
 *                        (C) 2013-2016 Nikolai Kudashov
 *                           (C) 2017 Björn Petersen
 *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1,31 +0,0 @@
-libEtPan! -- a mail stuff library
-
-Copyright (C) 2001 - 2005 - DINH Viet Hoa
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the libEtPan! project nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-This project contains code from sendmail, NetBSD,
-RSA Data Security MD5 Message-Digest Algorithm, Cyrus IMAP.
@@ -1,284 +0,0 @@
-2006-03-22 - libetpan-0.45
-
-	* release 0.45 - Depth Charge
-	    bugfix release
-
-2006-03-08 - libetpan-0.43
-
-	* release 0.43 - Lateralus
-	    bugfix release
-
-2006-01-09 - libetpan-0.42
-
-	* release 0.41 - Figure Number Five
-	    bugfix release
-
-2005-12-02 - libetpan-0.41
-
-    * release 0.41 - Transfixion
-        * passphrase is implemented for S/MIME and PGP.
-        * avoid symbols conflict between GnuTLS and OpenSSL.
-
-2005-10-07 - libetpan-0.40 - hoa
-
-    * release 0.40 - Kashmir
-
-	* SSL initialization is optional.
-
-2005-09-16 - libetpan-0.39 - hoa
-
-    * release 0.39 - Deliverance
-
-	* compatibility with GnuTLS
-	* SASL for higher level
-									
-2005-07-20 - libetpan-0.38 - hoa
-
-    * release 0.38 - Deadwing
-
-	* fixed SSL
-	* IMAP improvements
-	* SASL
-
-2005-07-03 - libetpan-0.37 - hoa
-
-    * release 0.37 - Deadwing
-
-	* windows port
-	* fixed IMAP implementation (for sylpheed)
-
-2005-02-22 - libetpan-0.36 - hoa
-
-    * release 0.36 - Silver Drop
-        
-        * memory leak
-        * fixed maildir support
-
-2004-12-28 - libetpan-0.35 - hoa
-
-    libEtPan! - a mail library
-	
-    	* release 0.35 - Dimebag Darrell
-
-	* minor bugfixes.
-
-2004-11-04 - libetpan-0.34 - hoa
-
-    libEtPan! - a mail library
-	
-	* release 0.34 - edge
-
-	* general
-	   - support for debian systems mbox
-	   - ability to disable thread-safe support
-
-
-2004-08-24 - libetpan-0.33 - hoa
-
-    libEtPan! - a mail library
-	
-	* release 0.33 - entropia
-
-	* general
-	   - bugfixes in IMAP module and mailstream
-	   - fixed low-level data structures
-	   - better support for ARM and PPC architecture
-       - support for cross-compilation	
-	   - fixed Berkeley DB support
-	   - changed folder structure of libetpan package
-	   - can now add a message to a mailbox with flags
-	   - support for hotmail mailboxes (with help of hotwayd)
-	   - added Berkeley DB mail storage as experimental
-       - added support for PGP and S/MIME
-	   - better folder API
-
-
-2003-12-16 - libetpan-0.32 - hoa
-
-	libEtPan! - a mail library
-
-	* release 0.32 - Black Utopia
-
-	* general
-	    - added documentation for IMF / tools
-	    - bugfixes in IMAP module due to structures change.
-	    - Application that use libEtPan! now have to use
-	        '#include <libetpan/libetpan.h>'
-
-	* generic    
-	    - get_message() is implemented in Maildir cached driver.
-
-2003-12-10 - libEtPan! version 0.31
-
-	libEtPan! - a mail library
-
-	* release 0.31 - Steve Morse release
-
-	* general
-	    - all fields name of structures are changed.
-	    - bugfixes.
-	    - union {} are added everywhere it is possible to save memory.
-	    - support for Berkeley DB 1.
-	    - improved compatibility with FreeBSD and Mac OS X.
-	
-	* drivers
-	    - cache drivers are disable if Berkeley DB is not found.
-	    - disable search call.
-	    - support of buggy Courier-IMAP server.
-	    - semantic of mailsession_get_envelopes_list() changed : it 
-	        does no more remove messages from the list.
-	    - mailsession_get_message_by_uid() is added and implemented 
-	        in some drivers.
-
-2003-11-21 - libEtPan! version 0.30
-
-	libEtPan! - a mail library
-
-	* release 0.30 - Spock's Beard release
-	
-	*  main new features
-	    - cache for drivers is cleaned up.
-	    - maildir driver.
-
-	* general
-	    - fixed several memory leaks.
-	    
-	    - defines now exist for new features since version 0.29
-
-
-	* tools
-	    - dump of network traffic is now possible by setting
-	      exported variable mailstream_debug to 1.
-	    
-	    - TLS/SSL driver for stream is fixed.
-	    
-	* imf
-	    - fixed RFC 2822 format, wrap headers and break lines
-	      when they are longer than requirement (998).
-	    
-	    - reduced size of headers data.
-	      a union is used inside the structure.
-	      *** WARNING *** : this change use of structure field as a union
-	      member is used in mailimf_field structure.
-
-	* imap
-	   - several fixes in IMAP module.
-	
-	* mime
-	   - fixed quoted-printable parser.
-	
-	* generic - cache for drivers
-	   - cache database is now cleaned up.
-	   
-	   - fixed header fields cache.
-	      *** WARNING *** cache format changed. You should reset all
-	      your cache of headers (env.db).
-
-	* generic - threading
-      
-	   - fixed threading when threading by references with subject.
-
-	* generic - drivers for message
-   
-	   - separated flush() and check() in message.
-	     *** WARNING *** : this changes the API of the message.
-	     flush() is used to free the internal structure used
-	     to store the MIME structure of the message. It invalidates
-	     the "mime" member of the message.
-	     check() is used for to notify the modification of message
-	     flags to the session, so that the session saves the flags
-	     of the message at the next call of mailsession_check() or
-	     when leaving the session.
-
-	   - IMAP implementation is more compliant.
-	   
-	   - added driver to build MIME message and see the rendering
-	     through fetch functions.
-	     
-	   - added driver to parse message content given with a string.
-
-	* generic - drivers for maildir
-
-	   - maildir driver for storage / session / messages
-	     is implemented.
-
-* 2003-10-06 - libEtPan! version 0.29
-
-	libEtPan! - a mail library
-
-	* XetPan release
-
-	* debug for stream, network timeout
-	* SSL library is initialized by SSL stream driver
-	* fixed messages threading
-	* added SMTP authentication CRAM-MD5, LOGIN, PLAIN
-	* added example of use of SMTP
-
-* 2003-04-01 - libEtPan! version 0.28
-
-	libEtPan! - a mail library
-	
-	* Avril Lavigne Release
-
-	* fixed IMAP parser
-	* access to network protocols with a command
-	* pop3 driver can try APOP authentication and fallback on clear
-		authentication
-
-* 2002-12-18 - libEtPan! version 0.27
-
-	libEtPan! - a mail library
-	
-	* Christmas release ^^ //clindoeil
-
-	* helper interface for IMF (RFC 2822) and MIME
-	* changed interface for mail threading so that a default
-	    charset can be set.
-		*** this means that mail threading INTERFACE CHANGED ***
-	* API documentation in code
-	* flags directory and cache directory can be different.
-		*** this means that storage INTERFACE CHANGED ***
-
-* 2002-09-02 - libEtPan! version 0.26
-
-	libEtPan! - a mail library
-
-	* flags for all cache drivers
-	* flags stored on disk use Berkeley DB
-	* mailmessage, session and storage interface are separated
-		*** this means that generic INTERFACE CHANGED ***
-	* fixes various bugs and memory leaks
-
-	etpan - a console mail client
-
-	* available on CVS
-	* virtual folder (using storage interface) is used
-	* folder list view / message list view / message view
-	* we can poll for status of mailboxes
-	* got rid of expat
-	* uses new interface of libEtPan!
-
-* 2002-06-26 - libEtPan! version 0.25
-
-	libEtPan! - a mail library
-
-	* BSD licence
-	* portability tested on Solaris, FreeBSD, IRIX and Linux
-	* implementation of messages threads
-	* MIME message generator
-	* drivers are implemented for IMAP4rev1, POP3, NNTP, MH, mbox
-	    in both cached and non-cached version.
-
-	etpan - a console mail client
-
-	* a small mail client not distributed has been implemented
-	    written in ncurses
-	    featuring :
-		- MIME message editor
-	    	- IMAP4rev1, POP3, NNTP, MH, mbox access
-	    	- renderer (HTML rendering for example)
-	    	- retrieving of MIME parts
-		- messages threads
-
-	    big missing feature :
-		- removing messages is not yet possible
@@ -1,62 +0,0 @@
-## LibEtPan
-
-The purpose of this mail library is to provide a portable, efficient framework for different kinds of mail access: IMAP, SMTP, POP and NNTP.
-
-It provides an API for C language.
-
-[![Build Status](https://travis-ci.org/dinhviethoa/libetpan.png?branch=master)](https://travis-ci.org/dinhviethoa/libetpan)
-
-## Features
-
- IMAP
- SMTP
- POP
- NNTP
- RFC822/MIME message builder
- RFC822/MIME message parser
- Maildir
- mbox
- MH
-
-## Build instructions
-
-### Unix
-
-You need to install autoconf, automake and libtool.
-They can be installed using [brew](http://brew.sh/).
-
-    $ ./autogen.sh
-    $ make
-
-You can use flag --with-poll for using poll() instead of select() for checking connection status
-
-### How to link with it
-
-    $ gcc -c -o sample.o sample.c `libetpan-config --cflags`
-    $ gcc -o sample sample.o `libetpan-config --libs`
-
-### Mac / iOS
-
- Download Xcode
- Open `build-mac/libetpan.xcodeproj`
- Choose the correct target "static libetpan" for Mac or "libetpan ios" for iOS.
- Build
-
-### Setup a Mac project
-
- Add `libetpan.xcodeproj` as sub-project
- Link with libetpan.a
-
-### Setup an iOS project
-
- Add `libetpan.xcodeproj` as sub-project
- Link with libetpan-ios.a
- Set "Other Linker Flags": `-lsasl2`
-
-### Build on Windows
-
- See README and Visual Studio Solution in build-windows folder
-
-## More information
-
-See http://etpan.org/libetpan.html for more information and examples.
@@ -1 +0,0 @@
-../../src/low-level/imap/acl.h
@@ -1 +0,0 @@
-../../src/low-level/imap/acl_types.h
@@ -1 +0,0 @@
-../../src/low-level/imap/annotatemore.h
@@ -1 +0,0 @@
-../../src/low-level/imap/annotatemore_types.h
@@ -1 +0,0 @@
-../../src/data-types/carray.h
@@ -1 +0,0 @@
-../../src/data-types/charconv.h
@@ -1 +0,0 @@
-../../src/data-types/chash.h
@@ -1 +0,0 @@
-../../src/data-types/clist.h
@@ -1 +0,0 @@
-../../src/low-level/imap/condstore.h
@@ -1 +0,0 @@
-../../src/low-level/imap/condstore_types.h
@@ -1,180 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Check for Linux's /usr/include/features.h
- */
-#ifdef _FEATURES_H
-#  error  config.h must be first file included
-#endif
-
-/* Define to detected Berkeley DB major version number */
-/* #undef DBVERS */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to use curl */
-/* #undef HAVE_CURL */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to use expat */
-/* #undef HAVE_EXPAT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to use getopt_long */
-#define HAVE_GETOPT_LONG 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
-
-/* prototype of iconv() has const parameters */
-/* #undef HAVE_ICONV_PROTO_CONST */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to enable IPv6 support. */
-#define HAVE_IPV6 1
-
-/* Define to 1 if you have the `lockfile' library (-llockfile). */
-/* #undef HAVE_LIBLOCKFILE */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Defined if we run on a W32 API based system */
-/* #undef HAVE_MINGW32_SYSTEM */
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-/* #undef HAVE_NETDB_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#define HAVE_PTHREAD_H 1
-
-/* Define to use setenv */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-/* #undef HAVE_WINSOCK2_H */
-
-/* Enable classes using zlib compression. */
-#define HAVE_ZLIB 1
-
-/* Define to include multithreading support */
-#define LIBETPAN_REENTRANT 1
-
-/* Define this to the version of libEtPan */
-#define LIBETPAN_VERSION "1.2-dev-20141203"
-
-/* Define this to the major version of libEtPan */
-#define LIBETPAN_VERSION_MAJOR 1
-
-/* Define this to the minor version of libEtPan */
-#define LIBETPAN_VERSION_MINOR 2
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "libetpan"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "libetpan-devel@lists.sourceforge.net"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libetpan"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libetpan 1.2"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libetpan"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to be lazy on protocol syntax */
-#define UNSTRICT_SYNTAX 1
-
-/* Define to use GnuTLS */
-/* #undef USE_GNUTLS */
-
-/* Define to use SASL */
-#define USE_SASL 1
-
-/* Define to use OpenSSL */
-#define USE_SSL 1
-
-/* Version number of package */
-#define VERSION "1.2"
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
@@ -1 +0,0 @@
-../../src/driver/implementation/data-message/data_message_driver.h
@@ -1 +0,0 @@
-../../src/driver/implementation/db/dbdriver.h
@@ -1 +0,0 @@
-../../src/driver/implementation/db/dbdriver_message.h
@@ -1 +0,0 @@
-../../src/driver/implementation/db/dbdriver_types.h
@@ -1 +0,0 @@
-../../src/driver/implementation/db/dbstorage.h
@@ -1 +0,0 @@
-../../src/low-level/imap/enable.h
@@ -1 +0,0 @@
-../../src/driver/implementation/feed/feeddriver.h
@@ -1 +0,0 @@
-../../src/driver/implementation/feed/feeddriver_message.h
@@ -1 +0,0 @@
-../../src/driver/implementation/feed/feeddriver_types.h
@@ -1 +0,0 @@
-../../src/driver/implementation/feed/feedstorage.h
@@ -1 +0,0 @@
-../../src/driver/tools/generic_cache_types.h
@@ -1 +0,0 @@
-../../src/driver/implementation/hotmail/hotmailstorage.h
@@ -1 +0,0 @@
-../../src/low-level/imap/idle.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapdriver.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapdriver_cached.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapdriver_cached_message.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapdriver_message.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapdriver_tools.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapdriver_tools_private.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapdriver_types.h
@@ -1 +0,0 @@
-../../src/driver/implementation/imap/imapstorage.h
@@ -1,26 +0,0 @@
-#ifndef LIBETPAN_CONFIG_H
-#define LIBETPAN_CONFIG_H
-#if WIN32
-# define MMAP_UNAVAILABLE
-#endif
-#if defined(_MSC_VER) && !defined(__cplusplus)
-# define inline __inline
-#endif
-#include <limits.h>
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-#include <sys/param.h>
-#include <inttypes.h>
-#define MAIL_DIR_SEPARATOR '/'
-#define MAIL_DIR_SEPARATOR_S "/"
-#ifdef _MSC_VER
-# ifdef LIBETPAN_DLL
-# define LIBETPAN_EXPORT __declspec(dllexport)
-# else
-# define LIBETPAN_EXPORT __declspec(dllimport)
-# endif
-#else
-# define LIBETPAN_EXPORT
-#endif
-#endif
@@ -1 +0,0 @@
-../../src/main/libetpan.h
@@ -1 +0,0 @@
-../../src/main/libetpan_version.h
@@ -1 +0,0 @@
-../../src/data-types/mail.h
@@ -1 +0,0 @@
-../../src/low-level/maildir/maildir.h
@@ -1 +0,0 @@
-../../src/low-level/maildir/maildir_types.h
@@ -1 +0,0 @@
-../../src/driver/implementation/maildir/maildirdriver.h
@@ -1 +0,0 @@
-../../src/driver/implementation/maildir/maildirdriver_cached.h
@@ -1 +0,0 @@
-../../src/driver/implementation/maildir/maildirdriver_cached_message.h
@@ -1 +0,0 @@
-../../src/driver/implementation/maildir/maildirdriver_message.h
@@ -1 +0,0 @@
-../../src/driver/implementation/maildir/maildirdriver_types.h
@@ -1 +0,0 @@
-../../src/driver/implementation/maildir/maildirstorage.h
@@ -1 +0,0 @@
-../../src/driver/interface/maildriver.h
@@ -1 +0,0 @@
-../../src/driver/interface/maildriver_errors.h
@@ -1 +0,0 @@
-../../src/driver/interface/maildriver_types.h
@@ -1 +0,0 @@
-../../src/driver/interface/maildriver_types_helper.h
@@ -1 +0,0 @@
-../../src/engine/mailengine.h
@@ -1 +0,0 @@
-../../src/driver/interface/mailfolder.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_compress.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_extension.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_extension_types.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_helper.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_id.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_id_types.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_oauth2.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_socket.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_sort.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_sort_types.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_ssl.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_types.h
@@ -1 +0,0 @@
-../../src/low-level/imap/mailimap_types_helper.h
@@ -1 +0,0 @@
-../../src/low-level/imf/mailimf.h
@@ -1 +0,0 @@
-../../src/low-level/imf/mailimf_types.h
@@ -1 +0,0 @@
-../../src/low-level/imf/mailimf_types_helper.h
@@ -1 +0,0 @@
-../../src/low-level/imf/mailimf_write_file.h
@@ -1 +0,0 @@
-../../src/low-level/imf/mailimf_write_generic.h
@@ -1 +0,0 @@
-../../src/low-level/imf/mailimf_write_mem.h
@@ -1 +0,0 @@
-../../src/data-types/maillock.h
@@ -1 +0,0 @@
-../../src/low-level/mbox/mailmbox.h
@@ -1 +0,0 @@
-../../src/low-level/mbox/mailmbox_types.h
@@ -1 +0,0 @@
-../../src/driver/interface/mailmessage.h
@@ -1 +0,0 @@
-../../src/driver/interface/mailmessage_types.h
@@ -1 +0,0 @@
-../../src/low-level/mh/mailmh.h
@@ -1 +0,0 @@
-../../src/low-level/mime/mailmime.h
@@ -1 +0,0 @@
-../../src/low-level/mime/mailmime_content.h
@@ -1 +0,0 @@
-../../src/low-level/mime/mailmime_decode.h
@@ -1 +0,0 @@
-../../src/low-level/mime/mailmime_disposition.h
@@ -1 +0,0 @@
-../../src/low-level/mime/mailmime_types.h
@@ -1 +0,0 @@
-../../src/low-level/mime/mailmime_types_helper.h
@@ -1 +0,0 @@
-../../src/low-level/mime/mailmime_write_file.h
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`../../src/low-level/imap/annotatemore_types.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/implementation/data-message/data_message_driver.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/implementation/db/dbdriver.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/implementation/db/dbstorage.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/implementation/feed/feeddriver.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/tools/generic_cache_types.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/implementation/hotmail/hotmailstorage.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/implementation/imap/imapdriver.h`
				`@@ -1 +0,0 @@`
				`../../src/low-level/maildir/maildir_types.h`
				`@@ -1 +0,0 @@`
				`../../src/driver/implementation/maildir/maildirdriver.h`