use encoded-words crate, which friedel ported from python

try fix filename encoding bug -- fails in one test
switch to quoted-printable, which is already used by mailparse
2026-06-25 17:16:36 +03:00 · 2019-12-05 18:56:34 +01:00 · 2019-12-05 14:52:16 +01:00 · 2019-12-05 13:23:31 +01:00 · 2019-12-05 13:11:51 +01:00 · 2019-12-05 11:06:42 +01:00
50 changed files with 974 additions and 1514 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,6 @@
 # Changelog 

-## next (pending)
-
- restructured (but not change) imap idle handling into own file. cc @link2xt
-
-## 1.0.0-beta.12
-
- fix python bindings to use core for copying attachments to blobdir
-  and fix core to actually do it. @hpk42
-
-## 1.0.0-beta.11
-
- trigger reconnect more often on imap error states.  Should fix an 
-  issue observed when trying to empty a folder.  @hpk42
-
- un-split qr tests: we fixed qr-securejoin protocol flakyness 
-  last weeks. @hpk42
-
-## 1.0.0-beta.10
+## 1.0.0-beta.10 (pending)

 - fix grpid-determination from in-reply-to and references headers. @hpk42

@@ -27,11 +10,6 @@

 - remove last unsafe code from dc_receive_imf :) @hpk42

- add experimental new dc_chat_get_info_json FFI/API so that desktop devs
-  can play with using it. @jikstra
-
- fix encoding of subjects and attachment-filenames @hpk42
-  @dignifiedquire . 

 ## 1.0.0-beta.9

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,31 +116,6 @@ dependencies = [
 "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "async-smtp"
-version = "0.1.0"
-source = "git+https://github.com/async-email/async-smtp#f6bf23d29fa0a09db2bce557a0e2c13c3d851f2f"
-dependencies = [
- "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "async-tls 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "async-trait 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hostname 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustls-connector 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "snafu 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "async-std"
 version = "1.2.0"
@@ -186,16 +161,6 @@ dependencies = [
 "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "async-trait"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "atty"
 version = "0.2.13"
@@ -642,10 +607,9 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.9"
 dependencies = [
 "async-imap 0.1.1 (git+https://github.com/async-email/async-imap)",
- "async-smtp 0.1.0 (git+https://github.com/async-email/async-smtp)",
 "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "async-tls 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -664,6 +628,7 @@ dependencies = [
 "image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lettre 0.9.2 (git+https://github.com/deltachat/lettre?branch=feat/mail)",
 "lettre_email 0.9.2 (git+https://github.com/deltachat/lettre?branch=feat/mail)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "mailparse 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -718,9 +683,9 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.9"
 dependencies = [
- "deltachat 1.0.0-beta.12",
+ "deltachat 1.0.0-beta.9",
 "deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -795,11 +760,6 @@ dependencies = [
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "doc-comment"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "dtoa"
 version = "0.4.4"
@@ -840,7 +800,7 @@ dependencies = [
 [[package]]
 name = "encoded-words"
 version = "0.1.0"
-source = "git+https://github.com/async-email/encoded-words#2631c258183620f6d976abffabbfc2dcc697d793"
+source = "git+https://github.com/async-email/encoded-words#019e833f0c9ea7d4b0b693aab44e66d78d18f1d0"
 dependencies = [
 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "charset 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1238,12 +1198,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "hostname"
-version = "0.2.0"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1456,9 +1415,17 @@ name = "lettre"
 version = "0.9.2"
 source = "git+https://github.com/deltachat/lettre?branch=feat/mail#00ba9db544059ddd60048f0b85d5052e4bf605da"
 dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustls-connector 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1554,11 +1521,6 @@ dependencies = [
 "quoted_printable 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "matches"
 version = "0.1.8"
@@ -2645,25 +2607,6 @@ name = "smallvec"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "snafu"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "snafu-derive 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "snafu-derive"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "sourcefile"
 version = "0.1.4"
@@ -3381,6 +3324,14 @@ dependencies = [
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "winutil"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -3442,11 +3393,9 @@ dependencies = [
 "checksum async-attributes 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423"
 "checksum async-imap 0.1.1 (git+https://github.com/async-email/async-imap)" = "<none>"
 "checksum async-macros 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "644a5a8de80f2085a1e7e57cd1544a2a7438f6e003c0790999bd43b92a77cdb2"
-"checksum async-smtp 0.1.0 (git+https://github.com/async-email/async-smtp)" = "<none>"
 "checksum async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "513ee3c49800679a319912340f5601afda9e72848d7dea3a48bab489e8c1a46f"
 "checksum async-task 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de6bd58f7b9cc49032559422595c81cbfcf04db2f2133592f70af19e258a1ced"
 "checksum async-tls 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce6977f57fa68da77ffe5542950d47e9c23d65f5bc7cb0a9f8700996913eec7"
-"checksum async-trait 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "8b6dd385bb33043b833ba049048d57bdbb4d654a121ed68c71871ca51ff67070"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
@@ -3508,7 +3457,6 @@ dependencies = [
 "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
-"checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
 "checksum ed25519-dalek 1.0.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "845aaacc16f01178f33349e7c992ecd0cee095aa5e577f0f4dee35971bd36455"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
@@ -3562,7 +3510,7 @@ dependencies = [
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
-"checksum hostname 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc5260e6c63877196b6fca5a7fb4eaff751134045ad3415716192baa36f5b9a0"
+"checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
@@ -3596,7 +3544,6 @@ dependencies = [
 "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
 "checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
 "checksum mailparse 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c00eb97cc18f08aaadd02808328dcc9be94948d8e5b54adbfd3414d2f87f7bf1"
-"checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 "checksum md-5 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8"
@@ -3710,8 +3657,6 @@ dependencies = [
 "checksum slice-deque 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffddf594f5f597f63533d897427a570dbaa9feabaaa06595b74b71b7014507d7"
 "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
 "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
-"checksum snafu 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41207ca11f96a62cd34e6b7fdf73d322b25ae3848eb9d38302169724bb32cf27"
-"checksum snafu-derive 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5e338c8b0577457c9dda8e794b6ad7231c96e25b1b0dd5842d52249020c1c0"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
@@ -3798,6 +3743,7 @@ dependencies = [
 "checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767"
 "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
 "checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
+"checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum x25519-dalek 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538"
 "checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.9"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"
@@ -17,7 +17,7 @@ smallvec = "0.6.9"
 reqwest = { version = "0.9.15", default-features = false, features = ["rustls-tls"] }
 num-derive = "0.2.5"
 num-traits = "0.2.6"
-async-smtp = { git = "https://github.com/async-email/async-smtp" }
+lettre = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" }
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" }
 async-imap = { git = "https://github.com/async-email/async-imap", branch="master" }
 async-tls = "0.6"
--- a/assets/icon-device.png
+++ b/assets/icon-device.png
--- a/assets/icon-device.svg
+++ b/assets/icon-device.svg
@@ -7,42 +7,42 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="409.60001"
-   inkscape:export-xdpi="409.60001"
-   inkscape:export-filename="/Users/bpetersen/projects/deltachat-core-rust/assets/icon-device.png"
-   version="1.0"
-   width="60"
-   height="60"
-   viewBox="0 0 45 45"
-   preserveAspectRatio="xMidYMid meet"
-   id="svg4344"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
   sodipodi:docname="icon-device.svg"
-   inkscape:version="1.0beta1 (32d4812, 2019-09-19)">
+   id="svg4344"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 45 45"
+   height="60"
+   width="60"
+   version="1.0"
+   inkscape:export-filename="/home/kerle/Workspace/deltachat-core-rust/assets/icon-device.png"
+   inkscape:export-xdpi="409.60001"
+   inkscape:export-ydpi="409.60001">
  <defs
     id="defs4348" />
  <sodipodi:namedview
-     inkscape:snap-global="false"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     inkscape:document-rotation="0"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="1035"
-     id="namedview4346"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="3.959798"
-     inkscape:cx="28.322498"
-     inkscape:cy="24.898474"
-     inkscape:window-x="45"
-     inkscape:window-y="23"
+     inkscape:current-layer="svg4344"
     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4344" />
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:cy="28.471578"
+     inkscape:cx="28.03926"
+     inkscape:zoom="5.6"
+     units="px"
+     showgrid="false"
+     id="namedview4346"
+     inkscape:window-height="1019"
+     inkscape:window-width="1248"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     inkscape:document-rotation="0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     inkscape:snap-global="false" />
  <metadata
     id="metadata4336">
 Created by potrace 1.15, written by Peter Selinger 2001-2017
@@ -56,28 +56,35 @@ Created by potrace 1.15, written by Peter Selinger 2001-2017
  </cc:Work>
 </rdf:RDF>
 </metadata>
-  <rect
-     y="-4.4408921e-16"
-     x="0"
-     height="45"
-     width="45"
-     id="rect860"
-     style="opacity:1;fill:#76868b;fill-opacity:1;stroke-width:0.819271" />
+  <circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071"
+     id="path859"
+     cx="22.5"
+     cy="22.5"
+     r="22.5" />
+  <circle
+     r="22.5"
+     cy="22.5"
+     cx="22.5"
+     id="path4917"
+     style="fill:#364e54;fill-opacity:0.67681497;stroke-width:0.58855402"
+     inkscape:export-xdpi="409"
+     inkscape:export-ydpi="409" />
  <g
-     fill="#000000"
-     stroke="none"
-     style="fill:#ffffff;fill-opacity:1"
+     id="g4342"
     transform="matrix(0.00255113,0,0,-0.00255113,5.586152,38.200477)"
-     id="g4342">
+     style="fill:#ffffff;fill-opacity:1"
+     stroke="none"
+     fill="#000000">
    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 8175,12765 c -703,-114 -1248,-608 -1387,-1258 -17,-82 -21,-136 -22,-277 0,-202 15,-307 70,-470 149,-446 499,-733 1009,-828 142,-26 465,-23 619,6 691,131 1201,609 1328,1244 31,158 31,417 0,565 -114,533 -482,889 -1038,1004 -133,27 -448,35 -579,14 z"
+       inkscape:connector-curvature="0"
       id="path4338"
-       inkscape:connector-curvature="0" />
+       d="m 8175,12765 c -703,-114 -1248,-608 -1387,-1258 -17,-82 -21,-136 -22,-277 0,-202 15,-307 70,-470 149,-446 499,-733 1009,-828 142,-26 465,-23 619,6 691,131 1201,609 1328,1244 31,158 31,417 0,565 -114,533 -482,889 -1038,1004 -133,27 -448,35 -579,14 z"
+       style="fill:#ffffff;fill-opacity:1" />
    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 7070,9203 c -212,-20 -275,-27 -397,-48 -691,-117 -1400,-444 -2038,-940 -182,-142 -328,-270 -585,-517 -595,-571 -911,-974 -927,-1181 -6,-76 11,-120 69,-184 75,-80 159,-108 245,-79 109,37 263,181 632,595 539,606 774,826 1035,969 135,75 231,105 341,106 82,1 94,-2 138,-27 116,-68 161,-209 122,-376 -9,-36 -349,-868 -757,-1850 -407,-982 -785,-1892 -838,-2021 -287,-694 -513,-1389 -615,-1889 -70,-342 -90,-683 -52,-874 88,-440 381,-703 882,-792 124,-23 401,-30 562,-16 783,69 1674,461 2561,1125 796,596 1492,1354 1607,1751 43,146 -33,308 -168,360 -61,23 -100,15 -173,-36 -105,-74 -202,-170 -539,-529 -515,-551 -762,-783 -982,-927 -251,-164 -437,-186 -543,-65 -56,64 -74,131 -67,247 13,179 91,434 249,815 135,324 1588,4102 1646,4280 106,325 151,561 159,826 9,281 -22,463 -112,652 -58,122 -114,199 -211,292 -245,233 -582,343 -1044,338 -91,-1 -181,-3 -200,-5 z"
+       inkscape:connector-curvature="0"
       id="path4340"
-       inkscape:connector-curvature="0" />
+       d="m 7070,9203 c -212,-20 -275,-27 -397,-48 -691,-117 -1400,-444 -2038,-940 -182,-142 -328,-270 -585,-517 -595,-571 -911,-974 -927,-1181 -6,-76 11,-120 69,-184 75,-80 159,-108 245,-79 109,37 263,181 632,595 539,606 774,826 1035,969 135,75 231,105 341,106 82,1 94,-2 138,-27 116,-68 161,-209 122,-376 -9,-36 -349,-868 -757,-1850 -407,-982 -785,-1892 -838,-2021 -287,-694 -513,-1389 -615,-1889 -70,-342 -90,-683 -52,-874 88,-440 381,-703 882,-792 124,-23 401,-30 562,-16 783,69 1674,461 2561,1125 796,596 1492,1354 1607,1751 43,146 -33,308 -168,360 -61,23 -100,15 -173,-36 -105,-74 -202,-170 -539,-529 -515,-551 -762,-783 -982,-927 -251,-164 -437,-186 -543,-65 -56,64 -74,131 -67,247 13,179 91,434 249,815 135,324 1588,4102 1646,4280 106,325 151,561 159,826 9,281 -22,463 -112,652 -58,122 -114,199 -211,292 -245,233 -582,343 -1044,338 -91,-1 -181,-3 -200,-5 z"
+       style="fill:#ffffff;fill-opacity:1" />
  </g>
 </svg>
--- a/assets/icon-saved-messages.png
+++ b/assets/icon-saved-messages.png
--- a/assets/icon-saved-messages.svg
+++ b/assets/icon-saved-messages.svg
@@ -7,42 +7,42 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="409.60001"
-   inkscape:export-xdpi="409.60001"
-   inkscape:export-filename="/home/kerle/test-icon.png"
-   version="1.0"
-   width="60"
-   height="60"
-   viewBox="0 0 45 45"
-   preserveAspectRatio="xMidYMid meet"
-   id="svg4344"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
   sodipodi:docname="icon-saved-messages.svg"
-   inkscape:version="1.0beta1 (32d4812, 2019-09-19)">
+   id="svg4344"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 45 45"
+   height="60"
+   width="60"
+   version="1.0"
+   inkscape:export-filename="/home/kerle/test-icon.png"
+   inkscape:export-xdpi="409.60001"
+   inkscape:export-ydpi="409.60001">
  <defs
     id="defs4348" />
  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     inkscape:document-rotation="0"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1395"
-     inkscape:window-height="855"
-     id="namedview4346"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="4"
-     inkscape:cx="29.308676"
-     inkscape:cy="49.03624"
-     inkscape:window-x="89"
-     inkscape:window-y="108"
-     inkscape:window-maximized="0"
+     inkscape:lockguides="false"
     inkscape:current-layer="svg4344"
-     inkscape:lockguides="false" />
+     inkscape:window-maximized="0"
+     inkscape:window-y="130"
+     inkscape:window-x="89"
+     inkscape:cy="43.28624"
+     inkscape:cx="-21.066324"
+     inkscape:zoom="4"
+     units="px"
+     showgrid="false"
+     id="namedview4346"
+     inkscape:window-height="855"
+     inkscape:window-width="1395"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     inkscape:document-rotation="0"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
  <metadata
     id="metadata4336">
 Created by potrace 1.15, written by Peter Selinger 2001-2017
@@ -56,16 +56,21 @@ Created by potrace 1.15, written by Peter Selinger 2001-2017
  </cc:Work>
 </rdf:RDF>
 </metadata>
-  <rect
-     y="0"
-     x="0"
-     height="45"
-     width="45"
-     id="rect1420"
-     style="fill:#87aade;fill-opacity:1;stroke:none;stroke-width:0.968078" />
+  <circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071"
+     id="path859"
+     cx="22.5"
+     cy="22.5"
+     r="22.5" />
+  <circle
+     r="22.5"
+     cy="22.50293"
+     cx="22.5"
+     id="path4917"
+     style="fill:#87aade;fill-opacity:1;stroke-width:0.58855402" />
  <path
-     id="rect846"
-     style="fill:#ffffff;stroke-width:0.58409804"
+     inkscape:connector-curvature="0"
     d="M 13.5,7.5 V 39 h 0.08654 L 22.533801,29.370239 31.482419,39 h 0.01758 V 7.5 Z m 9.004056,4.108698 1.879508,4.876388 5.039514,0.359779 -3.879358,3.363728 1.227764,5.095749 -4.276893,-2.796643 -4.280949,2.788618 1.237229,-5.093073 -3.873949,-3.371754 5.040866,-0.350417 z"
-     inkscape:connector-curvature="0" />
+     style="fill:#ffffff;stroke-width:0.58409804"
+     id="rect846" />
 </svg>
--- a/ci_scripts/remote_tests_python.sh
+++ b/ci_scripts/remote_tests_python.sh
@@ -2,7 +2,7 @@

 export BRANCH=${CIRCLE_BRANCH:?branch to build}
 export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
-export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+export SSHTARGET=ci@b1.delta.chat

 # we construct the BUILDDIR such that we can easily share the
 # CARGO_TARGET_DIR between runs ("..")
--- a/ci_scripts/remote_tests_rust.sh
+++ b/ci_scripts/remote_tests_rust.sh
@@ -2,7 +2,7 @@

 export BRANCH=${CIRCLE_BRANCH:?branch to build}
 export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
-export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+export SSHTARGET=ci@b1.delta.chat

 # we construct the BUILDDIR such that we can easily share the
 # CARGO_TARGET_DIR between runs ("..")
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.9"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -994,20 +994,11 @@ uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t co
 *
 * Example:
 * ~~~
- * char* blobdir = dc_get_blobdir(context);
- * char* file_to_send = mprintf("%s/%s", blobdir, "send.mp4")
- *
 * dc_msg_t* msg = dc_msg_new(context, DC_MSG_VIDEO);
- * dc_msg_set_file(msg, file_to_send, NULL);
+ * dc_msg_set_file(msg, "/file/to/send.mp4", NULL);
 * dc_prepare_msg(context, chat_id, msg);
- *
- * // ... create the file ...
- *
+ * // ... after /file/to/send.mp4 is ready:
 * dc_send_msg(context, chat_id, msg);
- *
- * dc_msg_unref(msg);
- * free(file_to_send);
- * dc_str_unref(file_to_send);
 * ~~~
 *
 * @memberof dc_context_t
@@ -1033,11 +1024,8 @@ uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t ch
 * Example:
 * ~~~
 * dc_msg_t* msg = dc_msg_new(context, DC_MSG_IMAGE);
- *
 * dc_msg_set_file(msg, "/file/to/send.jpg", NULL);
 * dc_send_msg(context, chat_id, msg);
- *
- * dc_msg_unref(msg);
 * ~~~
 *
 * @memberof dc_context_t
@@ -1146,9 +1134,6 @@ void            dc_set_draft                 (dc_context_t* context, uint32_t ch
 *     // add a changelog
 *     dc_add_device_msg(context, "update-123", changelog_msg);
 * }
- *
- * dc_msg_unref(changelog_msg);
- * dc_msg_unref(welome_msg);
 * ~~~
 */
 uint32_t        dc_add_device_msg            (dc_context_t* context, const char* label, dc_msg_t* msg);
@@ -1962,7 +1947,7 @@ void            dc_imex                      (dc_context_t* context, int what, c
 *         }
 *         while (!configure_succeeded())
 *     }
- *     dc_str_unref(file);
+ *     free(file);
 * }
 * ~~~
 *
@@ -2617,25 +2602,6 @@ dc_lot_t*        dc_chatlist_get_summary     (const dc_chatlist_t* chatlist, siz
 dc_context_t*    dc_chatlist_get_context     (dc_chatlist_t* chatlist);


-/**
- * Get info summary for a chat, in json format. 
- *
- * The returned json string has the following key/values: 
- *
- * id: chat id 
- * name: chat/group name 
- * color: color of this chat 
- * last-message-from: who sent the last message 
- * last-message-text: message (truncated) 
- * last-message-state: DC_STATE* constant
- * last-message-date: 
- * avatar-path: path-to-blobfile 
- * is_verified: yes/no
-
- * @return a utf8-encoded json string containing all requested info. Must be freed using dc_str_unref().  NULL is never returned.
- */
-char*            dc_chat_get_info_json       (dc_context_t* context, size_t chat_id);
-
 /**
 * @class dc_chat_t
 *
@@ -4050,6 +4016,11 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 */
 #define DC_CERTCK_STRICT 1

+/**
+ * Accept invalid hostnames, but not invalid certificates.
+ */
+#define DC_CERTCK_ACCEPT_INVALID_HOSTNAMES 2
+
 /**
 * Accept invalid certificates, including self-signed ones
 * or having incorrect hostname.
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -29,8 +29,6 @@ use deltachat::message::MsgId;
 use deltachat::stock::StockMessage;
 use deltachat::*;

-mod dc_array;
-
 mod string;
 use self::string::*;

@@ -2379,27 +2377,6 @@ pub unsafe extern "C" fn dc_chat_is_sending_locations(chat: *mut dc_chat_t) -> l
    ffi_chat.chat.is_sending_locations() as libc::c_int
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_get_info_json(
-    context: *mut dc_context_t,
-    chat_id: u32,
-) -> *mut libc::c_char {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_chat_get_info_json()");
-        return "".strdup();
-    }
-    let ffi_context = &*context;
-    ffi_context
-        .with_inner(|ctx| match chat::get_info_json(ctx, chat_id) {
-            Ok(s) => s.strdup(),
-            Err(err) => {
-                error!(ctx, "get_info_json({}) returned: {}", chat_id, err);
-                return "".strdup();
-            }
-        })
-        .unwrap_or_else(|_| "".strdup())
-}
-
 // dc_msg_t

 /// FFI struct for [dc_msg_t]
--- a/python/src/deltachat/chat.py
+++ b/python/src/deltachat/chat.py
@@ -2,7 +2,6 @@

 import mimetypes
 import calendar
-import json
 from datetime import datetime
 import os
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
@@ -109,30 +108,6 @@ class Chat(object):

    # ------  chat messaging API ------------------------------

-    def send_msg(self, msg):
-        """send a message by using a ready Message object.
-
-        :param msg: a :class:`deltachat.message.Message` instance
-           previously returned by
-           e.g. :meth:`deltachat.message.Message.new_empty` or
-           :meth:`prepare_file`.
-        :raises ValueError: if message can not be sent.
-
-        :returns: a :class:`deltachat.message.Message` instance as
-           sent out.  This is the same object as was passed in, which
-           has been modified with the new state of the core.
-        """
-        if msg.is_out_preparing():
-            assert msg.id != 0
-            # get a fresh copy of dc_msg, the core needs it
-            msg = Message.from_db(self.account, msg.id)
-        sent_id = lib.dc_send_msg(self._dc_context, self.id, msg._dc_msg)
-        if sent_id == 0:
-            raise ValueError("message could not be sent")
-        # modify message in place to avoid bad state for the caller
-        msg._dc_msg = Message.from_db(self.account, sent_id)._dc_msg
-        return msg
-
    def send_text(self, text):
        """ send a text message and return the resulting Message instance.

@@ -154,12 +129,9 @@ class Chat(object):
        :raises ValueError: if message can not be send/chat does not exist.
        :returns: the resulting :class:`deltachat.message.Message` instance
        """
-        msg = Message.new_empty(self.account, view_type="file")
-        msg.set_file(path, mime_type)
-        sent_id = lib.dc_send_msg(self._dc_context, self.id, msg._dc_msg)
-        if sent_id == 0:
-            raise ValueError("message could not be sent")
-        return Message.from_db(self.account, sent_id)
+        msg = self.prepare_message_file(path=path, mime_type=mime_type)
+        self.send_prepared(msg)
+        return msg

    def send_image(self, path):
        """ send an image message and return the resulting Message instance.
@@ -169,12 +141,9 @@ class Chat(object):
        :returns: the resulting :class:`deltachat.message.Message` instance
        """
        mime_type = mimetypes.guess_type(path)[0]
-        msg = Message.new_empty(self.account, view_type="image")
-        msg.set_file(path, mime_type)
-        sent_id = lib.dc_send_msg(self._dc_context, self.id, msg._dc_msg)
-        if sent_id == 0:
-            raise ValueError("message could not be sent")
-        return Message.from_db(self.account, sent_id)
+        msg = self.prepare_message_file(path=path, mime_type=mime_type, view_type="image")
+        self.send_prepared(msg)
+        return msg

    def prepare_message(self, msg):
        """ create a new prepared message.
@@ -273,12 +242,6 @@ class Chat(object):
        """
        return lib.dc_marknoticed_chat(self._dc_context, self.id)

-    def get_summary(self):
-        """ return dictionary with summary information. """
-        dc_res = lib.dc_chat_get_info_json(self._dc_context, self.id)
-        s = from_dc_charpointer(dc_res)
-        return json.loads(s)
-
    # ------  group management API ------------------------------

    def add_contact(self, contact):
@@ -361,18 +324,6 @@ class Chat(object):
            return None
        return from_dc_charpointer(dc_res)

-    def get_color(self):
-        """return the color of the chat.
-        :returns: color as 0x00rrggbb
-        """
-        return lib.dc_chat_get_color(self._dc_chat)
-
-    def get_subtitle(self):
-        """return the subtitle of the chat
-        :returns: the subtitle
-        """
-        return from_dc_charpointer(lib.dc_chat_get_subtitle(self._dc_chat))
-
    # ------  location streaming API ------------------------------

    def is_sending_locations(self):
@@ -381,12 +332,6 @@ class Chat(object):
        """
        return lib.dc_is_sending_locations_to_chat(self._dc_context, self.id)

-    def is_archived(self):
-        """return True if this chat is archived.
-        :returns: True if archived.
-        """
-        return lib.dc_chat_get_archived(self._dc_chat)
-
    def enable_sending_locations(self, seconds):
        """enable sending locations for this chat.

--- a/python/src/deltachat/const.py
+++ b/python/src/deltachat/const.py
@@ -68,6 +68,7 @@ DC_LP_SMTP_SOCKET_SSL = 0x20000
 DC_LP_SMTP_SOCKET_PLAIN = 0x40000
 DC_CERTCK_AUTO = 0
 DC_CERTCK_STRICT = 1
+DC_CERTCK_ACCEPT_INVALID_HOSTNAMES = 2
 DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3
 DC_EMPTY_MVBOX = 0x01
 DC_EMPTY_INBOX = 0x02
--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -1,6 +1,7 @@
 """ The Message object. """

 import os
+import shutil
 from . import props
 from .cutil import from_dc_charpointer, as_dc_charpointer
 from .capi import lib, ffi
@@ -69,6 +70,19 @@ class Message(object):
        mtype = ffi.NULL if mime_type is None else as_dc_charpointer(mime_type)
        if not os.path.exists(path):
            raise ValueError("path does not exist: {!r}".format(path))
+        blobdir = self.account.get_blobdir()
+        if not path.startswith(blobdir):
+            for i in range(50):
+                ext = "" if i == 0 else "-" + str(i)
+                dest = os.path.join(blobdir, os.path.basename(path) + ext)
+                if os.path.exists(dest):
+                    continue
+                shutil.copyfile(path, dest)
+                break
+            else:
+                raise ValueError("could not create blobdir-path for {}".format(path))
+            path = dest
+        assert path.startswith(blobdir), path
        lib.dc_msg_set_file(self._dc_msg, as_dc_charpointer(path), mtype)

    @props.with_doc
@@ -174,7 +188,7 @@ class Message(object):
    @property
    def _msgstate(self):
        if self.id == 0:
-            dc_msg = self._dc_msg
+            dc_msg = self.message._dc_msg
        else:
            # load message from db to get a fresh/current state
            dc_msg = ffi.gc(
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -155,18 +155,6 @@ class TestOfflineChat:
        chat.set_name("title2")
        assert chat.get_name() == "title2"

-        d = chat.get_summary()
-        print(d)
-        assert d["id"] == chat.id
-        assert d["type"] == chat.get_type()
-        assert d["name"] == chat.get_name()
-        assert d["archived"] == chat.is_archived()
-        # assert d["param"] == chat.param
-        assert d["color"] == chat.get_color()
-        assert d["profile_image"] == "" if chat.get_profile_image() is None else chat.get_profile_image()
-        assert d["subtitle"] == chat.get_subtitle()
-        assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()
-
    def test_group_chat_creation_with_translation(self, ac1):
        ac1.set_stock_translation(const.DC_STR_NEWGROUPDRAFT, "xyz %1$s")
        ac1._evlogger.consume_events()
@@ -442,60 +430,30 @@ class TestOnlineAccount:
        assert self_addr not in ev[2]
        ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")

-    def test_send_file_twice_unicode_filename_mangling(self, tmpdir, acfactory, lp):
+    def test_prepare_file_with_unicode(self, acfactory, lp):
        ac1, ac2 = acfactory.get_two_online_accounts()
        chat = self.get_chat(ac1, ac2)

-        basename = "somedäüta.html.zip"
-        p = os.path.join(tmpdir.strpath, basename)
-        with open(p, "w") as f:
-            f.write("some data")
-
-        def send_and_receive_message():
-            lp.sec("ac1: prepare and send attachment + text to ac2")
-            msg1 = Message.new_empty(ac1, "file")
-            msg1.set_text("withfile")
-            msg1.set_file(p)
-            chat.send_msg(msg1)
-
-            lp.sec("ac2: receive message")
-            ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
-            assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
-            return ac2.get_message_by_id(ev[2])
-
-        msg = send_and_receive_message()
-        assert msg.text == "withfile"
-        assert open(msg.filename).read() == "some data"
-        assert msg.filename.endswith(basename)
-
-        msg2 = send_and_receive_message()
-        assert msg2.text == "withfile"
-        assert open(msg2.filename).read() == "some data"
-        assert msg2.filename.endswith("html.zip")
-        assert msg.filename != msg2.filename
-
-    def test_send_file_html_attachment(self, tmpdir, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = self.get_chat(ac1, ac2)
-
-        basename = "test.html"
-        content = "<html><body>text</body>data"
-
-        p = os.path.join(tmpdir.strpath, basename)
-        with open(p, "w") as f:
-            # write wrong html to see if core tries to parse it
-            # (it shouldn't as it's a file attachment)
-            f.write(content)
-
        lp.sec("ac1: prepare and send attachment + text to ac2")
-        chat.send_file(p, mime_type="text/html")
+        blobdir = ac1.get_blobdir()
+        basename = "somedäüta.txt"
+        p = os.path.join(blobdir, basename)
+        with open(p, "w") as f:
+            f.write("some data")
+        msg = Message.new_empty(ac1, "file")
+        msg.set_text("hello ä world")
+        msg.set_file(p)
+        message = chat.prepare_message(msg)
+        assert message.is_out_preparing()
+        assert message.text == "hello ä world"
+        chat.send_prepared(message)

        lp.sec("ac2: receive message")
        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
-        msg = ac2.get_message_by_id(ev[2])
-
-        assert open(msg.filename).read() == content
+        msg = ac2.get_message_by_id(ev[1])
+        assert msg.text == "hello ä world"
+        assert open(msg.filename).read() == "some data"
        assert msg.filename.endswith(basename)

    def test_mvbox_sentbox_threads(self, acfactory, lp):
--- a/python/tests/test_increation.py
+++ b/python/tests/test_increation.py
@@ -1,49 +1,10 @@
 from __future__ import print_function
-
-import os.path
-import shutil
-
-import pytest
 from filecmp import cmp
-
-from conftest import wait_configuration_progress, wait_msgs_changed
 from deltachat import const
+from conftest import wait_configuration_progress, wait_msgs_changed


 class TestOnlineInCreation:
-    def test_increation_not_blobdir(self, tmpdir, acfactory, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
-
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-
-        lp.sec("Creating in-creation file outside of blobdir")
-        assert tmpdir.strpath != ac1.get_blobdir()
-        src = tmpdir.join('file.txt').ensure(file=1)
-        with pytest.raises(Exception):
-            chat.prepare_message_file(src.strpath)
-
-    def test_no_increation_copies_to_blobdir(self, tmpdir, acfactory, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
-
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-
-        lp.sec("Creating file outside of blobdir")
-        assert tmpdir.strpath != ac1.get_blobdir()
-        src = tmpdir.join('file.txt')
-        src.write("hello there\n")
-        chat.send_file(src.strpath)
-
-        blob_src = os.path.join(ac1.get_blobdir(), 'file.txt')
-        assert os.path.exists(blob_src), "file.txt not copied to blobdir"
-
    def test_forward_increation(self, acfactory, data, lp):
        ac1 = acfactory.get_online_configuring_account()
        ac2 = acfactory.get_online_configuring_account()
@@ -56,10 +17,7 @@ class TestOnlineInCreation:
        wait_msgs_changed(ac1, 0, 0)  # why no chat id?

        lp.sec("create a message with a file in creation")
-        orig = data.get_path("d.png")
-        path = os.path.join(ac1.get_blobdir(), 'd.png')
-        with open(path, "x") as fp:
-            fp.write("preparing")
+        path = data.get_path("d.png")
        prepared_original = chat.prepare_message_file(path)
        assert prepared_original.is_out_preparing()
        wait_msgs_changed(ac1, chat.id, prepared_original.id)
@@ -80,7 +38,6 @@ class TestOnlineInCreation:

        lp.sec("finish creating the file and send it")
        assert prepared_original.is_out_preparing()
-        shutil.copyfile(orig, path)
        chat.send_prepared(prepared_original)
        assert prepared_original.is_out_pending() or prepared_original.is_out_delivered()
        wait_msgs_changed(ac1, chat.id, prepared_original.id)
@@ -102,11 +59,11 @@ class TestOnlineInCreation:
        ev1 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
        assert ev1[1] > const.DC_CHAT_ID_LAST_SPECIAL
        received_original = ac2.get_message_by_id(ev1[2])
-        assert cmp(received_original.filename, orig, shallow=False)
+        assert cmp(received_original.filename, path, False)

        lp.sec("wait2 for original or forwarded messages to arrive")
        ev2 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
        assert ev2[1] > const.DC_CHAT_ID_LAST_SPECIAL
        assert ev2[1] != ev1[1]
        received_copy = ac2.get_message_by_id(ev2[2])
-        assert cmp(received_copy.filename, orig, shallow=False)
+        assert cmp(received_copy.filename, path, False)
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -7,7 +7,11 @@ envlist =

 [testenv]
 commands = 
-    pytest -n6 --reruns 2 --reruns-delay 5 -v -rsXx {posargs:tests} 
+    # (some qr tests are pretty heavy in terms of send/received
+    # messages and async-imap's likely has concurrency problems, 
+    # eg https://github.com/async-email/async-imap/issues/4 )
+    pytest -n6 --reruns 3 --reruns-delay 5 -v -rsXx -k "not qr" {posargs:tests} 
+    pytest -n6 --reruns 5 --reruns-delay 5 -v -rsXx -k "qr" {posargs:tests} 
    # python tests/package_wheels.py {toxworkdir}/wheelhouse
 passenv = 
    TRAVIS 
@@ -32,7 +36,7 @@ commands =

 [testenv:lint]
 skipsdist = True
-skip_install = True
+usedevelop = True
 deps =
    flake8
    # pygments required by rst-lint
@@ -65,8 +69,8 @@ commands =


 [pytest]
-addopts = -v -ra
-python_files = tests/test_*.py
+addopts = -v -rs 
+python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true
 timeout = 60 
--- a/src/aheader.rs
+++ b/src/aheader.rs
@@ -95,25 +95,16 @@ impl Aheader {

 impl fmt::Display for Aheader {
    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "addr={};", self.addr)?;
-        if self.prefer_encrypt == EncryptPreference::Mutual {
-            write!(fmt, " prefer-encrypt=mutual;")?;
-        }
-
-        // adds a whitespace every 78 characters, this allows
-        // email crate to wrap the lines according to RFC 5322
+        // TODO replace 78 with enum /rtn
+        // adds a whitespace every 78 characters, this allows libEtPan to
+        // wrap the lines according to RFC 5322
        // (which may insert a linebreak before every whitespace)
-        let keydata = self.public_key.to_base64().chars().enumerate().fold(
-            String::new(),
-            |mut res, (i, c)| {
-                if i % 78 == 78 - "keydata=".len() {
-                    res.push(' ')
-                }
-                res.push(c);
-                res
-            },
-        );
-        write!(fmt, " keydata={}", keydata)
+        let keydata = self.public_key.to_base64(78);
+        write!(
+            fmt,
+            "addr={}; prefer-encrypt={}; keydata={}",
+            self.addr, self.prefer_encrypt, keydata
+        )
    }
 }

@@ -159,10 +150,13 @@ impl str::FromStr for Aheader {
            }
        };

-        let prefer_encrypt = attributes
+        let prefer_encrypt = match attributes
            .remove("prefer-encrypt")
            .and_then(|raw| raw.parse().ok())
-            .unwrap_or_default();
+        {
+            Some(pref) => pref,
+            None => EncryptPreference::NoPreference,
+        };

        // Autocrypt-Level0: unknown attributes starting with an underscore can be safely ignored
        // Autocrypt-Level0: unknown attribute, treat the header as invalid
@@ -182,13 +176,15 @@ impl str::FromStr for Aheader {
 mod tests {
    use super::*;

-    const RAWKEY: &str = "xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJgWL7O3y/g4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6CJx8Wsv8ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKKbhH7Lu8880iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1KvVL3gTTllHOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbGUuZGU+wsCJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087LscCFPiFNyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VNHtODXjAgdLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Dddfxo3ao72rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCvSJa61i+v81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vauf1zK8JgCu3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+G7uXMMOtkb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjmkRl3ToKCLhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09/JM/Fw4sWVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHRTR1pcrWvBuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivXurm8zwGrwdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9MtrmZkZw+ktEk6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb+F//f0k0j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNgwm6qxo7xegRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc=";
+    fn rawkey() -> String {
+        "xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJgWL7O3y/g4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6CJx8Wsv8ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKKbhH7Lu8880iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1KvVL3gTTllHOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbGUuZGU+wsCJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087LscCFPiFNyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VNHtODXjAgdLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Dddfxo3ao72rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCvSJa61i+v81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vauf1zK8JgCu3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+G7uXMMOtkb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjmkRl3ToKCLhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09/JM/Fw4sWVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHRTR1pcrWvBuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivXurm8zwGrwdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9MtrmZkZw+ktEk6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb+F//f0k0j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNgwm6qxo7xegRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc=".into()
+    }

    #[test]
    fn test_from_str() {
        let h: Aheader = format!(
            "addr=me@mail.com; prefer-encrypt=mutual; keydata={}",
-            RAWKEY
+            rawkey()
        )
        .parse()
        .expect("failed to parse");
@@ -197,22 +193,9 @@ mod tests {
        assert_eq!(h.prefer_encrypt, EncryptPreference::Mutual);
    }

-    // EncryptPreference::Reset is an internal value, parser should never return it
-    #[test]
-    fn test_from_str_reset() {
-        let raw = format!(
-            "addr=reset@example.com; prefer-encrypt=reset; keydata={}",
-            RAWKEY
-        );
-        let h: Aheader = raw.parse().expect("failed to parse");
-
-        assert_eq!(h.addr, "reset@example.com");
-        assert_eq!(h.prefer_encrypt, EncryptPreference::NoPreference);
-    }
-
    #[test]
    fn test_from_str_non_critical() {
-        let raw = format!("addr=me@mail.com; _foo=one; _bar=two; keydata={}", RAWKEY);
+        let raw = format!("addr=me@mail.com; _foo=one; _bar=two; keydata={}", rawkey());
        let h: Aheader = raw.parse().expect("failed to parse");

        assert_eq!(h.addr, "me@mail.com");
@@ -223,57 +206,33 @@ mod tests {
    fn test_from_str_superflous_critical() {
        let raw = format!(
            "addr=me@mail.com; _foo=one; _bar=two; other=me; keydata={}",
-            RAWKEY
+            rawkey()
        );
        assert!(raw.parse::<Aheader>().is_err());
    }

    #[test]
    fn test_good_headers() {
-        let fixed_header = concat!(
-            "addr=a@b.example.org; prefer-encrypt=mutual; ",
-            "keydata=xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJg",
-            " WL7O3y/g4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6",
-            " CJx8Wsv8ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKK",
-            " bhH7Lu8880iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1Kv",
-            " VL3gTTllHOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbG",
-            " UuZGU+wsCJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaK",
-            " rc9mtiMLAAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087",
-            " LscCFPiFNyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VN",
-            " HtODXjAgdLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Ddd",
-            " fxo3ao72rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCv",
-            " SJa61i+v81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vau",
-            " f1zK8JgCu3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+",
-            " G7uXMMOtkb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjm",
-            " kRl3ToKCLhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09",
-            " /JM/Fw4sWVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHR",
-            " TR1pcrWvBuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaK",
-            " rc9mtiMLAAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivX",
-            " urm8zwGrwdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9Mtrm",
-            " ZkZw+ktEk6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb",
-            " +F//f0k0j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNg",
-            " wm6qxo7xegRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc="
-        );
+        let fixed_header = "addr=a@b.example.org; prefer-encrypt=mutual; keydata=xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJgWL7O3y/g 4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6CJx8Wsv8 ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKKbhH7Lu88 80iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1KvVL3gTTll HOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbGUuZGU+ws CJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaKrc9mtiML AAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087LscCFPiF Nyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VNHtODXjAg dLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Dddfxo3ao72 rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCvSJa61i+v 81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vauf1zK8JgC u3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+G7uXMMOt kb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjmkRl3ToKC LhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09/JM/Fw4s WVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHRTR1pcrWv BuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaKrc9mtiML AAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivXurm8zwGr wdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9MtrmZkZw+ktE k6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb+F//f0k0 j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNgwm6qxo7x egRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc=";

        let ah = Aheader::from_str(fixed_header).expect("failed to parse");
        assert_eq!(ah.addr, "a@b.example.org");
        assert_eq!(ah.prefer_encrypt, EncryptPreference::Mutual);
-        assert_eq!(format!("{}", ah), fixed_header);

        let rendered = ah.to_string();
        assert_eq!(rendered, fixed_header);

-        let ah = Aheader::from_str(&format!(" _foo; __FOO=BAR ;;; addr = a@b.example.org ;\r\n   prefer-encrypt = mutual ; keydata = {}", RAWKEY)).expect("failed to parse");
+        let ah = Aheader::from_str(&format!(" _foo; __FOO=BAR ;;; addr = a@b.example.org ;\r\n   prefer-encrypt = mutual ; keydata = {}", rawkey())).expect("failed to parse");
        assert_eq!(ah.addr, "a@b.example.org");
        assert_eq!(ah.prefer_encrypt, EncryptPreference::Mutual);

        Aheader::from_str(&format!(
            "addr=a@b.example.org; prefer-encrypt=ignoreUnknownValues; keydata={}",
-            RAWKEY
+            rawkey()
        ))
        .expect("failed to parse");

-        Aheader::from_str(&format!("addr=a@b.example.org; keydata={}", RAWKEY))
+        Aheader::from_str(&format!("addr=a@b.example.org; keydata={}", rawkey()))
            .expect("failed to parse");
    }

@@ -285,30 +244,4 @@ mod tests {
        assert!(Aheader::from_str(" ;;").is_err());
        assert!(Aheader::from_str("addr=a@t.de; unknwon=1; keydata=jau").is_err());
    }
-
-    #[test]
-    fn test_display_aheader() {
-        assert!(format!(
-            "{}",
-            Aheader::new(
-                "test@example.com".to_string(),
-                Key::from_base64(RAWKEY, KeyType::Public).unwrap(),
-                EncryptPreference::Mutual
-            )
-        )
-        .contains("prefer-encrypt=mutual;"));
-
-        // According to Autocrypt Level 1 specification,
-        // only "prefer-encrypt=mutual;" can be used.
-        // If the setting is nopreference, the whole attribute is omitted.
-        assert!(!format!(
-            "{}",
-            Aheader::new(
-                "test@example.com".to_string(),
-                Key::from_base64(RAWKEY, KeyType::Public).unwrap(),
-                EncryptPreference::NoPreference
-            )
-        )
-        .contains("prefer-encrypt"));
-    }
 }
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -159,7 +159,7 @@ impl<'a> BlobObject<'a> {
    /// This merely delegates to the [BlobObject::create_and_copy] and
    /// the [BlobObject::from_path] methods.  See those for possible
    /// errors.
-    pub fn new_from_path(
+    pub fn create_from_path(
        context: &Context,
        src: impl AsRef<Path>,
    ) -> std::result::Result<BlobObject, BlobError> {
@@ -559,14 +559,14 @@ mod tests {

        let src_ext = t.dir.path().join("external");
        fs::write(&src_ext, b"boo").unwrap();
-        let blob = BlobObject::new_from_path(&t.ctx, &src_ext).unwrap();
+        let blob = BlobObject::create_from_path(&t.ctx, &src_ext).unwrap();
        assert_eq!(blob.as_name(), "$BLOBDIR/external");
        let data = fs::read(blob.to_abs_path()).unwrap();
        assert_eq!(data, b"boo");

        let src_int = t.ctx.get_blobdir().join("internal");
        fs::write(&src_int, b"boo").unwrap();
-        let blob = BlobObject::new_from_path(&t.ctx, &src_int).unwrap();
+        let blob = BlobObject::create_from_path(&t.ctx, &src_int).unwrap();
        assert_eq!(blob.as_name(), "$BLOBDIR/internal");
        let data = fs::read(blob.to_abs_path()).unwrap();
        assert_eq!(data, b"boo");
@@ -576,7 +576,7 @@ mod tests {
        let t = dummy_context();
        let src_ext = t.dir.path().join("autocrypt-setup-message-4137848473.html");
        fs::write(&src_ext, b"boo").unwrap();
-        let blob = BlobObject::new_from_path(&t.ctx, &src_ext).unwrap();
+        let blob = BlobObject::create_from_path(&t.ctx, &src_ext).unwrap();
        assert_eq!(
            blob.as_name(),
            "$BLOBDIR/autocrypt-setup-message-4137848473.html"
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -4,7 +4,6 @@ use std::path::{Path, PathBuf};

 use itertools::Itertools;
 use num_traits::FromPrimitive;
-use serde_json::json;

 use crate::blob::{BlobError, BlobObject};
 use crate::chatlist::*;
@@ -730,7 +729,6 @@ fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<(), Error> {
            .get_blob(Param::File, context, !msg.is_increation())?
            .ok_or_else(|| format_err!("Attachment missing for message of type #{}", msg.type_0))?;
        msg.param.set(Param::File, blob.as_name());
-
        if msg.type_0 == Viewtype::File || msg.type_0 == Viewtype::Image {
            // Correct the type, take care not to correct already very special
            // formats as GIF or VOICE.
@@ -1905,54 +1903,6 @@ pub fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: u32) -> Resul
    Ok(())
 }

-pub fn get_info_json(context: &Context, chat_id: u32) -> Result<String, Error> {
-    let chat = Chat::load_from_db(context, chat_id).unwrap();
-
-    // ToDo:
-    // - [x] id
-    // - [x] type
-    // - [x] name
-    // - [x] archived
-    // - [x] color
-    // - [x] profileImage
-    // - [x] subtitle
-    // - [x] draft,
-    // - [ ] deaddrop,
-    // - [ ] summary,
-    // - [ ] lastUpdated,
-    // - [ ] freshMessageCounter,
-    // - [ ] email
-
-    let profile_image = match chat.get_profile_image(context) {
-        Some(path) => path.into_os_string().into_string().unwrap(),
-        None => "".to_string(),
-    };
-
-    let draft = match get_draft(context, chat_id) {
-        Ok(message) => match message {
-            Some(m) => m.text.unwrap_or_else(|| "".to_string()),
-            None => "".to_string(),
-        },
-        Err(_) => "".to_string(),
-    };
-
-    let s = json!({
-         "id": chat.id,
-         "type": chat.typ as u32,
-         "name": chat.name,
-         "archived": chat.archived,
-         "param": chat.param.to_string(),
-         "gossiped_timestamp": chat.gossiped_timestamp,
-         "is_sending_locations": chat.is_sending_locations,
-         "color": chat.get_color(context),
-         "profile_image": profile_image,
-         "subtitle": chat.get_subtitle(context),
-         "draft": draft
-    });
-
-    Ok(s.to_string())
-}
-
 pub fn get_chat_contact_cnt(context: &Context, chat_id: u32) -> usize {
    context
        .sql
--- a/src/config.rs
+++ b/src/config.rs
@@ -128,7 +128,7 @@ impl Context {
    pub fn set_config(&self, key: Config, value: Option<&str>) -> crate::sql::Result<()> {
        match key {
            Config::Selfavatar if value.is_some() => {
-                let blob = BlobObject::new_from_path(&self, value.unwrap())?;
+                let blob = BlobObject::create_from_path(&self, value.unwrap())?;
                self.sql.set_raw_config(self, key, Some(blob.as_name()))
            }
            Config::InboxWatch => {
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -1,6 +1,8 @@
 //! # Thunderbird's Autoconfiguration implementation
 //!
 //! Documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
+use failure::Fail;
+
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};

--- a/src/configure/auto_outlook.rs
+++ b/src/configure/auto_outlook.rs
@@ -1,5 +1,7 @@
 //! Outlook's Autodiscover

+use failure::Fail;
+
 use quick_xml;
 use quick_xml::events::BytesEnd;

--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -485,12 +485,8 @@ fn try_imap_connection(

 fn try_imap_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
    let inf = format!(
-        "imap: {}@{}:{} flags=0x{:x} certificate_checks={}",
-        param.mail_user,
-        param.mail_server,
-        param.mail_port,
-        param.server_flags,
-        param.imap_certificate_checks
+        "imap: {}@{}:{} flags=0x{:x}",
+        param.mail_user, param.mail_server, param.mail_port, param.server_flags
    );
    info!(context, "Trying: {}", inf);
    if context
--- a/src/configure/read_url.rs
+++ b/src/configure/read_url.rs
@@ -1,4 +1,5 @@
 use crate::context::Context;
+use failure::Fail;

 #[derive(Debug, Fail)]
 pub enum Error {
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -861,14 +861,14 @@ impl Contact {
            .unwrap_or_default() as usize
    }

-    pub fn get_origin_by_id(context: &Context, contact_id: u32, ret_blocked: &mut bool) -> Origin {
+    pub fn get_origin_by_id(context: &Context, contact_id: u32, ret_blocked: &mut i32) -> Origin {
        let mut ret = Origin::Unknown;
-        *ret_blocked = false;
+        *ret_blocked = 0;

        if let Ok(contact) = Contact::load_from_db(context, contact_id) {
            /* we could optimize this by loading only the needed fields */
            if contact.blocked {
-                *ret_blocked = true;
+                *ret_blocked = 1;
            } else {
                ret = contact.origin;
            }
--- a/deltachat-ffi/src/dc_array.rs
+++ b/deltachat-ffi/src/dc_array.rs
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -12,7 +12,6 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::error::Result;
 use crate::events::Event;
-use crate::headerdef::HeaderDef;
 use crate::job::*;
 use crate::location;
 use crate::message::{self, MessageState, MsgId};
@@ -48,7 +47,7 @@ pub fn dc_receive_imf(
        server_uid,
    );

-    if std::env::var(crate::DCC_MIME_DEBUG).unwrap_or_default() == "2" {
+    if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
        info!(context, "dc_receive_imf: incoming message mime-body:");
        println!("{}", String::from_utf8_lossy(imf_raw));
    }
@@ -61,21 +60,21 @@ pub fn dc_receive_imf(
        mime_parser.unwrap()
    };

-    if mime_parser.get(HeaderDef::From_).is_none() {
-        // Error - even adding an empty record won't help as we do not know the sender
-        warn!(context, "No From header.");
+    if mime_parser.header.is_empty() {
+        // Error - even adding an empty record won't help as we do not know the message ID
+        warn!(context, "No header.");
        return;
    }

    // the function returns the number of created messages in the database
-    let mut incoming = true;
+    let mut incoming = 1;
    let mut incoming_origin = Origin::Unknown;
    let mut to_self = false;
    let mut from_id = 0u32;
-    let mut from_id_blocked = false;
+    let mut from_id_blocked = 0;
    let mut to_id = 0u32;
    let mut chat_id = 0;
-    let mut hidden = false;
+    let mut hidden = 0;

    let mut needs_delete_job = false;
    let mut insert_msg_id = MsgId::new_unset();
@@ -115,7 +114,7 @@ pub fn dc_receive_imf(
        }
    };

-    if let Some(value) = mime_parser.get(HeaderDef::Date) {
+    if let Some(value) = mime_parser.lookup_field("Date") {
        // is not yet checked against bad times! we do this later if we have the database information.
        sent_timestamp = mailparse::dateparse(value).unwrap_or_default();
    }
@@ -123,7 +122,7 @@ pub fn dc_receive_imf(
    // get From: and check if it is known (for known From:'s we add the other To:/Cc: in the 3rd pass)
    // or if From: is equal to SELF (in this case, it is any outgoing messages,
    // we do not check Return-Path any more as this is unreliable, see issue #150
-    if let Some(field_from) = mime_parser.get(HeaderDef::From_) {
+    if let Some(field_from) = mime_parser.lookup_field("From") {
        let mut check_self = false;
        let mut from_list = Vec::with_capacity(16);
        dc_add_or_lookup_contacts_by_address_list(
@@ -134,7 +133,7 @@ pub fn dc_receive_imf(
            &mut check_self,
        );
        if check_self {
-            incoming = false;
+            incoming = 0;
            if mime_parser.sender_equals_recipient() {
                from_id = DC_CONTACT_ID_SELF;
            }
@@ -148,11 +147,11 @@ pub fn dc_receive_imf(
    }

    // Make sure, to_ids starts with the first To:-address (Cc: is added in the loop below pass)
-    if let Some(field) = mime_parser.get(HeaderDef::To) {
+    if let Some(field) = mime_parser.lookup_field("To") {
        dc_add_or_lookup_contacts_by_address_list(
            context,
            &field,
-            if !incoming {
+            if 0 == incoming {
                Origin::OutgoingTo
            } else if incoming_origin.is_verified() {
                Origin::IncomingTo
@@ -278,7 +277,7 @@ fn add_parts(
    context: &Context,
    mut mime_parser: &mut MimeParser,
    imf_raw: &[u8],
-    incoming: bool,
+    incoming: i32,
    incoming_origin: &mut Origin,
    server_folder: impl AsRef<str>,
    server_uid: u32,
@@ -286,8 +285,8 @@ fn add_parts(
    rfc724_mid: &str,
    sent_timestamp: &mut i64,
    from_id: &mut u32,
-    from_id_blocked: bool,
-    hidden: &mut bool,
+    from_id_blocked: i32,
+    hidden: &mut i32,
    chat_id: &mut u32,
    to_id: &mut u32,
    flags: u32,
@@ -308,11 +307,11 @@ fn add_parts(
    // collect the rest information, CC: is added to the to-list, BCC: is ignored
    // (we should not add BCC to groups as this would split groups. We could add them as "known contacts",
    // however, the benefit is very small and this may leak data that is expected to be hidden)
-    if let Some(fld_cc) = mime_parser.get(HeaderDef::Cc) {
+    if let Some(fld_cc) = mime_parser.lookup_field("Cc") {
        dc_add_or_lookup_contacts_by_address_list(
            context,
            fld_cc,
-            if !incoming {
+            if 0 == incoming {
                Origin::OutgoingCc
            } else if incoming_origin.is_verified() {
                Origin::IncomingCc
@@ -338,23 +337,23 @@ fn add_parts(
    }

    // 1 or 0 for yes/no
-    msgrmsg = mime_parser.has_chat_version() as _;
-    if msgrmsg == 0 && is_reply_to_messenger_message(context, mime_parser) {
+    msgrmsg = mime_parser.is_send_by_messenger as _;
+    if msgrmsg == 0 && 0 != dc_is_reply_to_messenger_message(context, mime_parser) {
        // 2=no, but is reply to messenger message
        msgrmsg = 2;
    }
    // incoming non-chat messages may be discarded;
    // maybe this can be optimized later, by checking the state before the message body is downloaded
-    let mut allow_creation = true;
+    let mut allow_creation = 1;
    let show_emails =
        ShowEmails::from_i32(context.get_config_int(Config::ShowEmails)).unwrap_or_default();
    if mime_parser.is_system_message != SystemMessage::AutocryptSetupMessage && msgrmsg == 0 {
        // this message is a classic email not a chat-message nor a reply to one
        if show_emails == ShowEmails::Off {
            *chat_id = DC_CHAT_ID_TRASH;
-            allow_creation = false
+            allow_creation = 0
        } else if show_emails == ShowEmails::AcceptedContacts {
-            allow_creation = false
+            allow_creation = 0
        }
    }

@@ -362,7 +361,7 @@ fn add_parts(
    // - outgoing messages introduce a chat with the first to: address if they are sent by a messenger
    // - incoming messages introduce a chat only for known contacts if they are sent by a messenger
    // (of course, the user can add other chats manually later)
-    if incoming {
+    if 0 != incoming {
        state = if 0 != flags & DC_IMAP_SEEN {
            MessageState::InSeen
        } else {
@@ -373,15 +372,15 @@ fn add_parts(

        // handshake messages must be processed _before_ chats are created
        // (eg. contacs may be marked as verified)
-        if mime_parser.get(HeaderDef::SecureJoin).is_some() {
+        if mime_parser.lookup_field("Secure-Join").is_some() {
            // avoid discarding by show_emails setting
            msgrmsg = 1;
            *chat_id = 0;
-            allow_creation = true;
+            allow_creation = 1;
            match handle_securejoin_handshake(context, mime_parser, *from_id) {
                Ok(ret) => {
                    if ret.hide_this_msg {
-                        *hidden = true;
+                        *hidden = 1;
                        *needs_delete_job = ret.delete_this_msg;
                        state = MessageState::InSeen;
                    }
@@ -450,7 +449,7 @@ fn add_parts(
            if 0 != test_normal_chat_id {
                *chat_id = test_normal_chat_id;
                chat_id_blocked = test_normal_chat_id_blocked;
-            } else if allow_creation {
+            } else if 0 != allow_creation {
                let (id, bl) =
                    chat::create_or_lookup_by_contact_id(context, *from_id, create_blocked)
                        .unwrap_or_default();
@@ -461,7 +460,7 @@ fn add_parts(
                if Blocked::Not == create_blocked {
                    chat::unblock(context, *chat_id);
                    chat_id_blocked = Blocked::Not;
-                } else if is_reply_to_known_message(context, mime_parser) {
+                } else if 0 != dc_is_reply_to_known_message(context, mime_parser) {
                    //  we do not want any chat to be created implicitly.  Because of the origin-scale-up,
                    // the contact requests will pop up and this should be just fine.
                    Contact::scaleup_origin_by_id(context, *from_id, Origin::IncomingReplyTo);
@@ -524,7 +523,7 @@ fn add_parts(
                    chat_id_blocked = Blocked::Not;
                }
            }
-            if *chat_id == 0 && allow_creation {
+            if *chat_id == 0 && 0 != allow_creation {
                let create_blocked = if 0 != msgrmsg && !Contact::is_blocked_load(context, *to_id) {
                    Blocked::Not
                } else {
@@ -570,7 +569,7 @@ fn add_parts(
        *chat_id,
        *from_id,
        *sent_timestamp,
-        0 == flags & DC_IMAP_SEEN,
+        if 0 != flags & DC_IMAP_SEEN { 0 } else { 1 },
        &mut sort_timestamp,
        sent_timestamp,
        &mut rcvd_timestamp,
@@ -582,11 +581,11 @@ fn add_parts(
    // if the mime-headers should be saved, find out its size
    // (the mime-header ends with an empty line)
    let save_mime_headers = context.get_config_bool(Config::SaveMimeHeaders);
-    if let Some(raw) = mime_parser.get(HeaderDef::InReplyTo) {
+    if let Some(raw) = mime_parser.lookup_field("In-Reply-To") {
        mime_in_reply_to = raw.clone();
    }

-    if let Some(raw) = mime_parser.get(HeaderDef::References) {
+    if let Some(raw) = mime_parser.lookup_field("References") {
        mime_references = raw.clone();
    }

@@ -605,9 +604,8 @@ fn add_parts(
         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references) \
         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?);",
        |mut stmt, conn| {
-            let subject = mime_parser.get_subject().unwrap_or_default();
-
-            for part in mime_parser.parts.iter_mut() {
+            for i in 0..icnt {
+                let part = &mut mime_parser.parts[i];
                if part.is_meta {
                    continue;
                }
@@ -616,7 +614,7 @@ fn add_parts(
                    && icnt == 1
                    && (part.msg == "-location-" || part.msg.is_empty())
                {
-                    *hidden = true;
+                    *hidden = 1;
                    if state == MessageState::InFresh {
                        state = MessageState::InNoticed;
                    }
@@ -624,6 +622,11 @@ fn add_parts(

                if part.typ == Viewtype::Text {
                    let msg_raw = part.msg_raw.as_ref().cloned().unwrap_or_default();
+                    let subject = mime_parser
+                        .subject
+                        .as_ref()
+                        .map(|s| s.to_string())
+                        .unwrap_or_else(|| "".into());
                    txt_raw = Some(format!("{}\n\n{}", subject, msg_raw));
                }
                if mime_parser.is_system_message != SystemMessage::Unknown {
@@ -677,8 +680,8 @@ fn add_parts(
    // check event to send
    if *chat_id == DC_CHAT_ID_TRASH {
        *create_event_to_send = None;
-    } else if incoming && state == MessageState::InFresh {
-        if from_id_blocked {
+    } else if 0 != incoming && state == MessageState::InFresh {
+        if 0 != from_id_blocked {
            *create_event_to_send = None;
        } else if Blocked::Not != chat_id_blocked {
            *create_event_to_send = Some(CreateEvent::MsgsChanged);
@@ -696,7 +699,7 @@ fn save_locations(
    chat_id: u32,
    from_id: u32,
    insert_msg_id: MsgId,
-    hidden: bool,
+    hidden: i32,
 ) {
    if chat_id <= DC_CHAT_ID_LAST_SPECIAL {
        return;
@@ -709,7 +712,7 @@ fn save_locations(
        let newest_location_id =
            location::save(context, chat_id, from_id, locations, true).unwrap_or_default();
        if 0 != newest_location_id
-            && !hidden
+            && 0 == hidden
            && location::set_msg_location_id(context, insert_msg_id, newest_location_id).is_ok()
        {
            location_id_written = true;
@@ -725,7 +728,7 @@ fn save_locations(
                    let newest_location_id =
                        location::save(context, chat_id, from_id, locations, false)
                            .unwrap_or_default();
-                    if newest_location_id != 0 && !hidden && !location_id_written {
+                    if newest_location_id != 0 && hidden == 0 && !location_id_written {
                        if let Err(err) = location::set_msg_location_id(
                            context,
                            insert_msg_id,
@@ -749,7 +752,7 @@ fn calc_timestamps(
    chat_id: u32,
    from_id: u32,
    message_timestamp: i64,
-    is_fresh_msg: bool,
+    is_fresh_msg: i32,
    sort_timestamp: &mut i64,
    sent_timestamp: &mut i64,
    rcvd_timestamp: &mut i64,
@@ -760,7 +763,7 @@ fn calc_timestamps(
        *sent_timestamp = *rcvd_timestamp
    }
    *sort_timestamp = message_timestamp;
-    if is_fresh_msg {
+    if 0 != is_fresh_msg {
        let last_msg_time: Option<i64> = context.sql.query_get_value(
            context,
            "SELECT MAX(timestamp) FROM msgs WHERE chat_id=? and from_id!=? AND timestamp>=?",
@@ -792,18 +795,19 @@ fn calc_timestamps(
 fn create_or_lookup_group(
    context: &Context,
    mime_parser: &mut MimeParser,
-    allow_creation: bool,
+    allow_creation: i32,
    create_blocked: Blocked,
    from_id: u32,
    to_ids: &[u32],
 ) -> Result<(u32, Blocked)> {
    let mut chat_id_blocked = Blocked::Not;
+    let mut grpname = None;
    let to_ids_cnt = to_ids.len();
-    let mut recreate_member_list = false;
-    let mut send_EVENT_CHAT_MODIFIED = false;
+    let mut recreate_member_list = 0;
+    let mut send_EVENT_CHAT_MODIFIED = 0;
    let mut X_MrRemoveFromGrp = None;
    let mut X_MrAddToGrp = None;
-    let mut X_MrGrpNameChanged = false;
+    let mut X_MrGrpNameChanged = 0;
    let mut X_MrGrpImageChanged = "".to_string();
    let mut better_msg: String = From::from("");

@@ -814,21 +818,20 @@ fn create_or_lookup_group(
    set_better_msg(mime_parser, &better_msg);

    let mut grpid = "".to_string();
-    if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupId) {
+    if let Some(optional_field) = mime_parser.lookup_field("Chat-Group-ID") {
        grpid = optional_field.clone();
    }

    if grpid.is_empty() {
-        if let Some(value) = mime_parser.get(HeaderDef::MessageId) {
+        if let Some(value) = mime_parser.lookup_field("Message-ID") {
            if let Some(extracted_grpid) = dc_extract_grpid_from_rfc724_mid(&value) {
                grpid = extracted_grpid.to_string();
            }
        }
        if grpid.is_empty() {
-            if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::InReplyTo) {
+            if let Some(extracted_grpid) = get_grpid_from_list(mime_parser, "In-Reply-To") {
                grpid = extracted_grpid;
-            } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::References)
-            {
+            } else if let Some(extracted_grpid) = get_grpid_from_list(mime_parser, "References") {
                grpid = extracted_grpid;
            } else {
                return create_or_lookup_adhoc_group(
@@ -847,15 +850,19 @@ fn create_or_lookup_group(
        }
    }

-    let grpname = mime_parser.get(HeaderDef::ChatGroupName).cloned();
-
-    if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupMemberRemoved).cloned() {
+    if let Some(optional_field) = mime_parser.lookup_field("Chat-Group-Name").cloned() {
+        grpname = Some(optional_field);
+    }
+    let field = mime_parser
+        .lookup_field("Chat-Group-Member-Removed")
+        .cloned();
+    if let Some(optional_field) = field {
        X_MrRemoveFromGrp = Some(optional_field);
        mime_parser.is_system_message = SystemMessage::MemberRemovedFromGroup;
-        let left_group = Contact::lookup_id_by_addr(context, X_MrRemoveFromGrp.as_ref().unwrap())
-            == from_id as u32;
+        let left_group = (Contact::lookup_id_by_addr(context, X_MrRemoveFromGrp.as_ref().unwrap())
+            == from_id as u32) as i32;
        better_msg = context.stock_system_msg(
-            if left_group {
+            if 0 != left_group {
                StockMessage::MsgGroupLeft
            } else {
                StockMessage::MsgDelMember
@@ -865,11 +872,11 @@ fn create_or_lookup_group(
            from_id as u32,
        )
    } else {
-        let field = mime_parser.get(HeaderDef::ChatGroupMemberAdded).cloned();
+        let field = mime_parser.lookup_field("Chat-Group-Member-Added").cloned();
        if let Some(optional_field) = field {
            X_MrAddToGrp = Some(optional_field);
            mime_parser.is_system_message = SystemMessage::MemberAddedToGroup;
-            if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupImage).cloned() {
+            if let Some(optional_field) = mime_parser.lookup_field("Chat-Group-Image").cloned() {
                X_MrGrpImageChanged = optional_field;
            }
            better_msg = context.stock_system_msg(
@@ -879,9 +886,9 @@ fn create_or_lookup_group(
                from_id as u32,
            )
        } else {
-            let field = mime_parser.get(HeaderDef::ChatGroupNameChanged);
+            let field = mime_parser.lookup_field("Chat-Group-Name-Changed");
            if let Some(field) = field {
-                X_MrGrpNameChanged = true;
+                X_MrGrpNameChanged = 1;
                better_msg = context.stock_system_msg(
                    StockMessage::MsgGrpName,
                    field,
@@ -894,7 +901,8 @@ fn create_or_lookup_group(
                );

                mime_parser.is_system_message = SystemMessage::GroupNameChanged;
-            } else if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupImage).cloned()
+            } else if let Some(optional_field) =
+                mime_parser.lookup_field("Chat-Group-Image").cloned()
            {
                // fld_value is a pointer somewhere into mime_parser, must not be freed
                X_MrGrpImageChanged = optional_field;
@@ -929,7 +937,7 @@ fn create_or_lookup_group(
        // check if the sender is a member of the existing group -
        // if not, we'll recreate the group list
        if !chat::is_contact_in_chat(context, chat_id, from_id as u32) {
-            recreate_member_list = true;
+            recreate_member_list = 1;
        }
    }

@@ -950,7 +958,7 @@ fn create_or_lookup_group(
                || X_MrAddToGrp.is_some() && addr_cmp(&self_addr, X_MrAddToGrp.as_ref().unwrap()))
    {
        // group does not exist but should be created
-        let create_verified = if mime_parser.get(HeaderDef::ChatVerified).is_some() {
+        let create_verified = if mime_parser.lookup_field("Chat-Verified").is_some() {
            if let Err(err) =
                check_verified_properties(context, mime_parser, from_id as u32, to_ids)
            {
@@ -963,7 +971,7 @@ fn create_or_lookup_group(
            VerifiedStatus::Unverified
        };

-        if !allow_creation {
+        if allow_creation == 0 {
            info!(context, "creating group forbidden by caller");
            return Ok((0, Blocked::Not));
        }
@@ -976,7 +984,7 @@ fn create_or_lookup_group(
            create_verified,
        );
        chat_id_blocked = create_blocked;
-        recreate_member_list = true;
+        recreate_member_list = 1;
    }

    // again, check chat_id
@@ -1001,8 +1009,8 @@ fn create_or_lookup_group(

    // execute group commands
    if X_MrAddToGrp.is_some() || X_MrRemoveFromGrp.is_some() {
-        recreate_member_list = true;
-    } else if X_MrGrpNameChanged {
+        recreate_member_list = 1;
+    } else if 0 != X_MrGrpNameChanged {
        if let Some(ref grpname) = grpname {
            if grpname.len() < 200 {
                info!(context, "updating grpname for chat {}", chat_id);
@@ -1055,14 +1063,14 @@ fn create_or_lookup_group(
                    None => chat.param.remove(Param::ProfileImage),
                };
                chat.update_param(context)?;
-                send_EVENT_CHAT_MODIFIED = true;
+                send_EVENT_CHAT_MODIFIED = 1;
            }
        }
    }

    // add members to group/check members
    // for recreation: we should add a timestamp
-    if recreate_member_list {
+    if 0 != recreate_member_list {
        // TODO: the member list should only be recreated if the corresponding message is newer
        // than the one that is responsible for the current member list, see
        // https://github.com/deltachat/deltachat-core/issues/127
@@ -1092,11 +1100,11 @@ fn create_or_lookup_group(
                chat::add_to_chat_contacts_table(context, chat_id, to_id);
            }
        }
-        send_EVENT_CHAT_MODIFIED = true;
+        send_EVENT_CHAT_MODIFIED = 1;
        chat::reset_gossiped_timestamp(context, chat_id);
    }

-    if send_EVENT_CHAT_MODIFIED {
+    if 0 != send_EVENT_CHAT_MODIFIED {
        context.call_cb(Event::ChatModified(chat_id));
    }

@@ -1104,7 +1112,7 @@ fn create_or_lookup_group(
    // the only critical situation is if the user hits "Reply" instead
    // of "Reply all" in a non-messenger-client */
    if to_ids_cnt == 1
-        && !mime_parser.has_chat_version()
+        && !mime_parser.is_send_by_messenger
        && chat::get_chat_contact_cnt(context, chat_id) > 3
    {
        // to_ids_cnt==1 may be "From: A, To: B, SELF" as SELF is not counted in to_ids_cnt.
@@ -1126,8 +1134,8 @@ fn create_or_lookup_group(
 }

 /// try extract a grpid from a message-id list header value
-fn extract_grpid(mime_parser: &MimeParser, headerdef: HeaderDef) -> Option<String> {
-    if let Some(value) = mime_parser.get(headerdef) {
+fn get_grpid_from_list(mime_parser: &MimeParser, header_key: &str) -> Option<String> {
+    if let Some(value) = mime_parser.lookup_field(header_key) {
        for part in value.split(',').map(str::trim) {
            if !part.is_empty() {
                if let Some(extracted_grpid) = dc_extract_grpid_from_rfc724_mid(part) {
@@ -1143,7 +1151,7 @@ fn extract_grpid(mime_parser: &MimeParser, headerdef: HeaderDef) -> Option<Strin
 fn create_or_lookup_adhoc_group(
    context: &Context,
    mime_parser: &MimeParser,
-    allow_creation: bool,
+    allow_creation: i32,
    create_blocked: Blocked,
    from_id: u32,
    to_ids: &[u32],
@@ -1196,7 +1204,7 @@ fn create_or_lookup_adhoc_group(
        }
    }

-    if !allow_creation {
+    if allow_creation == 0 {
        info!(context, "creating ad-hoc group prevented from caller");
        return Ok((0, Blocked::Not));
    }
@@ -1215,9 +1223,11 @@ fn create_or_lookup_adhoc_group(
        return Ok((0, Blocked::Not));
    }
    // use subject as initial chat name
-    let grpname = mime_parser.get_subject().unwrap_or_else(|| {
+    let grpname = if let Some(subject) = mime_parser.subject.as_ref().filter(|s| !s.is_empty()) {
+        subject.to_string()
+    } else {
        context.stock_string_repl_int(StockMessage::Member, member_ids.len() as i32)
-    });
+    };

    // create group record
    let new_chat_id = create_group_record(
@@ -1385,7 +1395,7 @@ fn check_verified_properties(
 ) -> Result<()> {
    let contact = Contact::load_from_db(context, from_id)?;

-    ensure!(mimeparser.was_encrypted(), "This message is not encrypted.");
+    ensure!(mimeparser.encrypted, "This message is not encrypted.");

    // ensure, the contact is verified
    // and the message is signed with a verified key of the sender.
@@ -1478,23 +1488,23 @@ fn set_better_msg(mime_parser: &mut MimeParser, better_msg: impl AsRef<str>) {
    }
 }

-fn is_reply_to_known_message(context: &Context, mime_parser: &MimeParser) -> bool {
+fn dc_is_reply_to_known_message(context: &Context, mime_parser: &MimeParser) -> i32 {
    /* check if the message is a reply to a known message; the replies are identified by the Message-ID from
    `In-Reply-To`/`References:` (to support non-Delta-Clients) */

-    if let Some(field) = mime_parser.get(HeaderDef::InReplyTo) {
+    if let Some(field) = mime_parser.lookup_field("In-Reply-To") {
        if is_known_rfc724_mid_in_list(context, &field) {
-            return true;
+            return 1;
        }
    }

-    if let Some(field) = mime_parser.get(HeaderDef::References) {
+    if let Some(field) = mime_parser.lookup_field("References") {
        if is_known_rfc724_mid_in_list(context, &field) {
-            return true;
+            return 1;
        }
    }

-    false
+    0
 }

 fn is_known_rfc724_mid_in_list(context: &Context, mid_list: &str) -> bool {
@@ -1528,25 +1538,26 @@ fn is_known_rfc724_mid(context: &Context, rfc724_mid: &mailparse::MailAddr) -> b
        .unwrap_or_default()
 }

-/// Checks if the message defined by mime_parser references a message send by us from Delta Chat.
-/// This is similar to is_reply_to_known_message() but
-/// - checks also if any of the referenced IDs are send by a messenger
-/// - it is okay, if the referenced messages are moved to trash here
-/// - no check for the Chat-* headers (function is only called if it is no messenger message itself)
-fn is_reply_to_messenger_message(context: &Context, mime_parser: &MimeParser) -> bool {
-    if let Some(value) = mime_parser.get(HeaderDef::InReplyTo) {
+fn dc_is_reply_to_messenger_message(context: &Context, mime_parser: &MimeParser) -> i32 {
+    /* function checks, if the message defined by mime_parser references a message send by us from Delta Chat.
+    This is similar to is_reply_to_known_message() but
+    - checks also if any of the referenced IDs are send by a messenger
+    - it is okay, if the referenced messages are moved to trash here
+    - no check for the Chat-* headers (function is only called if it is no messenger message itself) */
+
+    if let Some(value) = mime_parser.lookup_field("In-Reply-To") {
        if is_msgrmsg_rfc724_mid_in_list(context, &value) {
-            return true;
+            return 1;
        }
    }

-    if let Some(value) = mime_parser.get(HeaderDef::References) {
+    if let Some(value) = mime_parser.lookup_field("References") {
        if is_msgrmsg_rfc724_mid_in_list(context, &value) {
-            return true;
+            return 1;
        }
    }

-    false
+    0
 }

 fn is_msgrmsg_rfc724_mid_in_list(context: &Context, mid_list: &str) -> bool {
@@ -1679,9 +1690,9 @@ mod tests {
                    \n\
                    hello\x00";
        let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();
-        assert_eq!(extract_grpid(&mimeparser, HeaderDef::InReplyTo), None);
+        assert_eq!(get_grpid_from_list(&mimeparser, "In-Reply-To"), None);
        let grpid = Some("HcxyMARjyJy".to_string());
-        assert_eq!(extract_grpid(&mimeparser, HeaderDef::References), grpid);
+        assert_eq!(get_grpid_from_list(&mimeparser, "References"), grpid);
    }

    #[test]
@@ -1695,7 +1706,7 @@ mod tests {
                    hello\x00";
        let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();
        let grpid = Some("HcxyMARjyJy".to_string());
-        assert_eq!(extract_grpid(&mimeparser, HeaderDef::InReplyTo), grpid);
-        assert_eq!(extract_grpid(&mimeparser, HeaderDef::References), grpid);
+        assert_eq!(get_grpid_from_list(&mimeparser, "In-Reply-To"), grpid);
+        assert_eq!(get_grpid_from_list(&mimeparser, "References"), grpid);
    }
 }
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -278,9 +278,11 @@ pub fn dc_derive_safe_stem_ext(filename: &str) -> (String, String) {
 // the returned suffix is lower-case
 #[allow(non_snake_case)]
 pub fn dc_get_filesuffix_lc(path_filename: impl AsRef<str>) -> Option<String> {
-    Path::new(path_filename.as_ref())
-        .extension()
-        .map(|p| p.to_string_lossy().to_lowercase())
+    if let Some(p) = Path::new(path_filename.as_ref()).extension() {
+        Some(p.to_string_lossy().to_lowercase())
+    } else {
+        None
+    }
 }

 /// Returns the `(width, height)` of the given image buffer.
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -247,13 +247,13 @@ fn decrypt_if_autocrypt_message<'a>(
    // Errors are returned for failures related to decryption of AC-messages.

    let encrypted_data_part = match wrapmime::get_autocrypt_mime(mail) {
-        Err(_) => {
-            // not an autocrypt mime message, abort and ignore
+        Err(err) => {
+            // not a proper autocrypt message, abort and ignore
+            info!(context, "Not an autocrypt message: {:?}", err);
            return Ok(None);
        }
        Ok(res) => res,
    };
-    info!(context, "Detected Autocrypt-mime message");

    decrypt_part(
        context,
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,5 +1,6 @@
 //! # Error handling

+use failure::Fail;
 use lettre_email::mime;

 #[derive(Debug, Fail)]
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -1,43 +0,0 @@
-#[derive(Debug, Display, Clone, PartialEq, Eq, EnumVariantNames)]
-#[strum(serialize_all = "kebab_case")]
-#[allow(dead_code)]
-pub enum HeaderDef {
-    MessageId,
-    Subject,
-    Date,
-    From_,
-    To,
-    Cc,
-    Disposition,
-    OriginalMessageId,
-    ListId,
-    References,
-    InReplyTo,
-    Precedence,
-    ChatVersion,
-    ChatGroupId,
-    ChatGroupName,
-    ChatGroupNameChanged,
-    ChatVerified,
-    ChatGroupImage,
-    ChatVoiceMessage,
-    ChatGroupMemberRemoved,
-    ChatGroupMemberAdded,
-    ChatContent,
-    ChatDuration,
-    ChatDispositionNotificationTo,
-    AutocryptSetupMessage,
-    SecureJoin,
-    SecureJoinGroup,
-    SecureJoinFingerprint,
-    SecureJoinInvitenumber,
-    SecureJoinAuth,
-    _TestHeader,
-}
-
-impl HeaderDef {
-    /// Returns the corresponding Event id.
-    pub fn get_headername(&self) -> String {
-        self.to_string()
-    }
-}
--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -1,273 +0,0 @@
-use super::Imap;
-
-use async_imap::extensions::idle::IdleResponse;
-use async_std::prelude::*;
-use async_std::task;
-use std::sync::atomic::Ordering;
-use std::time::{Duration, SystemTime};
-
-use crate::context::Context;
-use crate::imap_client::*;
-
-use super::select_folder;
-
-type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "IMAP IDLE protocol failed to init/complete")]
-    IdleProtocolFailed(#[cause] async_imap::error::Error),
-
-    #[fail(display = "IMAP IDLE protocol timed out")]
-    IdleTimeout(#[cause] async_std::future::TimeoutError),
-
-    #[fail(display = "IMAP server does not have IDLE capability")]
-    IdleAbilityMissing,
-
-    #[fail(display = "IMAP select folder error")]
-    SelectFolderError(#[cause] select_folder::Error),
-
-    #[fail(display = "IMAP error")]
-    ImapError(#[cause] async_imap::error::Error),
-
-    #[fail(display = "Setup handle error")]
-    SetupHandleError(#[cause] super::Error),
-}
-
-impl From<select_folder::Error> for Error {
-    fn from(err: select_folder::Error) -> Error {
-        Error::SelectFolderError(err)
-    }
-}
-
-impl Imap {
-    pub fn can_idle(&self) -> bool {
-        task::block_on(async move { self.config.read().await.can_idle })
-    }
-
-    pub fn idle(&self, context: &Context, watch_folder: Option<String>) -> Result<()> {
-        task::block_on(async move {
-            if !self.can_idle() {
-                return Err(Error::IdleAbilityMissing);
-            }
-
-            self.setup_handle_if_needed(context)
-                .await
-                .map_err(Error::SetupHandleError)?;
-
-            self.select_folder(context, watch_folder.clone()).await?;
-
-            let session = self.session.lock().await.take();
-            let timeout = Duration::from_secs(23 * 60);
-            if let Some(session) = session {
-                match session.idle() {
-                    // BEWARE: If you change the Secure branch you
-                    // typically also need to change the Insecure branch.
-                    IdleHandle::Secure(mut handle) => {
-                        if let Err(err) = handle.init().await {
-                            return Err(Error::IdleProtocolFailed(err));
-                        }
-
-                        let (idle_wait, interrupt) = handle.wait_with_timeout(timeout);
-                        *self.interrupt.lock().await = Some(interrupt);
-
-                        if self.skip_next_idle_wait.load(Ordering::SeqCst) {
-                            // interrupt_idle has happened before we
-                            // provided self.interrupt
-                            self.skip_next_idle_wait.store(false, Ordering::SeqCst);
-                            std::mem::drop(idle_wait);
-                            info!(context, "Idle wait was skipped");
-                        } else {
-                            info!(context, "Idle entering wait-on-remote state");
-                            match idle_wait.await {
-                                IdleResponse::NewData(_) => {
-                                    info!(context, "Idle has NewData");
-                                }
-                                // TODO: idle_wait does not distinguish manual interrupts
-                                // from Timeouts if we would know it's a Timeout we could bail
-                                // directly and reconnect .
-                                IdleResponse::Timeout => {
-                                    info!(context, "Idle-wait timeout or interruption");
-                                }
-                                IdleResponse::ManualInterrupt => {
-                                    info!(context, "Idle wait was interrupted");
-                                }
-                            }
-                        }
-                        // if we can't properly terminate the idle
-                        // protocol let's break the connection.
-                        let res =
-                            async_std::future::timeout(Duration::from_secs(15), handle.done())
-                                .await
-                                .map_err(|err| {
-                                    self.trigger_reconnect();
-                                    Error::IdleTimeout(err)
-                                })?;
-
-                        match res {
-                            Ok(session) => {
-                                *self.session.lock().await = Some(Session::Secure(session));
-                            }
-                            Err(err) => {
-                                // if we cannot terminate IDLE it probably
-                                // means that we waited long (with idle_wait)
-                                // but the network went away/changed
-                                self.trigger_reconnect();
-                                return Err(Error::IdleProtocolFailed(err));
-                            }
-                        }
-                    }
-                    IdleHandle::Insecure(mut handle) => {
-                        if let Err(err) = handle.init().await {
-                            return Err(Error::IdleProtocolFailed(err));
-                        }
-
-                        let (idle_wait, interrupt) = handle.wait_with_timeout(timeout);
-                        *self.interrupt.lock().await = Some(interrupt);
-
-                        if self.skip_next_idle_wait.load(Ordering::SeqCst) {
-                            // interrupt_idle has happened before we
-                            // provided self.interrupt
-                            self.skip_next_idle_wait.store(false, Ordering::SeqCst);
-                            std::mem::drop(idle_wait);
-                            info!(context, "Idle wait was skipped");
-                        } else {
-                            info!(context, "Idle entering wait-on-remote state");
-                            match idle_wait.await {
-                                IdleResponse::NewData(_) => {
-                                    info!(context, "Idle has NewData");
-                                }
-                                // TODO: idle_wait does not distinguish manual interrupts
-                                // from Timeouts if we would know it's a Timeout we could bail
-                                // directly and reconnect .
-                                IdleResponse::Timeout => {
-                                    info!(context, "Idle-wait timeout or interruption");
-                                }
-                                IdleResponse::ManualInterrupt => {
-                                    info!(context, "Idle wait was interrupted");
-                                }
-                            }
-                        }
-                        // if we can't properly terminate the idle
-                        // protocol let's break the connection.
-                        let res =
-                            async_std::future::timeout(Duration::from_secs(15), handle.done())
-                                .await
-                                .map_err(|err| {
-                                    self.trigger_reconnect();
-                                    Error::IdleTimeout(err)
-                                })?;
-
-                        match res {
-                            Ok(session) => {
-                                *self.session.lock().await = Some(Session::Insecure(session));
-                            }
-                            Err(err) => {
-                                // if we cannot terminate IDLE it probably
-                                // means that we waited long (with idle_wait)
-                                // but the network went away/changed
-                                self.trigger_reconnect();
-                                return Err(Error::IdleProtocolFailed(err));
-                            }
-                        }
-                    }
-                }
-            }
-
-            Ok(())
-        })
-    }
-
-    pub(crate) fn fake_idle(&self, context: &Context, watch_folder: Option<String>) {
-        // Idle using polling. This is also needed if we're not yet configured -
-        // in this case, we're waiting for a configure job (and an interrupt).
-        task::block_on(async move {
-            let fake_idle_start_time = SystemTime::now();
-
-            info!(context, "IMAP-fake-IDLEing...");
-
-            let interrupt = stop_token::StopSource::new();
-
-            // check every minute if there are new messages
-            // TODO: grow sleep durations / make them more flexible
-            let interval = async_std::stream::interval(Duration::from_secs(60));
-            let mut interrupt_interval = interrupt.stop_token().stop_stream(interval);
-            *self.interrupt.lock().await = Some(interrupt);
-            if self.skip_next_idle_wait.load(Ordering::SeqCst) {
-                // interrupt_idle has happened before we
-                // provided self.interrupt
-                self.skip_next_idle_wait.store(false, Ordering::SeqCst);
-                info!(context, "fake-idle wait was skipped");
-            } else {
-                // loop until we are interrupted or if we fetched something
-                while let Some(_) = interrupt_interval.next().await {
-                    // try to connect with proper login params
-                    // (setup_handle_if_needed might not know about them if we
-                    // never successfully connected)
-                    if let Err(err) = self.connect_configured(context) {
-                        warn!(context, "fake_idle: could not connect: {}", err);
-                        continue;
-                    }
-                    if self.config.read().await.can_idle {
-                        // we only fake-idled because network was gone during IDLE, probably
-                        break;
-                    }
-                    info!(context, "fake_idle is connected");
-                    // we are connected, let's see if fetching messages results
-                    // in anything.  If so, we behave as if IDLE had data but
-                    // will have already fetched the messages so perform_*_fetch
-                    // will not find any new.
-
-                    if let Some(ref watch_folder) = watch_folder {
-                        match self.fetch_new_messages(context, watch_folder).await {
-                            Ok(res) => {
-                                info!(context, "fetch_new_messages returned {:?}", res);
-                                if res {
-                                    break;
-                                }
-                            }
-                            Err(err) => {
-                                error!(context, "could not fetch from folder: {}", err);
-                                self.trigger_reconnect()
-                            }
-                        }
-                    }
-                }
-            }
-            self.interrupt.lock().await.take();
-
-            info!(
-                context,
-                "IMAP-fake-IDLE done after {:.4}s",
-                SystemTime::now()
-                    .duration_since(fake_idle_start_time)
-                    .unwrap()
-                    .as_millis() as f64
-                    / 1000.,
-            );
-        })
-    }
-
-    pub fn interrupt_idle(&self, context: &Context) {
-        task::block_on(async move {
-            let mut interrupt: Option<stop_token::StopSource> = self.interrupt.lock().await.take();
-            if interrupt.is_none() {
-                // idle wait is not running, signal it needs to skip
-                self.skip_next_idle_wait.store(true, Ordering::SeqCst);
-
-                // meanwhile idle-wait may have produced the StopSource
-                interrupt = self.interrupt.lock().await.take();
-            }
-            // let's manually drop the StopSource
-            if interrupt.is_some() {
-                // the imap thread provided us a stop token but might
-                // not have entered idle_wait yet, give it some time
-                // for that to happen. XXX handle this without extra wait
-                // https://github.com/deltachat/deltachat-core-rust/issues/925
-                std::thread::sleep(Duration::from_millis(200));
-                info!(context, "low-level: dropping stop-source to interrupt idle");
-                std::mem::drop(interrupt)
-            }
-        });
-    }
-}
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -4,11 +4,14 @@
 //! to implement connect, fetch, delete functionality with standard IMAP servers.

 use std::sync::atomic::{AtomicBool, Ordering};
+use std::time::{Duration, SystemTime};

 use async_imap::{
    error::Result as ImapResult,
+    extensions::idle::IdleResponse,
    types::{Fetch, Flag, Mailbox, Name, NameAttribute},
 };
+use async_std::prelude::*;
 use async_std::sync::{Mutex, RwLock};
 use async_std::task;

@@ -25,7 +28,6 @@ use crate::param::Params;
 use crate::stock::StockMessage;
 use crate::wrapmime;

-mod idle;
 pub mod select_folder;

 const DC_IMAP_SEEN: usize = 0x0001;
@@ -49,16 +51,22 @@ pub enum Error {
    #[fail(display = "IMAP Could not login as {}", _0)]
    LoginFailed(String),

-    #[fail(display = "IMAP Could not fetch")]
+    #[fail(display = "IMAP Could not fetch {}", _0)]
    FetchFailed(#[cause] async_imap::error::Error),

+    #[fail(display = "IMAP IDLE protocol failed to init/complete")]
+    IdleProtocolFailed(#[cause] async_imap::error::Error),
+
+    #[fail(display = "IMAP server does not have IDLE capability")]
+    IdleAbilityMissing,
+
    #[fail(display = "IMAP operation attempted while it is torn down")]
    InTeardown,

    #[fail(display = "IMAP operation attempted while it is torn down")]
    SqlError(#[cause] crate::sql::Error),

-    #[fail(display = "IMAP got error from elsewhere")]
+    #[fail(display = "IMAP got error from elsewhere: {:?}", _0)]
    WrappedError(#[cause] crate::error::Error),

    #[fail(display = "IMAP select folder error")]
@@ -193,107 +201,112 @@ impl Imap {
        self.should_reconnect.store(true, Ordering::Relaxed)
    }

-    async fn setup_handle_if_needed(&self, context: &Context) -> Result<()> {
-        if self.config.read().await.imap_server.is_empty() {
-            return Err(Error::InTeardown);
-        }
-
-        if self.should_reconnect() {
-            self.unsetup_handle(context).await;
-            self.should_reconnect.store(false, Ordering::Relaxed);
-        } else if self.is_connected().await {
-            return Ok(());
-        }
-
-        let server_flags = self.config.read().await.server_flags as i32;
-
-        let connection_res: ImapResult<Client> =
-            if (server_flags & (DC_LP_IMAP_SOCKET_STARTTLS | DC_LP_IMAP_SOCKET_PLAIN)) != 0 {
-                let config = self.config.read().await;
-                let imap_server: &str = config.imap_server.as_ref();
-                let imap_port = config.imap_port;
-
-                match Client::connect_insecure((imap_server, imap_port)).await {
-                    Ok(client) => {
-                        if (server_flags & DC_LP_IMAP_SOCKET_STARTTLS) != 0 {
-                            client.secure(imap_server, config.certificate_checks).await
-                        } else {
-                            Ok(client)
-                        }
-                    }
-                    Err(err) => Err(err),
-                }
-            } else {
-                let config = self.config.read().await;
-                let imap_server: &str = config.imap_server.as_ref();
-                let imap_port = config.imap_port;
-
-                Client::connect_secure(
-                    (imap_server, imap_port),
-                    imap_server,
-                    config.certificate_checks,
-                )
-                .await
-            };
-
-        let login_res = match connection_res {
-            Ok(client) => {
-                let config = self.config.read().await;
-                let imap_user: &str = config.imap_user.as_ref();
-                let imap_pw: &str = config.imap_pw.as_ref();
-
-                if (server_flags & DC_LP_AUTH_OAUTH2) != 0 {
-                    let addr: &str = config.addr.as_ref();
-
-                    if let Some(token) = dc_get_oauth2_access_token(context, addr, imap_pw, true) {
-                        let auth = OAuth2 {
-                            user: imap_user.into(),
-                            access_token: token,
-                        };
-                        client.authenticate("XOAUTH2", &auth).await
-                    } else {
-                        return Err(Error::OauthError);
-                    }
-                } else {
-                    client.login(imap_user, imap_pw).await
-                }
+    fn setup_handle_if_needed(&self, context: &Context) -> Result<()> {
+        task::block_on(async move {
+            if self.config.read().await.imap_server.is_empty() {
+                return Err(Error::InTeardown);
            }
-            Err(err) => {
-                let message = {
+
+            if self.should_reconnect() {
+                self.unsetup_handle(context).await;
+                self.should_reconnect.store(false, Ordering::Relaxed);
+            } else if self.is_connected().await {
+                return Ok(());
+            }
+
+            let server_flags = self.config.read().await.server_flags as i32;
+
+            let connection_res: ImapResult<Client> =
+                if (server_flags & (DC_LP_IMAP_SOCKET_STARTTLS | DC_LP_IMAP_SOCKET_PLAIN)) != 0 {
                    let config = self.config.read().await;
                    let imap_server: &str = config.imap_server.as_ref();
                    let imap_port = config.imap_port;
-                    context.stock_string_repl_str2(
-                        StockMessage::ServerResponse,
-                        format!("{}:{}", imap_server, imap_port),
-                        err.to_string(),
+
+                    match Client::connect_insecure((imap_server, imap_port)).await {
+                        Ok(client) => {
+                            if (server_flags & DC_LP_IMAP_SOCKET_STARTTLS) != 0 {
+                                client.secure(imap_server, config.certificate_checks).await
+                            } else {
+                                Ok(client)
+                            }
+                        }
+                        Err(err) => Err(err),
+                    }
+                } else {
+                    let config = self.config.read().await;
+                    let imap_server: &str = config.imap_server.as_ref();
+                    let imap_port = config.imap_port;
+
+                    Client::connect_secure(
+                        (imap_server, imap_port),
+                        imap_server,
+                        config.certificate_checks,
                    )
+                    .await
                };
-                // IMAP connection failures are reported to users
-                emit_event!(context, Event::ErrorNetwork(message));
-                return Err(Error::ConnectionFailed(err.to_string()));
-            }
-        };

-        self.should_reconnect.store(false, Ordering::Relaxed);
+            let login_res = match connection_res {
+                Ok(client) => {
+                    let config = self.config.read().await;
+                    let imap_user: &str = config.imap_user.as_ref();
+                    let imap_pw: &str = config.imap_pw.as_ref();

-        match login_res {
-            Ok(session) => {
-                *self.session.lock().await = Some(session);
-                Ok(())
-            }
-            Err((err, _)) => {
-                let imap_user = self.config.read().await.imap_user.to_owned();
-                let message = context.stock_string_repl_str(StockMessage::CannotLogin, &imap_user);
+                    if (server_flags & DC_LP_AUTH_OAUTH2) != 0 {
+                        let addr: &str = config.addr.as_ref();

-                emit_event!(
-                    context,
-                    Event::ErrorNetwork(format!("{} ({})", message, err))
-                );
-                self.trigger_reconnect();
-                Err(Error::LoginFailed(format!("cannot login as {}", imap_user)))
+                        if let Some(token) =
+                            dc_get_oauth2_access_token(context, addr, imap_pw, true)
+                        {
+                            let auth = OAuth2 {
+                                user: imap_user.into(),
+                                access_token: token,
+                            };
+                            client.authenticate("XOAUTH2", &auth).await
+                        } else {
+                            return Err(Error::OauthError);
+                        }
+                    } else {
+                        client.login(imap_user, imap_pw).await
+                    }
+                }
+                Err(err) => {
+                    let message = {
+                        let config = self.config.read().await;
+                        let imap_server: &str = config.imap_server.as_ref();
+                        let imap_port = config.imap_port;
+                        context.stock_string_repl_str2(
+                            StockMessage::ServerResponse,
+                            format!("{}:{}", imap_server, imap_port),
+                            err.to_string(),
+                        )
+                    };
+                    // IMAP connection failures are reported to users
+                    emit_event!(context, Event::ErrorNetwork(message));
+                    return Err(Error::ConnectionFailed(err.to_string()));
+                }
+            };
+
+            self.should_reconnect.store(false, Ordering::Relaxed);
+
+            match login_res {
+                Ok(session) => {
+                    *self.session.lock().await = Some(session);
+                    Ok(())
+                }
+                Err((err, _)) => {
+                    let imap_user = self.config.read().await.imap_user.to_owned();
+                    let message =
+                        context.stock_string_repl_str(StockMessage::CannotLogin, &imap_user);
+
+                    emit_event!(
+                        context,
+                        Event::ErrorNetwork(format!("{} ({})", message, err))
+                    );
+                    self.trigger_reconnect();
+                    Err(Error::LoginFailed(format!("cannot login as {}", imap_user)))
+                }
            }
-        }
+        })
    }

    async fn unsetup_handle(&self, context: &Context) {
@@ -374,7 +387,7 @@ impl Imap {
                config.server_flags = server_flags;
            }

-            if let Err(err) = self.setup_handle_if_needed(context).await {
+            if let Err(err) = self.setup_handle_if_needed(context) {
                warn!(context, "failed to setup imap handle: {}", err);
                self.free_connect_params().await;
                return false;
@@ -430,17 +443,20 @@ impl Imap {
        });
    }

-    pub async fn fetch(&self, context: &Context, watch_folder: &str) -> Result<()> {
-        if !context.sql.is_open() {
-            // probably shutdown
-            return Err(Error::InTeardown);
-        }
-        self.setup_handle_if_needed(context).await?;
-
-        while self.fetch_new_messages(context, &watch_folder).await? {
-            // We fetch until no more new messages are there.
-        }
-        Ok(())
+    pub fn fetch(&self, context: &Context, watch_folder: &str) -> Result<()> {
+        task::block_on(async move {
+            if !context.sql.is_open() {
+                // probably shutdown
+                return Err(Error::InTeardown);
+            }
+            while self
+                .fetch_from_single_folder(context, &watch_folder)
+                .await?
+            {
+                // We fetch until no more new messages are there.
+            }
+            Ok(())
+        })
    }

    fn get_config_last_seen_uid<S: AsRef<str>>(&self, context: &Context, folder: S) -> (u32, u32) {
@@ -544,7 +560,7 @@ impl Imap {
        })
    }

-    async fn fetch_new_messages<S: AsRef<str>>(
+    async fn fetch_from_single_folder<S: AsRef<str>>(
        &self,
        context: &Context,
        folder: S,
@@ -577,11 +593,9 @@ impl Imap {
        for msg in &list {
            let cur_uid = msg.uid.unwrap_or_default();
            if cur_uid <= last_seen_uid {
-                // seems that at least dovecot sends the last available UID
-                // even if we asked for higher UID+N:*
-                info!(
+                warn!(
                    context,
-                    "fetch_new_messages: ignoring uid {}, last seen was {}", cur_uid, last_seen_uid
+                    "unexpected uid {}, last seen was {}", cur_uid, last_seen_uid
                );
                continue;
            }
@@ -720,6 +734,210 @@ impl Imap {
        1
    }

+    pub fn idle(&self, context: &Context, watch_folder: Option<String>) -> Result<()> {
+        task::block_on(async move {
+            if !self.config.read().await.can_idle {
+                return Err(Error::IdleAbilityMissing);
+            }
+
+            self.setup_handle_if_needed(context)?;
+
+            self.select_folder(context, watch_folder.clone()).await?;
+
+            let session = self.session.lock().await.take();
+            let timeout = Duration::from_secs(23 * 60);
+            if let Some(session) = session {
+                match session.idle() {
+                    // BEWARE: If you change the Secure branch you
+                    // typically also need to change the Insecure branch.
+                    IdleHandle::Secure(mut handle) => {
+                        if let Err(err) = handle.init().await {
+                            return Err(Error::IdleProtocolFailed(err));
+                        }
+
+                        let (idle_wait, interrupt) = handle.wait_with_timeout(timeout);
+                        *self.interrupt.lock().await = Some(interrupt);
+
+                        if self.skip_next_idle_wait.load(Ordering::SeqCst) {
+                            // interrupt_idle has happened before we
+                            // provided self.interrupt
+                            self.skip_next_idle_wait.store(false, Ordering::SeqCst);
+                            std::mem::drop(idle_wait);
+                            info!(context, "Idle wait was skipped");
+                        } else {
+                            info!(context, "Idle entering wait-on-remote state");
+                            match idle_wait.await {
+                                IdleResponse::NewData(_) => {
+                                    info!(context, "Idle has NewData");
+                                }
+                                // TODO: idle_wait does not distinguish manual interrupts
+                                // from Timeouts if we would know it's a Timeout we could bail
+                                // directly and reconnect .
+                                IdleResponse::Timeout => {
+                                    info!(context, "Idle-wait timeout or interruption");
+                                }
+                                IdleResponse::ManualInterrupt => {
+                                    info!(context, "Idle wait was interrupted");
+                                }
+                            }
+                        }
+                        match handle.done().await {
+                            Ok(session) => {
+                                *self.session.lock().await = Some(Session::Secure(session));
+                            }
+                            Err(err) => {
+                                // if we cannot terminate IDLE it probably
+                                // means that we waited long (with idle_wait)
+                                // but the network went away/changed
+                                self.trigger_reconnect();
+                                return Err(Error::IdleProtocolFailed(err));
+                            }
+                        }
+                    }
+                    IdleHandle::Insecure(mut handle) => {
+                        if let Err(err) = handle.init().await {
+                            return Err(Error::IdleProtocolFailed(err));
+                        }
+
+                        let (idle_wait, interrupt) = handle.wait_with_timeout(timeout);
+                        *self.interrupt.lock().await = Some(interrupt);
+
+                        if self.skip_next_idle_wait.load(Ordering::SeqCst) {
+                            // interrupt_idle has happened before we
+                            // provided self.interrupt
+                            self.skip_next_idle_wait.store(false, Ordering::SeqCst);
+                            std::mem::drop(idle_wait);
+                            info!(context, "Idle wait was skipped");
+                        } else {
+                            info!(context, "Idle entering wait-on-remote state");
+                            match idle_wait.await {
+                                IdleResponse::NewData(_) => {
+                                    info!(context, "Idle has NewData");
+                                }
+                                // TODO: idle_wait does not distinguish manual interrupts
+                                // from Timeouts if we would know it's a Timeout we could bail
+                                // directly and reconnect .
+                                IdleResponse::Timeout => {
+                                    info!(context, "Idle-wait timeout or interruption");
+                                }
+                                IdleResponse::ManualInterrupt => {
+                                    info!(context, "Idle wait was interrupted");
+                                }
+                            }
+                        }
+                        match handle.done().await {
+                            Ok(session) => {
+                                *self.session.lock().await = Some(Session::Insecure(session));
+                            }
+                            Err(err) => {
+                                // if we cannot terminate IDLE it probably
+                                // means that we waited long (with idle_wait)
+                                // but the network went away/changed
+                                self.trigger_reconnect();
+                                return Err(Error::IdleProtocolFailed(err));
+                            }
+                        }
+                    }
+                }
+            }
+
+            Ok(())
+        })
+    }
+
+    pub(crate) fn fake_idle(&self, context: &Context, watch_folder: Option<String>) {
+        // Idle using polling. This is also needed if we're not yet configured -
+        // in this case, we're waiting for a configure job (and an interrupt).
+        task::block_on(async move {
+            let fake_idle_start_time = SystemTime::now();
+
+            info!(context, "IMAP-fake-IDLEing...");
+
+            let interrupt = stop_token::StopSource::new();
+
+            // check every minute if there are new messages
+            // TODO: grow sleep durations / make them more flexible
+            let interval = async_std::stream::interval(Duration::from_secs(60));
+            let mut interrupt_interval = interrupt.stop_token().stop_stream(interval);
+            *self.interrupt.lock().await = Some(interrupt);
+            if self.skip_next_idle_wait.load(Ordering::SeqCst) {
+                // interrupt_idle has happened before we
+                // provided self.interrupt
+                self.skip_next_idle_wait.store(false, Ordering::SeqCst);
+                info!(context, "fake-idle wait was skipped");
+            } else {
+                // loop until we are interrupted or if we fetched something
+                while let Some(_) = interrupt_interval.next().await {
+                    // try to connect with proper login params
+                    // (setup_handle_if_needed might not know about them if we
+                    // never successfully connected)
+                    if let Err(err) = self.connect_configured(context) {
+                        warn!(context, "fake_idle: could not connect: {}", err);
+                        continue;
+                    }
+                    if self.config.read().await.can_idle {
+                        // we only fake-idled because network was gone during IDLE, probably
+                        break;
+                    }
+                    info!(context, "fake_idle is connected");
+                    // we are connected, let's see if fetching messages results
+                    // in anything.  If so, we behave as if IDLE had data but
+                    // will have already fetched the messages so perform_*_fetch
+                    // will not find any new.
+
+                    if let Some(ref watch_folder) = watch_folder {
+                        match self.fetch_from_single_folder(context, watch_folder).await {
+                            Ok(res) => {
+                                info!(context, "fetch_from_single_folder returned {:?}", res);
+                                if res {
+                                    break;
+                                }
+                            }
+                            Err(err) => {
+                                error!(context, "could not fetch from folder: {}", err);
+                                self.trigger_reconnect()
+                            }
+                        }
+                    }
+                }
+            }
+            self.interrupt.lock().await.take();
+
+            info!(
+                context,
+                "IMAP-fake-IDLE done after {:.4}s",
+                SystemTime::now()
+                    .duration_since(fake_idle_start_time)
+                    .unwrap()
+                    .as_millis() as f64
+                    / 1000.,
+            );
+        })
+    }
+
+    pub fn interrupt_idle(&self, context: &Context) {
+        task::block_on(async move {
+            let mut interrupt: Option<stop_token::StopSource> = self.interrupt.lock().await.take();
+            if interrupt.is_none() {
+                // idle wait is not running, signal it needs to skip
+                self.skip_next_idle_wait.store(true, Ordering::SeqCst);
+
+                // meanwhile idle-wait may have produced the StopSource
+                interrupt = self.interrupt.lock().await.take();
+            }
+            // let's manually drop the StopSource
+            if interrupt.is_some() {
+                // the imap thread provided us a stop token but might
+                // not have entered idle_wait yet, give it some time
+                // for that to happen. XXX handle this without extra wait
+                // https://github.com/deltachat/deltachat-core-rust/issues/925
+                std::thread::sleep(Duration::from_millis(200));
+                info!(context, "low-level: dropping stop-source to interrupt idle");
+                std::mem::drop(interrupt)
+            }
+        });
+    }
+
    pub fn mv(
        &self,
        context: &Context,
@@ -1104,17 +1322,13 @@ impl Imap {
        task::block_on(async move {
            info!(context, "emptying folder {}", folder);

-            // we want to report all error to the user
-            // (no retry should be attempted)
            if folder.is_empty() {
                error!(context, "cannot perform empty, folder not set");
                return;
            }
-            if let Err(err) = self.setup_handle_if_needed(context).await {
-                error!(context, "could not setup imap connection: {:?}", err);
-                return;
-            }
            if let Err(err) = self.select_folder(context, Some(&folder)).await {
+                // we want to report all error to the user
+                // (no retry should be attempted)
                error!(
                    context,
                    "Could not select {} for expunging: {:?}", folder, err
--- a/src/imap/select_folder.rs
+++ b/src/imap/select_folder.rs
@@ -34,7 +34,6 @@ impl Imap {
            let mut cfg = self.config.write().await;
            cfg.selected_folder = None;
            cfg.selected_folder_needs_expunge = false;
-            self.trigger_reconnect();
            return Err(Error::NoSession);
        }

@@ -62,7 +61,6 @@ impl Imap {
                            info!(context, "close/expunge succeeded");
                        }
                        Err(err) => {
-                            self.trigger_reconnect();
                            return Err(Error::CloseExpungeFailed(err));
                        }
                    }
--- a/src/job.rs
+++ b/src/job.rs
@@ -8,8 +8,6 @@ use std::time::Duration;
 use deltachat_derive::{FromSql, ToSql};
 use rand::{thread_rng, Rng};

-use async_std::task;
-
 use crate::blob::BlobObject;
 use crate::chat;
 use crate::config::Config;
@@ -167,15 +165,13 @@ impl Job {
                if let Some(recipients) = self.param.get(Param::Recipients) {
                    let recipients_list = recipients
                        .split('\x1e')
-                        .filter_map(
-                            |addr| match async_smtp::EmailAddress::new(addr.to_string()) {
-                                Ok(addr) => Some(addr),
-                                Err(err) => {
-                                    warn!(context, "invalid recipient: {} {:?}", addr, err);
-                                    None
-                                }
-                            },
-                        )
+                        .filter_map(|addr| match lettre::EmailAddress::new(addr.to_string()) {
+                            Ok(addr) => Some(addr),
+                            Err(err) => {
+                                warn!(context, "invalid recipient: {} {:?}", addr, err);
+                                None
+                            }
+                        })
                        .collect::<Vec<_>>();

                    /* if there is a msg-id and it does not exist in the db, cancel sending.
@@ -200,11 +196,11 @@ impl Job {
                        info!(context, "smtp-sending out mime message:");
                        println!("{}", String::from_utf8_lossy(&body));
                    }
-                    match task::block_on(smtp.send(context, recipients_list, body, self.job_id)) {
+                    match smtp.send(context, recipients_list, body, self.job_id) {
                        Err(crate::smtp::send::Error::SendError(err)) => {
                            // Remote error, retry later.
-                            info!(context, "SMTP failed to send: {}", err);
                            smtp.disconnect();
+                            info!(context, "SMTP failed to send: {}", err);
                            self.try_again_later(TryAgain::AtOnce, Some(err.to_string()));
                        }
                        Err(crate::smtp::send::Error::EnvelopeError(err)) => {
@@ -402,37 +398,31 @@ pub fn job_kill_action(context: &Context, action: Action) -> bool {
 pub fn perform_inbox_fetch(context: &Context) {
    let use_network = context.get_config_bool(Config::InboxWatch);

-    task::block_on(
-        context
-            .inbox_thread
-            .write()
-            .unwrap()
-            .fetch(context, use_network),
-    );
+    context
+        .inbox_thread
+        .write()
+        .unwrap()
+        .fetch(context, use_network);
 }

 pub fn perform_mvbox_fetch(context: &Context) {
    let use_network = context.get_config_bool(Config::MvboxWatch);

-    task::block_on(
-        context
-            .mvbox_thread
-            .write()
-            .unwrap()
-            .fetch(context, use_network),
-    );
+    context
+        .mvbox_thread
+        .write()
+        .unwrap()
+        .fetch(context, use_network);
 }

 pub fn perform_sentbox_fetch(context: &Context) {
    let use_network = context.get_config_bool(Config::SentboxWatch);

-    task::block_on(
-        context
-            .sentbox_thread
-            .write()
-            .unwrap()
-            .fetch(context, use_network),
-    );
+    context
+        .sentbox_thread
+        .write()
+        .unwrap()
+        .fetch(context, use_network);
 }

 pub fn perform_inbox_idle(context: &Context) {
--- a/src/job_thread.rs
+++ b/src/job_thread.rs
@@ -73,7 +73,7 @@ impl JobThread {
        info!(context, "Interrupting {}-IDLE... finished", self.name);
    }

-    pub async fn fetch(&mut self, context: &Context, use_network: bool) {
+    pub fn fetch(&mut self, context: &Context, use_network: bool) {
        {
            let &(ref lock, _) = &*self.state.clone();
            let mut state = lock.lock().unwrap();
@@ -86,10 +86,10 @@ impl JobThread {
        }

        if use_network {
-            if let Err(err) = self.connect_and_fetch(context).await {
+            if let Err(err) = self.connect_and_fetch(context) {
                warn!(context, "connect+fetch failed: {}, reconnect & retry", err);
                self.imap.trigger_reconnect();
-                if let Err(err) = self.connect_and_fetch(context).await {
+                if let Err(err) = self.connect_and_fetch(context) {
                    warn!(context, "connect+fetch failed: {}", err);
                }
            }
@@ -97,18 +97,14 @@ impl JobThread {
        self.state.0.lock().unwrap().using_handle = false;
    }

-    async fn connect_and_fetch(&mut self, context: &Context) -> Result<()> {
+    fn connect_and_fetch(&mut self, context: &Context) -> Result<()> {
        let prefix = format!("{}-fetch", self.name);
        match self.imap.connect_configured(context) {
            Ok(()) => {
                if let Some(watch_folder) = self.get_watch_folder(context) {
                    let start = std::time::Instant::now();
                    info!(context, "{} started...", prefix);
-                    let res = self
-                        .imap
-                        .fetch(context, &watch_folder)
-                        .await
-                        .map_err(Into::into);
+                    let res = self.imap.fetch(context, &watch_folder).map_err(Into::into);
                    let elapsed = start.elapsed().as_millis();
                    info!(context, "{} done in {:.3} ms.", prefix, elapsed);

@@ -174,19 +170,20 @@ impl JobThread {
        let prefix = format!("{}-IDLE", self.name);
        let do_fake_idle = match self.imap.connect_configured(context) {
            Ok(()) => {
-                if !self.imap.can_idle() {
-                    true // we have to do fake_idle
-                } else {
-                    let watch_folder = self.get_watch_folder(context);
-                    info!(context, "{} started...", prefix);
-                    let res = self.imap.idle(context, watch_folder);
-                    info!(context, "{} ended...", prefix);
-                    if let Err(err) = res {
+                info!(context, "{} started...", prefix);
+                let watch_folder = self.get_watch_folder(context);
+                let res = self.imap.idle(context, watch_folder);
+                info!(context, "{} ended...", prefix);
+                match res {
+                    Ok(()) => false,
+                    Err(crate::imap::Error::IdleAbilityMissing) => true, // we have to do fake_idle
+                    Err(err) => {
                        warn!(context, "{} failed: {} -> reconnecting", prefix, err);
                        // something is borked, let's start afresh on the next occassion
                        self.imap.disconnect(context);
+
+                        false
                    }
-                    false
                }
            }
            Err(err) => {
--- a/src/key.rs
+++ b/src/key.rs
@@ -178,9 +178,20 @@ impl Key {
        }
    }

-    pub fn to_base64(&self) -> String {
+    pub fn to_base64(&self, break_every: usize) -> String {
        let buf = self.to_bytes();
-        base64::encode(&buf)
+
+        let encoded = base64::encode(&buf);
+        encoded
+            .chars()
+            .enumerate()
+            .fold(String::new(), |mut res, (i, c)| {
+                if i > 0 && i % break_every == 0 {
+                    res.push(' ')
+                }
+                res.push(c);
+                res
+            })
    }

    pub fn to_armored_string(
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -33,8 +33,6 @@ mod log;
 #[macro_use]
 pub mod error;

-pub mod headerdef;
-
 pub(crate) mod events;
 pub use events::*;

@@ -75,6 +73,7 @@ mod token;
 mod wrapmime;
 mod dehtml;

+pub mod dc_array;
 pub mod dc_receive_imf;
 mod dc_simplify;
 pub mod dc_tools;
--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -16,11 +16,7 @@ use webpki_roots;
 pub enum CertificateChecks {
    Automatic = 0,
    Strict = 1,
-
-    /// Same as AcceptInvalidCertificates
-    /// Previously known as AcceptInvalidHostnames, now deprecated.
-    AcceptInvalidCertificates2 = 2,
-
+    AcceptInvalidHostnames = 2,
    AcceptInvalidCertificates = 3,
 }

@@ -292,8 +288,14 @@ pub fn dc_build_tls_config(certificate_checks: CertificateChecks) -> rustls::Cli
                .dangerous()
                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
        }
-        CertificateChecks::AcceptInvalidCertificates
-        | CertificateChecks::AcceptInvalidCertificates2 => {
+        CertificateChecks::AcceptInvalidCertificates => {
+            // TODO: only accept invalid certs
+            config
+                .dangerous()
+                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
+        }
+        CertificateChecks::AcceptInvalidHostnames => {
+            // TODO: only accept invalid hostnames
            config
                .dangerous()
                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
@@ -311,8 +313,8 @@ mod tests {
        use std::string::ToString;

        assert_eq!(
-            "accept_invalid_certificates".to_string(),
-            CertificateChecks::AcceptInvalidCertificates.to_string()
+            "accept_invalid_hostnames".to_string(),
+            CertificateChecks::AcceptInvalidHostnames.to_string()
        );
    }
 }
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -525,12 +525,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                outer_message = outer_message.header(header);
            }

-            if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
-                info!(self.context, "mimefactory: outgoing message mime:");
-                let raw_message = message.clone().build().as_string();
-                println!("{}", raw_message);
-            }
-
            let encrypted =
                encrypt_helper.encrypt(self.context, min_verified, message, &peerstates)?;

--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};

 use deltachat_derive::{FromSql, ToSql};
 use lettre_email::mime::{self, Mime};
-use mailparse::{DispositionType, MailHeaderMap};
+use mailparse::MailHeaderMap;

 use crate::aheader::Aheader;
 use crate::blob::BlobObject;
@@ -14,7 +14,6 @@ use crate::dc_simplify::*;
 use crate::dc_tools::*;
 use crate::e2ee;
 use crate::error::Result;
-use crate::headerdef::HeaderDef;
 use crate::job::{job_add, Action};
 use crate::location;
 use crate::message;
@@ -23,14 +22,16 @@ use crate::param::*;
 use crate::peerstate::Peerstate;
 use crate::securejoin::handle_degrade_event;
 use crate::stock::StockMessage;
-use crate::{bail, ensure};

 #[derive(Debug)]
 pub struct MimeParser<'a> {
    pub context: &'a Context,
    pub parts: Vec<Part>,
-    header: HashMap<String, String>,
+    pub header: HashMap<String, String>,
+    pub subject: Option<String>,
+    pub is_send_by_messenger: bool,
    pub decrypting_failed: bool,
+    pub encrypted: bool,
    pub signatures: HashSet<String>,
    pub gossipped_addr: HashSet<String>,
    pub is_forwarded: bool,
@@ -72,9 +73,10 @@ impl<'a> MimeParser<'a> {
        let mut parser = MimeParser {
            parts: Vec::new(),
            header: Default::default(),
+            subject: None,
+            is_send_by_messenger: false,
            decrypting_failed: false,
-
-            // only non-empty if it was a valid autocrypt message
+            encrypted: false,
            signatures: Default::default(),
            gossipped_addr: Default::default(),
            is_forwarded: false,
@@ -101,15 +103,12 @@ impl<'a> MimeParser<'a> {
        let mail = match e2ee::try_decrypt(parser.context, &mail, message_time) {
            Ok((raw, signatures)) => {
                // Valid autocrypt message, encrypted
+                parser.encrypted = raw.is_some();
                parser.signatures = signatures;

                if let Some(raw) = raw {
                    mail_raw = raw;
                    let decrypted_mail = mailparse::parse_mail(&mail_raw)?;
-                    if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
-                        info!(context, "decrypted message mime-body:");
-                        println!("{}", String::from_utf8_lossy(&mail_raw));
-                    }

                    // Handle any gossip headers if the mail was encrypted.  See section
                    // "3.6 Key Gossip" of https://autocrypt.org/autocrypt-spec-1.1.0.pdf
@@ -145,7 +144,15 @@ impl<'a> MimeParser<'a> {
    }

    fn parse_headers(&mut self) -> Result<()> {
-        if self.get(HeaderDef::AutocryptSetupMessage).is_some() {
+        if let Some(field) = self.lookup_field("Subject") {
+            self.subject = Some(field.clone());
+        }
+
+        if self.lookup_field("Chat-Version").is_some() {
+            self.is_send_by_messenger = true
+        }
+
+        if self.lookup_field("Autocrypt-Setup-Message").is_some() {
            let has_setup_file = self.parts.iter().any(|p| {
                p.mimetype.is_some() && p.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
            });
@@ -176,12 +183,12 @@ impl<'a> MimeParser<'a> {
                    }
                }
            }
-        } else if let Some(value) = self.get(HeaderDef::ChatContent) {
+        } else if let Some(value) = self.lookup_field("Chat-Content") {
            if value == "location-streaming-enabled" {
                self.is_system_message = SystemMessage::LocationStreamingEnabled;
            }
        }
-        if self.get(HeaderDef::ChatGroupImage).is_some() && !self.parts.is_empty() {
+        if self.lookup_field("Chat-Group-Image").is_some() && !self.parts.is_empty() {
            let textpart = &self.parts[0];
            if textpart.typ == Viewtype::Text && self.parts.len() >= 2 {
                let imgpart = &mut self.parts[1];
@@ -191,7 +198,7 @@ impl<'a> MimeParser<'a> {
            }
        }

-        if self.has_chat_version() && self.parts.len() == 2 {
+        if self.is_send_by_messenger && self.parts.len() == 2 {
            let need_drop = {
                let textpart = &self.parts[0];
                let filepart = &self.parts[1];
@@ -219,13 +226,13 @@ impl<'a> MimeParser<'a> {
                std::mem::replace(&mut self.parts[0], filepart);
            }
        }
-        if let Some(ref subject) = self.get_subject() {
+        if let Some(ref subject) = self.subject {
            let mut prepend_subject = 1i32;
            if !self.decrypting_failed {
                let colon = subject.find(':');
                if colon == Some(2)
                    || colon == Some(3)
-                    || self.has_chat_version()
+                    || self.is_send_by_messenger
                    || subject.contains("Chat:")
                {
                    prepend_subject = 0i32
@@ -256,13 +263,13 @@ impl<'a> MimeParser<'a> {
        }
        if self.parts.len() == 1 {
            if self.parts[0].typ == Viewtype::Audio
-                && self.get(HeaderDef::ChatVoiceMessage).is_some()
+                && self.lookup_field("Chat-Voice-Message").is_some()
            {
                let part_mut = &mut self.parts[0];
                part_mut.typ = Viewtype::Voice;
            }
            if self.parts[0].typ == Viewtype::Image {
-                if let Some(value) = self.get(HeaderDef::ChatContent) {
+                if let Some(value) = self.lookup_field("Chat-Content") {
                    if value == "sticker" {
                        let part_mut = &mut self.parts[0];
                        part_mut.typ = Viewtype::Sticker;
@@ -274,7 +281,7 @@ impl<'a> MimeParser<'a> {
                || part.typ == Viewtype::Voice
                || part.typ == Viewtype::Video
            {
-                if let Some(field_0) = self.get(HeaderDef::ChatDuration) {
+                if let Some(field_0) = self.lookup_field("Chat-Duration") {
                    let duration_ms = field_0.parse().unwrap_or_default();
                    if duration_ms > 0 && duration_ms < 24 * 60 * 60 * 1000 {
                        let part_mut = &mut self.parts[0];
@@ -284,12 +291,12 @@ impl<'a> MimeParser<'a> {
            }
        }
        if !self.decrypting_failed {
-            if let Some(dn_field) = self.get(HeaderDef::ChatDispositionNotificationTo) {
+            if let Some(dn_field) = self.lookup_field("Chat-Disposition-Notification-To") {
                if self.get_last_nonmeta().is_some() {
                    let addrs = mailparse::addrparse(&dn_field).unwrap();

                    if let Some(dn_to_addr) = addrs.first() {
-                        if let Some(from_field) = self.get(HeaderDef::From_) {
+                        if let Some(from_field) = self.lookup_field("From") {
                            let from_addrs = mailparse::addrparse(&from_field).unwrap();

                            if let Some(from_addr) = from_addrs.first() {
@@ -310,8 +317,8 @@ impl<'a> MimeParser<'a> {
            let mut part = Part::default();
            part.typ = Viewtype::Text;

-            if let Some(ref subject) = self.get_subject() {
-                if !self.has_chat_version() {
+            if let Some(ref subject) = self.subject {
+                if !self.is_send_by_messenger {
                    part.msg = subject.to_string();
                }
            }
@@ -330,27 +337,8 @@ impl<'a> MimeParser<'a> {
        self.parts.iter_mut().rev().find(|part| !part.is_meta)
    }

-    pub fn was_encrypted(&self) -> bool {
-        !self.signatures.is_empty()
-    }
-
-    pub(crate) fn has_chat_version(&self) -> bool {
-        self.header.contains_key("chat-version")
-    }
-
-    pub(crate) fn get_subject(&self) -> Option<String> {
-        if let Some(s) = self.get(HeaderDef::Subject) {
-            if s.is_empty() {
-                return None;
-            }
-            Some(s.to_string())
-        } else {
-            None
-        }
-    }
-
-    pub fn get(&self, headerdef: HeaderDef) -> Option<&String> {
-        self.header.get(&headerdef.get_headername())
+    pub fn lookup_field(&self, field_name: &str) -> Option<&String> {
+        self.header.get(&field_name.to_lowercase())
    }

    fn parse_mime_recursive(&mut self, mail: &mailparse::ParsedMail<'_>) -> Result<bool> {
@@ -454,9 +442,6 @@ impl<'a> MimeParser<'a> {
                }
            }
            (mime::MULTIPART, "encrypted") => {
-                // we currently do not try to decrypt non-autocrypt messages
-                // at all. If we see an encrypted part, we set
-                // decrypting_failed.
                let msg_body = self.context.stock_str(StockMessage::CantDecryptMsgBody);
                let txt = format!("[{}]", msg_body);

@@ -502,10 +487,41 @@ impl<'a> MimeParser<'a> {
                }
            }
            _ => {
-                // Add all parts (in fact, AddSinglePartIfKnown() later check if
-                // the parts are really supported)
-                for cur_data in mail.subparts.iter() {
-                    if self.parse_mime_recursive(cur_data)? {
+                // Add all parts (in fact,
+                // AddSinglePartIfKnown() later check if the parts are really supported)
+                // HACK: the following lines are a hack for clients who use
+                // multipart/mixed instead of multipart/alternative for
+                // combined text/html messages (eg. Stock Android "Mail" does so).
+                // So, if we detect such a message below, we skip the Html
+                // part.  However, not sure, if there are useful situations to use
+                // plain+html in multipart/mixed - if so, we should disable the hack.
+                let mut skip_part = -1;
+                let mut html_part = -1;
+                let mut plain_cnt = 0;
+                let mut html_cnt = 0;
+
+                for (i, cur_data) in mail.subparts.iter().enumerate() {
+                    match get_mime_type(cur_data)?.0.type_() {
+                        mime::TEXT => {
+                            plain_cnt += 1;
+                        }
+                        mime::HTML => {
+                            html_part = i as isize;
+                            html_cnt += 1;
+                        }
+                        _ => {}
+                    }
+                }
+                if plain_cnt == 1 && html_cnt == 1 {
+                    warn!(
+                        self.context,
+                        "HACK: multipart/mixed message found with Plain and HTML, we\'ll skip the HTML part as this seems to be unwanted."
+                    );
+                    skip_part = html_part;
+                }
+
+                for (i, cur_data) in mail.subparts.iter().enumerate() {
+                    if i as isize != skip_part && self.parse_mime_recursive(cur_data)? {
                        any_part_added = true;
                    }
                }
@@ -520,60 +536,84 @@ impl<'a> MimeParser<'a> {
        let (mime_type, msg_type) = get_mime_type(mail)?;
        let raw_mime = mail.ctype.mimetype.to_lowercase();

-        let filename = get_attachment_filename(mail);
-        info!(
-            self.context,
-            "add_single_part_if_known {:?} {:?} {:?}", mime_type, msg_type, filename
-        );
-
        let old_part_count = self.parts.len();

-        if let Ok(filename) = filename {
-            self.do_add_single_file_part(
-                msg_type,
-                mime_type,
-                &raw_mime,
-                &mail.get_body_raw()?,
-                &filename,
-            );
-        } else {
-            match mime_type.type_() {
-                mime::IMAGE | mime::AUDIO | mime::VIDEO | mime::APPLICATION => {
-                    bail!("missing attachment");
-                }
-                mime::TEXT | mime::HTML => {
-                    let decoded_data = match mail.get_body() {
-                        Ok(decoded_data) => decoded_data,
-                        Err(err) => {
-                            warn!(self.context, "Invalid body parsed {:?}", err);
-                            // Note that it's not always an error - might be no data
-                            return Ok(false);
-                        }
-                    };
-
-                    let mut simplifier = Simplify::new();
-                    let simplified_txt = if decoded_data.is_empty() {
-                        "".into()
-                    } else {
-                        let is_html = mime_type == mime::TEXT_HTML;
-                        simplifier.simplify(&decoded_data, is_html, self.has_chat_version())
-                    };
-
-                    if !simplified_txt.is_empty() {
-                        let mut part = Part::default();
-                        part.typ = Viewtype::Text;
-                        part.mimetype = Some(mime_type);
-                        part.msg = simplified_txt;
-                        part.msg_raw = Some(decoded_data);
-                        self.do_add_single_part(part);
+        // regard `Content-Transfer-Encoding:`
+        match mime_type.type_() {
+            mime::TEXT | mime::HTML => {
+                let decoded_data = match mail.get_body() {
+                    Ok(decoded_data) => decoded_data,
+                    Err(err) => {
+                        warn!(self.context, "Invalid body parsed {:?}", err);
+                        // Note that it's not always an error - might be no data
+                        return Ok(false);
                    }
+                };

-                    if simplifier.is_forwarded {
-                        self.is_forwarded = true;
-                    }
+                // check header directly as is_send_by_messenger is not yet set up
+                let is_msgrmsg = self.lookup_field("Chat-Version").is_some();
+
+                let mut simplifier = Simplify::new();
+                let simplified_txt = if decoded_data.is_empty() {
+                    "".into()
+                } else {
+                    let is_html = mime_type == mime::TEXT_HTML;
+                    simplifier.simplify(&decoded_data, is_html, is_msgrmsg)
+                };
+
+                if !simplified_txt.is_empty() {
+                    let mut part = Part::default();
+                    part.typ = Viewtype::Text;
+                    part.mimetype = Some(mime_type);
+                    part.msg = simplified_txt;
+                    part.msg_raw = Some(decoded_data);
+                    self.do_add_single_part(part);
+                }
+
+                if simplifier.is_forwarded {
+                    self.is_forwarded = true;
                }
-                _ => {}
            }
+            mime::IMAGE | mime::AUDIO | mime::VIDEO | mime::APPLICATION => {
+                // try to get file name from
+                //    `Content-Disposition: ... filename*=...`
+                // or `Content-Disposition: ... filename*0*=... filename*1*=... filename*2*=...`
+                // or `Content-Disposition: ... filename=...`
+
+                let ct = mail.get_content_disposition()?;
+                let mut desired_filename = ct
+                    .params
+                    .iter()
+                    .filter(|(key, _value)| key.starts_with("filename"))
+                    .fold(String::new(), |mut acc, (_key, value)| {
+                        acc += value;
+                        acc
+                    });
+
+                if desired_filename.is_empty() {
+                    if let Some(param) = ct.params.get("name") {
+                        // might be a wrongly encoded filename
+                        desired_filename = param.to_string();
+                    }
+                }
+
+                // if there is still no filename, guess one
+                if desired_filename.is_empty() {
+                    if let Some(subtype) = mail.ctype.mimetype.split('/').nth(1) {
+                        desired_filename = format!("file.{}", subtype,);
+                    } else {
+                        return Ok(false);
+                    }
+                }
+                self.do_add_single_file_part(
+                    msg_type,
+                    mime_type,
+                    &raw_mime,
+                    &mail.get_body_raw()?,
+                    &desired_filename,
+                );
+            }
+            _ => {}
        }

        // add object? (we do not add all objects, eg. signatures etc. are ignored)
@@ -622,7 +662,6 @@ impl<'a> MimeParser<'a> {
                return;
            }
        };
-        info!(self.context, "added blobfile: {:?}", blob.as_name());

        /* create and register Mime part referencing the new Blob object */
        let mut part = Part::default();
@@ -643,18 +682,25 @@ impl<'a> MimeParser<'a> {
    }

    fn do_add_single_part(&mut self, mut part: Part) {
-        if self.was_encrypted() {
-            part.param.set_int(Param::GuaranteeE2ee, 1);
+        if self.encrypted {
+            if !self.signatures.is_empty() {
+                part.param.set_int(Param::GuaranteeE2ee, 1);
+            } else {
+                // XXX if the message was encrypted but not signed
+                // it's not neccessarily an error we need to signal.
+                // we could just treat it as if it was not encrypted.
+                part.param.set_int(Param::ErroneousE2ee, 0x2);
+            }
        }
        self.parts.push(part);
    }

    pub fn is_mailinglist_message(&self) -> bool {
-        if self.get(HeaderDef::ListId).is_some() {
+        if self.lookup_field("List-Id").is_some() {
            return true;
        }

-        if let Some(precedence) = self.get(HeaderDef::Precedence) {
+        if let Some(precedence) = self.lookup_field("Precedence") {
            precedence == "list" || precedence == "bulk"
        } else {
            false
@@ -663,7 +709,7 @@ impl<'a> MimeParser<'a> {

    pub fn sender_equals_recipient(&self) -> bool {
        /* get From: and check there is exactly one sender */
-        if let Some(field) = self.get(HeaderDef::From_) {
+        if let Some(field) = self.lookup_field("From") {
            if let Ok(addrs) = mailparse::addrparse(field) {
                if addrs.len() != 1 {
                    return false;
@@ -694,11 +740,11 @@ impl<'a> MimeParser<'a> {
    }

    pub fn get_rfc724_mid(&self) -> Option<String> {
-        if let Some(msgid) = self.get(HeaderDef::MessageId) {
-            parse_message_id(msgid)
-        } else {
-            None
+        // get Message-ID from header
+        if let Some(field) = self.lookup_field("Message-ID") {
+            return parse_message_id(field);
        }
+        None
    }

    fn hash_header(&mut self, fields: &[mailparse::MailHeader<'_>]) {
@@ -728,10 +774,9 @@ impl<'a> MimeParser<'a> {
        let (report_fields, _) = mailparse::parse_headers(&report_body)?;

        // must be present
-        let disp = HeaderDef::Disposition.get_headername();
-        if let Some(_disposition) = report_fields.get_first_value(&disp).ok().flatten() {
+        if let Some(_disposition) = report_fields.get_first_value("Disposition").ok().flatten() {
            if let Some(original_message_id) = report_fields
-                .get_first_value(&HeaderDef::OriginalMessageId.get_headername())
+                .get_first_value("Original-Message-ID")
                .ok()
                .flatten()
                .and_then(|v| parse_message_id(&v))
@@ -767,11 +812,11 @@ impl<'a> MimeParser<'a> {
                mdn_consumed = true;
            }

-            if self.has_chat_version() || mdn_consumed {
+            if self.is_send_by_messenger || mdn_consumed {
                let mut param = Params::new();
                param.set(Param::ServerFolder, server_folder.as_ref());
                param.set_int(Param::ServerUid, server_uid as i32);
-                if self.has_chat_version() && self.context.get_config_bool(Config::MvboxMove) {
+                if self.is_send_by_messenger && self.context.get_config_bool(Config::MvboxMove) {
                    param.set_int(Param::AlsoMove, 1);
                }
                job_add(self.context, Action::MarkseenMdnOnImap, 0, param, 0);
@@ -868,13 +913,12 @@ pub struct Part {
    pub param: Params,
 }

-/// return mimetype and viewtype for a parsed mail
 fn get_mime_type(mail: &mailparse::ParsedMail<'_>) -> Result<(Mime, Viewtype)> {
    let mimetype = mail.ctype.mimetype.parse::<Mime>()?;

    let viewtype = match mimetype.type_() {
        mime::TEXT => {
-            if !is_attachment_disposition(mail) {
+            if !mailmime_is_attachment_disposition(mail) {
                match mimetype.subtype() {
                    mime::PLAIN | mime::HTML => Viewtype::Text,
                    _ => Viewtype::File,
@@ -908,62 +952,14 @@ fn get_mime_type(mail: &mailparse::ParsedMail<'_>) -> Result<(Mime, Viewtype)> {
    Ok((mimetype, viewtype))
 }

-fn is_attachment_disposition(mail: &mailparse::ParsedMail<'_>) -> bool {
-    if let Ok(ct) = mail.get_content_disposition() {
-        return ct.disposition == DispositionType::Attachment
-            && ct
-                .params
-                .iter()
-                .any(|(key, _value)| key.starts_with("filename"));
+fn mailmime_is_attachment_disposition(mail: &mailparse::ParsedMail<'_>) -> bool {
+    if let Some(ct) = mail.ctype.params.get("Content-Disposition") {
+        return ct.to_lowercase().starts_with("attachment");
    }

    false
 }

-fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<String> {
-    // try to get file name from
-    //    `Content-Disposition: ... filename*=...`
-    // or `Content-Disposition: ... filename*0*=... filename*1*=... filename*2*=...`
-    // or `Content-Disposition: ... filename=...`
-
-    let ct = mail.get_content_disposition()?;
-    ensure!(
-        ct.disposition == DispositionType::Attachment,
-        "disposition not an attachment: {:?}",
-        ct.disposition
-    );
-
-    let mut desired_filename = ct
-        .params
-        .iter()
-        .filter(|(key, _value)| key.starts_with("filename"))
-        .fold(String::new(), |mut acc, (_key, value)| {
-            acc += value;
-            acc
-        });
-    println!("get_attachment_filename1: {:?}", desired_filename);
-
-    if desired_filename.is_empty() {
-        if let Some(param) = ct.params.get("name") {
-            // might be a wrongly encoded filename
-            desired_filename = param.to_string();
-        }
-    }
-    println!("get_attachment_filename2: {:?}", desired_filename);
-
-    // if there is still no filename, guess one
-    if desired_filename.is_empty() {
-        if let Some(subtype) = mail.ctype.mimetype.split('/').nth(1) {
-            desired_filename = format!("file.{}", subtype,);
-        } else {
-            bail!("could not determine filename: {:?}", ct.disposition);
-        }
-    }
-    println!("get_attachment_filename3: {:?}", desired_filename);
-
-    Ok(desired_filename)
-}
-
 // returned addresses are normalized.
 fn get_recipients<S: AsRef<str>, T: Iterator<Item = (S, S)>>(headers: T) -> HashSet<String> {
    let mut recipients: HashSet<String> = Default::default();
@@ -1022,7 +1018,7 @@ mod tests {
        let raw = include_bytes!("../test-data/message/issue_523.txt");
        let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();

-        assert_eq!(mimeparser.get_subject(), None);
+        assert_eq!(mimeparser.subject, None);
        assert_eq!(mimeparser.parts.len(), 1);
    }

@@ -1068,29 +1064,6 @@ mod tests {
        assert_eq!(recipients.len(), 2);
    }

-    #[test]
-    fn test_is_attachment() {
-        let raw = include_bytes!("../test-data/message/mail_with_cc.txt");
-        let mail = mailparse::parse_mail(raw).unwrap();
-        assert!(!is_attachment_disposition(&mail));
-
-        let raw = include_bytes!("../test-data/message/mail_attach_txt.eml");
-        let mail = mailparse::parse_mail(raw).unwrap();
-        assert!(!is_attachment_disposition(&mail));
-        assert!(!is_attachment_disposition(&mail.subparts[0]));
-        assert!(is_attachment_disposition(&mail.subparts[1]));
-    }
-
-    #[test]
-    fn test_get_attachment_filename() {
-        let raw = include_bytes!("../test-data/message/html_attach.eml");
-        let mail = mailparse::parse_mail(raw).unwrap();
-        assert!(get_attachment_filename(&mail).is_err());
-        assert!(get_attachment_filename(&mail.subparts[0]).is_err());
-        let filename = get_attachment_filename(&mail.subparts[1]).unwrap();
-        assert_eq!(filename, "test.html")
-    }
-
    #[test]
    fn test_mailparse_content_type() {
        let ctype =
@@ -1110,14 +1083,14 @@ mod tests {
        let raw = b"From: hello\n\
                    Content-Type: multipart/mixed; boundary=\"==break==\";\n\
                    Subject: outer-subject\n\
-                    Secure-Join-Group: no\n\
-                    Test-Header: Bar\nChat-Version: 0.0\n\
+                    X-Special-A: special-a\n\
+                    Foo: Bar\nChat-Version: 0.0\n\
                    \n\
                    --==break==\n\
                    Content-Type: text/plain; protected-headers=\"v1\";\n\
                    Subject: inner-subject\n\
-                    SecureBar-Join-Group: yes\n\
-                    Test-Header: Xy\n\
+                    X-Special-B: special-b\n\
+                    Foo: Xy\n\
                    Chat-Version: 1.0\n\
                    \n\
                    test1\n\
@@ -1127,18 +1100,15 @@ mod tests {
                    \x00";
        let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();

-        // test that we treat Subject as a protected header that can
-        // bubble upwards
-        assert_eq!(mimeparser.get_subject(), Some("inner-subject".into()));
+        assert_eq!(mimeparser.subject, Some("inner-subject".into()));

-        let of = mimeparser.get(HeaderDef::SecureJoinGroup).unwrap();
-        assert_eq!(of, "no");
+        let of = mimeparser.lookup_field("X-Special-A").unwrap();
+        assert_eq!(of, "special-a");

-        // unprotected headers do not bubble upwards
-        let of = mimeparser.get(HeaderDef::_TestHeader).unwrap();
+        let of = mimeparser.lookup_field("Foo").unwrap();
        assert_eq!(of, "Bar");

-        let of = mimeparser.get(HeaderDef::ChatVersion).unwrap();
+        let of = mimeparser.lookup_field("Chat-Version").unwrap();
        assert_eq!(of, "1.0");
        assert_eq!(mimeparser.parts.len(), 1);
    }
--- a/src/param.rs
+++ b/src/param.rs
@@ -250,7 +250,7 @@ impl Params {
        let file = ParamsFile::from_param(context, val)?;
        let blob = match file {
            ParamsFile::FsPath(path) => match create {
-                true => BlobObject::new_from_path(context, path)?,
+                true => BlobObject::create_from_path(context, path)?,
                false => BlobObject::from_path(context, path)?,
            },
            ParamsFile::Blob(blob) => blob,
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -11,7 +11,6 @@ use crate::context::Context;
 use crate::e2ee::*;
 use crate::error::Error;
 use crate::events::Event;
-use crate::headerdef::HeaderDef;
 use crate::key::*;
 use crate::lot::LotState;
 use crate::message::Message;
@@ -351,7 +350,7 @@ pub(crate) fn handle_securejoin_handshake(
        "handle_securejoin_handshake(): called with special contact id"
    );
    let step = mimeparser
-        .get(HeaderDef::SecureJoin)
+        .lookup_field("Secure-Join")
        .ok_or_else(|| format_err!("This message is not a Secure-Join message"))?;

    info!(
@@ -379,7 +378,7 @@ pub(crate) fn handle_securejoin_handshake(
            // it just ensures, we have Bobs key now. If we do _not_ have the key because eg. MitM has removed it,
            // send_message() will fail with the error "End-to-end-encryption unavailable unexpectedly.", so, there is no additional check needed here.
            // verify that the `Secure-Join-Invitenumber:`-header matches invitenumber written to the QR code
-            let invitenumber = match mimeparser.get(HeaderDef::SecureJoinInvitenumber) {
+            let invitenumber = match mimeparser.lookup_field("Secure-Join-Invitenumber") {
                Some(n) => n,
                None => {
                    warn!(context, "Secure-join denied (invitenumber missing).",);
@@ -423,7 +422,7 @@ pub(crate) fn handle_securejoin_handshake(
                could_not_establish_secure_connection(
                    context,
                    contact_chat_id,
-                    if mimeparser.was_encrypted() {
+                    if mimeparser.encrypted {
                        "No valid signature."
                    } else {
                        "Not encrypted."
@@ -468,7 +467,7 @@ pub(crate) fn handle_securejoin_handshake(
            ====  Step 6 in "Out-of-band verified groups" protocol  ====
            ============================================================ */
            // verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob
-            let fingerprint = match mimeparser.get(HeaderDef::SecureJoinFingerprint) {
+            let fingerprint = match mimeparser.lookup_field("Secure-Join-Fingerprint") {
                Some(fp) => fp,
                None => {
                    could_not_establish_secure_connection(
@@ -497,7 +496,7 @@ pub(crate) fn handle_securejoin_handshake(
            }
            info!(context, "Fingerprint verified.",);
            // verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code
-            let auth_0 = match mimeparser.get(HeaderDef::SecureJoinAuth) {
+            let auth_0 = match mimeparser.lookup_field("Secure-Join-Auth") {
                Some(auth) => auth,
                None => {
                    could_not_establish_secure_connection(
@@ -527,7 +526,7 @@ pub(crate) fn handle_securejoin_handshake(
            inviter_progress!(context, contact_id, 600);
            if join_vg {
                let field_grpid = mimeparser
-                    .get(HeaderDef::SecureJoinGroup)
+                    .lookup_field("Secure-Join-Group")
                    .map(|s| s.as_str())
                    .unwrap_or_else(|| "");
                let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, field_grpid);
@@ -601,7 +600,7 @@ pub(crate) fn handle_securejoin_handshake(
            Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinJoined);
            emit_event!(context, Event::ContactsChanged(None));
            let cg_member_added = mimeparser
-                .get(HeaderDef::ChatGroupMemberAdded)
+                .lookup_field("Chat-Group-Member-Added")
                .map(|s| s.as_str())
                .unwrap_or_else(|| "");
            if join_vg && !addr_equals_self(context, cg_member_added) {
@@ -636,7 +635,7 @@ pub(crate) fn handle_securejoin_handshake(
                inviter_progress!(context, contact_id, 800);
                inviter_progress!(context, contact_id, 1000);
                let field_grpid = mimeparser
-                    .get(HeaderDef::SecureJoinGroup)
+                    .lookup_field("Secure-Join-Group")
                    .map(|s| s.as_str())
                    .unwrap_or_else(|| "");
                let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, &field_grpid);
@@ -718,7 +717,7 @@ fn mark_peer_as_verified(context: &Context, fingerprint: impl AsRef<str>) -> Res
 ******************************************************************************/

 fn encrypted_and_signed(mimeparser: &MimeParser, expected_fingerprint: impl AsRef<str>) -> bool {
-    if !mimeparser.was_encrypted() {
+    if !mimeparser.encrypted {
        warn!(mimeparser.context, "Message not encrypted.",);
        false
    } else if mimeparser.signatures.is_empty() {
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -2,10 +2,10 @@

 pub mod send;

-use async_smtp::smtp::client::net::*;
-use async_smtp::*;
+use lettre::smtp::client::net::*;
+use lettre::*;

-use async_std::task;
+use failure::Fail;

 use crate::constants::*;
 use crate::context::Context;
@@ -21,12 +21,12 @@ pub enum Error {
    InvalidLoginAddress {
        address: String,
        #[cause]
-        error: async_smtp::error::Error,
+        error: lettre::error::Error,
    },
    #[fail(display = "SMTP failed to connect: {:?}", _0)]
-    ConnectionFailure(#[cause] async_smtp::smtp::error::Error),
+    ConnectionFailure(#[cause] lettre::smtp::error::Error),
    #[fail(display = "SMTP: failed to setup connection {:?}", _0)]
-    ConnectionSetupFailure(#[cause] async_smtp::smtp::error::Error),
+    ConnectionSetupFailure(#[cause] lettre::smtp::error::Error),
    #[fail(display = "SMTP: oauth2 error {:?}", _0)]
    Oauth2Error { address: String },
 }
@@ -36,7 +36,8 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[derive(Default, DebugStub)]
 pub struct Smtp {
    #[debug_stub(some = "SmtpTransport")]
-    transport: Option<async_smtp::smtp::SmtpTransport>,
+    transport: Option<lettre::smtp::SmtpTransport>,
+    transport_connected: bool,
    /// Email address we are sending from.
    from: Option<EmailAddress>,
 }
@@ -49,12 +50,16 @@ impl Smtp {

    /// Disconnect the SMTP transport and drop it entirely.
    pub fn disconnect(&mut self) {
-        if let Some(ref mut transport) = self.transport.take() {
-            transport.close();
+        if self.transport.is_none() || !self.transport_connected {
+            return;
        }
+
+        let mut transport = self.transport.take().unwrap();
+        transport.close();
+        self.transport_connected = false;
    }

-    /// check whether we are connected
+    /// Check if a connection already exists.
    pub fn is_connected(&self) -> bool {
        self.transport.is_some()
    }
@@ -96,21 +101,21 @@ impl Smtp {
            }
            let user = &lp.send_user;
            (
-                async_smtp::smtp::authentication::Credentials::new(
+                lettre::smtp::authentication::Credentials::new(
                    user.to_string(),
                    access_token.unwrap_or_default(),
                ),
-                vec![async_smtp::smtp::authentication::Mechanism::Xoauth2],
+                vec![lettre::smtp::authentication::Mechanism::Xoauth2],
            )
        } else {
            // plain
            let user = lp.send_user.clone();
            let pw = lp.send_pw.clone();
            (
-                async_smtp::smtp::authentication::Credentials::new(user, pw),
+                lettre::smtp::authentication::Credentials::new(user, pw),
                vec![
-                    async_smtp::smtp::authentication::Mechanism::Plain,
-                    async_smtp::smtp::authentication::Mechanism::Login,
+                    lettre::smtp::authentication::Mechanism::Plain,
+                    lettre::smtp::authentication::Mechanism::Login,
                ],
            )
        };
@@ -118,26 +123,24 @@ impl Smtp {
        let security = if 0
            != lp.server_flags & (DC_LP_SMTP_SOCKET_STARTTLS | DC_LP_SMTP_SOCKET_PLAIN) as i32
        {
-            async_smtp::smtp::ClientSecurity::Opportunistic(tls_parameters)
+            lettre::smtp::ClientSecurity::Opportunistic(tls_parameters)
        } else {
-            async_smtp::smtp::ClientSecurity::Wrapper(tls_parameters)
+            lettre::smtp::ClientSecurity::Wrapper(tls_parameters)
        };

-        let client = task::block_on(async_smtp::smtp::SmtpClient::with_security(
-            (domain.as_str(), port),
-            security,
-        ))
-        .map_err(Error::ConnectionSetupFailure)?;
+        let client = lettre::smtp::SmtpClient::new((domain.as_str(), port), security)
+            .map_err(Error::ConnectionSetupFailure)?;

        let client = client
            .smtp_utf8(true)
            .credentials(creds)
            .authentication_mechanism(mechanism)
-            .connection_reuse(async_smtp::smtp::ConnectionReuseParameters::ReuseUnlimited);
-        let mut trans = client.into_transport();
-        task::block_on(trans.connect()).map_err(Error::ConnectionFailure)?;
+            .connection_reuse(lettre::smtp::ConnectionReuseParameters::ReuseUnlimited);
+        let mut trans = client.transport();
+        trans.connect().map_err(Error::ConnectionFailure)?;

        self.transport = Some(trans);
+        self.transport_connected = true;
        context.call_cb(Event::SmtpConnected(format!(
            "SMTP-LOGIN as {} ok",
            lp.send_user,
--- a/src/smtp/send.rs
+++ b/src/smtp/send.rs
@@ -1,7 +1,7 @@
 //! # SMTP message sending

 use super::Smtp;
-use async_smtp::*;
+use lettre::*;

 use crate::context::Context;
 use crate::events::Event;
@@ -11,9 +11,9 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[derive(Debug, Fail)]
 pub enum Error {
    #[fail(display = "Envelope error: {}", _0)]
-    EnvelopeError(#[cause] async_smtp::error::Error),
+    EnvelopeError(#[cause] lettre::error::Error),
    #[fail(display = "Send error: {}", _0)]
-    SendError(#[cause] async_smtp::smtp::error::Error),
+    SendError(#[cause] lettre::smtp::error::Error),
    #[fail(display = "SMTP has no transport")]
    NoTransport,
 }
@@ -21,7 +21,7 @@ pub enum Error {
 impl Smtp {
    /// Send a prepared mail to recipients.
    /// On successful send out Ok() is returned.
-    pub async fn send(
+    pub fn send(
        &mut self,
        context: &Context,
        recipients: Vec<EmailAddress>,
@@ -36,21 +36,22 @@ impl Smtp {
            .collect::<Vec<String>>()
            .join(",");

-        let envelope =
-            Envelope::new(self.from.clone(), recipients).map_err(Error::EnvelopeError)?;
-        let mail = SendableEmail::new(
-            envelope,
-            format!("{}", job_id), // only used for internal logging
-            message,
-        );
        if let Some(ref mut transport) = self.transport {
-            transport.send(mail).await.map_err(Error::SendError)?;
+            let envelope =
+                Envelope::new(self.from.clone(), recipients).map_err(Error::EnvelopeError)?;
+            let mail = SendableEmail::new(
+                envelope,
+                format!("{}", job_id), // only used for internal logging
+                message,
+            );
+
+            transport.send(mail).map_err(Error::SendError)?;

            context.call_cb(Event::SmtpMessageSent(format!(
                "Message len={} was smtp-sent to {}",
                message_len, recipients_display
            )));
-
+            self.transport_connected = true;
            Ok(())
        } else {
            warn!(
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -1,5 +1,7 @@
 //! # SQLite wrapper

+use failure::Fail;
+
 use std::collections::HashSet;
 use std::sync::{Arc, RwLock};
 use std::time::Duration;
--- a/test-data/message/html_attach.eml
+++ b/test-data/message/html_attach.eml
@@ -1,25 +0,0 @@
-Chat-Disposition-Notification-To: tmp_6272287793210918@testrun.org
-Subject: =?utf-8?q?Chat=3A_File_=E2=80=93_test=2Ehtml?=
-Message-ID: Mr.XA6y3og8-az.WGbH9_dNcQx@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-X-Mailer: Delta Chat Core 1.0.0-beta.12/DcFFI
-Chat-Version: 1.0
-To: <tmp_5890965001269692@testrun.org>
-From: "=?utf-8?q??=" <tmp_6272287793210918@testrun.org>
-Content-Type: multipart/mixed; boundary="mwkNRwaJw1M5n2xcr2ODfAqvTjcj9Z"
-
-
--mwkNRwaJw1M5n2xcr2ODfAqvTjcj9Z
-Content-Type: text/plain; charset=utf-8
-
-- 
-Sent with my Delta Chat Messenger: https://delta.chat
-
--mwkNRwaJw1M5n2xcr2ODfAqvTjcj9Z
-Content-Type: text/html
-Content-Disposition: attachment; filename="test.html"
-Content-Transfer-Encoding: base64
-
-PGh0bWw+PGJvZHk+dGV4dDwvYm9keT5kYXRh
-
--mwkNRwaJw1M5n2xcr2ODfAqvTjcj9Z--
--- a/test-data/message/mail_attach_txt.eml
+++ b/test-data/message/mail_attach_txt.eml
@@ -1,40 +0,0 @@
-From holger@merlinux.eu Sat Dec  7 11:53:58 2019
-Return-Path: <holger@merlinux.eu>
-X-Original-To: holger+test@merlinux.eu
-Delivered-To: holger+test@merlinux.eu
-Received: from [127.0.0.1] (localhost [127.0.0.1])
-	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by mail.merlinux.eu (Postfix) with ESMTPSA id 61825100531;
-	Sat,  7 Dec 2019 10:53:58 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=merlinux.eu;
-	s=default; t=1575716038;
-	bh=xhaPssQzVOHRafcciTQqDnZ1Zi4GMwsmg9pHLH3i8P8=;
-	h=Date:From:To:Subject;
-	b=U4HxGDZ8RwLwRPFtIvRsb+x5BiyICnbbY2ZOGlZdLt12MuDTfiYi/phHiQUC402EY
-	 GXb8dYgYr5+0PDiPBa7dyt2VQLC/h9QRfOA82tb1vpJYC+KksSAH0nYQqJvs7XrqCN
-	 i95/jwZnsWrV7w72+xsrO5qPujIE68TmM5I9Cyec=
-Received: by beto.merlinux.eu (Postfix, from userid 1000)
-	id 229D3820070; Sat,  7 Dec 2019 11:53:58 +0100 (CET)
-Date: Sat, 7 Dec 2019 11:53:57 +0100
-From: holger krekel <holger@merlinux.eu>
-To: holger+test@merlinux.eu
-Subject: hello
-Message-ID: <20191207105357.GA6266@beto>
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="YiEDa0DAkWCtVeE4"
-Content-Disposition: inline
-
--YiEDa0DAkWCtVeE4
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-siehe anhang
-
--YiEDa0DAkWCtVeE4
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: attachment; filename="x.txt"
-
-hello
-
--YiEDa0DAkWCtVeE4--
Author	SHA1	Message	Date
holger krekel	944a397ea8	use encoded-words crate, which friedel ported from python	2019-12-05 18:56:34 +01:00
holger krekel	225fdf560a	try fix filename encoding bug -- fails in one test	2019-12-05 14:52:16 +01:00
dignifiedquire	454aa90ed6	switch to quoted-printable, which is already used by mailparse	2019-12-05 13:23:31 +01:00
holger krekel	9b2c04ad34	use rfc2047 crate from @valodim and remove dc_strencode.rs completely	2019-12-05 13:11:51 +01:00
holger krekel	7e907f3f54	fix multi-line subject encoding and introduce MIME debugging env var	2019-12-05 11:06:42 +01:00