remove debug logging and fix update_gossip_headers location

refactor: unsafe, CStr and libc moved out
cleanup mimeparser and use mime
2026-04-03 14:02:10 +03:00 · 2019-12-03 10:59:30 +01:00 · 2019-12-02 15:29:47 +01:00 · 2019-12-02 08:44:51 +01:00 · 2019-12-02 00:11:11 +01:00 · 2019-12-02 00:01:37 +01:00
64 changed files with 1663 additions and 2367 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,67 +1,5 @@
 # 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
-
- fix grpid-determination from in-reply-to and references headers. @hpk42
-
- only send Autocrypt-gossip headers on encrypted messages. @dignifiedquire
-
- fix reply-to-encrypted message to also be encrypted. @hpk42
-
- 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
-
- historic: we now use the mailparse crate and lettre-email to generate mime
-  messages.  This got rid of mmime completely, the C2rust generated port of the libetpan 
-  mime-parse -- IOW 22KLocs of cumbersome code removed! see 
-  https://github.com/deltachat/deltachat-core-rust/pull/904#issuecomment-561163330
-  many thanks @dignifiedquire for making everybody's life easier 
-  and @jonhoo (from rust-imap fame) for suggesting to use the mailparse crate :) 
-
- lots of improvements and better error handling in many rust modules 
-  thanks @link2xt @flub @r10s, @hpk42 and @dignifiedquire 
-
- @r10s introduced a new device chat which has an initial
-  welcome message.  See 
-  https://c.delta.chat/classdc__context__t.html#a1a2aad98bd23c1d21ee42374e241f389
-  for the main new FFI-API.
-
- fix moving self-sent messages, thanks @r10s, @flub, @hpk42
-
- fix flakyness/sometimes-failing verified/join-protocols, 
-  thanks @flub, @r10s, @hpk42
-
- fix reply-to-encrypted message to keep encryption 
-
- new DC_EVENT_SECUREJOIN_MEMBER_ADDED event 
-
- many little fixes and rustifications (@link2xt, @flub, @hpk42)
-
-
 ## 1.0.0-beta.8

 - now uses async-email/async-imap as the new base 
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -607,7 +607,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.8"
 dependencies = [
 "async-imap 0.1.1 (git+https://github.com/async-email/async-imap)",
 "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -620,7 +620,6 @@ dependencies = [
 "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "debug_stub_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "deltachat_derive 0.1.0",
- "encoded-words 0.1.0 (git+https://github.com/async-email/encoded-words)",
 "escaper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -683,9 +682,9 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.8"
 dependencies = [
- "deltachat 1.0.0-beta.12",
+ "deltachat 1.0.0-beta.8",
 "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)",
@@ -797,20 +796,6 @@ dependencies = [
 "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "encoded-words"
-version = "0.1.0"
-source = "git+https://github.com/async-email/encoded-words#2631c258183620f6d976abffabbfc2dcc697d793"
-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)",
- "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "encoding"
 version = "0.2.33"
@@ -1167,7 +1152,7 @@ dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1207,7 +1192,7 @@ dependencies = [

 [[package]]
 name = "http"
-version = "0.1.21"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1222,7 +1207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1264,7 +1249,7 @@ dependencies = [
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1338,7 +1323,7 @@ dependencies = [
 [[package]]
 name = "imap-proto"
 version = "0.9.1"
-source = "git+https://github.com/djc/tokio-imap#2b8701b83c50085b7ffcdf26a95146b91f93a6d5"
+source = "git+https://github.com/djc/tokio-imap#a26056915f1d715f97935da1f0c97c6d0174f292"
 dependencies = [
 "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1471,7 +1456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1818,7 +1803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "pgp"
 version = "0.3.2"
-source = "git+https://github.com/rpgp/rpgp#8928a249f848d46889f618fde914417f698ea76f"
+source = "git+https://github.com/rpgp/rpgp#4cc60a1e45a781ea6e7f394ae2583844ac75d214"
 dependencies = [
 "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2278,7 +2263,7 @@ dependencies = [
 "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2775,24 +2760,6 @@ dependencies = [
 "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "thiserror"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.9"
-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 = "thread-local-object"
 version = "0.1.0"
@@ -3102,7 +3069,7 @@ dependencies = [

 [[package]]
 name = "vcpkg"
-version = "0.2.8"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -3461,7 +3428,6 @@ dependencies = [
 "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"
 "checksum email 0.0.21 (git+https://github.com/deltachat/rust-email)" = "<none>"
-"checksum encoded-words 0.1.0 (git+https://github.com/async-email/encoded-words)" = "<none>"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
 "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
 "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
@@ -3511,7 +3477,7 @@ dependencies = [
 "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.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 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "2790658cddc82e82b08e25176c431d7015a0adeb1718498715cbd20138a0bf68"
 "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"
 "checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd"
@@ -3678,8 +3644,6 @@ dependencies = [
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
-"checksum thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e"
-"checksum thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef"
 "checksum thread-local-object 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7da3caa820d0308c84c8654f6cafd81cc3195d45433311cbe22fcf44fc8be071"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
@@ -3715,7 +3679,7 @@ dependencies = [
 "checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d"
 "checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363"
 "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
-"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
+"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.8"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"
@@ -54,7 +54,6 @@ rustls = "0.16.0"
 webpki-roots = "0.18.0"
 webpki = "0.21.0"
 mailparse = "0.10.1"
-encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }

 [dev-dependencies]
 tempfile = "3.0"
--- a/README.md
+++ b/README.md
@@ -87,15 +87,6 @@ $ cargo test --all
 $ cargo build -p deltachat_ffi --release
 ```

-## Debugging environment variables 
-
- `DCC_IMAP_DEBUG`: if set IMAP protocol commands and responses will be
-  printed
-
- `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
-
-
-
 ### Expensive tests

 Some tests are expensive and marked with `#[ignore]`, to run these
--- 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/assets/welcome-image.jpg
+++ b/assets/welcome-image.jpg
--- 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.8"
 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,32 +1134,11 @@ 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);


-/**
- * Init device-messages and saved-messages chat.
- * This function adds the device-chat and saved-messages chat
- * and adds one or more welcome or update-messages.
- * The ui can add messages on its own using dc_add_device_msg() -
- * for ordering, either before or after or even without calling this function.
- *
- * Chat and message creation is done only once.
- * So if the user has manually deleted things, they won't be re-created
- * (however, not seen device messages are added and may re-create the device-chat).
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @return None.
- */
-void            dc_update_device_chats       (dc_context_t* context);
-
-
 /**
 * Check if a device-message with a given label was ever added.
 * Device-messages can be added dc_add_device_msg().
@@ -1962,7 +1929,7 @@ void            dc_imex                      (dc_context_t* context, int what, c
 *         }
 *         while (!configure_succeeded())
 *     }
- *     dc_str_unref(file);
+ *     free(file);
 * }
 * ~~~
 *
@@ -2617,25 +2584,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
 *
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -851,21 +851,6 @@ pub unsafe extern "C" fn dc_add_device_msg(
        .unwrap_or(0)
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_update_device_chats(context: *mut dc_context_t) {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_update_device_chats()");
-        return;
-    }
-    let ffi_context = &mut *context;
-    ffi_context
-        .with_inner(|ctx| {
-            ctx.update_device_chats()
-                .unwrap_or_log_default(ctx, "Failed to add device message")
-        })
-        .unwrap_or(())
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_was_device_msg_ever_added(
    context: *mut dc_context_t,
@@ -2377,27 +2362,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/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -832,9 +832,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
            msg.set_text(Some(arg1.to_string()));
            chat::add_device_msg(context, None, Some(&mut msg))?;
        }
-        "updatedevicechats" => {
-            context.update_device_chats()?;
-        }
        "listmedia" => {
            ensure!(sel_chat.is_some(), "No chat selected.");

@@ -879,7 +876,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
        }
        "forward" => {
            ensure!(
-                !arg1.is_empty() && !arg2.is_empty(),
+                !arg1.is_empty() && arg2.is_empty(),
                "Arguments <msg-id> <chat-id> expected"
            );

--- 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
@@ -243,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):
@@ -331,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):
@@ -351,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/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
@@ -57,6 +58,8 @@ class Message(object):

    def set_text(self, text):
        """set text of this message. """
+        assert self.id > 0, "message not prepared"
+        assert self.is_out_preparing()
        lib.dc_msg_set_text(self._dc_msg, as_dc_charpointer(text))

    @props.with_doc
@@ -69,6 +72,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
--- 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,65 +430,6 @@ 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):
-        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)
-            message = chat.prepare_message(msg1)
-            assert message.is_out_preparing()
-            assert message.text == "withfile"
-            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
-            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")
-
-        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
-        assert msg.filename.endswith(basename)
-
    def test_mvbox_sentbox_threads(self, acfactory, lp):
        lp.sec("ac1: start with mvbox thread")
        ac1 = acfactory.get_online_configuring_account(mvbox=True, sentbox=True)
@@ -546,32 +475,27 @@ class TestOnlineAccount:
        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")

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

-        lp.sec("ac1: send message to ac2")
        msg_out = chat.send_text("message2")

-        lp.sec("ac2: wait for receive")
+        # wait for other account to receive
        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
        assert ev[2] == msg_out.id
        msg_in = ac2.get_message_by_id(msg_out.id)
        assert msg_in.text == "message2"

-        lp.sec("ac2: check that the message arrive in deaddrop")
+        # check the message arrived in contact-requests/deaddrop
        chat2 = msg_in.chat
        assert msg_in in chat2.get_messages()
        assert not msg_in.is_forwarded()
        assert chat2.is_deaddrop()
        assert chat2 == ac2.get_deaddrop_chat()
-
-        lp.sec("ac2: create new chat and forward message to it")
        chat3 = ac2.create_group_chat("newgroup")
        assert not chat3.is_promoted()
        ac2.forward_messages([msg_in], chat3)
-
-        lp.sec("ac2: check new chat has a forwarded message")
        assert chat3.is_promoted()
        messages = chat3.get_messages()
        msg = messages[-1]
@@ -705,71 +629,6 @@ class TestOnlineAccount:
        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
        assert not msg.is_encrypted()

-    def test_send_first_message_as_long_unicode_with_cr(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        ac2.set_config("save_mime_headers", "1")
-
-        lp.sec("ac1: create chat with ac2")
-        chat = self.get_chat(ac1, ac2, both_created=True)
-
-        lp.sec("sending multi-line non-unicode message from ac1 to ac2")
-        text1 = "hello\nworld"
-        msg_out = chat.send_text(text1)
-        assert not msg_out.is_encrypted()
-
-        lp.sec("sending multi-line unicode text message from ac1 to ac2")
-        text2 = "äalis\nthis is ßßÄ"
-        msg_out = chat.send_text(text2)
-        assert not msg_out.is_encrypted()
-
-        lp.sec("wait for ac2 to receive multi-line non-unicode message")
-        msg_in = ac2.wait_next_incoming_message()
-        assert msg_in.text == text1
-
-        lp.sec("wait for ac2 to receive multi-line unicode message")
-        msg_in = ac2.wait_next_incoming_message()
-        assert msg_in.text == text2
-        assert ac1.get_config("addr") in msg_in.chat.get_name()
-
-    def test_reply_encrypted(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        lp.sec("ac1: create chat with ac2")
-        chat = self.get_chat(ac1, ac2)
-
-        lp.sec("sending text message from ac1 to ac2")
-        msg_out = chat.send_text("message1")
-        assert not msg_out.is_encrypted()
-
-        lp.sec("wait for ac2 to receive message")
-        ev = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        msg_in = ac2.get_message_by_id(msg_out.id)
-        assert msg_in.text == "message1"
-        assert not msg_in.is_encrypted()
-
-        lp.sec("create new chat with contact and send back (encrypted) message")
-        chat2b = ac2.create_chat_by_message(msg_in)
-        chat2b.send_text("message-back")
-
-        lp.sec("wait for ac1 to receive message")
-        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        assert ev[1] == chat.id
-        msg_back = ac1.get_message_by_id(ev[2])
-        assert msg_back.text == "message-back"
-        assert msg_back.is_encrypted()
-
-        lp.sec("ac1: e2ee_enabled=0 and see if reply is encrypted")
-        print("ac1: e2ee_enabled={}".format(ac1.get_config("e2ee_enabled")))
-        print("ac2: e2ee_enabled={}".format(ac2.get_config("e2ee_enabled")))
-        ac1.set_config("e2ee_enabled", "0")
-        chat.send_text("message2 -- should be encrypted")
-
-        lp.sec("wait for ac2 to receive message")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        msg_in = ac2.get_message_by_id(ev[2])
-        assert msg_in.text == "message2 -- should be encrypted"
-        assert msg_in.is_encrypted()
-
    def test_saved_mime_on_received_message(self, acfactory, lp):
        ac1, ac2 = acfactory.get_two_online_accounts()

--- a/python/tests/test_increation.py
+++ b/python/tests/test_increation.py
@@ -57,13 +57,13 @@ class TestOnlineInCreation:

        lp.sec("wait1 for original or forwarded messages to arrive")
        ev1 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ev1[1] > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev1[1] >= const.DC_CHAT_ID_LAST_SPECIAL
        received_original = ac2.get_message_by_id(ev1[2])
        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] >= 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, 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
--- a/set_core_version.py
+++ b/set_core_version.py
@@ -33,8 +33,6 @@ def replace_toml_version(relpath, newversion):
 if __name__ == "__main__":

    if len(sys.argv) < 2:
-        for x in ("Cargo.toml", "deltachat-ffi/Cargo.toml"):
-            print("{}: {}".format(x, read_toml_version(x)))
        raise SystemExit("need argument: new version, example 1.0.0-beta.27")
    newversion = sys.argv[1]
    if newversion.count(".") < 2:
--- a/src/aheader.rs
+++ b/src/aheader.rs
@@ -76,6 +76,7 @@ impl Aheader {
        if let Ok(Some(value)) = headers.get_first_value("Autocrypt") {
            match Self::from_str(&value) {
                Ok(header) => {
+                    info!(context, "comparing {} - {}", header.addr, wanted_from);
                    if addr_cmp(&header.addr, wanted_from) {
                        return Some(header);
                    }
@@ -95,25 +96,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 +151,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 +177,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 +194,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 +207,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 +245,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
@@ -483,23 +483,23 @@ mod tests {
    #[test]
    fn test_suffix() {
        let t = dummy_context();
-        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
-        assert_eq!(blob.suffix(), Some("txt"));
-        let blob = BlobObject::create(&t.ctx, "bar", b"world").unwrap();
-        assert_eq!(blob.suffix(), None);
+        let foo = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
+        assert_eq!(foo.suffix(), Some("txt"));
+        let bar = BlobObject::create(&t.ctx, "bar", b"world").unwrap();
+        assert_eq!(bar.suffix(), None);
    }

    #[test]
    fn test_create_dup() {
        let t = dummy_context();
        BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
-        let foo_path = t.ctx.get_blobdir().join("foo.txt");
-        assert!(foo_path.exists());
+        let foo = t.ctx.get_blobdir().join("foo.txt");
+        assert!(foo.exists());
        BlobObject::create(&t.ctx, "foo.txt", b"world").unwrap();
        for dirent in fs::read_dir(t.ctx.get_blobdir()).unwrap() {
            let fname = dirent.unwrap().file_name();
-            if fname == foo_path.file_name().unwrap() {
-                assert_eq!(fs::read(&foo_path).unwrap(), b"hello");
+            if fname == foo.file_name().unwrap() {
+                assert_eq!(fs::read(&foo).unwrap(), b"hello");
            } else {
                let name = fname.to_str().unwrap();
                assert!(name.starts_with("foo"));
@@ -512,13 +512,13 @@ mod tests {
    fn test_double_ext_preserved() {
        let t = dummy_context();
        BlobObject::create(&t.ctx, "foo.tar.gz", b"hello").unwrap();
-        let foo_path = t.ctx.get_blobdir().join("foo.tar.gz");
-        assert!(foo_path.exists());
+        let foo = t.ctx.get_blobdir().join("foo.tar.gz");
+        assert!(foo.exists());
        BlobObject::create(&t.ctx, "foo.tar.gz", b"world").unwrap();
        for dirent in fs::read_dir(t.ctx.get_blobdir()).unwrap() {
            let fname = dirent.unwrap().file_name();
-            if fname == foo_path.file_name().unwrap() {
-                assert_eq!(fs::read(&foo_path).unwrap(), b"hello");
+            if fname == foo.file_name().unwrap() {
+                assert_eq!(fs::read(&foo).unwrap(), b"hello");
            } else {
                let name = fname.to_str().unwrap();
                println!("{}", name);
--- 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::*;
@@ -260,6 +259,8 @@ impl Chat {
        msg: &mut Message,
        timestamp: i64,
    ) -> Result<MsgId, Error> {
+        let mut do_guarantee_e2ee: bool;
+        let e2ee_enabled: bool;
        let mut new_references = "".into();
        let mut new_in_reply_to = "".into();
        let mut msg_id = 0;
@@ -310,20 +311,24 @@ impl Chat {
                        self.id
                    );
                }
-            } else if self.typ == Chattype::Group
-                || self.typ == Chattype::VerifiedGroup
-                    && self.param.get_int(Param::Unpromoted).unwrap_or_default() == 1
-            {
-                self.param.remove(Param::Unpromoted);
-                self.update_param(context)?;
+            } else {
+                if self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup {
+                    if self.param.get_int(Param::Unpromoted).unwrap_or_default() == 1 {
+                        self.param.remove(Param::Unpromoted);
+                        self.update_param(context)?;
+                    }
+                }
            }

-            /* check if we want to encrypt this message.  If yes and circumstances change
+            /* check if we can guarantee E2EE for this message.
+            if we guarantee E2EE, and circumstances change
            so that E2EE is no longer available at a later point (reset, changed settings),
-            we might not send the message out at all */
-            if msg.param.get_int(Param::ForcePlaintext).unwrap_or_default() == 0 {
+            we do not send the message out at all */
+            do_guarantee_e2ee = false;
+            e2ee_enabled = context.get_config_bool(Config::E2eeEnabled);
+            if e2ee_enabled && msg.param.get_int(Param::ForcePlaintext).unwrap_or_default() == 0 {
                let mut can_encrypt = true;
-                let mut all_mutual = context.get_config_bool(Config::E2eeEnabled);
+                let mut all_mutual = true;

                // take care that this statement returns NULL rows
                // if there is no peerstates for a chat member!
@@ -370,13 +375,18 @@ impl Chat {
                    }
                }

-                if can_encrypt
-                    && (all_mutual || last_msg_in_chat_encrypted(context, &context.sql, self.id))
-                {
-                    msg.param.set_int(Param::GuaranteeE2ee, 1);
+                if can_encrypt {
+                    if all_mutual {
+                        do_guarantee_e2ee = true;
+                    } else if last_msg_in_chat_encrypted(context, &context.sql, self.id) {
+                        do_guarantee_e2ee = true;
+                    }
                }
            }
-            // reset encrypt error state eg. for forwarding
+            if do_guarantee_e2ee {
+                msg.param.set_int(Param::GuaranteeE2ee, 1);
+            }
+            // reset eg. for forwarding
            msg.param.remove(Param::ErroneousE2ee);

            // set "In-Reply-To:" to identify the message to which the composed message is a reply;
@@ -409,15 +419,15 @@ impl Chat {
                    } else if !parent_in_reply_to.is_empty() && !parent_rfc724_mid.is_empty() {
                        new_references = format!("{} {}", parent_in_reply_to, parent_rfc724_mid);
                    } else if !parent_in_reply_to.is_empty() {
-                        new_references = parent_in_reply_to;
+                        new_references = parent_in_reply_to.clone();
                    }
                }
            }

            // add independent location to database

-            if msg.param.exists(Param::SetLatitude)
-                && sql::execute(
+            if msg.param.exists(Param::SetLatitude) {
+                if sql::execute(
                    context,
                    &context.sql,
                    "INSERT INTO locations \
@@ -432,16 +442,17 @@ impl Chat {
                    ],
                )
                .is_ok()
-            {
-                location_id = sql::get_rowid2(
-                    context,
-                    &context.sql,
-                    "locations",
-                    "timestamp",
-                    timestamp,
-                    "from_id",
-                    DC_CONTACT_ID_SELF as i32,
-                );
+                {
+                    location_id = sql::get_rowid2(
+                        context,
+                        &context.sql,
+                        "locations",
+                        "timestamp",
+                        timestamp,
+                        "from_id",
+                        DC_CONTACT_ID_SELF as i32,
+                    );
+                }
            }

            // add message to the database
@@ -498,7 +509,7 @@ impl Chat {
 /// chat messages, use dc_get_chat_msgs().
 ///
 /// If the user is asked before creation, he should be
-/// asked whether he wants to chat with the *contact* belonging to the message;
+/// asked whether he wants to chat with the _contact_ belonging to the message;
 /// the group names may be really weird when taken from the subject of implicit
 /// groups and this may look confusing.
 ///
@@ -580,10 +591,6 @@ pub fn unblock(context: &Context, chat_id: u32) {
 }

 pub fn set_blocking(context: &Context, chat_id: u32, new_blocking: Blocked) -> bool {
-    if chat_id == 0 {
-        warn!(context, "ignoring setting of Block-status for chat_id=0");
-        return false;
-    }
    sql::execute(
        context,
        &context.sql,
@@ -725,21 +732,11 @@ fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<(), Error> {
    if msg.type_0 == Viewtype::Text {
        // the caller should check if the message text is empty
    } else if msgtype_has_file(msg.type_0) {
-        let blob = if let Some(f) = msg.param.get_file(Param::File, context)? {
-            match f {
-                ParamsFile::Blob(blob) => blob,
-                ParamsFile::FsPath(path) => {
-                    // path is outside the blobdir, let's copy
-                    let blob = BlobObject::create_and_copy(context, path)?;
-                    msg.param.set(Param::File, blob.as_name());
-
-                    blob
-                }
-            }
-        } else {
-            bail!("Attachment missing for message of type #{}", msg.type_0);
-        };
-
+        let blob = msg
+            .param
+            .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.
@@ -877,14 +874,17 @@ pub fn send_msg(context: &Context, chat_id: u32, msg: &mut Message) -> Result<Ms
        let forwards = msg.param.get(Param::PrepForwards);
        if let Some(forwards) = forwards {
            for forward in forwards.split(' ') {
-                if let Ok(msg_id) = forward
+                match forward
                    .parse::<u32>()
                    .map_err(|_| InvalidMsgId)
-                    .map(MsgId::new)
+                    .map(|id| MsgId::new(id))
                {
-                    if let Ok(mut msg) = Message::load_from_db(context, msg_id) {
-                        send_msg(context, 0, &mut msg)?;
-                    };
+                    Ok(msg_id) => {
+                        if let Ok(mut msg) = Message::load_from_db(context, msg_id) {
+                            send_msg(context, 0, &mut msg)?;
+                        };
+                    }
+                    Err(_) => (),
                }
            }
            msg.param.remove(Param::PrepForwards);
@@ -1726,8 +1726,12 @@ pub fn set_chat_name(
            if sql::execute(
                context,
                &context.sql,
-                "UPDATE chats SET name=? WHERE id=?;",
-                params![new_name.as_ref(), chat_id as i32],
+                format!(
+                    "UPDATE chats SET name='{}' WHERE id={};",
+                    new_name.as_ref(),
+                    chat_id as i32
+                ),
+                params![],
            )
            .is_ok()
            {
@@ -1845,7 +1849,6 @@ pub fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: u32) -> Resul

    unarchive(context, chat_id)?;
    if let Ok(mut chat) = Chat::load_from_db(context, chat_id) {
-        ensure!(chat.can_send(), "cannot send to chat #{}", chat_id);
        curr_timestamp = dc_create_smeared_timestamps(context, msg_ids.len());
        let ids = context.sql.query_map(
            format!(
@@ -1914,54 +1917,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
@@ -2029,7 +1984,6 @@ pub fn add_device_msg(
        chat_id = create_or_lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE, Blocked::Not)?.0;

        let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
-        msg.try_calc_and_set_dimensions(context).ok();
        prepare_msg_blob(context, msg)?;
        unarchive(context, chat_id)?;

@@ -2257,7 +2211,6 @@ mod tests {
        let chat = Chat::load_from_db(&t.ctx, chat_id);
        assert!(chat.is_ok());
        let chat = chat.unwrap();
-        assert_eq!(chat.get_type(), Chattype::Single);
        assert!(chat.is_device_talk());
        assert!(!chat.is_self_talk());
        assert!(!chat.can_send());
@@ -2325,22 +2278,6 @@ mod tests {
        assert_eq!(chatlist_len(&t.ctx, 0), 0)
    }

-    #[test]
-    fn test_device_chat_cannot_sent() {
-        let t = test_context(Some(Box::new(logging_cb)));
-        t.ctx.update_device_chats().unwrap();
-        let (device_chat_id, _) =
-            create_or_lookup_by_contact_id(&t.ctx, DC_CONTACT_ID_DEVICE, Blocked::Not).unwrap();
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some("message text".to_string());
-        assert!(send_msg(&t.ctx, device_chat_id, &mut msg).is_err());
-        assert!(prepare_msg(&t.ctx, device_chat_id, &mut msg).is_err());
-
-        let msg_id = add_device_msg(&t.ctx, None, Some(&mut msg)).unwrap();
-        assert!(forward_msgs(&t.ctx, &[msg_id], device_chat_id).is_err());
-    }
-
    fn chatlist_len(ctx: &Context, listflags: usize) -> usize {
        Chatlist::try_load(ctx, listflags, None, None)
            .unwrap()
@@ -2396,20 +2333,4 @@ mod tests {
        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 1);
        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 1);
    }
-
-    #[test]
-    fn test_set_chat_name() {
-        let t = dummy_context();
-        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo").unwrap();
-        assert_eq!(
-            Chat::load_from_db(&t.ctx, chat_id).unwrap().get_name(),
-            "foo"
-        );
-
-        set_chat_name(&t.ctx, chat_id, "bar").unwrap();
-        assert_eq!(
-            Chat::load_from_db(&t.ctx, chat_id).unwrap().get_name(),
-            "bar"
-        );
-    }
 }
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -60,7 +60,7 @@ impl Chatlist {
    ///   or "Not now".
    ///   The UI can also offer a "Close" button that calls dc_marknoticed_contact() then.
    /// - DC_CHAT_ID_ARCHIVED_LINK (6) - this special chat is present if the user has
-    ///   archived *any* chat using dc_archive_chat(). The UI should show a link as
+    ///   archived _any_ chat using dc_archive_chat(). The UI should show a link as
    ///   "Show archived chats", if the user clicks this item, the UI should show a
    ///   list of all archived chats that can be created by this function hen using
    ///   the DC_GCL_ARCHIVED_ONLY flag.
@@ -71,7 +71,7 @@ impl Chatlist {
    /// The `listflags` is a combination of flags:
    /// - if the flag DC_GCL_ARCHIVED_ONLY is set, only archived chats are returned.
    ///   if DC_GCL_ARCHIVED_ONLY is not set, only unarchived chats are returned and
-    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are *any* archived
+    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are _any_ archived
    ///   chats
    /// - if the flag DC_GCL_NO_SPECIALS is set, deaddrop and archive link are not added
    ///   to the list (may be used eg. for selecting chats on forwarding, the flag is
--- a/src/config.rs
+++ b/src/config.rs
@@ -28,38 +28,27 @@ pub enum Config {
    SendPort,
    SmtpCertificateChecks,
    ServerFlags,
-
    #[strum(props(default = "INBOX"))]
    ImapFolder,
-
    Displayname,
    Selfstatus,
    Selfavatar,
-
    #[strum(props(default = "0"))]
    BccSelf,
-
    #[strum(props(default = "1"))]
    E2eeEnabled,
-
    #[strum(props(default = "1"))]
    MdnsEnabled,
-
    #[strum(props(default = "1"))]
    InboxWatch,
-
    #[strum(props(default = "1"))]
    SentboxWatch,
-
    #[strum(props(default = "1"))]
    MvboxWatch,
-
    #[strum(props(default = "1"))]
    MvboxMove,
-
    #[strum(props(default = "0"))] // also change ShowEmails.default() on changes
    ShowEmails,
-
    SaveMimeHeaders,
    ConfiguredAddr,
    ConfiguredMailServer,
@@ -77,13 +66,11 @@ pub enum Config {
    ConfiguredSendSecurity,
    ConfiguredE2EEEnabled,
    Configured,
-
+    // Deprecated
    #[strum(serialize = "sys.version")]
    SysVersion,
-
    #[strum(serialize = "sys.msgsize_max_recommended")]
    SysMsgsizeMaxRecommended,
-
    #[strum(serialize = "sys.config_keys")]
    SysConfigKeys,
 }
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -1,43 +1,17 @@
-//! # Thunderbird's Autoconfiguration implementation
-//!
-//! Documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
+//! Thunderbird's Autoconfiguration implementation
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};

 use crate::constants::*;
 use crate::context::Context;
+use crate::error::Error;
 use crate::login_param::LoginParam;

-use super::read_url::read_url;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "Invalid email address: {:?}", _0)]
-    InvalidEmailAddress(String),
-
-    #[fail(display = "XML error at position {}", position)]
-    InvalidXml {
-        position: usize,
-        #[cause]
-        error: quick_xml::Error,
-    },
-
-    #[fail(display = "Bad or incomplete autoconfig")]
-    IncompleteAutoconfig(LoginParam),
-
-    #[fail(display = "Failed to get URL {}", _0)]
-    ReadUrlError(#[cause] super::read_url::Error),
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-impl From<super::read_url::Error> for Error {
-    fn from(err: super::read_url::Error) -> Error {
-        Error::ReadUrlError(err)
-    }
-}
-
-#[derive(Debug)]
+use super::read_autoconf_file;
+/* ******************************************************************************
+ * Thunderbird's Autoconfigure
+ ******************************************************************************/
+/* documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
 struct MozAutoconfigure<'a> {
    pub in_emailaddr: &'a str,
    pub in_emaildomain: &'a str,
@@ -49,14 +23,13 @@ struct MozAutoconfigure<'a> {
    pub tag_config: MozConfigTag,
 }

-#[derive(Debug, PartialEq)]
+#[derive(PartialEq)]
 enum MozServer {
    Undefined,
    Imap,
    Smtp,
 }

-#[derive(Debug)]
 enum MozConfigTag {
    Undefined,
    Hostname,
@@ -65,14 +38,15 @@ enum MozConfigTag {
    Username,
 }

-fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {
+pub fn moz_parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam, Error> {
    let mut reader = quick_xml::Reader::from_str(xml_raw);
    reader.trim_text(true);

    // Split address into local part and domain part.
-    let p = in_emailaddr
-        .find('@')
-        .ok_or_else(|| Error::InvalidEmailAddress(in_emailaddr.to_string()))?;
+    let p = match in_emailaddr.find('@') {
+        Some(i) => i,
+        None => bail!("Email address {} does not contain @", in_emailaddr),
+    };
    let (in_emaillocalpart, in_emaildomain) = in_emailaddr.split_at(p);
    let in_emaildomain = &in_emaildomain[1..];

@@ -89,22 +63,22 @@ fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {

    let mut buf = Vec::new();
    loop {
-        let event = reader
-            .read_event(&mut buf)
-            .map_err(|error| Error::InvalidXml {
-                position: reader.buffer_position(),
-                error,
-            })?;
-
-        match event {
-            quick_xml::events::Event::Start(ref e) => {
+        match reader.read_event(&mut buf) {
+            Ok(quick_xml::events::Event::Start(ref e)) => {
                moz_autoconfigure_starttag_cb(e, &mut moz_ac, &reader)
            }
-            quick_xml::events::Event::End(ref e) => moz_autoconfigure_endtag_cb(e, &mut moz_ac),
-            quick_xml::events::Event::Text(ref e) => {
+            Ok(quick_xml::events::Event::End(ref e)) => moz_autoconfigure_endtag_cb(e, &mut moz_ac),
+            Ok(quick_xml::events::Event::Text(ref e)) => {
                moz_autoconfigure_text_cb(e, &mut moz_ac, &reader)
            }
-            quick_xml::events::Event::Eof => break,
+            Err(e) => {
+                bail!(
+                    "Configure xml: Error at position {}: {:?}",
+                    reader.buffer_position(),
+                    e
+                );
+            }
+            Ok(quick_xml::events::Event::Eof) => break,
            _ => (),
        }
        buf.clear();
@@ -115,27 +89,27 @@ fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {
        || moz_ac.out.send_server.is_empty()
        || moz_ac.out.send_port == 0
    {
-        Err(Error::IncompleteAutoconfig(moz_ac.out))
-    } else {
-        Ok(moz_ac.out)
+        let r = moz_ac.out.to_string();
+        bail!("Bad or incomplete autoconfig: {}", r,);
    }
+
+    Ok(moz_ac.out)
 }

 pub fn moz_autoconfigure(
    context: &Context,
    url: &str,
    param_in: &LoginParam,
-) -> Result<LoginParam> {
-    let xml_raw = read_url(context, url)?;
+) -> Option<LoginParam> {
+    let xml_raw = read_autoconf_file(context, url)?;

-    let res = parse_xml(&param_in.addr, &xml_raw);
-    if let Err(err) = &res {
-        warn!(
-            context,
-            "Failed to parse Thunderbird autoconfiguration XML: {}", err
-        );
+    match moz_parse_xml(&param_in.addr, &xml_raw) {
+        Err(err) => {
+            warn!(context, "{}", err);
+            None
+        }
+        Ok(lp) => Some(lp),
    }
-    res
 }

 fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
@@ -340,7 +314,7 @@ mod tests {
    </loginPageInfo>
  </webMail>
 </clientConfig>";
-        let res = parse_xml("example@outlook.com", xml_raw).expect("XML parsing failed");
+        let res = moz_parse_xml("example@outlook.com", xml_raw).expect("XML parsing failed");
        assert_eq!(res.mail_server, "outlook.office365.com");
        assert_eq!(res.mail_port, 993);
        assert_eq!(res.send_server, "smtp.office365.com");
--- a/src/configure/auto_outlook.rs
+++ b/src/configure/auto_outlook.rs
@@ -1,41 +1,14 @@
-//! Outlook's Autodiscover
-
 use quick_xml;
 use quick_xml::events::BytesEnd;

 use crate::constants::*;
 use crate::context::Context;
+use crate::error::Error;
 use crate::login_param::LoginParam;

-use super::read_url::read_url;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "XML error at position {}", position)]
-    InvalidXml {
-        position: usize,
-        #[cause]
-        error: quick_xml::Error,
-    },
-
-    #[fail(display = "Bad or incomplete autoconfig")]
-    IncompleteAutoconfig(LoginParam),
-
-    #[fail(display = "Failed to get URL {}", _0)]
-    ReadUrlError(#[cause] super::read_url::Error),
-
-    #[fail(display = "Number of redirection is exceeded")]
-    RedirectionError,
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-impl From<super::read_url::Error> for Error {
-    fn from(err: super::read_url::Error) -> Error {
-        Error::ReadUrlError(err)
-    }
-}
+use super::read_autoconf_file;

+/// Outlook's Autodiscover
 struct OutlookAutodiscover {
    pub out: LoginParam,
    pub out_imap_set: bool,
@@ -52,7 +25,7 @@ enum ParsingResult {
    RedirectUrl(String),
 }

-fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
+fn outlk_parse_xml(xml_raw: &str) -> Result<ParsingResult, Error> {
    let mut outlk_ad = OutlookAutodiscover {
        out: LoginParam::new(),
        out_imap_set: false,
@@ -72,15 +45,8 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
    let mut current_tag: Option<String> = None;

    loop {
-        let event = reader
-            .read_event(&mut buf)
-            .map_err(|error| Error::InvalidXml {
-                position: reader.buffer_position(),
-                error,
-            })?;
-
-        match event {
-            quick_xml::events::Event::Start(ref e) => {
+        match reader.read_event(&mut buf) {
+            Ok(quick_xml::events::Event::Start(ref e)) => {
                let tag = String::from_utf8_lossy(e.name()).trim().to_lowercase();

                if tag == "protocol" {
@@ -95,11 +61,11 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
                    current_tag = Some(tag);
                }
            }
-            quick_xml::events::Event::End(ref e) => {
+            Ok(quick_xml::events::Event::End(ref e)) => {
                outlk_autodiscover_endtag_cb(e, &mut outlk_ad);
                current_tag = None;
            }
-            quick_xml::events::Event::Text(ref e) => {
+            Ok(quick_xml::events::Event::Text(ref e)) => {
                let val = e.unescape_and_decode(&reader).unwrap_or_default();

                if let Some(ref tag) = current_tag {
@@ -115,14 +81,21 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
                    };
                }
            }
-            quick_xml::events::Event::Eof => break,
+            Err(e) => {
+                bail!(
+                    "Configure xml: Error at position {}: {:?}",
+                    reader.buffer_position(),
+                    e
+                );
+            }
+            Ok(quick_xml::events::Event::Eof) => break,
            _ => (),
        }
        buf.clear();
    }

    // XML redirect via redirecturl
-    let res = if outlk_ad.config_redirecturl.is_none()
+    if outlk_ad.config_redirecturl.is_none()
        || outlk_ad.config_redirecturl.as_ref().unwrap().is_empty()
    {
        if outlk_ad.out.mail_server.is_empty()
@@ -130,34 +103,41 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
            || outlk_ad.out.send_server.is_empty()
            || outlk_ad.out.send_port == 0
        {
-            return Err(Error::IncompleteAutoconfig(outlk_ad.out));
+            let r = outlk_ad.out.to_string();
+            bail!("Bad or incomplete autoconfig: {}", r,);
        }
-        ParsingResult::LoginParam(outlk_ad.out)
+        Ok(ParsingResult::LoginParam(outlk_ad.out))
    } else {
-        ParsingResult::RedirectUrl(outlk_ad.config_redirecturl.unwrap())
-    };
-    Ok(res)
+        Ok(ParsingResult::RedirectUrl(
+            outlk_ad.config_redirecturl.unwrap(),
+        ))
+    }
 }

 pub fn outlk_autodiscover(
    context: &Context,
    url: &str,
    _param_in: &LoginParam,
-) -> Result<LoginParam> {
+) -> Option<LoginParam> {
    let mut url = url.to_string();
-    /* Follow up to 10 xml-redirects (http-redirects are followed in read_url() */
+    /* Follow up to 10 xml-redirects (http-redirects are followed in read_autoconf_file() */
    for _i in 0..10 {
-        let xml_raw = read_url(context, &url)?;
-        let res = parse_xml(&xml_raw);
-        if let Err(err) = &res {
-            warn!(context, "{}", err);
-        }
-        match res? {
-            ParsingResult::RedirectUrl(redirect_url) => url = redirect_url,
-            ParsingResult::LoginParam(login_param) => return Ok(login_param),
+        if let Some(xml_raw) = read_autoconf_file(context, &url) {
+            match outlk_parse_xml(&xml_raw) {
+                Err(err) => {
+                    warn!(context, "{}", err);
+                    return None;
+                }
+                Ok(res) => match res {
+                    ParsingResult::RedirectUrl(redirect_url) => url = redirect_url,
+                    ParsingResult::LoginParam(login_param) => return Some(login_param),
+                },
+            }
+        } else {
+            return None;
        }
    }
-    Err(Error::RedirectionError)
+    None
 }

 fn outlk_autodiscover_endtag_cb(event: &BytesEnd, outlk_ad: &mut OutlookAutodiscover) {
@@ -199,7 +179,7 @@ mod tests {

    #[test]
    fn test_parse_redirect() {
-        let res = parse_xml("
+        let res = outlk_parse_xml("
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
  <Autodiscover xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006\">
    <Response xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a\">
@@ -226,7 +206,7 @@ mod tests {

    #[test]
    fn test_parse_loginparam() {
-        let res = parse_xml(
+        let res = outlk_parse_xml(
            "\
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
 <Autodiscover xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006\">
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -1,9 +1,5 @@
 //! Email accounts autoconfiguration process module

-mod auto_mozilla;
-mod auto_outlook;
-mod read_url;
-
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};

 use crate::config::Config;
@@ -16,8 +12,10 @@ use crate::login_param::LoginParam;
 use crate::oauth2::*;
 use crate::param::Params;

-use auto_mozilla::moz_autoconfigure;
+mod auto_outlook;
 use auto_outlook::outlk_autodiscover;
+mod auto_mozilla;
+use auto_mozilla::moz_autoconfigure;

 macro_rules! progress {
    ($context:tt, $progress:expr) => {
@@ -168,7 +166,7 @@ pub fn JobConfigureImap(context: &Context) {
                        "https://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
                        param_domain, param_addr_urlencoded
                    );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                }
                true
            }
@@ -180,7 +178,7 @@ pub fn JobConfigureImap(context: &Context) {
                        "https://{}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={}",
                        param_domain, param_addr_urlencoded
                    );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                }
                true
            }
@@ -193,7 +191,7 @@ pub fn JobConfigureImap(context: &Context) {
                        "https://{}{}/autodiscover/autodiscover.xml",
                        "", param_domain
                    );
-                    param_autoconfig = outlk_autodiscover(context, &url, &param).ok();
+                    param_autoconfig = outlk_autodiscover(context, &url, &param);
                }
                true
            }
@@ -204,7 +202,7 @@ pub fn JobConfigureImap(context: &Context) {
                        "https://{}{}/autodiscover/autodiscover.xml",
                        "autodiscover.", param_domain
                    );
-                    param_autoconfig = outlk_autodiscover(context, &url, &param).ok();
+                    param_autoconfig = outlk_autodiscover(context, &url, &param);
                }
                true
            }
@@ -216,7 +214,7 @@ pub fn JobConfigureImap(context: &Context) {
                        "http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
                        param_domain, param_addr_urlencoded
                    );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                }
                true
            }
@@ -228,7 +226,7 @@ pub fn JobConfigureImap(context: &Context) {
                        "http://{}/.well-known/autoconfig/mail/config-v1.1.xml",
                        param_domain
                    );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                }
                true
            }
@@ -238,7 +236,7 @@ pub fn JobConfigureImap(context: &Context) {
                if param_autoconfig.is_none() {
                    /* always SSL for Thunderbird's database */
                    let url = format!("https://autoconfig.thunderbird.net/v1.1/{}", param_domain);
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                }
                true
            }
@@ -564,6 +562,27 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
    }
 }

+/*******************************************************************************
+ * Configure a Context
+ ******************************************************************************/
+
+pub fn read_autoconf_file(context: &Context, url: &str) -> Option<String> {
+    info!(context, "Testing {} ...", url);
+
+    match reqwest::Client::new()
+        .get(url)
+        .send()
+        .and_then(|mut res| res.text())
+    {
+        Ok(res) => Some(res),
+        Err(_err) => {
+            info!(context, "Can\'t read file.",);
+
+            None
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {

--- a/src/configure/read_url.rs
+++ b/src/configure/read_url.rs
@@ -1,26 +0,0 @@
-use crate::context::Context;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "URL request error")]
-    GetError(#[cause] reqwest::Error),
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-pub fn read_url(context: &Context, url: &str) -> Result<String> {
-    info!(context, "Requesting URL {}", url);
-
-    match reqwest::Client::new()
-        .get(url)
-        .send()
-        .and_then(|mut res| res.text())
-    {
-        Ok(res) => Ok(res),
-        Err(err) => {
-            info!(context, "Can\'t read URL {}", url);
-
-            Err(Error::GetError(err))
-        }
-    }
-}
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -23,17 +23,15 @@ use crate::stock::StockMessage;
 const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;

 /// An object representing a single contact in memory.
-///
 /// The contact object is not updated.
 /// If you want an update, you have to recreate the object.
 ///
 /// The library makes sure
 /// only to use names _authorized_ by the contact in `To:` or `Cc:`.
-/// *Given-names* as "Daddy" or "Honey" are not used there.
+/// _Given-names _as "Daddy" or "Honey" are not used there.
 /// For this purpose, internally, two names are tracked -
-/// authorized name and given name.
+/// authorized-name and given-name.
 /// By default, these names are equal, but functions working with contact names
-/// only affect the given name.
 #[derive(Debug)]
 pub struct Contact {
    /// The contact ID.
@@ -108,6 +106,11 @@ impl Default for Origin {
 }

 impl Origin {
+    /// Contacts that start a new "normal" chat, defaults to off.
+    pub fn is_start_new_chat(self) -> bool {
+        self as i32 >= 0x7FFFFFFF
+    }
+
    /// Contacts that are verified and known not to be spam.
    pub fn is_verified(self) -> bool {
        self as i32 >= 0x100
@@ -205,7 +208,7 @@ impl Contact {
    /// Add a single contact as a result of an _explicit_ user action.
    ///
    /// We assume, the contact name, if any, is entered by the user and is used "as is" therefore,
-    /// normalize() is *not* called for the name. If the contact is blocked, it is unblocked.
+    /// normalize() is _not_ called for the name. If the contact is blocked, it is unblocked.
    ///
    /// To add a number of contacts, see `dc_add_address_book()` which is much faster for adding
    /// a bunch of addresses.
@@ -235,7 +238,7 @@ impl Contact {
    }

    /// Mark all messages sent by the given contact
-    /// as *noticed*.  See also dc_marknoticed_chat() and dc_markseen_msgs()
+    /// as _noticed_.  See also dc_marknoticed_chat() and dc_markseen_msgs()
    ///
    /// Calling this function usually results in the event `#DC_EVENT_MSGS_CHANGED`.
    pub fn mark_noticed(context: &Context, id: u32) {
@@ -425,7 +428,7 @@ impl Contact {
    /// the event `DC_EVENT_CONTACTS_CHANGED` is sent.
    ///
    /// To add a single contact entered by the user, you should prefer `Contact::create`,
-    /// however, for adding a bunch of addresses, this function is much faster.
+    /// however, for adding a bunch of addresses, this function is _much_ faster.
    ///
    /// The `addr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
    ///
@@ -903,7 +906,7 @@ impl Contact {
 }

 /// Extracts first name from full name.
-fn get_first_name(full_name: &str) -> &str {
+fn get_first_name<'a>(full_name: &'a str) -> &'a str {
    full_name.splitn(2, ' ').next().unwrap_or_default()
 }

@@ -930,21 +933,21 @@ fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
    }

    if let Ok(contact) = Contact::load_from_db(context, contact_id) {
-        if contact.blocked != new_blocking
-            && sql::execute(
+        if contact.blocked != new_blocking {
+            if sql::execute(
                context,
                &context.sql,
                "UPDATE contacts SET blocked=? WHERE id=?;",
                params![new_blocking as i32, contact_id as i32],
            )
            .is_ok()
-        {
-            // also (un)block all chats with _only_ this contact - we do not delete them to allow a
-            // non-destructive blocking->unblocking.
-            // (Maybe, beside normal chats (type=100) we should also block group chats with only this user.
-            // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
-            // this would result in recreating the same group...)
-            if sql::execute(
+            {
+                // also (un)block all chats with _only_ this contact - we do not delete them to allow a
+                // non-destructive blocking->unblocking.
+                // (Maybe, beside normal chats (type=100) we should also block group chats with only this user.
+                // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
+                // this would result in recreating the same group...)
+                if sql::execute(
                    context,
                    &context.sql,
                    "UPDATE chats SET blocked=? WHERE type=? AND id IN (SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
@@ -953,6 +956,7 @@ fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
                    Contact::mark_noticed(context, contact_id);
                    context.call_cb(Event::ContactsChanged(None));
                }
+            }
        }
    }
 }
--- a/src/context.rs
+++ b/src/context.rs
@@ -1,5 +1,3 @@
-//! Contacts module
-
 use std::collections::HashMap;
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -47,10 +47,10 @@ pub fn dc_receive_imf(
        server_uid,
    );

-    if std::env::var(crate::DCC_MIME_DEBUG).unwrap_or_default() == "2" {
-        info!(context, "dc_receive_imf: incoming message mime-body:");
-        println!("{}", String::from_utf8_lossy(imf_raw));
-    }
+    // Parse the imf to mailimf_message. normally, this is done by mailimf_message_parse(),
+    // however, as we also need the MIME data,
+    // we use mailmime_parse() through dc_mimeparser (both call mailimf_struct_multiple_parse()
+    // somewhen, I did not found out anything that speaks against this approach yet)

    let mime_parser = MimeParser::from_bytes(context, imf_raw);
    let mut mime_parser = if let Err(err) = mime_parser {
@@ -172,7 +172,7 @@ pub fn dc_receive_imf(
            // client that relies in the SMTP server to generate one.
            // true eg. for the Webmailer used in all-inkl-KAS
            match dc_create_incoming_rfc724_mid(sent_timestamp, from_id, &to_ids) {
-                Some(x) => x,
+                Some(x) => x.to_string(),
                None => {
                    error!(context, "can not create incoming rfc724_mid");
                    cleanup(
@@ -210,7 +210,7 @@ pub fn dc_receive_imf(
            &mut created_db_entries,
            &mut create_event_to_send,
        ) {
-            warn!(context, "add_parts error: {:?}", err);
+            warn!(context, "{}", err);

            cleanup(
                context,
@@ -337,7 +337,7 @@ fn add_parts(
    }

    // 1 or 0 for yes/no
-    msgrmsg = mime_parser.has_chat_version() as _;
+    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;
@@ -407,25 +407,27 @@ fn add_parts(
            // try to create a group
            // (groups appear automatically only if the _sender_ is known, see core issue #54)

-            let create_blocked =
-                if 0 != test_normal_chat_id && test_normal_chat_id_blocked == Blocked::Not {
-                    Blocked::Not
-                } else {
-                    Blocked::Deaddrop
-                };
+            let create_blocked = if 0 != test_normal_chat_id
+                && test_normal_chat_id_blocked == Blocked::Not
+                || incoming_origin.is_start_new_chat()
+            {
+                Blocked::Not
+            } else {
+                Blocked::Deaddrop
+            };

-            let (new_chat_id, new_chat_id_blocked) = create_or_lookup_group(
+            create_or_lookup_group(
                context,
                &mut mime_parser,
                allow_creation,
                create_blocked,
                *from_id,
                to_ids,
+                chat_id,
+                &mut chat_id_blocked,
            )?;
-            *chat_id = new_chat_id;
-            chat_id_blocked = new_chat_id_blocked;
-            if *chat_id != 0 && chat_id_blocked != Blocked::Not && create_blocked == Blocked::Not {
-                chat::unblock(context, new_chat_id);
+            if 0 != *chat_id && Blocked::Not != chat_id_blocked && create_blocked == Blocked::Not {
+                chat::unblock(context, *chat_id);
                chat_id_blocked = Blocked::Not;
            }
        }
@@ -440,7 +442,7 @@ fn add_parts(

        if *chat_id == 0 {
            // try to create a normal chat
-            let create_blocked = if *from_id == *to_id {
+            let create_blocked = if incoming_origin.is_start_new_chat() || *from_id == *to_id {
                Blocked::Not
            } else {
                Blocked::Deaddrop
@@ -507,19 +509,18 @@ fn add_parts(
        if !to_ids.is_empty() {
            *to_id = to_ids[0];
            if *chat_id == 0 {
-                let (new_chat_id, new_chat_id_blocked) = create_or_lookup_group(
+                create_or_lookup_group(
                    context,
                    &mut mime_parser,
                    allow_creation,
                    Blocked::Not,
                    *from_id,
                    to_ids,
+                    chat_id,
+                    &mut chat_id_blocked,
                )?;
-                *chat_id = new_chat_id;
-                chat_id_blocked = new_chat_id_blocked;
-                // automatically unblock chat when the user sends a message
-                if *chat_id != 0 && chat_id_blocked != Blocked::Not {
-                    chat::unblock(context, new_chat_id);
+                if 0 != *chat_id && Blocked::Not != chat_id_blocked {
+                    chat::unblock(context, *chat_id);
                    chat_id_blocked = Blocked::Not;
                }
            }
@@ -544,18 +545,20 @@ fn add_parts(
                }
            }
        }
-        if *chat_id == 0 && to_ids.is_empty() && to_self {
-            // from_id==to_id==DC_CONTACT_ID_SELF - this is a self-sent messages,
-            // maybe an Autocrypt Setup Messag
-            let (id, bl) =
-                chat::create_or_lookup_by_contact_id(context, DC_CONTACT_ID_SELF, Blocked::Not)
-                    .unwrap_or_default();
-            *chat_id = id;
-            chat_id_blocked = bl;
+        if *chat_id == 0 {
+            if to_ids.is_empty() && to_self {
+                // from_id==to_id==DC_CONTACT_ID_SELF - this is a self-sent messages,
+                // maybe an Autocrypt Setup Messag
+                let (id, bl) =
+                    chat::create_or_lookup_by_contact_id(context, DC_CONTACT_ID_SELF, Blocked::Not)
+                        .unwrap_or_default();
+                *chat_id = id;
+                chat_id_blocked = bl;

-            if 0 != *chat_id && Blocked::Not != chat_id_blocked {
-                chat::unblock(context, *chat_id);
-                chat_id_blocked = Blocked::Not;
+                if 0 != *chat_id && Blocked::Not != chat_id_blocked {
+                    chat::unblock(context, *chat_id);
+                    chat_id_blocked = Blocked::Not;
+                }
            }
        }
        if *chat_id == 0 {
@@ -626,7 +629,7 @@ fn add_parts(
                        .subject
                        .as_ref()
                        .map(|s| s.to_string())
-                        .unwrap_or_else(|| "".into());
+                        .unwrap_or("".into());
                    txt_raw = Some(format!("{}\n\n{}", subject, msg_raw));
                }
                if mime_parser.is_system_message != SystemMessage::Unknown {
@@ -702,7 +705,7 @@ fn save_locations(
    hidden: i32,
 ) {
    if chat_id <= DC_CHAT_ID_LAST_SPECIAL {
-        return;
+        return ();
    }
    let mut location_id_written = false;
    let mut send_event = false;
@@ -711,12 +714,11 @@ fn save_locations(
        let locations = &mime_parser.message_kml.as_ref().unwrap().locations;
        let newest_location_id =
            location::save(context, chat_id, from_id, locations, true).unwrap_or_default();
-        if 0 != newest_location_id
-            && 0 == hidden
-            && location::set_msg_location_id(context, insert_msg_id, newest_location_id).is_ok()
-        {
-            location_id_written = true;
-            send_event = true;
+        if 0 != newest_location_id && 0 == hidden {
+            if location::set_msg_location_id(context, insert_msg_id, newest_location_id).is_ok() {
+                location_id_written = true;
+                send_event = true;
+            }
        }
    }

@@ -770,8 +772,10 @@ fn calc_timestamps(
            params![chat_id as i32, from_id as i32, *sort_timestamp],
        );
        if let Some(last_msg_time) = last_msg_time {
-            if last_msg_time > 0 && *sort_timestamp <= last_msg_time {
-                *sort_timestamp = last_msg_time + 1;
+            if last_msg_time > 0 {
+                if *sort_timestamp <= last_msg_time {
+                    *sort_timestamp = last_msg_time + 1;
+                }
            }
        }
    }
@@ -790,7 +794,7 @@ fn calc_timestamps(
 /// - is there a group with the same recipients? if so, use this (if there are multiple, use the most recent one)
 /// - create an ad-hoc group based on the recipient list
 ///
-/// on success the function returns the found/created (chat_id, chat_blocked) tuple .
+/// So when the function returns, the caller has the group id matching the current state of the group.
 #[allow(non_snake_case)]
 fn create_or_lookup_group(
    context: &Context,
@@ -798,9 +802,14 @@ fn create_or_lookup_group(
    allow_creation: i32,
    create_blocked: Blocked,
    from_id: u32,
-    to_ids: &[u32],
-) -> Result<(u32, Blocked)> {
+    to_ids: &mut Vec<u32>,
+    ret_chat_id: *mut u32,
+    ret_chat_id_blocked: &mut Blocked,
+) -> Result<()> {
+    let group_explicitly_left: bool;
+    let mut chat_id = 0;
    let mut chat_id_blocked = Blocked::Not;
+    let mut grpid = "".to_string();
    let mut grpname = None;
    let to_ids_cnt = to_ids.len();
    let mut recreate_member_list = 0;
@@ -811,13 +820,26 @@ fn create_or_lookup_group(
    let mut X_MrGrpImageChanged = "".to_string();
    let mut better_msg: String = From::from("");

+    let cleanup = |ret_chat_id: *mut u32,
+                   ret_chat_id_blocked: &mut Blocked,
+                   chat_id: u32,
+                   chat_id_blocked: Blocked| {
+        if !ret_chat_id.is_null() {
+            unsafe { *ret_chat_id = chat_id };
+        }
+        *ret_chat_id_blocked = if 0 != chat_id {
+            chat_id_blocked
+        } else {
+            Blocked::Not
+        };
+    };
+
    if mime_parser.is_system_message == SystemMessage::LocationStreamingEnabled {
        better_msg =
            context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", from_id as u32)
    }
    set_better_msg(mime_parser, &better_msg);

-    let mut grpid = "".to_string();
    if let Some(optional_field) = mime_parser.lookup_field("Chat-Group-ID") {
        grpid = optional_field.clone();
    }
@@ -826,26 +848,33 @@ fn create_or_lookup_group(
        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();
+            } else {
+                grpid = "".to_string();
            }
        }
        if grpid.is_empty() {
-            if let Some(extracted_grpid) = get_grpid_from_list(mime_parser, "In-Reply-To") {
-                grpid = extracted_grpid;
-            } else if let Some(extracted_grpid) = get_grpid_from_list(mime_parser, "References") {
-                grpid = extracted_grpid;
-            } else {
-                return create_or_lookup_adhoc_group(
-                    context,
-                    mime_parser,
-                    allow_creation,
-                    create_blocked,
-                    from_id,
-                    to_ids,
-                )
-                .map_err(|err| {
-                    info!(context, "could not create adhoc-group: {:?}", err);
-                    err
-                });
+            if let Some(value) = mime_parser.lookup_field("In-Reply-To") {
+                grpid = value.clone();
+            }
+            if grpid.is_empty() {
+                if let Some(value) = mime_parser.lookup_field("References") {
+                    grpid = value.clone();
+                }
+
+                if grpid.is_empty() {
+                    create_or_lookup_adhoc_group(
+                        context,
+                        mime_parser,
+                        allow_creation,
+                        create_blocked,
+                        from_id,
+                        to_ids,
+                        &mut chat_id,
+                        &mut chat_id_blocked,
+                    )?;
+                    cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+                    return Ok(());
+                }
            }
        }
    }
@@ -887,11 +916,11 @@ fn create_or_lookup_group(
            )
        } else {
            let field = mime_parser.lookup_field("Chat-Group-Name-Changed");
-            if let Some(field) = field {
+            if field.is_some() {
                X_MrGrpNameChanged = 1;
                better_msg = context.stock_system_msg(
                    StockMessage::MsgGrpName,
-                    field,
+                    &field.unwrap(),
                    if let Some(ref name) = grpname {
                        name
                    } else {
@@ -901,22 +930,23 @@ fn create_or_lookup_group(
                );

                mime_parser.is_system_message = SystemMessage::GroupNameChanged;
-            } 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;
-                mime_parser.is_system_message = SystemMessage::GroupImageChanged;
-                better_msg = context.stock_system_msg(
-                    if X_MrGrpImageChanged == "0" {
-                        StockMessage::MsgGrpImgDeleted
-                    } else {
-                        StockMessage::MsgGrpImgChanged
-                    },
-                    "",
-                    "",
-                    from_id as u32,
-                )
+            } 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;
+                    mime_parser.is_system_message = SystemMessage::GroupImageChanged;
+                    better_msg = context.stock_system_msg(
+                        if X_MrGrpImageChanged == "0" {
+                            StockMessage::MsgGrpImgDeleted
+                        } else {
+                            StockMessage::MsgGrpImgChanged
+                        },
+                        "",
+                        "",
+                        from_id as u32,
+                    )
+                }
            }
        }
    }
@@ -934,19 +964,20 @@ fn create_or_lookup_group(
                mime_parser.repl_msg_by_error(s);
            }
        }
-        // 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 = 1;
-        }
+    }
+
+    // check if the sender is a member of the existing group -
+    // if not, we'll recreate the group list
+    if chat_id != 0 && !chat::is_contact_in_chat(context, chat_id, from_id as u32) {
+        recreate_member_list = 1;
    }

    // check if the group does not exist but should be created
-    let group_explicitly_left = chat::is_group_explicitly_left(context, &grpid).unwrap_or_default();
+    group_explicitly_left = chat::is_group_explicitly_left(context, &grpid).unwrap_or_default();
+
    let self_addr = context
        .get_config(Config::ConfiguredAddr)
        .unwrap_or_default();
-
    if chat_id == 0
            && !mime_parser.is_mailinglist_message()
            && !grpid.is_empty()
@@ -957,8 +988,10 @@ fn create_or_lookup_group(
            && (!group_explicitly_left
                || 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.lookup_field("Chat-Verified").is_some() {
+        let mut create_verified = VerifiedStatus::Unverified;
+        if mime_parser.lookup_field("Chat-Verified").is_some() {
+            create_verified = VerifiedStatus::Verified;
+
            if let Err(err) =
                check_verified_properties(context, mime_parser, from_id as u32, to_ids)
            {
@@ -966,16 +999,11 @@ fn create_or_lookup_group(
                let s = format!("{}. See 'Info' for more details", err);
                mime_parser.repl_msg_by_error(&s);
            }
-            VerifiedStatus::Verified
-        } else {
-            VerifiedStatus::Unverified
-        };
-
-        if allow_creation == 0 {
-            info!(context, "creating group forbidden by caller");
-            return Ok((0, Blocked::Not));
        }
-
+        if 0 == allow_creation {
+            cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+            return Ok(());
+        }
        chat_id = create_group_record(
            context,
            &grpid,
@@ -989,8 +1017,9 @@ fn create_or_lookup_group(

    // again, check chat_id
    if chat_id <= DC_CHAT_ID_LAST_SPECIAL {
-        return if group_explicitly_left {
-            Ok((DC_CHAT_ID_TRASH, chat_id_blocked))
+        chat_id = 0;
+        if group_explicitly_left {
+            chat_id = DC_CHAT_ID_TRASH;
        } else {
            create_or_lookup_adhoc_group(
                context,
@@ -999,12 +1028,12 @@ fn create_or_lookup_group(
                create_blocked,
                from_id,
                to_ids,
-            )
-            .map_err(|err| {
-                warn!(context, "failed to create ad-hoc group: {:?}", err);
-                err
-            })
-        };
+                &mut chat_id,
+                &mut chat_id_blocked,
+            )?;
+        }
+        cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+        return Ok(());
    }

    // execute group commands
@@ -1086,12 +1115,13 @@ fn create_or_lookup_group(
        if skip.is_none() || !addr_cmp(&self_addr, skip.unwrap()) {
            chat::add_to_chat_contacts_table(context, chat_id, DC_CONTACT_ID_SELF);
        }
-        if from_id > DC_CHAT_ID_LAST_SPECIAL
-            && !Contact::addr_equals_contact(context, &self_addr, from_id as u32)
-            && (skip.is_none()
-                || !Contact::addr_equals_contact(context, skip.unwrap(), from_id as u32))
-        {
-            chat::add_to_chat_contacts_table(context, chat_id, from_id as u32);
+        if from_id > DC_CHAT_ID_LAST_SPECIAL {
+            if !Contact::addr_equals_contact(context, &self_addr, from_id as u32)
+                && (skip.is_none()
+                    || !Contact::addr_equals_contact(context, skip.unwrap(), from_id as u32))
+            {
+                chat::add_to_chat_contacts_table(context, chat_id, from_id as u32);
+            }
        }
        for &to_id in to_ids.iter() {
            if !Contact::addr_equals_contact(context, &self_addr, to_id)
@@ -1109,78 +1139,74 @@ fn create_or_lookup_group(
    }

    // check the number of receivers -
-    // 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()
-        && 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.
-        // So everything up to 3 is no error.
-        create_or_lookup_adhoc_group(
-            context,
-            mime_parser,
-            allow_creation,
-            create_blocked,
-            from_id,
-            to_ids,
-        )
-        .map_err(|err| {
-            warn!(context, "could not create ad-hoc group: {:?}", err);
-            err
-        })?;
-    }
-    Ok((chat_id, chat_id_blocked))
-}
-
-/// try extract a grpid from a message-id list header value
-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) {
-                    return Some(extracted_grpid.to_string());
-                }
-            }
+    // 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.is_send_by_messenger {
+        let is_contact_cnt = chat::get_chat_contact_cnt(context, chat_id);
+        if is_contact_cnt > 3 {
+            // to_ids_cnt==1 may be "From: A, To: B, SELF" as SELF is not counted in to_ids_cnt.
+            // So everything up to 3 is no error.
+            chat_id = 0;
+            create_or_lookup_adhoc_group(
+                context,
+                mime_parser,
+                allow_creation,
+                create_blocked,
+                from_id,
+                to_ids,
+                &mut chat_id,
+                &mut chat_id_blocked,
+            )?;
        }
    }
-    None
+
+    cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+    return Ok(());
 }

-/// Handle groups for received messages, return chat_id/Blocked status on success
+/// Handle groups for received messages
 fn create_or_lookup_adhoc_group(
    context: &Context,
    mime_parser: &MimeParser,
    allow_creation: i32,
    create_blocked: Blocked,
    from_id: u32,
-    to_ids: &[u32],
-) -> Result<(u32, Blocked)> {
-    // if we're here, no grpid was found, check if there is an existing
-    // ad-hoc group matching the to-list or if we should and can create one
-    // (we do not want to heuristically look at the likely mangled Subject)
+    to_ids: &mut Vec<u32>,
+    ret_chat_id: *mut u32,
+    ret_chat_id_blocked: &mut Blocked,
+) -> Result<()> {
+    // if we're here, no grpid was found, check there is an existing ad-hoc
+    // group matching the to-list or if we can create one
+    let mut chat_id = 0;
+    let mut chat_id_blocked = Blocked::Not;

-    if mime_parser.is_mailinglist_message() {
-        // XXX we could parse List-* headers and actually create and
-        // manage a mailing list group, eventually
-        info!(
-            context,
-            "not creating ad-hoc group for mailing list message"
-        );
-        return Ok((0, Blocked::Not));
+    let cleanup = |ret_chat_id: *mut u32,
+                   ret_chat_id_blocked: &mut Blocked,
+                   chat_id: u32,
+                   chat_id_blocked: Blocked| {
+        if !ret_chat_id.is_null() {
+            unsafe { *ret_chat_id = chat_id };
+        }
+        *ret_chat_id_blocked = chat_id_blocked;
+    };
+
+    // build member list from the given ids
+    if to_ids.is_empty() || mime_parser.is_mailinglist_message() {
+        // too few contacts or a mailinglist
+        cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+        return Ok(());
    }

-    let mut member_ids = to_ids.to_vec();
+    let mut member_ids = to_ids.clone();
    if !member_ids.contains(&from_id) {
        member_ids.push(from_id);
    }
    if !member_ids.contains(&DC_CONTACT_ID_SELF) {
        member_ids.push(DC_CONTACT_ID_SELF);
    }
-
    if member_ids.len() < 3 {
-        info!(context, "not creating ad-hoc group: too few contacts");
-        return Ok((0, Blocked::Not));
+        // too few contacts given
+        cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+        return Ok(());
    }

    let chat_ids = search_chat_ids_by_contact_ids(context, &member_ids)?;
@@ -1199,16 +1225,18 @@ fn create_or_lookup_adhoc_group(
        );

        if let Ok((id, id_blocked)) = res {
+            chat_id = id as u32;
+            chat_id_blocked = id_blocked;
            /* success, chat found */
-            return Ok((id as u32, id_blocked));
+            cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+            return Ok(());
        }
    }

-    if allow_creation == 0 {
-        info!(context, "creating ad-hoc group prevented from caller");
-        return Ok((0, Blocked::Not));
+    if 0 == allow_creation {
+        cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+        return Ok(());
    }
-
    // we do not check if the message is a reply to another group, this may result in
    // chats with unclear member list. instead we create a new group in the following lines ...

@@ -1216,12 +1244,10 @@ fn create_or_lookup_adhoc_group(
    // - there is no need to check if this group exists; otherwise we would have caught it above
    let grpid = create_adhoc_grp_id(context, &member_ids);
    if grpid.is_empty() {
-        warn!(
-            context,
-            "failed to create ad-hoc grpid for {:?}", member_ids
-        );
-        return Ok((0, Blocked::Not));
+        cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+        return Ok(());
    }
+
    // use subject as initial chat name
    let grpname = if let Some(subject) = mime_parser.subject.as_ref().filter(|s| !s.is_empty()) {
        subject.to_string()
@@ -1230,20 +1256,22 @@ fn create_or_lookup_adhoc_group(
    };

    // create group record
-    let new_chat_id = create_group_record(
+    chat_id = create_group_record(
        context,
        &grpid,
        grpname,
        create_blocked,
        VerifiedStatus::Unverified,
    );
+    chat_id_blocked = create_blocked;
    for &member_id in &member_ids {
-        chat::add_to_chat_contacts_table(context, new_chat_id, member_id);
+        chat::add_to_chat_contacts_table(context, chat_id, member_id);
    }

-    context.call_cb(Event::ChatModified(new_chat_id));
+    context.call_cb(Event::ChatModified(chat_id));

-    Ok((new_chat_id, create_blocked))
+    cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
+    Ok(())
 }

 fn create_group_record(
@@ -1324,7 +1352,7 @@ fn hex_hash(s: impl AsRef<str>) -> String {
 #[allow(non_snake_case)]
 fn search_chat_ids_by_contact_ids(
    context: &Context,
-    unsorted_contact_ids: &[u32],
+    unsorted_contact_ids: &Vec<u32>,
 ) -> Result<Vec<u32>> {
    /* searches chat_id's by the given contact IDs, may return zero, one or more chat_id's */
    let mut contact_ids = Vec::with_capacity(23);
@@ -1480,7 +1508,7 @@ fn check_verified_properties(

 fn set_better_msg(mime_parser: &mut MimeParser, better_msg: impl AsRef<str>) {
    let msg = better_msg.as_ref();
-    if !msg.is_empty() && !mime_parser.parts.is_empty() {
+    if msg.len() > 0 && !mime_parser.parts.is_empty() {
        let part = &mut mime_parser.parts[0];
        if part.typ == Viewtype::Text {
            part.msg = msg.to_string();
@@ -1507,12 +1535,12 @@ fn dc_is_reply_to_known_message(context: &Context, mime_parser: &MimeParser) ->
    0
 }

-fn is_known_rfc724_mid_in_list(context: &Context, mid_list: &str) -> bool {
+fn is_known_rfc724_mid_in_list(context: &Context, mid_list: &String) -> bool {
    if mid_list.is_empty() {
        return false;
    }

-    if let Ok(ids) = mailparse::addrparse(mid_list) {
+    if let Ok(ids) = mailparse::addrparse(mid_list.as_str()) {
        for id in ids.iter() {
            if is_known_rfc724_mid(context, id) {
                return true;
@@ -1560,8 +1588,8 @@ fn dc_is_reply_to_messenger_message(context: &Context, mime_parser: &MimeParser)
    0
 }

-fn is_msgrmsg_rfc724_mid_in_list(context: &Context, mid_list: &str) -> bool {
-    if let Ok(ids) = mailparse::addrparse(mid_list) {
+fn is_msgrmsg_rfc724_mid_in_list(context: &Context, mid_list: &String) -> bool {
+    if let Ok(ids) = mailparse::addrparse(mid_list.as_str()) {
        for id in ids.iter() {
            if is_msgrmsg_rfc724_mid(context, id) {
                return true;
@@ -1633,7 +1661,7 @@ fn dc_add_or_lookup_contacts_by_address_list(
 fn add_or_lookup_contact_by_addr(
    context: &Context,
    display_name: &Option<String>,
-    addr: &str,
+    addr: &String,
    origin: Origin,
    ids: &mut Vec<u32>,
    check_self: &mut bool,
@@ -1670,7 +1698,6 @@ fn add_or_lookup_contact_by_addr(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::test_utils::dummy_context;

    #[test]
    fn test_hex_hash() {
@@ -1679,34 +1706,4 @@ mod tests {
        let res = hex_hash(data);
        assert_eq!(res, "b94d27b9934d3e08");
    }
-
-    #[test]
-    fn test_grpid_simple() {
-        let context = dummy_context();
-        let raw = b"From: hello\n\
-                    Subject: outer-subject\n\
-                    In-Reply-To: <lqkjwelq123@123123>\n\
-                    References: <Gr.HcxyMARjyJy.9-uvzWPTLtV@nauta.cu>\n\
-                    \n\
-                    hello\x00";
-        let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();
-        assert_eq!(get_grpid_from_list(&mimeparser, "In-Reply-To"), None);
-        let grpid = Some("HcxyMARjyJy".to_string());
-        assert_eq!(get_grpid_from_list(&mimeparser, "References"), grpid);
-    }
-
-    #[test]
-    fn test_grpid_from_multiple() {
-        let context = dummy_context();
-        let raw = b"From: hello\n\
-                    Subject: outer-subject\n\
-                    In-Reply-To: <Gr.HcxyMARjyJy.9-qweqwe@asd.net>\n\
-                    References: <qweqweqwe>, <Gr.HcxyMARjyJy.9-uvzWPTLtV@nau.ca>\n\
-                    \n\
-                    hello\x00";
-        let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();
-        let grpid = Some("HcxyMARjyJy".to_string());
-        assert_eq!(get_grpid_from_list(&mimeparser, "In-Reply-To"), grpid);
-        assert_eq!(get_grpid_from_list(&mimeparser, "References"), grpid);
-    }
 }
--- a/src/dc_simplify.rs
+++ b/src/dc_simplify.rs
@@ -49,7 +49,7 @@ impl Simplify {
    /**
     * Simplify Plain Text
     */
-    #[allow(non_snake_case, clippy::mut_range_bound)]
+    #[allow(non_snake_case)]
    fn simplify_plain_text(&mut self, buf_terminated: &str, is_msgrmsg: bool) -> String {
        /* This function ...
        ... removes all text after the line `-- ` (footer mark)
--- a/src/dc_strencode.rs
+++ b/src/dc_strencode.rs
@@ -0,0 +1,74 @@
+use itertools::Itertools;
+
+/// Encode non-ascii-strings as `=?UTF-8?Q?Bj=c3=b6rn_Petersen?=`.
+/// Belongs to RFC 2047: https://tools.ietf.org/html/rfc2047
+///
+/// We do not fold at position 72; this would result in empty words as `=?utf-8?Q??=` which are correct,
+/// but cannot be displayed by some mail programs (eg. Android Stock Mail).
+/// however, this is not needed, as long as _one_ word is not longer than 72 characters.
+/// _if_ it is, the display may get weird.  This affects the subject only.
+/// the best solution wor all this would be if libetpan encodes the line as only libetpan knowns when a header line is full.
+///
+/// @param to_encode Null-terminated UTF-8-string to encode.
+/// @return Returns the encoded string which must be free()'d when no longed needed.
+///     On errors, NULL is returned.
+pub fn dc_encode_header_words(input: impl AsRef<str>) -> String {
+    let mut result = String::default();
+    for (_, group) in &input.as_ref().chars().group_by(|c| c.is_whitespace()) {
+        let word: String = group.collect();
+        result.push_str(&quote_word(&word.as_bytes()));
+    }
+
+    result
+}
+
+fn must_encode(byte: u8) -> bool {
+    static SPECIALS: &[u8] = b",:!\"#$@[\\]^`{|}~=?_";
+
+    SPECIALS.iter().any(|b| *b == byte)
+}
+
+fn quote_word(word: &[u8]) -> String {
+    let mut result = String::default();
+    let mut encoded = false;
+
+    for byte in word {
+        let byte = *byte;
+        if byte >= 128 || must_encode(byte) {
+            result.push_str(&format!("={:2X}", byte));
+            encoded = true;
+        } else if byte == b' ' {
+            result.push('_');
+            encoded = true;
+        } else {
+            result.push(byte as _);
+        }
+    }
+
+    if encoded {
+        result = format!("=?utf-8?Q?{}?=", &result);
+    }
+    result
+}
+
+/* ******************************************************************************
+ * Encode/decode header words, RFC 2047
+ ******************************************************************************/
+
+pub fn dc_needs_ext_header(to_check: impl AsRef<str>) -> bool {
+    let to_check = to_check.as_ref();
+
+    if to_check.is_empty() {
+        return false;
+    }
+
+    to_check.chars().any(|c| {
+        !(c.is_ascii_alphanumeric()
+            || c == '-'
+            || c == '_'
+            || c == '_'
+            || c == '.'
+            || c == '~'
+            || c == '%')
+    })
+}
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -217,11 +217,8 @@ pub(crate) fn dc_create_outgoing_rfc724_mid(grpid: Option<&str>, from_addr: &str
 ///
 /// # Arguments
 ///
-/// * `mid` - A string that holds the message id.  Leading/Trailing <>
-/// characters are automatically stripped.
+/// * `mid` - A string that holds the message id
 pub(crate) fn dc_extract_grpid_from_rfc724_mid(mid: &str) -> Option<&str> {
-    let mid = mid.trim_start_matches('<').trim_end_matches('>');
-
    if mid.len() < 9 || !mid.starts_with("Gr.") {
        return None;
    }
@@ -238,6 +235,13 @@ pub(crate) fn dc_extract_grpid_from_rfc724_mid(mid: &str) -> Option<&str> {
    None
 }

+pub(crate) fn dc_ensure_no_slash_safe(path: &str) -> &str {
+    if path.ends_with('/') || path.ends_with('\\') {
+        return &path[..path.len() - 1];
+    }
+    path
+}
+
 // Function returns a sanitized basename that does not contain
 // win/linux path separators and also not any non-ascii chars
 fn get_safe_basename(filename: &str) -> String {
@@ -278,9 +282,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.
@@ -689,16 +695,6 @@ mod tests {
        let mid = "Gr.1234567890123456.morerandom@domain.de";
        let grpid = dc_extract_grpid_from_rfc724_mid(mid);
        assert_eq!(grpid, Some("1234567890123456"));
-
-        // Should return extracted grpid for grpid with length of 11
-        let mid = "<Gr.12345678901.morerandom@domain.de>";
-        let grpid = dc_extract_grpid_from_rfc724_mid(mid);
-        assert_eq!(grpid, Some("12345678901"));
-
-        // Should return extracted grpid for grpid with length of 11
-        let mid = "<Gr.1234567890123456.morerandom@domain.de>";
-        let grpid = dc_extract_grpid_from_rfc724_mid(mid);
-        assert_eq!(grpid, Some("1234567890123456"));
    }

    #[test]
@@ -782,9 +778,9 @@ mod tests {

    #[test]
    fn test_dc_create_incoming_rfc724_mid() {
-        let res = dc_create_incoming_rfc724_mid(123, 45, &[6, 7]);
+        let res = dc_create_incoming_rfc724_mid(123, 45, &vec![6, 7]);
        assert_eq!(res, Some("123-45-7@stub".into()));
-        let res = dc_create_incoming_rfc724_mid(123, 45, &[]);
+        let res = dc_create_incoming_rfc724_mid(123, 45, &vec![]);
        assert_eq!(res, Some("123-45-0@stub".into()));
    }

@@ -863,15 +859,15 @@ mod tests {
    #[test]
    fn test_listflags_has() {
        let listflags: u32 = 0x1101;
-        assert!(listflags_has(listflags, 0x1));
-        assert!(!listflags_has(listflags, 0x10));
-        assert!(listflags_has(listflags, 0x100));
-        assert!(listflags_has(listflags, 0x1000));
+        assert!(listflags_has(listflags, 0x1) == true);
+        assert!(listflags_has(listflags, 0x10) == false);
+        assert!(listflags_has(listflags, 0x100) == true);
+        assert!(listflags_has(listflags, 0x1000) == true);
        let listflags: u32 = (DC_GCL_ADD_SELF | DC_GCL_VERIFIED_ONLY).try_into().unwrap();
-        assert!(listflags_has(listflags, DC_GCL_VERIFIED_ONLY));
-        assert!(listflags_has(listflags, DC_GCL_ADD_SELF));
+        assert!(listflags_has(listflags, DC_GCL_VERIFIED_ONLY) == true);
+        assert!(listflags_has(listflags, DC_GCL_ADD_SELF) == true);
        let listflags: u32 = DC_GCL_VERIFIED_ONLY.try_into().unwrap();
-        assert!(!listflags_has(listflags, DC_GCL_ADD_SELF));
+        assert!(listflags_has(listflags, DC_GCL_ADD_SELF) == false);
    }

    #[test]
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -98,6 +98,7 @@ impl EncryptHelper {
            .iter()
            .filter_map(|(state, addr)| state.as_ref().map(|s| (s, addr)))
        {
+            info!(context, "adding for {}: {:?}", addr, peerstate);
            let key = peerstate.peek_key(min_verified).ok_or_else(|| {
                format_err!("proper enc-key for {} missing, cannot encrypt", addr)
            })?;
@@ -121,6 +122,8 @@ pub fn try_decrypt(
    mail: &mailparse::ParsedMail<'_>,
    message_time: i64,
 ) -> Result<(Option<Vec<u8>>, HashSet<String>)> {
+    info!(context, "trying to decrypt");
+
    let from = mail
        .headers
        .get_first_value("From")?
@@ -210,7 +213,7 @@ fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef<str
    );
    match pgp::create_keypair(&self_addr) {
        Some((public_key, private_key)) => {
-            if dc_key_save_self_keypair(
+            match dc_key_save_self_keypair(
                context,
                &public_key,
                &private_key,
@@ -218,14 +221,15 @@ fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef<str
                true,
                &context.sql,
            ) {
-                info!(
-                    context,
-                    "Keypair generated in {:.3}s.",
-                    start.elapsed().as_secs()
-                );
-                Ok(public_key)
-            } else {
-                Err(format_err!("Failed to save keypair"))
+                true => {
+                    info!(
+                        context,
+                        "Keypair generated in {:.3}s.",
+                        start.elapsed().as_secs()
+                    );
+                    Ok(public_key)
+                }
+                false => Err(format_err!("Failed to save keypair")),
            }
        }
        None => Err(format_err!("Failed to generate keypair")),
@@ -247,13 +251,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
+            warn!(context, "Invalid autocrypt message: {:?}", err);
            return Ok(None);
        }
        Ok(res) => res,
    };
-    info!(context, "Detected Autocrypt-mime message");

    decrypt_part(
        context,
@@ -266,12 +270,13 @@ fn decrypt_if_autocrypt_message<'a>(

 /// Returns Ok(None) if nothing encrypted was found.
 fn decrypt_part(
-    _context: &Context,
+    context: &Context,
    mail: &mailparse::ParsedMail<'_>,
    private_keyring: &Keyring,
    public_keyring_for_validate: &Keyring,
    ret_valid_signatures: &mut HashSet<String>,
 ) -> Result<Option<Vec<u8>>> {
+    info!(context, "decrypting part");
    let data = mail.get_body_raw()?;

    if has_decrypted_pgp_armor(&data) {
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,5 +1,4 @@
-//! # Error handling
-
+use failure::Fail;
 use lettre_email::mime;

 #[derive(Debug, Fail)]
--- a/src/events.rs
+++ b/src/events.rs
@@ -1,5 +1,3 @@
-//! # Events specification
-
 use std::path::PathBuf;

 use strum::EnumProperty;
@@ -92,7 +90,7 @@ pub enum Event {
    /// However, for ongoing processes (eg. configure())
    /// or for functions that are expected to fail (eg. dc_continue_key_transfer())
    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the *last* error
+    /// failed (returned false). It should be sufficient to report only the _last_ error
    /// in a messasge box then.
    ///
    /// @return
--- 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,15 +28,15 @@ use crate::param::Params;
 use crate::stock::StockMessage;
 use crate::wrapmime;

-mod idle;
-pub mod select_folder;
-
 const DC_IMAP_SEEN: usize = 0x0001;

 type Result<T> = std::result::Result<T, Error>;

 #[derive(Debug, Fail)]
 pub enum Error {
+    #[fail(display = "IMAP Could not obtain imap-session object.")]
+    NoSession,
+
    #[fail(display = "IMAP Connect without configured params")]
    ConnectWithoutConfigure,

@@ -49,21 +52,33 @@ 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 Connection Lost or no connection established")]
+    ConnectionLost,
+
+    #[fail(display = "IMAP close/expunge failed: {}", _0)]
+    CloseExpungeFailed(#[cause] async_imap::error::Error),
+
+    #[fail(display = "IMAP Folder name invalid: {:?}", _0)]
+    BadFolderName(String),
+
    #[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")]
-    SelectFolderError(#[cause] select_folder::Error),
-
    #[fail(display = "IMAP other error: {:?}", _0)]
    Other(String),
 }
@@ -86,12 +101,6 @@ impl From<Error> for crate::error::Error {
    }
 }

-impl From<select_folder::Error> for Error {
-    fn from(err: select_folder::Error) -> Error {
-        Error::SelectFolderError(err)
-    }
-}
-
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq)]
 pub enum ImapActionResult {
    Failed,
@@ -105,7 +114,7 @@ const JUST_UID: &str = "(UID)";
 const BODY_FLAGS: &str = "(FLAGS BODY.PEEK[])";
 const SELECT_ALL: &str = "1:*";

-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct Imap {
    config: RwLock<ImapConfig>,
    session: Mutex<Option<Session>>,
@@ -178,7 +187,14 @@ impl Default for ImapConfig {

 impl Imap {
    pub fn new() -> Self {
-        Default::default()
+        Imap {
+            session: Mutex::new(None),
+            config: RwLock::new(ImapConfig::default()),
+            interrupt: Mutex::new(None),
+            connected: Mutex::new(false),
+            skip_next_idle_wait: AtomicBool::new(false),
+            should_reconnect: AtomicBool::new(false),
+        }
    }

    pub async fn is_connected(&self) -> bool {
@@ -193,107 +209,116 @@ 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 {
+                                let res =
+                                    client.secure(imap_server, config.certificate_checks).await;
+                                res
+                            } 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,
+                            };
+                            let res = client.authenticate("XOAUTH2", &auth).await;
+                            res
+                        } else {
+                            return Err(Error::OauthError);
+                        }
+                    } else {
+                        let res = client.login(imap_user, imap_pw).await;
+                        res
+                    }
+                }
+                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) {
@@ -344,7 +369,7 @@ impl Imap {
        if self.connect(context, &param) {
            self.ensure_configured_folders(context, true)
        } else {
-            Err(Error::ConnectionFailed(format!("{}", param)))
+            Err(Error::ConnectionFailed(format!("{}", param).to_string()))
        }
    }

@@ -374,7 +399,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 +455,106 @@ 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?;
+    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(())
+        })
+    }

-        while self.fetch_new_messages(context, &watch_folder).await? {
-            // We fetch until no more new messages are there.
+    /// select a folder, possibly update uid_validity and, if needed,
+    /// expunge the folder to remove delete-marked messages.
+    async fn select_folder<S: AsRef<str>>(
+        &self,
+        context: &Context,
+        folder: Option<S>,
+    ) -> Result<()> {
+        if self.session.lock().await.is_none() {
+            let mut cfg = self.config.write().await;
+            cfg.selected_folder = None;
+            cfg.selected_folder_needs_expunge = false;
+            return Err(Error::NoSession);
+        }
+
+        // if there is a new folder and the new folder is equal to the selected one, there's nothing to do.
+        // if there is _no_ new folder, we continue as we might want to expunge below.
+        if let Some(ref folder) = folder {
+            if let Some(ref selected_folder) = self.config.read().await.selected_folder {
+                if folder.as_ref() == selected_folder {
+                    return Ok(());
+                }
+            }
+        }
+
+        // deselect existing folder, if needed (it's also done implicitly by SELECT, however, without EXPUNGE then)
+        let needs_expunge = { self.config.read().await.selected_folder_needs_expunge };
+        if needs_expunge {
+            if let Some(ref folder) = self.config.read().await.selected_folder {
+                info!(context, "Expunge messages in \"{}\".", folder);
+
+                // A CLOSE-SELECT is considerably faster than an EXPUNGE-SELECT, see
+                // https://tools.ietf.org/html/rfc3501#section-6.4.2
+                if let Some(ref mut session) = &mut *self.session.lock().await {
+                    match session.close().await {
+                        Ok(_) => {
+                            info!(context, "close/expunge succeeded");
+                        }
+                        Err(err) => {
+                            return Err(Error::CloseExpungeFailed(err));
+                        }
+                    }
+                } else {
+                    return Err(Error::NoSession);
+                }
+            }
+            self.config.write().await.selected_folder_needs_expunge = false;
+        }
+
+        // select new folder
+        if let Some(ref folder) = folder {
+            if let Some(ref mut session) = &mut *self.session.lock().await {
+                let res = session.select(folder).await;
+
+                // https://tools.ietf.org/html/rfc3501#section-6.3.1
+                // says that if the server reports select failure we are in
+                // authenticated (not-select) state.
+
+                match res {
+                    Ok(mailbox) => {
+                        let mut config = self.config.write().await;
+                        config.selected_folder = Some(folder.as_ref().to_string());
+                        config.selected_mailbox = Some(mailbox);
+                        Ok(())
+                    }
+                    Err(async_imap::error::Error::ConnectionLost) => {
+                        self.trigger_reconnect();
+                        self.config.write().await.selected_folder = None;
+                        Err(Error::ConnectionLost)
+                    }
+                    Err(async_imap::error::Error::Validate(_)) => {
+                        Err(Error::BadFolderName(folder.as_ref().to_string()))
+                    }
+                    Err(err) => {
+                        self.config.write().await.selected_folder = None;
+                        self.trigger_reconnect();
+                        Err(Error::Other(err.to_string()))
+                    }
+                }
+            } else {
+                Err(Error::NoSession)
+            }
+        } else {
+            Ok(())
        }
-        Ok(())
    }

    fn get_config_last_seen_uid<S: AsRef<str>>(&self, context: &Context, folder: S) -> (u32, u32) {
@@ -544,7 +658,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 +691,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 +832,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,
@@ -859,15 +1175,15 @@ impl Imap {
            }
            match self.select_folder(context, Some(&folder)).await {
                Ok(()) => None,
-                Err(select_folder::Error::ConnectionLost) => {
+                Err(Error::ConnectionLost) => {
                    warn!(context, "Lost imap connection");
                    Some(ImapActionResult::RetryLater)
                }
-                Err(select_folder::Error::NoSession) => {
+                Err(Error::NoSession) => {
                    warn!(context, "no imap session");
                    Some(ImapActionResult::Failed)
                }
-                Err(select_folder::Error::BadFolderName(folder_name)) => {
+                Err(Error::BadFolderName(folder_name)) => {
                    warn!(context, "invalid folder name: {:?}", folder_name);
                    Some(ImapActionResult::Failed)
                }
@@ -1082,7 +1398,11 @@ impl Imap {
        })
    }

-    async fn list_folders(&self, session: &mut Session, context: &Context) -> Option<Vec<Name>> {
+    async fn list_folders<'a>(
+        &self,
+        session: &'a mut Session,
+        context: &Context,
+    ) -> Option<Vec<Name>> {
        // TODO: use xlist when available
        match session.list(Some(""), Some("*")).await {
            Ok(list) => {
@@ -1104,17 +1424,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
@@ -1154,7 +1470,7 @@ fn get_folder_meaning_by_name(folder_name: &Name) -> FolderMeaning {
    let sent_names = vec!["sent", "sent objects", "gesendet"];
    let lower = folder_name.name().to_lowercase();

-    if sent_names.into_iter().any(|s| s == lower) {
+    if sent_names.into_iter().find(|s| *s == lower).is_some() {
        FolderMeaning::SentObjects
    } else {
        FolderMeaning::Unknown
@@ -1170,12 +1486,15 @@ fn get_folder_meaning(folder_name: &Name) -> FolderMeaning {
    let special_names = vec!["\\Spam", "\\Trash", "\\Drafts", "\\Junk"];

    for attr in folder_name.attributes() {
-        if let NameAttribute::Custom(ref label) = attr {
-            if special_names.iter().any(|s| *s == label) {
-                res = FolderMeaning::Other;
-            } else if label == "\\Sent" {
-                res = FolderMeaning::SentObjects
+        match attr {
+            NameAttribute::Custom(ref label) => {
+                if special_names.iter().find(|s| *s == label).is_some() {
+                    res = FolderMeaning::Other;
+                } else if label == "\\Sent" {
+                    res = FolderMeaning::SentObjects
+                }
            }
+            _ => {}
        }
    }

--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -1,250 +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 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");
-                                }
-                            }
-                        }
-                        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_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/select_folder.rs
+++ b/src/imap/select_folder.rs
@@ -1,113 +0,0 @@
-use super::Imap;
-
-use crate::context::Context;
-
-type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "IMAP Could not obtain imap-session object.")]
-    NoSession,
-
-    #[fail(display = "IMAP Connection Lost or no connection established")]
-    ConnectionLost,
-
-    #[fail(display = "IMAP Folder name invalid: {:?}", _0)]
-    BadFolderName(String),
-
-    #[fail(display = "IMAP close/expunge failed: {}", _0)]
-    CloseExpungeFailed(#[cause] async_imap::error::Error),
-
-    #[fail(display = "IMAP other error: {:?}", _0)]
-    Other(String),
-}
-
-impl Imap {
-    /// select a folder, possibly update uid_validity and, if needed,
-    /// expunge the folder to remove delete-marked messages.
-    pub(super) async fn select_folder<S: AsRef<str>>(
-        &self,
-        context: &Context,
-        folder: Option<S>,
-    ) -> Result<()> {
-        if self.session.lock().await.is_none() {
-            let mut cfg = self.config.write().await;
-            cfg.selected_folder = None;
-            cfg.selected_folder_needs_expunge = false;
-            self.trigger_reconnect();
-            return Err(Error::NoSession);
-        }
-
-        // if there is a new folder and the new folder is equal to the selected one, there's nothing to do.
-        // if there is _no_ new folder, we continue as we might want to expunge below.
-        if let Some(ref folder) = folder {
-            if let Some(ref selected_folder) = self.config.read().await.selected_folder {
-                if folder.as_ref() == selected_folder {
-                    return Ok(());
-                }
-            }
-        }
-
-        // deselect existing folder, if needed (it's also done implicitly by SELECT, however, without EXPUNGE then)
-        let needs_expunge = { self.config.read().await.selected_folder_needs_expunge };
-        if needs_expunge {
-            if let Some(ref folder) = self.config.read().await.selected_folder {
-                info!(context, "Expunge messages in \"{}\".", folder);
-
-                // A CLOSE-SELECT is considerably faster than an EXPUNGE-SELECT, see
-                // https://tools.ietf.org/html/rfc3501#section-6.4.2
-                if let Some(ref mut session) = &mut *self.session.lock().await {
-                    match session.close().await {
-                        Ok(_) => {
-                            info!(context, "close/expunge succeeded");
-                        }
-                        Err(err) => {
-                            self.trigger_reconnect();
-                            return Err(Error::CloseExpungeFailed(err));
-                        }
-                    }
-                } else {
-                    return Err(Error::NoSession);
-                }
-            }
-            self.config.write().await.selected_folder_needs_expunge = false;
-        }
-
-        // select new folder
-        if let Some(ref folder) = folder {
-            if let Some(ref mut session) = &mut *self.session.lock().await {
-                let res = session.select(folder).await;
-
-                // https://tools.ietf.org/html/rfc3501#section-6.3.1
-                // says that if the server reports select failure we are in
-                // authenticated (not-select) state.
-
-                match res {
-                    Ok(mailbox) => {
-                        let mut config = self.config.write().await;
-                        config.selected_folder = Some(folder.as_ref().to_string());
-                        config.selected_mailbox = Some(mailbox);
-                        Ok(())
-                    }
-                    Err(async_imap::error::Error::ConnectionLost) => {
-                        self.trigger_reconnect();
-                        self.config.write().await.selected_folder = None;
-                        Err(Error::ConnectionLost)
-                    }
-                    Err(async_imap::error::Error::Validate(_)) => {
-                        Err(Error::BadFolderName(folder.as_ref().to_string()))
-                    }
-                    Err(err) => {
-                        self.config.write().await.selected_folder = None;
-                        self.trigger_reconnect();
-                        Err(Error::Other(err.to_string()))
-                    }
-                }
-            } else {
-                Err(Error::NoSession)
-            }
-        } else {
-            Ok(())
-        }
-    }
-}
--- a/src/imap_client.rs
+++ b/src/imap_client.rs
@@ -11,6 +11,8 @@ use async_tls::client::TlsStream;

 use crate::login_param::{dc_build_tls_config, CertificateChecks};

+const DCC_IMAP_DEBUG: &str = "DCC_IMAP_DEBUG";
+
 #[derive(Debug)]
 pub(crate) enum Client {
    Secure(ImapClient<TlsStream<TcpStream>>),
@@ -40,7 +42,7 @@ impl Client {
        let tls_connector: async_tls::TlsConnector = Arc::new(tls_config).into();
        let tls_stream = tls_connector.connect(domain.as_ref(), stream)?.await?;
        let mut client = ImapClient::new(tls_stream);
-        if std::env::var(crate::DCC_IMAP_DEBUG).is_ok() {
+        if std::env::var(DCC_IMAP_DEBUG).is_ok() {
            client.debug = true;
        }

@@ -56,7 +58,7 @@ impl Client {
        let stream = TcpStream::connect(addr).await?;

        let mut client = ImapClient::new(stream);
-        if std::env::var(crate::DCC_IMAP_DEBUG).is_ok() {
+        if std::env::var(DCC_IMAP_DEBUG).is_ok() {
            client.debug = true;
        }
        let _greeting = client
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -53,7 +53,7 @@ pub enum ImexMode {
 /// For this purpose, the function creates a job that is executed in the IMAP-thread then;
 /// this requires to call dc_perform_inbox_jobs() regularly.
 ///
-/// What to do is defined by the *what* parameter.
+/// What to do is defined by the _what_ parameter.
 ///
 /// While dc_imex() returns immediately, the started job may take a while,
 /// you can stop it using dc_stop_ongoing_process(). During execution of the job,
@@ -84,24 +84,27 @@ pub fn has_backup(context: &Context, dir_name: impl AsRef<Path>) -> Result<Strin
    let mut newest_backup_time = 0;
    let mut newest_backup_path: Option<std::path::PathBuf> = None;
    for dirent in dir_iter {
-        if let Ok(dirent) = dirent {
-            let path = dirent.path();
-            let name = dirent.file_name();
-            let name = name.to_string_lossy();
-            if name.starts_with("delta-chat") && name.ends_with(".bak") {
-                let sql = Sql::new();
-                if sql.open(context, &path, true) {
-                    let curr_backup_time = sql
-                        .get_raw_config_int(context, "backup_time")
-                        .unwrap_or_default();
-                    if curr_backup_time > newest_backup_time {
-                        newest_backup_path = Some(path);
-                        newest_backup_time = curr_backup_time;
+        match dirent {
+            Ok(dirent) => {
+                let path = dirent.path();
+                let name = dirent.file_name();
+                let name = name.to_string_lossy();
+                if name.starts_with("delta-chat") && name.ends_with(".bak") {
+                    let sql = Sql::new();
+                    if sql.open(context, &path, true) {
+                        let curr_backup_time = sql
+                            .get_raw_config_int(context, "backup_time")
+                            .unwrap_or_default();
+                        if curr_backup_time > newest_backup_time {
+                            newest_backup_path = Some(path);
+                            newest_backup_time = curr_backup_time;
+                        }
+                        info!(context, "backup_time of {} is {}", name, curr_backup_time);
+                        sql.close(&context);
                    }
-                    info!(context, "backup_time of {} is {}", name, curr_backup_time);
-                    sql.close(&context);
                }
            }
+            Err(_) => (),
        }
    }
    match newest_backup_path {
@@ -172,7 +175,7 @@ pub fn render_setup_file(context: &Context, passphrase: &str) -> Result<String>
    );
    let self_addr = e2ee::ensure_secret_key_exists(context)?;
    let private_key = Key::from_self_private(context, self_addr, &context.sql)
-        .ok_or_else(|| format_err!("Failed to get private key."))?;
+        .ok_or(format_err!("Failed to get private key."))?;
    let ac_headers = match context.get_config_bool(Config::E2eeEnabled) {
        false => None,
        true => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
@@ -219,7 +222,7 @@ pub fn create_setup_code(_context: &Context) -> String {
    for i in 0..9 {
        loop {
            random_val = rng.gen();
-            if random_val as usize <= 60000 {
+            if !(random_val as usize > 60000) {
                break;
            }
        }
@@ -545,7 +548,7 @@ fn export_backup(context: &Context, dir: impl AsRef<Path>) -> Result<()> {
        }
        Ok(()) => {
            dest_sql.set_raw_config_int(context, "backup_time", now as i32)?;
-            context.call_cb(Event::ImexFileWritten(dest_path_filename));
+            context.call_cb(Event::ImexFileWritten(dest_path_filename.clone()));
            Ok(())
        }
    };
--- a/src/job.rs
+++ b/src/job.rs
@@ -1,15 +1,8 @@
-//! # Job module
-//!
-//! This module implements a job queue maintained in the SQLite database
-//! and job types.
-
 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;
@@ -124,7 +117,6 @@ pub struct Job {
 }

 impl Job {
-    /// Deletes the job from the database.
    fn delete(&self, context: &Context) -> bool {
        context
            .sql
@@ -132,9 +124,6 @@ impl Job {
            .is_ok()
    }

-    /// Updates the job already stored in the database.
-    ///
-    /// To add a new job, use [job_add].
    fn update(&self, context: &Context) -> bool {
        sql::execute(
            context,
@@ -194,10 +183,6 @@ impl Job {
                    // was sent we need to mark it in the database ASAP as we
                    // otherwise might send it twice.
                    let mut smtp = context.smtp.lock().unwrap();
-                    if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
-                        info!(context, "smtp-sending out mime message:");
-                        println!("{}", String::from_utf8_lossy(&body));
-                    }
                    match smtp.send(context, recipients_list, body, self.job_id) {
                        Err(crate::smtp::send::Error::SendError(err)) => {
                            // Remote error, retry later.
@@ -400,37 +385,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) {
@@ -618,7 +597,7 @@ fn set_delivered(context: &Context, msg_id: MsgId) {
        .unwrap_or_default();
    context.call_cb(Event::MsgDelivered {
        chat_id: chat_id as u32,
-        msg_id,
+        msg_id: msg_id,
    });
 }

@@ -626,7 +605,26 @@ fn set_delivered(context: &Context, msg_id: MsgId) {
 #[allow(non_snake_case)]
 pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
    let mut msg = Message::load_from_db(context, msg_id)?;
-    msg.try_calc_and_set_dimensions(context).ok();
+
+    if chat::msgtype_has_file(msg.type_0) {
+        let file_param = msg.param.get_path(Param::File, context)?;
+        if let Some(pathNfilename) = file_param {
+            if (msg.type_0 == Viewtype::Image || msg.type_0 == Viewtype::Gif)
+                && !msg.param.exists(Param::Width)
+            {
+                msg.param.set_int(Param::Width, 0);
+                msg.param.set_int(Param::Height, 0);
+
+                if let Ok(buf) = dc_read_file(context, pathNfilename) {
+                    if let Ok((width, height)) = dc_get_filemeta(&buf) {
+                        msg.param.set_int(Param::Width, width as i32);
+                        msg.param.set_int(Param::Height, height as i32);
+                    }
+                }
+                msg.save_param_to_disk(context);
+            }
+        }
+    }

    /* create message */
    let needs_encryption = msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default();
@@ -914,8 +912,6 @@ fn add_smtp_job(
    Ok(())
 }

-/// Adds a job to the database, scheduling it `delay_seconds`
-/// after the current time.
 pub fn job_add(
    context: &Context,
    action: Action,
--- 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,21 @@ 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
+            })
+            .to_string()
    }

    pub fn to_armored_string(
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,17 +1,8 @@
-#![deny(clippy::correctness, missing_debug_implementations, clippy::all)]
-// for now we hide warnings to not clutter/hide errors during "cargo clippy"
-#![allow(
-    clippy::type_complexity,
-    clippy::cognitive_complexity,
-    clippy::too_many_arguments,
-    clippy::block_in_if_condition_stmt,
-    clippy::large_enum_variant
-)]
-#![allow(
-    clippy::unreadable_literal,
-    clippy::needless_range_loop,
-    clippy::match_bool
-)]
+#![deny(clippy::correctness, missing_debug_implementations)]
+// TODO: make all of these errors, such that clippy actually passes.
+#![warn(clippy::all, clippy::perf, clippy::not_unsafe_ptr_arg_deref)]
+// This is nice, but for now just annoying.
+#![allow(clippy::unreadable_literal)]
 #![feature(ptr_wrapping_offset_from)]

 #[macro_use]
@@ -76,13 +67,8 @@ mod dehtml;
 pub mod dc_array;
 pub mod dc_receive_imf;
 mod dc_simplify;
+mod dc_strencode;
 pub mod dc_tools;

-/// if set imap/incoming and smtp/outgoing MIME messages will be printed
-pub const DCC_MIME_DEBUG: &str = "DCC_MIME_DEBUG";
-
-/// if set IMAP protocol commands and responses will be printed
-pub const DCC_IMAP_DEBUG: &str = "DCC_IMAP_DEBUG";
-
 #[cfg(test)]
 mod test_utils;
--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -1,5 +1,3 @@
-//! # Login parameters
-
 use std::borrow::Cow;
 use std::fmt;

@@ -106,7 +104,7 @@ impl LoginParam {
        let server_flags = sql.get_raw_config_int(context, key).unwrap_or_default();

        LoginParam {
-            addr,
+            addr: addr.to_string(),
            mail_server,
            mail_user,
            mail_pw,
@@ -200,7 +198,6 @@ impl fmt::Display for LoginParam {
    }
 }

-#[allow(clippy::ptr_arg)]
 fn unset_empty(s: &String) -> Cow<String> {
    if s.is_empty() {
        Cow::Owned("unset".to_string())
@@ -209,45 +206,44 @@ fn unset_empty(s: &String) -> Cow<String> {
    }
 }

-#[allow(clippy::useless_let_if_seq)]
 fn get_readable_flags(flags: i32) -> String {
    let mut res = String::new();
    for bit in 0..31 {
        if 0 != flags & 1 << bit {
-            let mut flag_added = false;
+            let mut flag_added = 0;
            if 1 << bit == 0x2 {
                res += "OAUTH2 ";
-                flag_added = true;
+                flag_added = 1;
            }
            if 1 << bit == 0x4 {
                res += "AUTH_NORMAL ";
-                flag_added = true;
+                flag_added = 1;
            }
            if 1 << bit == 0x100 {
                res += "IMAP_STARTTLS ";
-                flag_added = true;
+                flag_added = 1;
            }
            if 1 << bit == 0x200 {
                res += "IMAP_SSL ";
-                flag_added = true;
+                flag_added = 1;
            }
            if 1 << bit == 0x400 {
                res += "IMAP_PLAIN ";
-                flag_added = true;
+                flag_added = 1;
            }
            if 1 << bit == 0x10000 {
                res += "SMTP_STARTTLS ";
-                flag_added = true;
+                flag_added = 1
            }
            if 1 << bit == 0x20000 {
                res += "SMTP_SSL ";
-                flag_added = true;
+                flag_added = 1
            }
            if 1 << bit == 0x40000 {
                res += "SMTP_PLAIN ";
-                flag_added = true;
+                flag_added = 1
            }
-            if flag_added {
+            if 0 == flag_added {
                res += &format!("{:#0x}", 1 << bit);
            }
        }
--- a/src/lot.rs
+++ b/src/lot.rs
@@ -5,7 +5,7 @@ use deltachat_derive::{FromSql, ToSql};
 /// Lot objects are created
 /// eg. by chatlist.get_summary() or dc_msg_get_summary().
 ///
-/// *Lot* is used in the meaning *heap* here.
+/// _Lot_ is used in the meaning _heap_ here.
 #[derive(Default, Debug, Clone)]
 pub struct Lot {
    pub(crate) text1_meaning: Meaning,
--- a/src/message.rs
+++ b/src/message.rs
@@ -1,5 +1,3 @@
-//! # Messages and their identifiers
-
 use std::path::{Path, PathBuf};

 use deltachat_derive::{FromSql, ToSql};
@@ -46,7 +44,7 @@ impl MsgId {
    /// Whether the message ID signifies a special message.
    ///
    /// This kind of message ID can not be used for real messages.
-    pub fn is_special(self) -> bool {
+    pub fn is_special(&self) -> bool {
        match self.0 {
            0..=DC_MSG_ID_LAST_SPECIAL => true,
            _ => false,
@@ -62,21 +60,21 @@ impl MsgId {
    ///
    /// When this is `true`, [MsgId::is_special] will also always be
    /// `true`.
-    pub fn is_unset(self) -> bool {
+    pub fn is_unset(&self) -> bool {
        self.0 == 0
    }

    /// Whether the message ID is the special marker1 marker.
    ///
    /// See the docs of the `dc_get_chat_msgs` C API for details.
-    pub fn is_marker1(self) -> bool {
+    pub fn is_marker1(&self) -> bool {
        self.0 == DC_MSG_ID_MARKER1
    }

    /// Whether the message ID is the special day marker.
    ///
    /// See the docs of the `dc_get_chat_msgs` C API for details.
-    pub fn is_daymarker(self) -> bool {
+    pub fn is_daymarker(&self) -> bool {
        self.0 == DC_MSG_ID_DAYMARKER
    }

@@ -84,7 +82,7 @@ impl MsgId {
    ///
    /// Avoid using this, eventually types should be cleaned up enough
    /// that it is no longer necessary.
-    pub fn to_u32(self) -> u32 {
+    pub fn to_u32(&self) -> u32 {
        self.0
    }
 }
@@ -311,32 +309,6 @@ impl Message {
        self.param.get_path(Param::File, context).unwrap_or(None)
    }

-    pub fn try_calc_and_set_dimensions(&mut self, context: &Context) -> Result<(), Error> {
-        if chat::msgtype_has_file(self.type_0) {
-            let file_param = self.param.get_path(Param::File, context)?;
-            if let Some(path_and_filename) = file_param {
-                if (self.type_0 == Viewtype::Image || self.type_0 == Viewtype::Gif)
-                    && !self.param.exists(Param::Width)
-                {
-                    self.param.set_int(Param::Width, 0);
-                    self.param.set_int(Param::Height, 0);
-
-                    if let Ok(buf) = dc_read_file(context, path_and_filename) {
-                        if let Ok((width, height)) = dc_get_filemeta(&buf) {
-                            self.param.set_int(Param::Width, width as i32);
-                            self.param.set_int(Param::Height, height as i32);
-                        }
-                    }
-
-                    if !self.id.is_unset() {
-                        self.save_param_to_disk(context);
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
    /// Check if a message has a location bound to it.
    /// These messages are also returned by dc_get_locations()
    /// and the UI may decide to display a special icon beside such messages,
@@ -689,7 +661,7 @@ impl Lot {
        self.text2 = Some(get_summarytext_by_raw(
            msg.type_0,
            msg.text.as_ref(),
-            &msg.param,
+            &mut msg.param,
            SUMMARY_CHARACTERS,
            context,
        ));
@@ -1220,10 +1192,9 @@ pub fn mdn_from_ext(
                } // else wait for more receipts
            }
        }
-        return if read_by_all {
-            Some((chat_id, msg_id))
-        } else {
-            None
+        return match read_by_all {
+            true => Some((chat_id, msg_id)),
+            false => None,
        };
    }
    None
@@ -1371,32 +1342,50 @@ mod tests {
        some_file.set(Param::File, "foo.bar");

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Text, some_text.as_ref(), &Params::new(), 50, &ctx),
+            get_summarytext_by_raw(
+                Viewtype::Text,
+                some_text.as_ref(),
+                &mut Params::new(),
+                50,
+                &ctx
+            ),
            "bla bla" // for simple text, the type is not added to the summary
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Image, no_text.as_ref(), &some_file, 50, &ctx,),
+            get_summarytext_by_raw(Viewtype::Image, no_text.as_ref(), &mut some_file, 50, &ctx,),
            "Image" // file names are not added for images
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Video, no_text.as_ref(), &some_file, 50, &ctx,),
+            get_summarytext_by_raw(Viewtype::Video, no_text.as_ref(), &mut some_file, 50, &ctx,),
            "Video" // file names are not added for videos
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Gif, no_text.as_ref(), &some_file, 50, &ctx,),
+            get_summarytext_by_raw(Viewtype::Gif, no_text.as_ref(), &mut some_file, 50, &ctx,),
            "GIF" // file names are not added for GIFs
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Sticker, no_text.as_ref(), &some_file, 50, &ctx,),
+            get_summarytext_by_raw(
+                Viewtype::Sticker,
+                no_text.as_ref(),
+                &mut some_file,
+                50,
+                &ctx,
+            ),
            "Sticker" // file names are not added for stickers
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Voice, empty_text.as_ref(), &some_file, 50, &ctx,),
+            get_summarytext_by_raw(
+                Viewtype::Voice,
+                empty_text.as_ref(),
+                &mut some_file,
+                50,
+                &ctx,
+            ),
            "Voice message" // file names are not added for voice messages, empty text is skipped
        );

@@ -1406,7 +1395,13 @@ mod tests {
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Voice, some_text.as_ref(), &some_file, 50, &ctx),
+            get_summarytext_by_raw(
+                Viewtype::Voice,
+                some_text.as_ref(),
+                &mut some_file,
+                50,
+                &ctx
+            ),
            "Voice message \u{2013} bla bla" // `\u{2013}` explicitly checks for "EN DASH"
        );

@@ -1416,12 +1411,24 @@ mod tests {
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Audio, empty_text.as_ref(), &some_file, 50, &ctx,),
+            get_summarytext_by_raw(
+                Viewtype::Audio,
+                empty_text.as_ref(),
+                &mut some_file,
+                50,
+                &ctx,
+            ),
            "Audio \u{2013} foo.bar" // file name is added for audio, empty text is not added
        );

        assert_eq!(
-            get_summarytext_by_raw(Viewtype::Audio, some_text.as_ref(), &some_file, 50, &ctx),
+            get_summarytext_by_raw(
+                Viewtype::Audio,
+                some_text.as_ref(),
+                &mut some_file,
+                50,
+                &ctx
+            ),
            "Audio \u{2013} foo.bar \u{2013} bla bla" // file name and text added for audio
        );

--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -6,6 +6,7 @@ use crate::config::Config;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::{get_version_str, Context};
+use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::e2ee::*;
 use crate::error::Error;
@@ -130,12 +131,11 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                    .get_config(Config::ConfiguredAddr)
                    .unwrap_or_default();

-                if !email_to_remove.is_empty()
-                    && !addr_cmp(email_to_remove, self_addr)
-                    && !vec_contains_lowercase(&factory.recipients_addr, &email_to_remove)
-                {
-                    factory.recipients_names.push("".to_string());
-                    factory.recipients_addr.push(email_to_remove.to_string());
+                if !email_to_remove.is_empty() && !addr_cmp(email_to_remove, self_addr) {
+                    if !vec_contains_lowercase(&factory.recipients_addr, &email_to_remove) {
+                        factory.recipients_names.push("".to_string());
+                        factory.recipients_addr.push(email_to_remove.to_string());
+                    }
                }
            }
            if command != SystemMessage::AutocryptSetupMessage
@@ -299,7 +299,14 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                    return true;
                }

-                self.msg.param.get_cmd() == SystemMessage::MemberAddedToGroup
+                match self.msg.param.get_cmd() {
+                    SystemMessage::MemberAddedToGroup => {
+                        return true;
+                    }
+                    _ => {}
+                }
+
+                false
            }
            Loaded::MDN => false,
        }
@@ -332,19 +339,13 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            Loaded::Message => {
                match self.chat {
                    Some(ref chat) => {
-                        let raw = message::get_summarytext_by_raw(
+                        let raw_subject = message::get_summarytext_by_raw(
                            self.msg.type_0,
                            self.msg.text.as_ref(),
                            &self.msg.param,
                            32,
                            self.context,
                        );
-                        let mut lines = raw.lines();
-                        let raw_subject = if let Some(line) = lines.next() {
-                            line
-                        } else {
-                            ""
-                        };

                        let afwd_email = self.msg.param.exists(Param::Forwarded);
                        let fwd = if afwd_email { "Fwd: " } else { "" };
@@ -382,7 +383,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        let mut unprotected_headers: Vec<Header> = Vec::new();

        let from = Address::new_mailbox_with_name(
-            encode_words(&self.from_displayname),
+            dc_encode_header_words(&self.from_displayname),
            self.from_addr.clone(),
        );

@@ -394,7 +395,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                to.push(Address::new_mailbox(addr.clone()));
            } else {
                to.push(Address::new_mailbox_with_name(
-                    encode_words(name),
+                    dc_encode_header_words(name),
                    addr.clone(),
                ));
            }
@@ -450,7 +451,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        let e2ee_guranteed = self.is_e2ee_guranteed();
        let mut encrypt_helper = EncryptHelper::new(self.context)?;

-        let subject = encode_words(&subject_str);
+        let subject = dc_encode_header_words(subject_str);

        let mut message = match self.loaded {
            Loaded::Message => {
@@ -472,6 +473,17 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            encrypt_helper.should_encrypt(self.context, e2ee_guranteed, &peerstates)?;
        let is_encrypted = should_encrypt && force_plaintext == 0;

+        // Add gossip headers
+        if do_gossip {
+            for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) {
+                if peerstate.peek_key(min_verified).is_some() {
+                    if let Some(header) = peerstate.render_gossip_header(min_verified) {
+                        protected_headers.push(Header::new("Autocrypt-Gossip".into(), header));
+                    }
+                }
+            }
+        }
+
        let rfc724_mid = match self.loaded {
            Loaded::Message => self.msg.rfc724_mid.clone(),
            Loaded::MDN => dc_create_outgoing_rfc724_mid(None, &self.from_addr),
@@ -483,23 +495,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        unprotected_headers.push(Header::new_with_value("From".into(), vec![from]).unwrap());

        let outer_message = if is_encrypted {
-            // Add gossip headers
-            if do_gossip {
-                for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) {
-                    if peerstate.peek_key(min_verified).is_some() {
-                        if let Some(header) = peerstate.render_gossip_header(min_verified) {
-                            message =
-                                message.header(Header::new("Autocrypt-Gossip".into(), header));
-                        }
-                    }
-                }
-            }
-
            // Store protected headers in the inner message.
            for header in protected_headers.into_iter() {
                message = message.header(header);
            }
-
            // Set the appropriate Content-Type for the inner message.
            let mut existing_ct = message
                .get_header("Content-Type".to_string())
@@ -517,7 +516,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            // Set the appropriate Content-Type for the outer message
            let mut outer_message = PartBuilder::new().header((
                "Content-Type".to_string(),
-                "multipart/encrypted; protocol=\"application/pgp-encrypted\"".to_string(),
+                "multipart/encrypted; protocol=\"application/pgp-encrypted\";".to_string(),
            ));

            // Store the unprotected headers on the outer message.
@@ -525,12 +524,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)?;

@@ -616,7 +609,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
            protected_headers.push(Header::new("Chat-Group-ID".into(), chat.grpid.clone()));

-            let encoded = encode_words(&chat.name);
+            let encoded = dc_encode_header_words(&chat.name);
            protected_headers.push(Header::new("Chat-Group-Name".into(), encoded));

            match command {
@@ -986,18 +979,20 @@ fn build_body_file(
        }
    };

+    let needs_ext = dc_needs_ext_header(&filename_to_send);
+
    // create mime part, for Content-Disposition, see RFC 2183.
    // `Content-Disposition: attachment` seems not to make a difference to `Content-Disposition: inline`
    // at least on tested Thunderbird and Gma'l in 2017.
    // But I've heard about problems with inline and outl'k, so we just use the attachment-type until we
    // run into other problems ...
-    let cd_value = if needs_encoding(&filename_to_send) {
+    let cd_value = if needs_ext {
+        format!("attachment; filename=\"{}\"", &filename_to_send)
+    } else {
        format!(
            "attachment; filename*=\"{}\"",
-            encode_words(&filename_to_send)
+            dc_encode_header_words(&filename_to_send)
        )
-    } else {
-        format!("attachment; filename=\"{}\"", &filename_to_send)
    };

    let body = std::fs::read(blob.to_abs_path())?;
@@ -1031,23 +1026,3 @@ fn is_file_size_okay(context: &Context, msg: &Message) -> bool {
        None => false,
    }
 }
-
-/* ******************************************************************************
- * Encode/decode header words, RFC 2047
- ******************************************************************************/
-
-fn encode_words(word: &str) -> String {
-    encoded_words::encode(word, None, encoded_words::EncodingFlag::Shortest, None)
-}
-
-pub fn needs_encoding(to_check: impl AsRef<str>) -> bool {
-    let to_check = to_check.as_ref();
-
-    if to_check.is_empty() {
-        return false;
-    }
-
-    to_check.chars().any(|c| {
-        !c.is_ascii_alphanumeric() && c != '-' && c != '_' && c != '.' && c != '~' && c != '%'
-    })
-}
--- 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;
@@ -22,7 +22,6 @@ 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> {
@@ -30,6 +29,7 @@ pub struct MimeParser<'a> {
    pub parts: Vec<Part>,
    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>,
@@ -74,6 +74,7 @@ impl<'a> MimeParser<'a> {
            parts: Vec::new(),
            header: Default::default(),
            subject: None,
+            is_send_by_messenger: false,
            decrypting_failed: false,
            encrypted: false,
            signatures: Default::default(),
@@ -108,10 +109,6 @@ impl<'a> MimeParser<'a> {
                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
@@ -151,7 +148,11 @@ impl<'a> MimeParser<'a> {
            self.subject = Some(field.clone());
        }

-        if self.lookup_field("Autocrypt-Setup-Message").is_some() {
+        if let Some(_) = self.lookup_field("Chat-Version") {
+            self.is_send_by_messenger = true
+        }
+
+        if let Some(_) = self.lookup_field("Autocrypt-Setup-Message") {
            let has_setup_file = self.parts.iter().any(|p| {
                p.mimetype.is_some() && p.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
            });
@@ -187,17 +188,19 @@ impl<'a> MimeParser<'a> {
                self.is_system_message = SystemMessage::LocationStreamingEnabled;
            }
        }
-        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];
-                if imgpart.typ == Viewtype::Image {
-                    imgpart.is_meta = true;
+        if let Some(_) = self.lookup_field("Chat-Group-Image") {
+            if !self.parts.is_empty() {
+                let textpart = &self.parts[0];
+                if textpart.typ == Viewtype::Text && self.parts.len() >= 2 {
+                    let imgpart = &mut self.parts[1];
+                    if imgpart.typ == Viewtype::Image {
+                        imgpart.is_meta = true;
+                    }
                }
            }
        }

-        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];
@@ -231,7 +234,7 @@ impl<'a> MimeParser<'a> {
                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
@@ -261,11 +264,11 @@ impl<'a> MimeParser<'a> {
            }
        }
        if self.parts.len() == 1 {
-            if self.parts[0].typ == Viewtype::Audio
-                && 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::Audio {
+                if let Some(_) = self.lookup_field("Chat-Voice-Message") {
+                    let part_mut = &mut self.parts[0];
+                    part_mut.typ = Viewtype::Voice;
+                }
            }
            if self.parts[0].typ == Viewtype::Image {
                if let Some(value) = self.lookup_field("Chat-Content") {
@@ -317,7 +320,7 @@ impl<'a> MimeParser<'a> {
            part.typ = Viewtype::Text;

            if let Some(ref subject) = self.subject {
-                if !self.has_chat_version() {
+                if !self.is_send_by_messenger {
                    part.msg = subject.to_string();
                }
            }
@@ -336,10 +339,6 @@ impl<'a> MimeParser<'a> {
        self.parts.iter_mut().rev().find(|part| !part.is_meta)
    }

-    pub(crate) fn has_chat_version(&self) -> bool {
-        self.header.contains_key("chat-version")
-    }
-
    pub fn lookup_field(&self, field_name: &str) -> Option<&String> {
        self.header.get(&field_name.to_lowercase())
    }
@@ -490,10 +489,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;
                    }
                }
@@ -508,60 +538,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('/').skip(1).next() {
+                        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)
@@ -572,7 +626,7 @@ impl<'a> MimeParser<'a> {
        &mut self,
        msg_type: Viewtype,
        mime_type: Mime,
-        raw_mime: &str,
+        raw_mime: &String,
        decoded_data: &[u8],
        filename: &str,
    ) {
@@ -610,7 +664,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();
@@ -632,7 +685,7 @@ impl<'a> MimeParser<'a> {

    fn do_add_single_part(&mut self, mut part: Part) {
        if self.encrypted {
-            if !self.signatures.is_empty() {
+            if self.signatures.len() > 0 {
                part.param.set_int(Param::GuaranteeE2ee, 1);
            } else {
                // XXX if the message was encrypted but not signed
@@ -645,15 +698,17 @@ impl<'a> MimeParser<'a> {
    }

    pub fn is_mailinglist_message(&self) -> bool {
-        if self.lookup_field("List-Id").is_some() {
+        if let Some(_) = self.lookup_field("List-Id") {
            return true;
        }

        if let Some(precedence) = self.lookup_field("Precedence") {
-            precedence == "list" || precedence == "bulk"
-        } else {
-            false
+            if precedence == "list" || precedence == "bulk" {
+                return true;
+            }
        }
+
+        false
    }

    pub fn sender_equals_recipient(&self) -> bool {
@@ -761,11 +816,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);
@@ -862,13 +917,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,
@@ -902,69 +956,22 @@ 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> {
+fn get_recipients<'a, S: AsRef<str>, T: Iterator<Item = (S, S)>>(headers: T) -> HashSet<String> {
    let mut recipients: HashSet<String> = Default::default();

    for (hkey, hvalue) in headers {
-        let hkey = hkey.as_ref().to_lowercase();
+        let hkey = hkey.as_ref();
        let hvalue = hvalue.as_ref();
+
        if hkey == "to" || hkey == "cc" {
            if let Ok(addrs) = mailparse::addrparse(hvalue) {
                for addr in addrs.iter() {
@@ -1051,40 +1058,6 @@ mod tests {
        assert_eq!(mimeparser.get_rfc724_mid(), None);
    }

-    #[test]
-    fn test_get_recipients() {
-        let context = dummy_context();
-        let raw = include_bytes!("../test-data/message/mail_with_cc.txt");
-        let mimeparser = MimeParser::from_bytes(&context.ctx, &raw[..]).unwrap();
-        let recipients = get_recipients(mimeparser.header.iter());
-        assert!(recipients.contains("abc@bcd.com"));
-        assert!(recipients.contains("def@def.de"));
-        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 =
--- a/src/param.rs
+++ b/src/param.rs
@@ -50,8 +50,8 @@ pub enum Param {
    Error = b'L',
    /// For Messages: space-separated list of messaged IDs of forwarded copies.
    ///
-    /// This is used when a [crate::message::Message] is in the
-    /// [crate::message::MessageState::OutPending] state but is already forwarded.
+    /// This is used when a [Message] is in the
+    /// [MessageState::OutPending] state but is already forwarded.
    /// In this case the forwarded messages are written to the
    /// database and their message IDs are added to this parameter of
    /// the original message, which is also saved in the database.
@@ -222,7 +222,7 @@ impl Params {
            Some(val) => val,
            None => return Ok(None),
        };
-        ParamsFile::from_param(context, val).map(Some)
+        ParamsFile::from_param(context, val).map(|file| Some(file))
    }

    /// Gets the parameter and returns a [BlobObject] for it.
@@ -373,7 +373,7 @@ mod tests {
        if let ParamsFile::FsPath(p) = ParamsFile::from_param(&t.ctx, "/foo/bar/baz").unwrap() {
            assert_eq!(p, Path::new("/foo/bar/baz"));
        } else {
-            panic!("Wrong enum variant");
+            assert!(false, "Wrong enum variant");
        }
    }

@@ -383,7 +383,7 @@ mod tests {
        if let ParamsFile::Blob(b) = ParamsFile::from_param(&t.ctx, "$BLOBDIR/foo").unwrap() {
            assert_eq!(b.as_name(), "$BLOBDIR/foo");
        } else {
-            panic!("Wrong enum variant");
+            assert!(false, "Wrong enum variant");
        }
    }

--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -230,7 +230,6 @@ pub fn pk_encrypt(
    Ok(encoded_msg)
 }

-#[allow(clippy::implicit_hasher)]
 pub fn pk_decrypt(
    ctext: &[u8],
    private_keys_for_decryption: &Keyring,
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -533,10 +533,12 @@ pub(crate) fn handle_securejoin_handshake(
                if group_chat_id == 0 {
                    error!(context, "Chat {} not found.", &field_grpid);
                    return Ok(ret);
-                } else if let Err(err) =
-                    chat::add_contact_to_chat_ex(context, group_chat_id, contact_id, true)
-                {
-                    error!(context, "failed to add contact: {}", err);
+                } else {
+                    if let Err(err) =
+                        chat::add_contact_to_chat_ex(context, group_chat_id, contact_id, true)
+                    {
+                        error!(context, "failed to add contact: {}", err);
+                    }
                }
            } else {
                send_handshake_msg(context, contact_chat_id, "vc-contact-confirm", "", None, "");
@@ -641,7 +643,7 @@ pub(crate) fn handle_securejoin_handshake(
                let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, &field_grpid);
                context.call_cb(Event::SecurejoinMemberAdded {
                    chat_id: group_chat_id,
-                    contact_id,
+                    contact_id: contact_id,
                });
            } else {
                warn!(context, "vg-member-added-received invalid.",);
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -5,6 +5,8 @@ pub mod send;
 use lettre::smtp::client::net::*;
 use lettre::*;

+use failure::Fail;
+
 use crate::constants::*;
 use crate::context::Context;
 use crate::events::Event;
@@ -31,7 +33,7 @@ pub enum Error {

 pub type Result<T> = std::result::Result<T, Error>;

-#[derive(Default, DebugStub)]
+#[derive(DebugStub)]
 pub struct Smtp {
    #[debug_stub(some = "SmtpTransport")]
    transport: Option<lettre::smtp::SmtpTransport>,
@@ -43,7 +45,11 @@ pub struct Smtp {
 impl Smtp {
    /// Create a new Smtp instances.
    pub fn new() -> Self {
-        Default::default()
+        Smtp {
+            transport: None,
+            transport_connected: false,
+            from: None,
+        }
    }

    /// Disconnect the SMTP transport and drop it entirely.
@@ -74,12 +80,15 @@ impl Smtp {
            return Err(Error::BadParameters);
        }

-        let from =
-            EmailAddress::new(lp.addr.clone()).map_err(|err| Error::InvalidLoginAddress {
-                address: lp.addr.clone(),
-                error: err,
-            })?;
-        self.from = Some(from);
+        self.from = match EmailAddress::new(lp.addr.clone()) {
+            Ok(addr) => Some(addr),
+            Err(err) => {
+                return Err(Error::InvalidLoginAddress {
+                    address: lp.addr.clone(),
+                    error: err,
+                })
+            }
+        };

        let domain = &lp.send_server;
        let port = lp.send_port as u16;
@@ -126,23 +135,30 @@ impl Smtp {
            lettre::smtp::ClientSecurity::Wrapper(tls_parameters)
        };

-        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(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,
-        )));
-        Ok(())
+        match lettre::smtp::SmtpClient::new((domain.as_str(), port), security) {
+            Ok(client) => {
+                let client = client
+                    .smtp_utf8(true)
+                    .credentials(creds)
+                    .authentication_mechanism(mechanism)
+                    .connection_reuse(lettre::smtp::ConnectionReuseParameters::ReuseUnlimited);
+                let mut trans = client.transport();
+                match trans.connect() {
+                    Ok(()) => {
+                        self.transport = Some(trans);
+                        self.transport_connected = true;
+                        context.call_cb(Event::SmtpConnected(format!(
+                            "SMTP-LOGIN as {} ok",
+                            lp.send_user,
+                        )));
+                        return Ok(());
+                    }
+                    Err(err) => return Err(Error::ConnectionFailure(err)),
+                }
+            }
+            Err(err) => {
+                return Err(Error::ConnectionSetupFailure(err));
+            }
+        }
    }
 }
--- a/src/smtp/send.rs
+++ b/src/smtp/send.rs
@@ -58,7 +58,7 @@ impl Smtp {
                context,
                "uh? SMTP has no transport, failed to send to {}", recipients_display
            );
-            Err(Error::NoTransport)
+            return Err(Error::NoTransport);
        }
    }
 }
--- 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;
@@ -66,19 +68,13 @@ pub struct Sql {
    in_use: Arc<ThreadLocal<String>>,
 }

-impl Default for Sql {
-    fn default() -> Self {
-        Self {
+impl Sql {
+    pub fn new() -> Sql {
+        Sql {
            pool: RwLock::new(None),
            in_use: Arc::new(ThreadLocal::new()),
        }
    }
-}
-
-impl Sql {
-    pub fn new() -> Sql {
-        Self::default()
-    }

    pub fn is_open(&self) -> bool {
        self.pool.read().unwrap().is_some()
@@ -545,6 +541,7 @@ fn open(

        let mut dbversion = dbversion_before_update;
        let mut recalc_fingerprints = 0;
+        let mut update_file_paths = 0;
        let mut update_icons = false;

        if dbversion < 1 {
@@ -709,6 +706,19 @@ fn open(
                "CREATE INDEX acpeerstates_index5 ON acpeerstates (verified_key_fingerprint);",
                params![],
            )?;
+            if dbversion_before_update == 34 {
+                // migrate database from the use of verified-flags to verified_key,
+                // _only_ version 34 (0.17.0) has the fields public_key_verified and gossip_key_verified
+                // this block can be deleted in half a year or so (created 5/2018)
+                sql.execute(
+                    "UPDATE acpeerstates SET verified_key=gossip_key, verified_key_fingerprint=gossip_key_fingerprint WHERE gossip_key_verified=2;",
+                    params![]
+                )?;
+                sql.execute(
+                    "UPDATE acpeerstates SET verified_key=public_key, verified_key_fingerprint=public_key_fingerprint WHERE public_key_verified=2;",
+                    params![]
+                )?;
+            }
            dbversion = 39;
            sql.set_raw_config_int(context, "dbversion", 39)?;
        }
@@ -721,6 +731,20 @@ fn open(
            dbversion = 40;
            sql.set_raw_config_int(context, "dbversion", 40)?;
        }
+        if dbversion < 41 {
+            info!(context, "[migration] v41");
+            update_file_paths = 1;
+            dbversion = 41;
+            sql.set_raw_config_int(context, "dbversion", 41)?;
+        }
+        if dbversion < 42 {
+            info!(context, "[migration] v42");
+            // older versions set the txt-field to the filenames, for debugging and fulltext search.
+            // to allow text+attachment compound messages, we need to reset these fields.
+            sql.execute("UPDATE msgs SET txt='' WHERE type!=10", params![])?;
+            dbversion = 42;
+            sql.set_raw_config_int(context, "dbversion", 42)?;
+        }
        if dbversion < 44 {
            info!(context, "[migration] v44");
            sql.execute("ALTER TABLE msgs ADD COLUMN mime_headers TEXT;", params![])?;
@@ -882,6 +906,34 @@ fn open(
                },
            )?;
        }
+        if 0 != update_file_paths {
+            // versions before 2018-08 save the absolute paths in the database files at "param.f=";
+            // for newer versions, we copy files always to the blob directory and store relative paths.
+            // this snippet converts older databases and can be removed after some time.
+            info!(context, "[migration] update file paths");
+            let repl_from = sql
+                .get_raw_config(context, "backup_for")
+                .unwrap_or_else(|| context.get_blobdir().to_string_lossy().into());
+
+            let repl_from = dc_ensure_no_slash_safe(&repl_from);
+            sql.execute(
+                &format!(
+                    "UPDATE msgs SET param=replace(param, 'f={}/', 'f=$BLOBDIR/')",
+                    repl_from
+                ),
+                NO_PARAMS,
+            )?;
+
+            sql.execute(
+                &format!(
+                    "UPDATE chats SET param=replace(param, 'i={}/', 'i=$BLOBDIR/');",
+                    repl_from
+                ),
+                NO_PARAMS,
+            )?;
+
+            sql.set_raw_config(context, "backup_for", None)?;
+        }
        if update_icons {
            update_saved_messages_icon(context)?;
        }
@@ -950,12 +1002,13 @@ pub fn get_rowid_with_conn(
    // the ORDER BY ensures, this function always returns the most recent id,
    // eg. if a Message-ID is split into different messages.
    let query = format!(
-        "SELECT id FROM {} WHERE {}=? ORDER BY id DESC",
+        "SELECT id FROM {} WHERE {}='{}' ORDER BY id DESC",
        table.as_ref(),
        field.as_ref(),
+        value.as_ref()
    );

-    match conn.query_row(&query, params![value.as_ref()], |row| row.get::<_, u32>(0)) {
+    match conn.query_row(&query, NO_PARAMS, |row| row.get::<_, u32>(0)) {
        Ok(id) => id,
        Err(err) => {
            error!(
@@ -1087,23 +1140,26 @@ pub fn housekeeping(context: &Context) {

                unreferenced_count += 1;

-                if let Ok(stats) = std::fs::metadata(entry.path()) {
-                    let recently_created =
-                        stats.created().is_ok() && stats.created().unwrap() > keep_files_newer_than;
-                    let recently_modified = stats.modified().is_ok()
-                        && stats.modified().unwrap() > keep_files_newer_than;
-                    let recently_accessed = stats.accessed().is_ok()
-                        && stats.accessed().unwrap() > keep_files_newer_than;
+                match std::fs::metadata(entry.path()) {
+                    Ok(stats) => {
+                        let recently_created = stats.created().is_ok()
+                            && stats.created().unwrap() > keep_files_newer_than;
+                        let recently_modified = stats.modified().is_ok()
+                            && stats.modified().unwrap() > keep_files_newer_than;
+                        let recently_accessed = stats.accessed().is_ok()
+                            && stats.accessed().unwrap() > keep_files_newer_than;

-                    if recently_created || recently_modified || recently_accessed {
-                        info!(
-                            context,
-                            "Housekeeping: Keeping new unreferenced file #{}: {:?}",
-                            unreferenced_count,
-                            entry.file_name(),
-                        );
-                        continue;
+                        if recently_created || recently_modified || recently_accessed {
+                            info!(
+                                context,
+                                "Housekeeping: Keeping new unreferenced file #{}: {:?}",
+                                unreferenced_count,
+                                entry.file_name(),
+                            );
+                            continue;
+                        }
                    }
+                    Err(_) => {}
                }
                info!(
                    context,
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -5,15 +5,9 @@ use std::borrow::Cow;
 use strum::EnumProperty;
 use strum_macros::EnumProperty;

-use crate::blob::BlobObject;
-use crate::chat;
-use crate::constants::{Viewtype, DC_CONTACT_ID_SELF};
 use crate::contact::*;
 use crate::context::Context;
 use crate::error::Error;
-use crate::message::Message;
-use crate::param::Param;
-use crate::stock::StockMessage::{DeviceMessagesHint, WelcomeMessage};

 /// Stock strings
 ///
@@ -28,174 +22,107 @@ use crate::stock::StockMessage::{DeviceMessagesHint, WelcomeMessage};
 pub enum StockMessage {
    #[strum(props(fallback = "No messages."))]
    NoMessages = 1,
-
    #[strum(props(fallback = "Me"))]
    SelfMsg = 2,
-
    #[strum(props(fallback = "Draft"))]
    Draft = 3,
-
    #[strum(props(fallback = "%1$s member(s)"))]
    Member = 4,
-
    #[strum(props(fallback = "%1$s contact(s)"))]
    Contact = 6,
-
    #[strum(props(fallback = "Voice message"))]
    VoiceMessage = 7,
-
    #[strum(props(fallback = "Contact requests"))]
    DeadDrop = 8,
-
    #[strum(props(fallback = "Image"))]
    Image = 9,
-
    #[strum(props(fallback = "Video"))]
    Video = 10,
-
    #[strum(props(fallback = "Audio"))]
    Audio = 11,
-
    #[strum(props(fallback = "File"))]
    File = 12,
-
    #[strum(props(fallback = "Sent with my Delta Chat Messenger: https://delta.chat"))]
    StatusLine = 13,
-
    #[strum(props(fallback = "Hello, I\'ve just created the group \"%1$s\" for us."))]
    NewGroupDraft = 14,
-
    #[strum(props(fallback = "Group name changed from \"%1$s\" to \"%2$s\"."))]
    MsgGrpName = 15,
-
    #[strum(props(fallback = "Group image changed."))]
    MsgGrpImgChanged = 16,
-
    #[strum(props(fallback = "Member %1$s added."))]
    MsgAddMember = 17,
-
    #[strum(props(fallback = "Member %1$s removed."))]
    MsgDelMember = 18,
-
    #[strum(props(fallback = "Group left."))]
    MsgGroupLeft = 19,
-
    #[strum(props(fallback = "GIF"))]
    Gif = 23,
-
    #[strum(props(fallback = "Encrypted message"))]
    EncryptedMsg = 24,
-
    #[strum(props(fallback = "End-to-end encryption available."))]
    E2eAvailable = 25,
-
    #[strum(props(fallback = "Transport-encryption."))]
    EncrTransp = 27,
-
    #[strum(props(fallback = "No encryption."))]
    EncrNone = 28,
-
    #[strum(props(fallback = "This message was encrypted for another setup."))]
    CantDecryptMsgBody = 29,
-
    #[strum(props(fallback = "Fingerprints"))]
    FingerPrints = 30,
-
    #[strum(props(fallback = "Return receipt"))]
    ReadRcpt = 31,
-
    #[strum(props(fallback = "This is a return receipt for the message \"%1$s\"."))]
    ReadRcptMailBody = 32,
-
    #[strum(props(fallback = "Group image deleted."))]
    MsgGrpImgDeleted = 33,
-
    #[strum(props(fallback = "End-to-end encryption preferred."))]
    E2ePreferred = 34,
-
    #[strum(props(fallback = "%1$s verified."))]
    ContactVerified = 35,
-
    #[strum(props(fallback = "Cannot verify %1$s"))]
    ContactNotVerified = 36,
-
    #[strum(props(fallback = "Changed setup for %1$s"))]
    ContactSetupChanged = 37,
-
    #[strum(props(fallback = "Archived chats"))]
    ArchivedChats = 40,
-
    #[strum(props(fallback = "Starred messages"))]
    StarredMsgs = 41,
-
    #[strum(props(fallback = "Autocrypt Setup Message"))]
    AcSetupMsgSubject = 42,
-
    #[strum(props(
        fallback = "This is the Autocrypt Setup Message used to transfer your key between clients.\n\nTo decrypt and use your key, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device."
    ))]
    AcSetupMsgBody = 43,
-
    #[strum(props(fallback = "Messages I sent to myself"))]
    SelfTalkSubTitle = 50,
-
    #[strum(props(fallback = "Cannot login as %1$s."))]
    CannotLogin = 60,
-
    #[strum(props(fallback = "Could not connect to %1$s: %2$s"))]
    ServerResponse = 61,
-
    #[strum(props(fallback = "%1$s by %2$s."))]
    MsgActionByUser = 62,
-
    #[strum(props(fallback = "%1$s by me."))]
    MsgActionByMe = 63,
-
    #[strum(props(fallback = "Location streaming enabled."))]
    MsgLocationEnabled = 64,
-
    #[strum(props(fallback = "Location streaming disabled."))]
    MsgLocationDisabled = 65,
-
    #[strum(props(fallback = "Location"))]
    Location = 66,
-
    #[strum(props(fallback = "Sticker"))]
    Sticker = 67,
-
    #[strum(props(fallback = "Device messages"))]
    DeviceMessages = 68,
-
    #[strum(props(fallback = "Saved messages"))]
    SavedMessages = 69,
-
-    #[strum(props(
-        fallback = "Messages in this chat are generated locally by your Delta Chat app. \
-                    Its makers use it to inform about app updates and problems during usage."
-    ))]
-    DeviceMessagesHint = 70,
-
-    #[strum(props(fallback = "Welcome to Delta Chat! – \
-                    Delta Chat looks and feels like other popular messenger apps, \
-                    but does not involve centralized control, \
-                    tracking or selling you, friends, colleagues or family out to large organizations.\n\n\
-                    Technically, Delta Chat is an email application with a modern chat interface. \
-                    Email in a new dress if you will 👻\n\n\
-                    Use Delta Chat with anyone out of billions of people: just use their e-mail address. \
-                    Recipients don't need to install Delta Chat, visit websites or sign up anywhere - \
-                    however, of course, if they like, you may point them to 👉 https://get.delta.chat"))]
-    WelcomeMessage = 71,
 }

-/*
-"
-*/
-
 impl StockMessage {
    /// Default untranslated strings for stock messages.
    ///
    /// These could be used in logging calls, so no logging here.
-    fn fallback(self) -> &'static str {
+    fn fallback(&self) -> &'static str {
        self.get_str("fallback").unwrap_or_default()
    }
 }
@@ -240,7 +167,7 @@ impl Context {
            .unwrap()
            .get(&(id as usize))
        {
-            Some(ref x) => Cow::Owned((*x).to_string()),
+            Some(ref x) => Cow::Owned(x.to_string()),
            None => Cow::Borrowed(id.fallback()),
        }
    }
@@ -337,40 +264,6 @@ impl Context {
            }
        }
    }
-
-    pub fn update_device_chats(&self) -> Result<(), Error> {
-        // check for the LAST added device message - if it is present, we can skip message creation.
-        // this is worthwhile as this function is typically called
-        // by the ui on every probram start or even on every opening of the chatlist.
-        if chat::was_device_msg_ever_added(&self, "core-welcome")? {
-            return Ok(());
-        }
-
-        // create saved-messages chat;
-        // we do this only once, if the user has deleted the chat, he can recreate it manually.
-        if !self.sql.get_raw_config_bool(&self, "self-chat-added") {
-            self.sql
-                .set_raw_config_bool(&self, "self-chat-added", true)?;
-            chat::create_by_contact_id(&self, DC_CONTACT_ID_SELF)?;
-        }
-
-        // add welcome-messages. by the label, this is done only once,
-        // if the user has deleted the message or the chat, it is not added again.
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(self.stock_str(DeviceMessagesHint).to_string());
-        chat::add_device_msg(&self, Some("core-about-device-chat"), Some(&mut msg))?;
-
-        let image = include_bytes!("../assets/welcome-image.jpg");
-        let blob = BlobObject::create(&self, "welcome-image.jpg".to_string(), image)?;
-        let mut msg = Message::new(Viewtype::Image);
-        msg.param.set(Param::File, blob.as_name());
-        chat::add_device_msg(&self, Some("core-welcome-image"), Some(&mut msg))?;
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(self.stock_str(WelcomeMessage).to_string());
-        chat::add_device_msg(&self, Some("core-welcome"), Some(&mut msg))?;
-        Ok(())
-    }
 }

 #[cfg(test)]
@@ -380,7 +273,6 @@ mod tests {

    use crate::constants::DC_CONTACT_ID_SELF;

-    use crate::chatlist::Chatlist;
    use num_traits::ToPrimitive;

    #[test]
@@ -536,22 +428,4 @@ mod tests {
            "Group name changed from \"Some chat\" to \"Other chat\" by Alice (alice@example.com)."
        )
    }
-
-    #[test]
-    fn test_update_device_chats() {
-        let t = dummy_context();
-        t.ctx.update_device_chats().ok();
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
-        assert_eq!(chats.len(), 2);
-
-        chat::delete(&t.ctx, chats.get_chat_id(0)).ok();
-        chat::delete(&t.ctx, chats.get_chat_id(1)).ok();
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
-        assert_eq!(chats.len(), 0);
-
-        // a subsequent call to update_device_chats() must not re-add manally deleted messages or chats
-        t.ctx.update_device_chats().ok();
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
-        assert_eq!(chats.len(), 0);
-    }
 }
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -34,7 +34,7 @@ pub fn test_context(callback: Option<Box<ContextCallback>>) -> TestContext {
        None => Box::new(|_, _| 0),
    };
    let ctx = Context::new(cb, "FakeOs".into(), dbfile).unwrap();
-    TestContext { ctx, dir }
+    TestContext { ctx: ctx, dir: dir }
 }

 /// Return a dummy [TestContext].
--- 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--
--- a/test-data/message/mail_with_cc.txt
+++ b/test-data/message/mail_with_cc.txt
@@ -1,14 +0,0 @@
-Return-Path: <x@testrun.org>
-Received: from hq5.merlinux.eu
-	by hq5.merlinux.eu (Dovecot) with LMTP id yRKOBakcfV1AewAAPzvFDg
-	; Sat, 14 Sep 2019 19:00:25 +0200
-Received: from localhost (unknown 7.165.105.24])
-	by hq5.merlinux.eu (Postfix) with ESMTPSA id 8D9844E023;
-	Sat, 14 Sep 2019 19:00:22 +0200 (CEST)
-message-id: <2dfdbde7@example.org>
-Date: Sat, 14 Sep 2019 19:00:13 +0200
-From: lmn <x@tux.org>
-To: abc <abc@bcd.com>
-CC: def <def@def.de>
-
-hi
Author	SHA1	Message	Date
holger krekel	7a208c4f6b	remove debug logging and fix update_gossip_headers location	2019-12-03 10:59:30 +01:00
dignifiedquire	25ab59eb93	refactor: unsafe, CStr and libc moved out	2019-12-02 15:29:47 +01:00
dignifiedquire	e6f737be9d	cleanup mimeparser and use `mime`	2019-12-02 08:44:51 +01:00
dignifiedquire	e94a896478	fix chat-verified	2019-12-02 00:11:11 +01:00
dignifiedquire	a7a0277330	fix content-type setting and some encryption	2019-12-02 00:01:37 +01:00
dignifiedquire	62a2f70fab	fix various parsing and sending issues	2019-12-01 21:41:13 +01:00
dignifiedquire	04ec7f86ef	some fixes for mdn handling	2019-12-01 21:41:13 +01:00
dignifiedquire	f9e27934f5	fix mailparsing test	2019-12-01 21:41:13 +01:00
dignifiedquire	f1b978c9c7	switch to forked rust-email	2019-12-01 21:41:13 +01:00
dignifiedquire	4eea6b297a	less dead code, and update test	2019-12-01 21:41:13 +01:00
dignifiedquire	0c77cadf19	cleanup and finish missing parts	2019-12-01 21:41:13 +01:00
dignifiedquire	b616830aea	implement mdn rendering	2019-12-01 21:41:13 +01:00
dignifiedquire	4bc637d6d8	restructure mimefactory	2019-12-01 21:41:13 +01:00
dignifiedquire	bb605e28aa	remove dead code	2019-12-01 21:41:13 +01:00
dignifiedquire	deddb8fde4	integrate encryption when sending	2019-12-01 21:41:13 +01:00
dignifiedquire	a59f0bd885	Implement message generation using lettre_email	2019-12-01 21:41:13 +01:00
dignifiedquire	881e15d218	remove mmime	2019-12-01 21:41:13 +01:00
dignifiedquire	7bf825a253	some things	2019-12-01 21:41:13 +01:00
dignifiedquire	fe7d99ae11	first compile	2019-12-01 21:41:13 +01:00