Start implementing Ui config on top of the Config enum

cargo fmt
Implement set/get_ui_config and use those methods if config string starts with 'ui.'
2026-04-14 20:16:31 +03:00 · 2019-09-14 21:44:59 +02:00 · 2019-09-13 11:02:34 +02:00 · 2019-09-12 21:53:37 +02:00 · 2019-09-11 23:53:48 +02:00 · 2019-09-11 23:53:48 +02:00
56 changed files with 3822 additions and 4360 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,6 +110,19 @@ dependencies = [
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "bit-set"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bitfield"
 version = "0.13.2"
@@ -221,7 +234,7 @@ name = "c2-chacha"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -382,7 +395,7 @@ dependencies = [
 "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -401,7 +414,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -474,9 +487,10 @@ dependencies = [
 "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "imap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "imap 1.0.2 (git+https://github.com/jonhoo/rust-imap?rev=281d2eb8ab50dc656ceff2ae749ca5045f334e15)",
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jetscii 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "mmime 0.1.2-alpha.0 (git+https://github.com/dignifiedquire/mmime?rev=bccd2c2)",
@@ -489,6 +503,7 @@ dependencies = [
 "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "quick-xml 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "r2d2_sqlite 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -949,23 +964,24 @@ dependencies = [
 [[package]]
 name = "imap"
 version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/jonhoo/rust-imap?rev=281d2eb8ab50dc656ceff2ae749ca5045f334e15#281d2eb8ab50dc656ceff2ae749ca5045f334e15"
 dependencies = [
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "imap-proto 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "imap-proto 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "imap-proto"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -995,6 +1011,11 @@ name = "itoa"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "jetscii"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "keccak"
 version = "0.1.0"
@@ -1011,7 +1032,7 @@ dependencies = [

 [[package]]
 name = "lazy_static"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -1031,6 +1052,18 @@ dependencies = [
 "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "lexical-core"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stackvector 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.62"
@@ -1198,7 +1231,7 @@ dependencies = [
 "charset 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1209,7 +1242,7 @@ name = "native-tls"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1257,13 +1290,23 @@ dependencies = [
 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "nom"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lexical-core 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num-bigint-dig"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1338,7 +1381,7 @@ dependencies = [
 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1508,7 +1551,7 @@ dependencies = [
 "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "md-5 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1624,6 +1667,25 @@ dependencies = [
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "proptest"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusty-fork 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "publicsuffix"
 version = "1.5.2"
@@ -1631,7 +1693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.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.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1950,7 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-bigint-dig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1997,6 +2059,17 @@ dependencies = [
 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "rusty-fork"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wait-timeout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustyline"
 version = "4.1.0"
@@ -2036,7 +2109,7 @@ name = "schannel"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -2209,6 +2282,20 @@ name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "stackvector"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "static_assertions"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "stream-cipher"
 version = "0.3.0"
@@ -2343,7 +2430,7 @@ name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -2419,7 +2506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2564,6 +2651,14 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "unreachable"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "unsafe-any"
 version = "0.4.2"
@@ -2619,6 +2714,14 @@ name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.2.9"
@@ -2766,6 +2869,8 @@ dependencies = [
 "checksum backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)" = "b5164d292487f037ece34ec0de2fcede2faa162f085dd96d2385ab81b12765ba"
 "checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80"
+"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb"
 "checksum bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
 "checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
 "checksum blake2b_simd 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "461f4b879a8eb70c1debf7d0788a9a5ff15f1ea9d25925fea264ef4258bed6b2"
@@ -2855,16 +2960,18 @@ dependencies = [
 "checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b00861cbbb254a627d8acc0cec786b484297d896ab8f20fdc8e28536a3e918ef"
-"checksum imap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "178392198cb2716f4fe34b86a1bf1de1240a3e31136a199b16490fa87538fa25"
-"checksum imap-proto 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4e77b1d61faf028893531b071cc5584cdd02b6186cebe7f7168ffd8d591339a"
+"checksum imap 1.0.2 (git+https://github.com/jonhoo/rust-imap?rev=281d2eb8ab50dc656ceff2ae749ca5045f334e15)" = "<none>"
+"checksum imap-proto 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b92ca529b24c5f80a950abe993d3883df6fe6791d4a46b1fda1eb339796c589"
 "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum jetscii 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5f25cca2463cb19dbb1061eb3bd38a8b5e4ce1cc5a5a9fc0e02de486d92b9b05"
 "checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c66afaa5dfadbb81d4e00fd1d1ab057c7cd4c799c5a44e0009386d553587e728"
+"checksum lexical-core 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b0f90c979adde96d19eb10eb6431ba0c441e2f9e9bdff868b2f6f5114ff519"
 "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
 "checksum libsqlite3-sys 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5b95e89c330291768dc840238db7f9e204fd208511ab6319b56193a7f2ae25"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
@@ -2890,6 +2997,7 @@ dependencies = [
 "checksum nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4dbdc256eaac2e3bd236d93ad999d3479ef775c863dbda3068c4006a92eec51b"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
+"checksum nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c618b63422da4401283884e6668d39f819a106ef51f5f59b81add00075da35ca"
 "checksum num-bigint-dig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3cd60678022301da54082fcc383647fc895cba2795f868c871d58d29c8922595"
 "checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
 "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
@@ -2926,6 +3034,7 @@ dependencies = [
 "checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802"
+"checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f"
 "checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d"
 "checksum pulldown-cmark 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eef52fac62d0ea7b9b4dc7da092aa64ea7ec3d90af6679422d3d7e0e14b6ee15"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
@@ -2963,6 +3072,7 @@ dependencies = [
 "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum rusty-fork 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3dd93264e10c577503e926bd1430193eeb5d21b059148910082245309b424fae"
 "checksum rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f47ea1ceb347d2deae482d655dc8eef4bd82363d3329baffa3818bd76fea48b"
 "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
 "checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
@@ -2988,6 +3098,8 @@ dependencies = [
 "checksum slice-deque 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffddf594f5f597f63533d897427a570dbaa9feabaaa06595b74b71b7014507d7"
 "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum stackvector 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4dade1e9ad1ce13baaba168a04cdefb5c0cbc100242a4035d6dfa9c64348f9c5"
+"checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3"
 "checksum stream-cipher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8861bc80f649f5b4c9bd38b696ae9af74499d479dbfb327f0607de6b326a36bc"
 "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
@@ -3028,6 +3140,7 @@ dependencies = [
 "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d"
@@ -3036,6 +3149,7 @@ dependencies = [
 "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 void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum wait-timeout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
 "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 "checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ num-derive = "0.2.5"
 num-traits = "0.2.6"
 native-tls = "0.2.3"
 lettre = "0.9.0"
-imap = "1.0.1"
+imap = { git = "https://github.com/jonhoo/rust-imap", rev = "281d2eb8ab50dc656ceff2ae749ca5045f334e15" }
 mmime = { git = "https://github.com/dignifiedquire/mmime", rev = "bccd2c2" }
 base64 = "0.10"
 charset = "0.1"
@@ -35,7 +35,7 @@ failure = "0.1.5"
 failure_derive = "0.1.5"
 # TODO: make optional
 rustyline = "4.1.0"
-lazy_static = "1.3.0"
+lazy_static = "1.4.0"
 regex = "1.1.6"
 rusqlite = { version = "0.20", features = ["bundled"] }
 r2d2_sqlite = "0.12.0"
@@ -50,11 +50,13 @@ image-meta = "0.1.0"
 quick-xml = "0.15.0"
 escaper = "0.1.0"
 bitflags = "1.1.0"
+jetscii = "0.4.4"

 [dev-dependencies]
 tempfile = "3.0"
 pretty_assertions = "0.6.1"
 pretty_env_logger = "0.3.0"
+proptest = "0.9.4"

 [workspace]
 members = [
--- a/ci_scripts/run_all.sh
+++ b/ci_scripts/run_all.sh
@@ -41,7 +41,8 @@ if [ -n "$TESTS" ]; then
    # see https://github.com/deltachat/deltachat-core-rust/issues/331
    # unset DCC_PY_LIVECONFIG

-    tox --workdir "$TOXWORKDIR" -e lint,py35,py36,py37,auditwheels
+    tox --workdir "$TOXWORKDIR" -e lint,py35,py36,py37,auditwheels -- -k "not qr"
+    tox --workdir "$TOXWORKDIR" -e py35,py36,py37 -- -k "qr"
    popd
 fi

--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
--- a/deltachat_derive/src/lib.rs
+++ b/deltachat_derive/src/lib.rs
@@ -36,7 +36,7 @@ pub fn from_sql_derive(input: TokenStream) -> TokenStream {
        impl rusqlite::types::FromSql for #name {
            fn column_result(col: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
                let inner = rusqlite::types::FromSql::column_result(col)?;
-                num_traits::FromPrimitive::from_i64(inner).ok_or(rusqlite::types::FromSqlError::InvalidType)
+                Ok(num_traits::FromPrimitive::from_i64(inner).unwrap_or_default())
            }
        }
    };
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -28,10 +28,10 @@ use num_traits::FromPrimitive;
 /// Argument is a bitmask, executing single or multiple actions in one call.
 /// e.g. bitmask 7 triggers actions definded with bits 1, 2 and 4.
 pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
-    info!(context, 0, "Resetting tables ({})...", bits);
+    info!(context, "Resetting tables ({})...", bits);
    if 0 != bits & 1 {
        sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]).unwrap();
-        info!(context, 0, "(1) Jobs reset.");
+        info!(context, "(1) Jobs reset.");
    }
    if 0 != bits & 2 {
        sql::execute(
@@ -41,11 +41,11 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
            params![],
        )
        .unwrap();
-        info!(context, 0, "(2) Peerstates reset.");
+        info!(context, "(2) Peerstates reset.");
    }
    if 0 != bits & 4 {
        sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]).unwrap();
-        info!(context, 0, "(4) Private keypairs reset.");
+        info!(context, "(4) Private keypairs reset.");
    }
    if 0 != bits & 8 {
        sql::execute(
@@ -84,7 +84,7 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
        )
        .unwrap();
        sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]).unwrap();
-        info!(context, 0, "(8) Rest but server config reset.");
+        info!(context, "(8) Rest but server config reset.");
    }

    context.call_cb(Event::MSGS_CHANGED, 0, 0);
@@ -122,7 +122,7 @@ unsafe fn dc_poke_eml_file(context: &Context, filename: *const libc::c_char) ->
 /// @return 1=success, 0=error.
 unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int {
    if !context.sql.is_open() {
-        error!(context, 0, "Import: Database not opened.");
+        error!(context, "Import: Database not opened.");
        return 0;
    }

@@ -143,7 +143,7 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
    } else {
        let rs = context.sql.get_config(context, "import_spec");
        if rs.is_none() {
-            error!(context, 0, "Import: No file or folder given.");
+            error!(context, "Import: No file or folder given.");
            ok_to_continue = false;
        } else {
            ok_to_continue = true;
@@ -166,7 +166,6 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
            if dir.is_err() {
                error!(
                    context,
-                    0,
                    "Import: Cannot open directory \"{}\".",
                    as_str(real_spec),
                );
@@ -182,7 +181,7 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
                    let name = name_f.to_string_lossy();
                    if name.ends_with(".eml") {
                        let path_plus_name = format!("{}/{}", as_str(real_spec), name);
-                        info!(context, 0, "Import: {}", path_plus_name);
+                        info!(context, "Import: {}", path_plus_name);
                        let path_plus_name_c = CString::yolo(path_plus_name);
                        if 0 != dc_poke_eml_file(context, path_plus_name_c.as_ptr()) {
                            read_cnt += 1
@@ -195,7 +194,6 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
        if ok_to_continue2 {
            info!(
                context,
-                0,
                "Import: {} items read from \"{}\".",
                read_cnt,
                as_str(real_spec)
@@ -228,7 +226,6 @@ unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
    let msgtext = dc_msg_get_text(msg);
    info!(
        context,
-        0,
        "{}#{}{}{}: {} (Contact#{}): {} {}{}{}{} [{}]",
        prefix.as_ref(),
        dc_msg_get_id(msg) as libc::c_int,
@@ -268,7 +265,6 @@ unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error
        if msg_id == 9 as libc::c_uint {
            info!(
                context,
-                0,
                "--------------------------------------------------------------------------------"
            );

@@ -276,7 +272,7 @@ unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error
        } else if msg_id > 0 {
            if lines_out == 0 {
                info!(
-                    context, 0,
+                    context,
                    "--------------------------------------------------------------------------------",
                );
                lines_out += 1
@@ -288,7 +284,7 @@ unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error
    if lines_out > 0 {
        info!(
            context,
-            0, "--------------------------------------------------------------------------------"
+            "--------------------------------------------------------------------------------"
        );
    }
    Ok(())
@@ -305,7 +301,7 @@ unsafe fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
        if let Ok(contact) = Contact::get_by_id(context, contact_id) {
            let name = contact.get_name();
            let addr = contact.get_addr();
-            let verified_state = contact.is_verified();
+            let verified_state = contact.is_verified(context);
            let verified_str = if VerifiedStatus::Unverified != verified_state {
                if verified_state == VerifiedStatus::BidirectVerified {
                    " √√"
@@ -337,17 +333,11 @@ unsafe fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
                );
            }

-            info!(context, 0, "Contact#{}: {}{}", contact_id, line, line2);
+            info!(context, "Contact#{}: {}{}", contact_id, line, line2);
        }
    }
 }

-static mut S_IS_AUTH: libc::c_int = 0;
-
-pub unsafe fn dc_cmdline_skip_auth() {
-    S_IS_AUTH = 1;
-}
-
 fn chat_prefix(chat: &Chat) -> &'static str {
    chat.typ.into()
 }
@@ -428,7 +418,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 send <text>\n\
                 send-garbage\n\
                 sendimage <file> [<text>]\n\
-                 sendfile <file>\n\
+                 sendfile <file> [<text>]\n\
                 draft [<text>]\n\
                 listmedia\n\
                 archive <chat-id>\n\
@@ -461,20 +451,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 ============================================="
            ),
        },
-        "auth" => {
-            if 0 == S_IS_AUTH {
-                let is_pw = context
-                    .get_config(config::Config::MailPw)
-                    .unwrap_or_default();
-                if arg1 == is_pw {
-                    S_IS_AUTH = 1;
-                } else {
-                    println!("Bad password.");
-                }
-            } else {
-                println!("Already authorized.");
-            }
-        }
        "open" => {
            ensure!(!arg1.is_empty(), "Argument <file> missing");
            dc_close(context);
@@ -500,7 +476,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            let msg_id: u32 = arg1.parse()?;
            let msg = dc_get_msg(context, msg_id)?;
            if dc_msg_is_setupmessage(&msg) {
-                let setupcodebegin = dc_msg_get_setupcodebegin(&msg);
+                let setupcodebegin = dc_msg_get_setupcodebegin(context, &msg);
                println!(
                    "The setup code for setup message Msg#{} starts with: {}",
                    msg_id,
@@ -516,7 +492,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                !arg1.is_empty() && !arg2.is_empty(),
                "Arguments <msg-id> <setup-code> expected"
            );
-            if 0 == dc_continue_key_transfer(context, arg1.parse()?, arg2_c) {
+            if !dc_continue_key_transfer(context, arg1.parse()?, arg2_c) {
                bail!("Continue key transfer failed");
            }
        }
@@ -574,9 +550,8 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
        }
        "get" => {
            ensure!(!arg1.is_empty(), "Argument <key> missing.");
-            let key = config::Config::from_str(&arg1)?;
-            let val = context.get_config(key);
-            println!("{}={:?}", key, val);
+            let val = context.get_config_from_str(&arg1);
+            println!("{}={:?}", &arg1.to_string(), val);
        }
        "info" => {
            println!("{}", to_string(dc_get_info(context)));
@@ -599,17 +574,16 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            let cnt = chatlist.len();
            if cnt > 0 {
                info!(
-                    context, 0,
+                    context,
                    "================================================================================"
                );

                for i in (0..cnt).rev() {
                    let chat = Chat::load_from_db(context, chatlist.get_chat_id(i))?;
-                    let temp_subtitle = chat.get_subtitle();
+                    let temp_subtitle = chat.get_subtitle(context);
                    let temp_name = chat.get_name();
                    info!(
                        context,
-                        0,
                        "{}#{}: {} [{}] [{} fresh]",
                        chat_prefix(&chat),
                        chat.get_id(),
@@ -617,7 +591,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                        temp_subtitle,
                        chat::get_fresh_msg_cnt(context, chat.get_id()),
                    );
-                    let lot = chatlist.get_summary(i, Some(&chat));
+                    let lot = chatlist.get_summary(context, i, Some(&chat));
                    let statestr = if chat.is_archived() {
                        " [Archived]"
                    } else {
@@ -634,7 +608,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                    let text2 = lot.get_text2();
                    info!(
                        context,
-                        0,
                        "{}{}{}{} [{}]{}",
                        text1.unwrap_or(""),
                        if text1.is_some() { ": " } else { "" },
@@ -648,13 +621,13 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                        },
                    );
                    info!(
-                        context, 0,
+                        context,
                        "================================================================================"
                    );
                }
            }
            if location::is_sending_locations_to_chat(context, 0 as uint32_t) {
-                info!(context, 0, "Location streaming enabled.");
+                info!(context, "Location streaming enabled.");
            }
            println!("{} chats", cnt);
        }
@@ -673,11 +646,10 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            let sel_chat = sel_chat.as_ref().unwrap();

            let msglist = chat::get_chat_msgs(context, sel_chat.get_id(), 0x1, 0);
-            let temp2 = sel_chat.get_subtitle();
+            let temp2 = sel_chat.get_subtitle(context);
            let temp_name = sel_chat.get_name();
            info!(
                context,
-                0,
                "{}#{}: {} [{}]{}",
                chat_prefix(sel_chat),
                sel_chat.get_id(),
@@ -773,7 +745,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            ensure!(sel_chat.is_some(), "No chat selected.");

            let contacts = chat::get_chat_contacts(context, sel_chat.as_ref().unwrap().get_id());
-            info!(context, 0, "Memberlist:");
+            info!(context, "Memberlist:");

            log_contactlist(context, &contacts);
            println!(
@@ -801,7 +773,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                let marker = location.marker.as_ref().unwrap_or(&default_marker);
                info!(
                    context,
-                    0,
                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} Msg#{} {}",
                    location.location_id,
                    dc_timestamp_to_str(location.timestamp),
@@ -815,7 +786,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                );
            }
            if locations.is_empty() {
-                info!(context, 0, "No locations.");
+                info!(context, "No locations.");
            }
        }
        "sendlocations" => {
@@ -862,18 +833,17 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
        }
        "sendimage" | "sendfile" => {
            ensure!(sel_chat.is_some(), "No chat selected.");
-            ensure!(!arg1.is_empty() && !arg2.is_empty(), "No file given.");
+            ensure!(!arg1.is_empty(), "No file given.");

-            let mut msg = dc_msg_new(
-                context,
-                if arg0 == "sendimage" {
-                    Viewtype::Image
-                } else {
-                    Viewtype::File
-                },
-            );
+            let mut msg = dc_msg_new(if arg0 == "sendimage" {
+                Viewtype::Image
+            } else {
+                Viewtype::File
+            });
            dc_msg_set_file(&mut msg, arg1_c, ptr::null());
-            dc_msg_set_text(&mut msg, arg2_c);
+            if !arg2.is_empty() {
+                dc_msg_set_text(&mut msg, arg2_c);
+            }
            chat::send_msg(context, sel_chat.as_ref().unwrap().get_id(), &mut msg)?;
        }
        "listmsgs" => {
@@ -894,7 +864,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            ensure!(sel_chat.is_some(), "No chat selected.");

            if !arg1.is_empty() {
-                let mut draft = dc_msg_new(context, Viewtype::Text);
+                let mut draft = dc_msg_new(Viewtype::Text);
                dc_msg_set_text(&mut draft, arg1_c);
                chat::set_draft(
                    context,
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -14,6 +14,8 @@ extern crate lazy_static;
 extern crate rusqlite;

 use std::borrow::Cow::{self, Borrowed, Owned};
+use std::io::{self, Write};
+use std::process::Command;
 use std::ptr;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
@@ -22,10 +24,10 @@ use deltachat::config;
 use deltachat::configure::*;
 use deltachat::constants::*;
 use deltachat::context::*;
-use deltachat::dc_securejoin::*;
 use deltachat::dc_tools::*;
 use deltachat::job::*;
 use deltachat::oauth2::*;
+use deltachat::securejoin::*;
 use deltachat::types::*;
 use deltachat::x::*;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
@@ -387,8 +389,6 @@ impl Helper for DcHelper {}
 fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
    let mut context = dc_context_new(Some(receive_event), ptr::null_mut(), Some("CLI".into()));

-    unsafe { dc_cmdline_skip_auth() };
-
    if args.len() == 2 {
        if unsafe { !dc_open(&mut context, &args[1], None) } {
            println!("Error: Cannot open {}.", args[0],);
@@ -495,7 +495,7 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
            configure(&ctx.read().unwrap());
        }
        "oauth2" => {
-            if let Some(addr) = ctx.read().unwrap().get_config(config::Config::Addr) {
+            if let Some(addr) = ctx.read().unwrap().get_config(&config::Config::Addr) {
                let oauth2_url = dc_get_oauth2_url(
                    &ctx.read().unwrap(),
                    &addr,
@@ -516,30 +516,27 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
        }
        "getqr" | "getbadqr" => {
            start_threads(ctx.clone());
-            let qrstr =
-                dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default());
-            if !qrstr.is_null() && 0 != *qrstr.offset(0isize) as libc::c_int {
-                if arg0 == "getbadqr" && strlen(qrstr) > 40 {
-                    let mut i: libc::c_int = 12i32;
-                    while i < 22i32 {
-                        *qrstr.offset(i as isize) = '0' as i32 as libc::c_char;
-                        i += 1
+            if let Some(mut qr) =
+                dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default())
+            {
+                if !qr.is_empty() {
+                    if arg0 == "getbadqr" && qr.len() > 40 {
+                        qr.replace_range(12..22, "0000000000")
                    }
+                    println!("{}", qr);
+                    let output = Command::new("qrencode")
+                        .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                        .output()
+                        .expect("failed to execute process");
+                    io::stdout().write_all(&output.stdout).unwrap();
+                    io::stderr().write_all(&output.stderr).unwrap();
                }
-                println!("{}", to_string(qrstr as *const _));
-                let syscmd = dc_mprintf(
-                    b"qrencode -t ansiutf8 \"%s\" -o -\x00" as *const u8 as *const libc::c_char,
-                    qrstr,
-                );
-                system(syscmd);
-                free(syscmd as *mut libc::c_void);
            }
-            free(qrstr as *mut libc::c_void);
        }
        "joinqr" => {
            start_threads(ctx.clone());
            if !arg0.is_empty() {
-                dc_join_securejoin(&ctx.read().unwrap(), arg1_c);
+                dc_join_securejoin(&ctx.read().unwrap(), arg1);
            }
        }
        "exit" | "quit" => return Ok(ExitResult::Exit),
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -101,7 +101,7 @@ fn main() {
        let chats = Chatlist::try_load(&ctx, 0, None, None).unwrap();

        for i in 0..chats.len() {
-            let summary = chats.get_summary(0, None);
+            let summary = chats.get_summary(&ctx, 0, None);
            let text1 = summary.get_text1();
            let text2 = summary.get_text2();
            println!("chat: {} - {:?} - {:?}", i, text1, text2,);
--- a/proptest-regressions/dc_strencode.txt
+++ b/proptest-regressions/dc_strencode.txt
@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 679506fe9ac59df773f8cfa800fdab5f0a32fe49d2ab370394000a1aa5bc2a72 # shrinks to buf = "%0A"
--- a/proptest-regressions/dc_tools.txt
+++ b/proptest-regressions/dc_tools.txt
@@ -0,0 +1,9 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc c310754465ee0261807b96fa9bcc4861ff9aa286e94667524b5960c69f9b6620 # shrinks to buf = "", approx_chars = 0, do_unwrap = false
+cc 5fd8d730b0a9cdf7308ce58818ca9aefc0255c9ba2a0878944fc48d43a67315b # shrinks to buf = "𑒀ὐ￠🜀\u{1e01b}A a🟠", approx_chars = 0, do_unwrap = false
+cc c6a0029a54137a4b9efc9ef2ea6d9a7dd1d60d1c937bb472b66a174618ba8013 # shrinks to buf = "𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ  ", approx_chars = 0, do_unwrap = false
--- a/python/README.rst
+++ b/python/README.rst
@@ -65,17 +65,17 @@ Afterwards ``which python`` tells you that it comes out of the "venv"
 directory that contains all python install artifacts. Let's first
 install test tools::

-    pip install pytest pytest-timeout requests
+    pip install pytest pytest-timeout pytest-rerunfailures requests

 then cargo-build and install the deltachat bindings::

    python install_python_bindings.py

 The bindings will be installed in release mode but with debug symbols.
-The release mode is neccessary because some tests generate RSA keys
+The release mode is necessary because some tests generate RSA keys
 which is prohibitively slow in debug mode.

-After succcessul binding installation you can finally run the tests::
+After successful binding installation you can finally run the tests::

    pytest -v tests

--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -14,7 +14,7 @@ except ImportError:
 import deltachat
 from . import const
 from .capi import ffi, lib
-from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
+from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array, DCLot
 from .chatting import Contact, Chat, Message


@@ -329,6 +329,56 @@ class Account(object):
            raise RuntimeError("could not send out autocrypt setup message")
        return from_dc_charpointer(res)

+    def get_setup_contact_qr(self):
+        """ get/create Setup-Contact QR Code as ascii-string.
+
+        this string needs to be transferred to another DC account
+        in a second channel (typically used by mobiles with QRcode-show + scan UX)
+        where qr_setup_contact(qr) is called.
+        """
+        res = lib.dc_get_securejoin_qr(self._dc_context, 0)
+        return from_dc_charpointer(res)
+
+    def check_qr(self, qr):
+        """ check qr code and return :class:`ScannedQRCode` instance representing the result"""
+        res = ffi.gc(
+            lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)),
+            lib.dc_lot_unref
+        )
+        lot = DCLot(res)
+        if lot.state() == const.DC_QR_ERROR:
+            raise ValueError("invalid or unknown QR code: {}".format(lot.text1()))
+        return ScannedQRCode(lot)
+
+    def qr_setup_contact(self, qr):
+        """ setup contact and return a Chat after contact is established.
+
+        Note that this function may block for a long time as messages are exchanged
+        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
+        is returned.
+        :param qr: valid "setup contact" QR code (all other QR codes will result in an exception)
+        """
+        assert self.check_qr(qr).is_ask_verifycontact()
+        chat_id = lib.dc_join_securejoin(self._dc_context, as_dc_charpointer(qr))
+        if chat_id == 0:
+            raise ValueError("could not setup secure contact")
+        return Chat(self, chat_id)
+
+    def qr_join_chat(self, qr):
+        """ join a chat group through a QR code.
+
+        Note that this function may block for a long time as messages are exchanged
+        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
+        is returned which is the chat that we just joined.
+
+        :param qr: valid "join-group" QR code (all other QR codes will result in an exception)
+        """
+        assert self.check_qr(qr).is_ask_verifygroup()
+        chat_id = lib.dc_join_securejoin(self._dc_context, as_dc_charpointer(qr))
+        if chat_id == 0:
+            raise ValueError("could not join group")
+        return Chat(self, chat_id)
+
    def start_threads(self):
        """ start IMAP/SMTP threads (and configure account if it hasn't happened).

@@ -433,6 +483,10 @@ class EventLogger:
    def set_timeout(self, timeout):
        self._timeout = timeout

+    def consume_events(self, check_error=True):
+        while not self._event_queue.empty():
+            self.get()
+
    def get(self, timeout=None, check_error=True):
        timeout = timeout or self._timeout
        ev = self._event_queue.get(timeout=timeout)
@@ -492,3 +546,18 @@ def _destroy_dc_context(dc_context, dc_context_unref=lib.dc_context_unref):
        # we are deep into Python Interpreter shutdown,
        # so no need to clear the callback context mapping.
        pass
+
+
+class ScannedQRCode:
+    def __init__(self, dc_lot):
+        self._dc_lot = dc_lot
+
+    def is_ask_verifycontact(self):
+        return self._dc_lot.state() == const.DC_QR_ASK_VERIFYCONTACT
+
+    def is_ask_verifygroup(self):
+        return self._dc_lot.state() == const.DC_QR_ASK_VERIFYGROUP
+
+    @property
+    def contact_id(self):
+        return self._dc_lot.id()
--- a/python/src/deltachat/chatting.py
+++ b/python/src/deltachat/chatting.py
@@ -1,6 +1,7 @@
 """ chatting related objects: Contact, Chat, Message. """

 import mimetypes
+import os
 from . import props
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .capi import lib, ffi
@@ -131,6 +132,16 @@ class Chat(object):
        """
        return lib.dc_chat_get_type(self._dc_chat)

+    def get_join_qr(self):
+        """ get/create Join-Group QR Code as ascii-string.
+
+        this string needs to be transferred to another DC account
+        in a second channel (typically used by mobiles with QRcode-show + scan UX)
+        where account.join_with_qrcode(qr) needs to be called.
+        """
+        res = lib.dc_get_securejoin_qr(self._dc_context, self.id)
+        return from_dc_charpointer(res)
+
    # ------  chat messaging API ------------------------------

    def send_text(self, text):
@@ -305,3 +316,46 @@ class Chat(object):
        return list(iter_array(
            dc_array, lambda id: Contact(self._dc_context, id))
        )
+
+    def set_profile_image(self, img_path):
+        """Set group profile image.
+
+        If the group is already promoted (any message was sent to the group),
+        all group members are informed by a special status message that is sent
+        automatically by this function.
+        :params img_path: path to image object
+        :raises ValueError: if profile image could not be set
+        :returns: None
+        """
+        assert os.path.exists(img_path), img_path
+        p = as_dc_charpointer(img_path)
+        res = lib.dc_set_chat_profile_image(self._dc_context, self.id, p)
+        if res != 1:
+            raise ValueError("Setting Profile Image {!r} failed".format(p))
+
+    def remove_profile_image(self):
+        """remove group profile image.
+
+        If the group is already promoted (any message was sent to the group),
+        all group members are informed by a special status message that is sent
+        automatically by this function.
+        :raises ValueError: if profile image could not be reset
+        :returns: None
+        """
+        res = lib.dc_set_chat_profile_image(self._dc_context, self.id, ffi.NULL)
+        if res != 1:
+            raise ValueError("Removing Profile Image failed")
+
+    def get_profile_image(self):
+        """Get group profile image.
+
+        For groups, this is the image set by any group member using
+        set_chat_profile_image(). For normal chats, this is the image
+        set by each remote user on their own using dc_set_config(context,
+        "selfavatar", image).
+        :returns: path to profile image, None if no profile image exists.
+        """
+        dc_res = lib.dc_chat_get_profile_image(self._dc_chat)
+        if dc_res == ffi.NULL:
+            return None
+        return from_dc_charpointer(dc_res)
--- a/python/src/deltachat/const.py
+++ b/python/src/deltachat/const.py
@@ -13,6 +13,15 @@ DC_GCL_NO_SPECIALS = 0x02
 DC_GCL_ADD_ALLDONE_HINT = 0x04
 DC_GCL_VERIFIED_ONLY = 0x01
 DC_GCL_ADD_SELF = 0x02
+DC_QR_ASK_VERIFYCONTACT = 200
+DC_QR_ASK_VERIFYGROUP = 202
+DC_QR_FPR_OK = 210
+DC_QR_FPR_MISMATCH = 220
+DC_QR_FPR_WITHOUT_ADDR = 230
+DC_QR_ADDR = 320
+DC_QR_TEXT = 330
+DC_QR_URL = 332
+DC_QR_ERROR = 400
 DC_CHAT_ID_DEADDROP = 1
 DC_CHAT_ID_TRASH = 3
 DC_CHAT_ID_MSGS_IN_CREATION = 4
@@ -69,15 +78,13 @@ DC_EVENT_IMEX_FILE_WRITTEN = 2052
 DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
 DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
 DC_EVENT_GET_STRING = 2091
-DC_EVENT_HTTP_GET = 2100
-DC_EVENT_HTTP_POST = 2110
 DC_EVENT_FILE_COPIED = 2055
 DC_EVENT_IS_OFFLINE = 2081
 # end const generated


 def read_event_defines(f):
-    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_MSG|DC_STATE_|DC_CONTACT_ID_|DC_GCL|DC_CHAT)\S+)\s+([x\d]+).*')
+    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_QR|DC_MSG|DC_STATE_|DC_CONTACT_ID_|DC_GCL|DC_CHAT)\S+)\s+([x\d]+).*')
    for line in f:
        m = rex.match(line)
        if m:
@@ -90,7 +97,7 @@ if __name__ == "__main__":
    if len(sys.argv) >= 2:
        deltah = sys.argv[1]
    else:
-        deltah = joinpath(dirname(dirname(dirname(here_dir))), "src", "deltachat.h")
+        deltah = joinpath(dirname(dirname(dirname(here_dir))), "deltachat-ffi", "deltachat.h")
    assert os.path.exists(deltah)

    lines = []
--- a/python/src/deltachat/cutil.py
+++ b/python/src/deltachat/cutil.py
@@ -1,5 +1,6 @@
 from .capi import lib
 from .capi import ffi
+from datetime import datetime


 def as_dc_charpointer(obj):
@@ -17,3 +18,29 @@ def iter_array(dc_array_t, constructor):

 def from_dc_charpointer(obj):
    return ffi.string(ffi.gc(obj, lib.dc_str_unref)).decode("utf8")
+
+
+class DCLot:
+    def __init__(self, dc_lot):
+        self._dc_lot = dc_lot
+
+    def id(self):
+        return lib.dc_lot_get_id(self._dc_lot)
+
+    def state(self):
+        return lib.dc_lot_get_state(self._dc_lot)
+
+    def text1(self):
+        return from_dc_charpointer(lib.dc_lot_get_text1(self._dc_lot))
+
+    def text1_meaning(self):
+        return lib.dc_lot_get_text1_meaning(self._dc_lot)
+
+    def text2(self):
+        return from_dc_charpointer(lib.dc_lot_get_text2(self._dc_lot))
+
+    def timestamp(self):
+        ts = lib.dc_lot_get_timestamp(self._dc_lot)
+        if ts == 0:
+            return None
+        return datetime.utcfromtimestamp(ts)
--- a/python/tests/conftest.py
+++ b/python/tests/conftest.py
@@ -213,6 +213,15 @@ def wait_configuration_progress(account, target):
            break


+def wait_securejoin_inviter_progress(account, target):
+    while 1:
+        evt_name, data1, data2 = \
+            account._evlogger.get_matching("DC_EVENT_SECUREJOIN_INVITER_PROGRESS")
+        if data2 >= target:
+            print("** SECUREJOINT-INVITER PROGRESS {}".format(target), account)
+            break
+
+
 def wait_successful_IMAP_SMTP_connection(account):
    imap_ok = smtp_ok = False
    while not imap_ok or not smtp_ok:
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -4,7 +4,7 @@ import os
 from deltachat import const, Account
 from deltachat.message import Message
 from datetime import datetime, timedelta
-from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection
+from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection, wait_securejoin_inviter_progress


 class TestOfflineAccountBasic:
@@ -140,6 +140,22 @@ class TestOfflineChat:
        chat.set_name("title2")
        assert chat.get_name() == "title2"

+    @pytest.mark.parametrize("verified", [True, False])
+    def test_group_chat_qr(self, acfactory, ac1, verified):
+        ac2 = acfactory.get_configured_offline_account()
+        chat = ac1.create_group_chat(name="title1", verified=verified)
+        qr = chat.get_join_qr()
+        assert ac2.check_qr(qr).is_ask_verifygroup
+
+    def test_get_set_profile_image_simple(self, ac1, data):
+        chat = ac1.create_group_chat(name="title1")
+        p = data.get_path("d.png")
+        chat.set_profile_image(p)
+        p2 = chat.get_profile_image()
+        assert open(p, "rb").read() == open(p2, "rb").read()
+        chat.remove_profile_image()
+        assert chat.get_profile_image() is None
+
    def test_delete_and_send_fails(self, ac1, chat1):
        chat1.delete()
        ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -306,6 +322,16 @@ class TestOfflineChat:
        chat1.set_draft(None)
        assert chat1.get_draft() is None

+    def test_qr_setup_contact(self, acfactory, lp):
+        ac1 = acfactory.get_configured_offline_account()
+        ac2 = acfactory.get_configured_offline_account()
+        qr = ac1.get_setup_contact_qr()
+        assert qr.startswith("OPENPGP4FPR:")
+        res = ac2.check_qr(qr)
+        assert res.is_ask_verifycontact()
+        assert not res.is_ask_verifygroup()
+        assert res.contact_id == 10
+

 class TestOnlineAccount:
    def test_one_account_init(self, acfactory):
@@ -546,3 +572,85 @@ class TestOnlineAccount:
        print("*************** Setup Code: ", setup_code)
        msg.continue_key_transfer(setup_code)
        assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
+
+    def test_qr_setup_contact(self, acfactory, lp):
+        ac1 = acfactory.get_online_configuring_account()
+        ac2 = acfactory.get_online_configuring_account()
+        wait_configuration_progress(ac2, 1000)
+        wait_configuration_progress(ac1, 1000)
+        lp.sec("ac1: create QR code and let ac2 scan it, starting the securejoin")
+        qr = ac1.get_setup_contact_qr()
+        lp.sec("ac2: start QR-code based setup contact protocol")
+        ch = ac2.qr_setup_contact(qr)
+        assert ch.id >= 10
+        wait_securejoin_inviter_progress(ac1, 1000)
+
+    def test_qr_join_chat(self, acfactory, lp):
+        ac1 = acfactory.get_online_configuring_account()
+        ac2 = acfactory.get_online_configuring_account()
+        wait_configuration_progress(ac2, 1000)
+        wait_configuration_progress(ac1, 1000)
+        lp.sec("ac1: create QR code and let ac2 scan it, starting the securejoin")
+
+        chat = ac1.create_group_chat("hello")
+        qr = chat.get_join_qr()
+        lp.sec("ac2: start QR-code based join-group protocol")
+        ch = ac2.qr_join_chat(qr)
+        assert ch.id >= 10
+        wait_securejoin_inviter_progress(ac1, 1000)
+
+    def test_set_get_profile_image(self, acfactory, data, lp):
+        ac1 = acfactory.get_online_configuring_account()
+        ac2 = acfactory.get_online_configuring_account()
+        wait_configuration_progress(ac2, 1000)
+        wait_configuration_progress(ac1, 1000)
+
+        lp.sec("create unpromoted group chat")
+        chat = ac1.create_group_chat("hello")
+        p = data.get_path("d.png")
+
+        lp.sec("ac1: set profile image on unpromoted chat")
+        chat.set_profile_image(p)
+        ac1._evlogger.get_matching("DC_EVENT_CHAT_MODIFIED")
+        assert not chat.is_promoted()
+
+        lp.sec("ac1: send text to promote chat (XXX without contact added)")
+        # XXX first promote the chat before adding contact
+        # because DC does not send out profile images for unpromoted chats
+        # otherwise
+        chat.send_text("ac1: initial message to promote chat (workaround)")
+        assert chat.is_promoted()
+
+        lp.sec("ac2: add ac1 to a chat so the message does not land in DEADDROP")
+        c1 = ac2.create_contact(email=ac1.get_config("addr"))
+        ac2.create_chat_by_contact(c1)
+        ev = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
+
+        lp.sec("ac1: add ac2 to promoted group chat")
+        c2 = ac1.create_contact(email=ac2.get_config("addr"))
+        chat.add_contact(c2)
+
+        lp.sec("ac1: send a first message to ac2")
+        chat.send_text("hi")
+        assert chat.is_promoted()
+
+        lp.sec("ac2: wait for receiving message from ac1")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        msg_in = ac2.get_message_by_id(ev[2])
+        assert not msg_in.chat.is_deaddrop()
+
+        lp.sec("ac2: create chat and read profile image")
+        chat2 = ac2.create_chat_by_message(msg_in)
+        p2 = chat2.get_profile_image()
+        assert p2 is not None
+        assert open(p2, "rb").read() == open(p, "rb").read()
+
+        ac2._evlogger.consume_events()
+        ac1._evlogger.consume_events()
+        lp.sec("ac2: delete profile image from chat")
+        chat2.remove_profile_image()
+        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        assert ev[1] == chat.id
+        chat1b = ac1.create_chat_by_message(ev[2])
+        assert chat1b.get_profile_image() is None
+        assert chat.get_profile_image() is None
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -16,7 +16,10 @@ passenv =
    DCC_PY_LIVECONFIG
 deps = 
    pytest
-    pytest-faulthandler
+    pytest-rerunfailures
+    pytest-timeout
+    pytest-xdist
+    auditwheel
    pdbpp
    requests

@@ -51,11 +54,12 @@ commands =


 [pytest]
-addopts = -v -rs
+addopts = -v -rs --reruns 3 --reruns-delay 2
 python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true
-timeout = 60
+timeout = 60 
+timeout_method = thread

 [flake8]
 max-line-length = 120
--- a/src/chat.rs
+++ b/src/chat.rs
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -31,17 +31,12 @@ use crate::stock::StockMessage;
 /// first entry and only present on new messages, there is the rough idea that it can be optionally always
 /// present and sorted into the list by date. Rendering the deaddrop in the described way
 /// would not add extra work in the UI then.
-pub struct Chatlist<'a> {
-    context: &'a Context,
+pub struct Chatlist {
    /// Stores pairs of `chat_id, message_id`
    ids: Vec<(u32, u32)>,
 }

-impl<'a> Chatlist<'a> {
-    pub fn get_context(&self) -> &Context {
-        self.context
-    }
-
+impl Chatlist {
    /// Get a list of chats.
    /// The list can be filtered by query parameters.
    ///
@@ -85,7 +80,7 @@ impl<'a> Chatlist<'a> {
    /// `query_contact_id`: An optional contact ID for filtering the list. Only chats including this contact ID
    ///     are returned.
    pub fn try_load(
-        context: &'a Context,
+        context: &Context,
        listflags: usize,
        query: Option<&str>,
        query_contact_id: Option<u32>,
@@ -200,7 +195,7 @@ impl<'a> Chatlist<'a> {
            ids.push((DC_CHAT_ID_ARCHIVED_LINK, 0));
        }

-        Ok(Chatlist { context, ids })
+        Ok(Chatlist { ids })
    }

    /// Find out the number of chats.
@@ -247,7 +242,7 @@ impl<'a> Chatlist<'a> {
    /// - dc_lot_t::timestamp: the timestamp of the message.  0 if not applicable.
    /// - dc_lot_t::state: The state of the message as one of the DC_STATE_* constants (see #dc_msg_get_state()).
    //    0 if not applicable.
-    pub fn get_summary(&self, index: usize, chat: Option<&Chat<'a>>) -> Lot {
+    pub fn get_summary(&self, context: &Context, index: usize, chat: Option<&Chat>) -> Lot {
        // The summary is created by the chat, not by the last message.
        // This is because we may want to display drafts here or stuff as
        // "is typing".
@@ -263,7 +258,7 @@ impl<'a> Chatlist<'a> {
        let chat = if let Some(chat) = chat {
            chat
        } else {
-            if let Ok(chat) = Chat::load_from_db(self.context, self.ids[index].0) {
+            if let Ok(chat) = Chat::load_from_db(context, self.ids[index].0) {
                chat_loaded = chat;
                &chat_loaded
            } else {
@@ -275,11 +270,11 @@ impl<'a> Chatlist<'a> {
        let mut lastcontact = None;

        let lastmsg = if 0 != lastmsg_id {
-            if let Ok(lastmsg) = dc_msg_load_from_db(self.context, lastmsg_id) {
+            if let Ok(lastmsg) = dc_msg_load_from_db(context, lastmsg_id) {
                if lastmsg.from_id != 1 as libc::c_uint
                    && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
                {
-                    lastcontact = Contact::load_from_db(self.context, lastmsg.from_id).ok();
+                    lastcontact = Contact::load_from_db(context, lastmsg.from_id).ok();
                }

                Some(lastmsg)
@@ -294,14 +289,9 @@ impl<'a> Chatlist<'a> {
            ret.text2 = None;
        } else if lastmsg.is_none() || lastmsg.as_ref().unwrap().from_id == DC_CONTACT_ID_UNDEFINED
        {
-            ret.text2 = Some(self.context.stock_str(StockMessage::NoMessages).to_string());
+            ret.text2 = Some(context.stock_str(StockMessage::NoMessages).to_string());
        } else {
-            ret.fill(
-                &mut lastmsg.unwrap(),
-                chat,
-                lastcontact.as_ref(),
-                self.context,
-            );
+            ret.fill(&mut lastmsg.unwrap(), chat, lastcontact.as_ref(), context);
        }

        ret
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,3 +1,5 @@
+use std::str::FromStr;
+
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};

@@ -8,9 +10,11 @@ use crate::error::Error;
 use crate::job::*;
 use crate::stock::StockMessage;

+pub const CONFIG_UI_PREFIX: &str = "ui.";
+
 /// The available configuration keys.
 #[derive(
-    Debug, Clone, Copy, PartialEq, Eq, Display, EnumString, AsRefStr, EnumIter, EnumProperty,
+    Debug, Clone, PartialEq, Eq, Display, EnumString, AsRefStr, EnumIter, EnumProperty,
 )]
 #[strum(serialize_all = "snake_case")]
 pub enum Config {
@@ -65,11 +69,17 @@ pub enum Config {
    SysMsgsizeMaxRecommended,
    #[strum(serialize = "sys.config_keys")]
    SysConfigKeys,
+    Ui(String)
 }

 impl Context {
+
+    pub fn get_config_from_str(&self, key: &str) -> Option<String> {
+        self.get_config(&config_from_str(key))
+    }
+
    /// Get a configuration key. Returns `None` if no value is set, and no default value found.
-    pub fn get_config(&self, key: Config) -> Option<String> {
+    pub fn get_config(&self, key: &Config) -> Option<String> {
        let value = match key {
            Config::Selfavatar => {
                let rel_path = self.sql.get_config(self, key);
@@ -78,6 +88,7 @@ impl Context {
            Config::SysVersion => Some((&*DC_VERSION_STR).clone()),
            Config::SysMsgsizeMaxRecommended => Some(format!("{}", 24 * 1024 * 1024 / 4 * 3)),
            Config::SysConfigKeys => Some(get_config_keys_string()),
+            Config::Ui(key) => self.sql.get_config(self, format!("{}{}", CONFIG_UI_PREFIX, key)),
            _ => self.sql.get_config(self, key),
        };

@@ -92,6 +103,13 @@ impl Context {
        }
    }

+    pub fn set_config_from_str(&self, key: &str, value: Option<&str>) -> Result<(), &str> {
+        if self.sql.set_config(self, config_from_str(key), value).is_err() {
+            return Err("Sql error");
+        }
+        Ok(())
+    }
+
    /// Set the given config key.
    /// If `None` is passed as a value the value is cleared and set to the default if there is one.
    pub fn set_config(&self, key: Config, value: Option<&str>) -> Result<(), Error> {
@@ -125,7 +143,11 @@ impl Context {
                };

                self.sql.set_config(self, key, val)
-            }
+            },
+            Config::Ui(key) => {
+                let key = format!("{}{}", CONFIG_UI_PREFIX, key);
+                self.sql.set_config(self, key, value)
+            },
            _ => self.sql.set_config(self, key, value),
        }
    }
@@ -142,12 +164,23 @@ fn get_config_keys_string() -> String {
    format!(" {} ", keys)
 }

+fn config_from_str(key: &str) -> Result<Config, &str> {
+    if key.starts_with(CONFIG_UI_PREFIX) {
+        Config::Ui(key[CONFIG_UI_PREFIX.len()-1..].to_string())
+    } else {
+        if let Ok(config) = Config::from_str(key) {
+            config
+        } else {
+            Err("invalid key")
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
-
-    use std::str::FromStr;
    use std::string::ToString;
+    use crate::test_utils::*;

    #[test]
    fn test_to_string() {
@@ -165,4 +198,20 @@ mod tests {
    fn test_default_prop() {
        assert_eq!(Config::ImapFolder.get_str("default"), Some("INBOX"));
    }
+
+    #[test]
+    fn test_config_from_str() {
+        assert_eq!(config_from_str("addr"), Config::Addr);
+        assert_eq!(config_from_str("addrxyz"), None);
+    }
+
+    #[test]
+    fn test_get_config_from_str() {
+        let t = dummy_context();
+        assert_eq!(t.ctx.set_config_from_str("addr", Some("foo@bar.bar")), Ok(()));
+        assert_eq!(t.ctx.get_config_from_str("addr").unwrap(), "foo@bar.bar");
+
+        assert_eq!(t.ctx.set_config_from_str("ui.desktop.some_string", Some("foobar")), Ok(()));
+        assert_eq!(t.ctx.get_config_from_str("ui.desktop.some_string").unwrap(), "foobar");
+    }
 }
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -2,8 +2,8 @@ use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};

 use crate::context::Context;
-use crate::dc_loginparam::*;
 use crate::dc_tools::*;
+use crate::login_param::LoginParam;
 use crate::x::*;

 use super::read_autoconf_file;
@@ -13,10 +13,10 @@ use super::read_autoconf_file;
 /* documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
 #[repr(C)]
 struct moz_autoconfigure_t<'a> {
-    pub in_0: &'a dc_loginparam_t,
-    pub in_emaildomain: *mut libc::c_char,
-    pub in_emaillocalpart: *mut libc::c_char,
-    pub out: dc_loginparam_t,
+    pub in_0: &'a LoginParam,
+    pub in_emaildomain: &'a str,
+    pub in_emaillocalpart: &'a str,
+    pub out: LoginParam,
    pub out_imap_set: libc::c_int,
    pub out_smtp_set: libc::c_int,
    pub tag_server: libc::c_int,
@@ -26,44 +26,37 @@ struct moz_autoconfigure_t<'a> {
 pub unsafe fn moz_autoconfigure(
    context: &Context,
    url: &str,
-    param_in: &dc_loginparam_t,
-) -> Option<dc_loginparam_t> {
-    let mut moz_ac = moz_autoconfigure_t {
-        in_0: param_in,
-        in_emaildomain: std::ptr::null_mut(),
-        in_emaillocalpart: std::ptr::null_mut(),
-        out: dc_loginparam_new(),
-        out_imap_set: 0,
-        out_smtp_set: 0,
-        tag_server: 0,
-        tag_config: 0,
-    };
-
-    let url_c = url.strdup();
-    let xml_raw = read_autoconf_file(context, url_c);
-    free(url_c as *mut libc::c_void);
+    param_in: &LoginParam,
+) -> Option<LoginParam> {
+    let xml_raw = read_autoconf_file(context, url);
    if xml_raw.is_null() {
        return None;
    }

-    moz_ac.in_emaillocalpart = param_in.addr.strdup();
-    let p = strchr(moz_ac.in_emaillocalpart, '@' as i32);
-
-    if p.is_null() {
+    // Split address into local part and domain part.
+    let p = param_in.addr.find("@");
+    if p.is_none() {
        free(xml_raw as *mut libc::c_void);
-        free(moz_ac.in_emaildomain as *mut libc::c_void);
-        free(moz_ac.in_emaillocalpart as *mut libc::c_void);
        return None;
    }
-
-    *p = 0 as libc::c_char;
-    moz_ac.in_emaildomain = dc_strdup(p.offset(1isize));
+    let (in_emaillocalpart, in_emaildomain) = param_in.addr.split_at(p.unwrap());
+    let in_emaildomain = &in_emaildomain[1..];

    let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
    reader.trim_text(true);

    let mut buf = Vec::new();

+    let mut moz_ac = moz_autoconfigure_t {
+        in_0: param_in,
+        in_emaildomain,
+        in_emaillocalpart,
+        out: LoginParam::new(),
+        out_imap_set: 0,
+        out_smtp_set: 0,
+        tag_server: 0,
+        tag_config: 0,
+    };
    loop {
        match reader.read_event(&mut buf) {
            Ok(quick_xml::events::Event::Start(ref e)) => {
@@ -76,7 +69,6 @@ pub unsafe fn moz_autoconfigure(
            Err(e) => {
                error!(
                    context,
-                    0,
                    "Configure xml: Error at position {}: {:?}",
                    reader.buffer_position(),
                    e
@@ -93,17 +85,13 @@ pub unsafe fn moz_autoconfigure(
        || moz_ac.out.send_server.is_empty()
        || moz_ac.out.send_port == 0
    {
-        let r = dc_loginparam_get_readable(&moz_ac.out);
-        warn!(context, 0, "Bad or incomplete autoconfig: {}", r,);
+        let r = moz_ac.out.to_string();
+        warn!(context, "Bad or incomplete autoconfig: {}", r,);
        free(xml_raw as *mut libc::c_void);
-        free(moz_ac.in_emaildomain as *mut libc::c_void);
-        free(moz_ac.in_emaillocalpart as *mut libc::c_void);
        return None;
    }

    free(xml_raw as *mut libc::c_void);
-    free(moz_ac.in_emaildomain as *mut libc::c_void);
-    free(moz_ac.in_emaillocalpart as *mut libc::c_void);
    Some(moz_ac.out)
 }

@@ -115,8 +103,8 @@ fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
    let val = event.unescape_and_decode(reader).unwrap_or_default();

    let addr = &moz_ac.in_0.addr;
-    let email_local = as_str(moz_ac.in_emaillocalpart);
-    let email_domain = as_str(moz_ac.in_emaildomain);
+    let email_local = moz_ac.in_emaillocalpart;
+    let email_domain = moz_ac.in_emaildomain;

    let val = val
        .trim()
--- a/src/configure/auto_outlook.rs
+++ b/src/configure/auto_outlook.rs
@@ -2,8 +2,8 @@ use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};

 use crate::context::Context;
-use crate::dc_loginparam::*;
 use crate::dc_tools::*;
+use crate::login_param::LoginParam;
 use crate::x::*;
 use std::ptr;

@@ -13,8 +13,8 @@ use super::read_autoconf_file;
 ******************************************************************************/
 #[repr(C)]
 struct outlk_autodiscover_t<'a> {
-    pub in_0: &'a dc_loginparam_t,
-    pub out: dc_loginparam_t,
+    pub in_0: &'a LoginParam,
+    pub out: LoginParam,
    pub out_imap_set: libc::c_int,
    pub out_smtp_set: libc::c_int,
    pub tag_config: libc::c_int,
@@ -25,13 +25,13 @@ struct outlk_autodiscover_t<'a> {
 pub unsafe fn outlk_autodiscover(
    context: &Context,
    url__: &str,
-    param_in: &dc_loginparam_t,
-) -> Option<dc_loginparam_t> {
+    param_in: &LoginParam,
+) -> Option<LoginParam> {
    let mut xml_raw: *mut libc::c_char = ptr::null_mut();
    let mut url = url__.strdup();
    let mut outlk_ad = outlk_autodiscover_t {
        in_0: param_in,
-        out: dc_loginparam_new(),
+        out: LoginParam::new(),
        out_imap_set: 0,
        out_smtp_set: 0,
        tag_config: 0,
@@ -50,7 +50,7 @@ pub unsafe fn outlk_autodiscover(
            0,
            ::std::mem::size_of::<outlk_autodiscover_t>(),
        );
-        xml_raw = read_autoconf_file(context, url);
+        xml_raw = read_autoconf_file(context, as_str(url));
        if xml_raw.is_null() {
            ok_to_continue = false;
            break;
@@ -75,7 +75,6 @@ pub unsafe fn outlk_autodiscover(
                Err(e) => {
                    error!(
                        context,
-                        0,
                        "Configure xml: Error at position {}: {:?}",
                        reader.buffer_position(),
                        e
@@ -108,8 +107,8 @@ pub unsafe fn outlk_autodiscover(
            || outlk_ad.out.send_server.is_empty()
            || outlk_ad.out.send_port == 0
        {
-            let r = dc_loginparam_get_readable(&outlk_ad.out);
-            warn!(context, 0, "Bad or incomplete autoconfig: {}", r,);
+            let r = outlk_ad.out.to_string();
+            warn!(context, "Bad or incomplete autoconfig: {}", r,);
            free(url as *mut libc::c_void);
            free(xml_raw as *mut libc::c_void);
            outlk_clean_config(&mut outlk_ad);
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -18,6 +18,12 @@ pub enum MoveState {
    Moving = 3,
 }

+impl Default for MoveState {
+    fn default() -> Self {
+        MoveState::Undefined
+    }
+}
+
 // some defaults
 const DC_E2EE_DEFAULT_ENABLED: i32 = 1;
 pub const DC_MDNS_DEFAULT_ENABLED: i32 = 1;
@@ -42,7 +48,7 @@ impl Default for Blocked {

 pub const DC_IMAP_SEEN: u32 = 0x1;

-const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
+pub const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
 pub const DC_HANDSHAKE_STOP_NORMAL_PROCESSING: i32 = 0x02;
 pub const DC_HANDSHAKE_ADD_DELETE_JOB: i32 = 0x04;

@@ -52,7 +58,7 @@ pub const DC_GCL_ADD_ALLDONE_HINT: usize = 0x04;

 const DC_GCM_ADDDAYMARKER: usize = 0x01;

-const DC_GCL_VERIFIED_ONLY: usize = 0x01;
+pub const DC_GCL_VERIFIED_ONLY: usize = 0x01;
 pub const DC_GCL_ADD_SELF: usize = 0x02;

 /// param1 is a directory where the keys are written to
@@ -71,7 +77,7 @@ pub const DC_CHAT_ID_TRASH: u32 = 3;
 /// a message is just in creation but not yet assigned to a chat (eg. we may need the message ID to set up blobs; this avoids unready message to be sent and shown)
 const DC_CHAT_ID_MSGS_IN_CREATION: u32 = 4;
 /// virtual chat showing all messages flagged with msgs.starred=2
-const DC_CHAT_ID_STARRED: u32 = 5;
+pub const DC_CHAT_ID_STARRED: u32 = 5;
 /// only an indicator in a chatlist
 pub const DC_CHAT_ID_ARCHIVED_LINK: u32 = 6;
 /// only an indicator in a chatlist
@@ -169,6 +175,12 @@ const DC_LP_IMAP_SOCKET_FLAGS: usize =
 const DC_LP_SMTP_SOCKET_FLAGS: usize =
    (DC_LP_SMTP_SOCKET_STARTTLS | DC_LP_SMTP_SOCKET_SSL | DC_LP_SMTP_SOCKET_PLAIN);

+// QR code scanning (view from Bob, the joiner)
+pub const DC_VC_AUTH_REQUIRED: i32 = 2;
+pub const DC_VC_CONTACT_CONFIRM: i32 = 6;
+pub const DC_BOB_ERROR: i32 = 0;
+pub const DC_BOB_SUCCESS: i32 = 1;
+
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
 #[repr(i32)]
 pub enum Viewtype {
@@ -214,6 +226,12 @@ pub enum Viewtype {
    File = 60,
 }

+impl Default for Viewtype {
+    fn default() -> Self {
+        Viewtype::Unknown
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -539,6 +557,6 @@ pub const DC_CMD_GROUPIMAGE_CHANGED: libc::c_int = 3;
 pub const DC_CMD_MEMBER_ADDED_TO_GROUP: libc::c_int = 4;
 pub const DC_CMD_MEMBER_REMOVED_FROM_GROUP: libc::c_int = 5;
 pub const DC_CMD_AUTOCRYPT_SETUP_MESSAGE: libc::c_int = 6;
-const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7;
+pub const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7;
 pub const DC_CMD_LOCATION_STREAMING_ENABLED: libc::c_int = 8;
-const DC_CMD_LOCATION_ONLY: libc::c_int = 9;
+pub const DC_CMD_LOCATION_ONLY: libc::c_int = 9;
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -1,25 +1,23 @@
+use deltachat_derive::*;
 use itertools::Itertools;
-use num_traits::{FromPrimitive, ToPrimitive};
 use rusqlite;
-use rusqlite::types::*;
+use std::path::PathBuf;

 use crate::aheader::EncryptPreference;
 use crate::config::Config;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_loginparam::*;
 use crate::dc_tools::*;
 use crate::e2ee;
 use crate::error::Result;
 use crate::key::*;
+use crate::login_param::LoginParam;
 use crate::message::MessageState;
 use crate::peerstate::*;
 use crate::sql;
 use crate::stock::StockMessage;
 use crate::types::*;

-const DC_GCL_VERIFIED_ONLY: u32 = 0x01;
-
 /// Contacts with at least this origin value are shown in the contact list.
 const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;

@@ -33,8 +31,7 @@ const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;
 /// For this purpose, internally, two names are tracked -
 /// authorized-name and given-name.
 /// By default, these names are equal, but functions working with contact names
-pub struct Contact<'a> {
-    context: &'a Context,
+pub struct Contact {
    /// The contact ID.
    ///
    /// Special message IDs:
@@ -60,7 +57,9 @@ pub struct Contact<'a> {
 }

 /// Possible origins of a contact.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive, FromSql, ToSql,
+)]
 #[repr(i32)]
 pub enum Origin {
    Unknown = 0,
@@ -98,20 +97,9 @@ pub enum Origin {
    ManuallyCreated = 0x4000000,
 }

-impl ToSql for Origin {
-    fn to_sql(&self) -> rusqlite::Result<ToSqlOutput> {
-        let num: i64 = self
-            .to_i64()
-            .expect("impossible: Origin -> i64 conversion failed");
-
-        Ok(ToSqlOutput::Owned(Value::Integer(num)))
-    }
-}
-
-impl FromSql for Origin {
-    fn column_result(col: ValueRef) -> FromSqlResult<Self> {
-        let inner = FromSql::column_result(col)?;
-        FromPrimitive::from_i64(inner).ok_or(FromSqlError::InvalidType)
+impl Default for Origin {
+    fn default() -> Self {
+        Origin::Unknown
    }
 }

@@ -150,16 +138,15 @@ pub enum VerifiedStatus {
    BidirectVerified = 2,
 }

-impl<'a> Contact<'a> {
-    pub fn load_from_db(context: &'a Context, contact_id: u32) -> Result<Self> {
+impl Contact {
+    pub fn load_from_db(context: &Context, contact_id: u32) -> Result<Self> {
        if contact_id == DC_CONTACT_ID_SELF {
            let contact = Contact {
-                context,
                id: contact_id,
                name: context.stock_str(StockMessage::SelfMsg).into(),
                authname: "".into(),
                addr: context
-                    .get_config(Config::ConfiguredAddr)
+                    .get_config(&Config::ConfiguredAddr)
                    .unwrap_or_default(),
                blocked: false,
                origin: Origin::Unknown,
@@ -173,7 +160,6 @@ impl<'a> Contact<'a> {
            params![contact_id as i32],
            |row| {
                let contact = Self {
-                    context,
                    id: contact_id,
                    name: row.get::<_, String>(0)?,
                    authname: row.get::<_, String>(4)?,
@@ -192,7 +178,7 @@ impl<'a> Contact<'a> {
    }

    /// Check if a contact is blocked.
-    pub fn is_blocked_load(context: &'a Context, id: u32) -> bool {
+    pub fn is_blocked_load(context: &Context, id: u32) -> bool {
        Self::load_from_db(context, id)
            .map(|contact| contact.blocked)
            .unwrap_or_default()
@@ -271,7 +257,7 @@ impl<'a> Contact<'a> {

        let addr_normalized = addr_normalize(addr.as_ref());
        let addr_self = context
-            .get_config(Config::ConfiguredAddr)
+            .get_config(&Config::ConfiguredAddr)
            .unwrap_or_default();

        if addr_normalized == addr_self {
@@ -309,7 +295,7 @@ impl<'a> Contact<'a> {

        let addr = addr_normalize(addr.as_ref());
        let addr_self = context
-            .get_config(Config::ConfiguredAddr)
+            .get_config(&Config::ConfiguredAddr)
            .unwrap_or_default();

        if addr == addr_self {
@@ -319,7 +305,6 @@ impl<'a> Contact<'a> {
        if !may_be_valid_addr(&addr) {
            warn!(
                context,
-                0,
                "Bad address \"{}\" for contact \"{}\".",
                addr,
                if !name.as_ref().is_empty() {
@@ -343,19 +328,22 @@ impl<'a> Contact<'a> {
                let row_id = row.get(0)?;
                let row_name: String = row.get(1)?;
                let row_addr: String = row.get(2)?;
-                let row_origin = row.get(3)?;
+                let row_origin: Origin = row.get(3)?;
                let row_authname: String = row.get(4)?;

-                if !name.as_ref().is_empty() && !row_name.is_empty() {
-                    if origin >= row_origin && name.as_ref() != row_name {
+                if !name.as_ref().is_empty() {
+                    if !row_name.is_empty() {
+                        if origin >= row_origin && name.as_ref() != row_name {
+                            update_name = true;
+                        }
+                    } else {
                        update_name = true;
                    }
-                } else {
-                    update_name = true;
-                }
-                if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
-                    update_authname = true;
+                    if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
+                        update_authname = true;
+                    }
                }
+
                Ok((row_id, row_name, row_addr, row_origin, row_authname))
            },
        ) {
@@ -395,7 +383,7 @@ impl<'a> Contact<'a> {
                    context,
                    &context.sql,
                    "UPDATE chats SET name=? WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
-                    params![name.as_ref(), 100, row_id]
+                    params![name.as_ref(), Chattype::Single, row_id]
                ).ok();
                }
                sth_modified = Modifier::Modified;
@@ -412,7 +400,7 @@ impl<'a> Contact<'a> {
                row_id = sql::get_rowid(context, &context.sql, "contacts", "addr", addr);
                sth_modified = Modifier::Created;
            } else {
-                error!(context, 0, "Cannot add contact.");
+                error!(context, "Cannot add contact.");
            }
        }

@@ -433,19 +421,13 @@ impl<'a> Contact<'a> {
    /// 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.
    ///
-    /// The `adr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
+    /// The `addr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
    ///
    /// Returns the number of modified contacts.
-    pub fn add_address_book(context: &Context, adr_book: impl AsRef<str>) -> Result<usize> {
+    pub fn add_address_book(context: &Context, addr_book: impl AsRef<str>) -> Result<usize> {
        let mut modify_cnt = 0;

-        for chunk in &adr_book.as_ref().lines().chunks(2) {
-            let chunk = chunk.collect::<Vec<_>>();
-            if chunk.len() < 2 {
-                break;
-            }
-            let name = chunk[0];
-            let addr = chunk[1];
+        for (name, addr) in split_address_book(addr_book.as_ref()).into_iter() {
            let name = normalize_name(name);
            let (_, modified) = Contact::add_or_lookup(context, name, addr, Origin::AdressBook)?;
            if modified != Modifier::None {
@@ -474,13 +456,15 @@ impl<'a> Contact<'a> {
        query: Option<impl AsRef<str>>,
    ) -> Result<Vec<u32>> {
        let self_addr = context
-            .get_config(Config::ConfiguredAddr)
+            .get_config(&Config::ConfiguredAddr)
            .unwrap_or_default();

        let mut add_self = false;
        let mut ret = Vec::new();
+        let flag_verified_only = listflags_has(listflags, DC_GCL_VERIFIED_ONLY);
+        let flag_add_self = listflags_has(listflags, DC_GCL_ADD_SELF);

-        if (listflags & DC_GCL_VERIFIED_ONLY) > 0 || query.is_some() {
+        if flag_verified_only || query.is_some() {
            let s3str_like_cmd = format!(
                "%{}%",
                query
@@ -504,7 +488,7 @@ impl<'a> Contact<'a> {
                    0x100,
                    &s3str_like_cmd,
                    &s3str_like_cmd,
-                    if 0 != listflags & 0x1 { 0 } else { 1 },
+                    if flag_verified_only { 0 } else { 1 },
                ],
                |row| row.get::<_, i32>(0),
                |ids| {
@@ -515,7 +499,7 @@ impl<'a> Contact<'a> {
                },
            )?;

-            let self_name = context.get_config(Config::Displayname).unwrap_or_default();
+            let self_name = context.get_config(&Config::Displayname).unwrap_or_default();
            let self_name2 = context.stock_str(StockMessage::SelfMsg);

            if let Some(query) = query {
@@ -544,7 +528,7 @@ impl<'a> Contact<'a> {
            )?;
        }

-        if 0 != listflags & DC_GCL_ADD_SELF as u32 && add_self {
+        if flag_add_self && add_self {
            ret.push(DC_CONTACT_ID_SELF);
        }

@@ -589,7 +573,7 @@ impl<'a> Contact<'a> {

        if let Ok(contact) = Contact::load_from_db(context, contact_id) {
            let peerstate = Peerstate::from_addr(context, &context.sql, &contact.addr);
-            let loginparam = dc_loginparam_read(context, &context.sql, "configured_");
+            let loginparam = LoginParam::from_database(context, "configured_");

            let mut self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);

@@ -695,7 +679,7 @@ impl<'a> Contact<'a> {
                    return Ok(());
                }
                Err(err) => {
-                    error!(context, 0, "delete_contact {} failed ({})", contact_id, err);
+                    error!(context, "delete_contact {} failed ({})", contact_id, err);
                    return Err(err);
                }
            }
@@ -703,7 +687,7 @@ impl<'a> Contact<'a> {

        info!(
            context,
-            0, "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
+            "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
        );
        bail!("Could not delete contact with messages in it");
    }
@@ -779,9 +763,11 @@ impl<'a> Contact<'a> {
    /// Get the contact's profile image.
    /// This is the image set by each remote user on their own
    /// using dc_set_config(context, "selfavatar", image).
-    pub fn get_profile_image(&self) -> Option<String> {
+    pub fn get_profile_image(&self, context: &Context) -> Option<PathBuf> {
        if self.id == DC_CONTACT_ID_SELF {
-            return self.context.get_config(Config::Selfavatar);
+            if let Some(p) = context.get_config(&Config::Selfavatar) {
+                return Some(PathBuf::from(p));
+            }
        }
        // TODO: else get image_abs from contact param
        None
@@ -800,14 +786,18 @@ impl<'a> Contact<'a> {
    ///
    /// The UI may draw a checkbox or something like that beside verified contacts.
    ///
-    pub fn is_verified(&self) -> VerifiedStatus {
-        self.is_verified_ex(None)
+    pub fn is_verified(&self, context: &Context) -> VerifiedStatus {
+        self.is_verified_ex(context, None)
    }

    /// Same as `Contact::is_verified` but allows speeding up things
    /// by adding the peerstate belonging to the contact.
    /// If you do not have the peerstate available, it is loaded automatically.
-    pub fn is_verified_ex(&self, peerstate: Option<&Peerstate<'a>>) -> VerifiedStatus {
+    pub fn is_verified_ex(
+        &self,
+        context: &Context,
+        peerstate: Option<&Peerstate>,
+    ) -> VerifiedStatus {
        // We're always sort of secured-verified as we could verify the key on this device any time with the key
        // on this device
        if self.id == DC_CONTACT_ID_SELF {
@@ -820,7 +810,7 @@ impl<'a> Contact<'a> {
            }
        }

-        let peerstate = Peerstate::from_addr(self.context, &self.context.sql, &self.addr);
+        let peerstate = Peerstate::from_addr(context, &context.sql, &self.addr);
        if let Some(ps) = peerstate {
            if ps.verified_key().is_some() {
                return VerifiedStatus::BidirectVerified;
@@ -1036,13 +1026,28 @@ pub fn addr_cmp(addr1: impl AsRef<str>, addr2: impl AsRef<str>) -> bool {
 pub fn addr_equals_self(context: &Context, addr: impl AsRef<str>) -> bool {
    if !addr.as_ref().is_empty() {
        let normalized_addr = addr_normalize(addr.as_ref());
-        if let Some(self_addr) = context.get_config(Config::ConfiguredAddr) {
+        if let Some(self_addr) = context.get_config(&Config::ConfiguredAddr) {
            return normalized_addr == self_addr;
        }
    }
    false
 }

+fn split_address_book(book: &str) -> Vec<(&str, &str)> {
+    book.lines()
+        .chunks(2)
+        .into_iter()
+        .filter_map(|mut chunk| {
+            let name = chunk.next().unwrap();
+            let addr = match chunk.next() {
+                Some(a) => a,
+                None => return None,
+            };
+            Some((name, addr))
+        })
+        .collect()
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -1078,4 +1083,14 @@ mod tests {
    fn test_get_first_name() {
        assert_eq!(get_first_name("John Doe"), "John");
    }
+
+    #[test]
+    fn test_split_address_book() {
+        let book = "Name one\nAddress one\nName two\nAddress two\nrest name";
+        let list = split_address_book(&book);
+        assert_eq!(
+            list,
+            vec![("Name one", "Address one"), ("Name two", "Address two")]
+        )
+    }
 }
--- a/src/context.rs
+++ b/src/context.rs
@@ -3,13 +3,13 @@ use std::sync::{Arc, Condvar, Mutex, RwLock};
 use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
-use crate::dc_loginparam::*;
 use crate::dc_receive_imf::*;
 use crate::dc_tools::*;
 use crate::imap::*;
 use crate::job::*;
 use crate::job_thread::JobThread;
 use crate::key::*;
+use crate::login_param::LoginParam;
 use crate::lot::Lot;
 use crate::message::*;
 use crate::param::Params;
@@ -208,17 +208,11 @@ unsafe fn cb_precheck_imf(
        if *old_server_folder.offset(0isize) as libc::c_int == 0i32
            && old_server_uid == 0i32 as libc::c_uint
        {
-            info!(
-                context,
-                0,
-                "[move] detected bbc-self {}",
-                as_str(rfc724_mid),
-            );
+            info!(context, "[move] detected bbc-self {}", as_str(rfc724_mid),);
            mark_seen = 1i32
        } else if as_str(old_server_folder) != server_folder {
            info!(
                context,
-                0,
                "[move] detected moved message {}",
                as_str(rfc724_mid),
            );
@@ -258,16 +252,16 @@ fn cb_get_config(context: &Context, key: &str) -> Option<String> {
 }

 pub unsafe fn dc_close(context: &Context) {
-    info!(context, 0, "disconnecting INBOX-watch",);
+    info!(context, "disconnecting INBOX-watch",);
    context.inbox.read().unwrap().disconnect(context);
-    info!(context, 0, "disconnecting sentbox-thread",);
+    info!(context, "disconnecting sentbox-thread",);
    context
        .sentbox_thread
        .read()
        .unwrap()
        .imap
        .disconnect(context);
-    info!(context, 0, "disconnecting mvbox-thread",);
+    info!(context, "disconnecting mvbox-thread",);
    context
        .mvbox_thread
        .read()
@@ -275,7 +269,7 @@ pub unsafe fn dc_close(context: &Context) {
        .imap
        .disconnect(context);

-    info!(context, 0, "disconnecting SMTP");
+    info!(context, "disconnecting SMTP");
    context.smtp.clone().lock().unwrap().disconnect();

    context.sql.close(context);
@@ -331,8 +325,8 @@ pub unsafe fn dc_get_blobdir(context: &Context) -> *mut libc::c_char {

 pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char {
    let unset = "0";
-    let l = dc_loginparam_read(context, &context.sql, "");
-    let l2 = dc_loginparam_read(context, &context.sql, "configured_");
+    let l = LoginParam::from_database(context, "");
+    let l2 = LoginParam::from_database(context, "configured_");
    let displayname = context.sql.get_config(context, "displayname");
    let chats = get_chat_cnt(context) as usize;
    let real_msgs = dc_get_real_msg_cnt(context) as usize;
@@ -376,8 +370,6 @@ pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char {
        "<Not yet calculated>".into()
    };

-    let l_readable_str = dc_loginparam_get_readable(&l);
-    let l2_readable_str = dc_loginparam_get_readable(&l2);
    let inbox_watch = context
        .sql
        .get_config_int(context, "inbox_watch")
@@ -457,8 +449,8 @@ pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char {
        },
        displayname.unwrap_or_else(|| unset.into()),
        is_configured,
-        l_readable_str,
-        l2_readable_str,
+        l,
+        l2,
        inbox_watch,
        sentbox_watch,
        mvbox_watch,
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -58,7 +58,6 @@ pub unsafe fn dc_imex_has_backup(
    if dir_iter.is_err() {
        info!(
            context,
-            0,
            "Backup check: Cannot open directory \"{}\".\x00",
            dir_name.display(),
        );
@@ -92,7 +91,7 @@ pub unsafe fn dc_imex_has_backup(
        Some(path) => match path.to_c_string() {
            Ok(cstr) => dc_strdup(cstr.as_ptr()),
            Err(err) => {
-                error!(context, 0, "Invalid backup filename: {}", err);
+                error!(context, "Invalid backup filename: {}", err);
                std::ptr::null_mut()
            }
        },
@@ -103,7 +102,7 @@ pub unsafe fn dc_imex_has_backup(
 pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
    let mut setup_file_name: *mut libc::c_char = ptr::null_mut();
    let mut msg: Message;
-    if dc_alloc_ongoing(context) == 0 {
+    if !dc_alloc_ongoing(context) {
        return std::ptr::null_mut();
    }
    let setup_code = dc_create_setup_code(context);
@@ -139,7 +138,7 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                    ))
                {
                    if let Ok(chat_id) = chat::create_by_contact_id(context, 1) {
-                        msg = dc_msg_new_untyped(context);
+                        msg = dc_msg_new_untyped();
                        msg.type_0 = Viewtype::File;
                        msg.param.set(Param::File, as_str(setup_file_name));

@@ -156,7 +155,7 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                            .shall_stop_ongoing
                        {
                            if let Ok(msg_id) = chat::send_msg(context, chat_id, &mut msg) {
-                                info!(context, 0, "Wait for setup message being sent ...",);
+                                info!(context, "Wait for setup message being sent ...",);
                                loop {
                                    if context
                                        .running_state
@@ -170,7 +169,7 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                                    std::thread::sleep(std::time::Duration::from_secs(1));
                                    if let Ok(msg) = dc_get_msg(context, msg_id) {
                                        if 0 != dc_msg_is_sent(&msg) {
-                                            info!(context, 0, "... setup message sent.",);
+                                            info!(context, "... setup message sent.",);
                                            break;
                                        }
                                    }
@@ -208,16 +207,8 @@ pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result<Strin
        _ => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
    };
    let private_key_asc = private_key.to_asc(ac_headers);
-    let encr = {
-        let private_key_asc_c = CString::yolo(private_key_asc);
-        let passphrase_c = CString::yolo(passphrase);
-        dc_pgp_symm_encrypt(
-            passphrase_c.as_ptr(),
-            private_key_asc_c.as_ptr() as *const libc::c_void,
-            private_key_asc_c.as_bytes().len(),
-        )
-        .ok_or(format_err!("Failed to encrypt private key."))?
-    };
+    let encr = dc_pgp_symm_encrypt(&passphrase, private_key_asc.as_bytes())
+        .ok_or(format_err!("Failed to encrypt private key."))?;
    let replacement = format!(
        concat!(
            "-----BEGIN PGP MESSAGE-----\r\n",
@@ -272,56 +263,57 @@ pub fn dc_create_setup_code(_context: &Context) -> String {
    ret
 }

-// TODO should return bool /rtn
 pub unsafe fn dc_continue_key_transfer(
    context: &Context,
    msg_id: uint32_t,
    setup_code: *const libc::c_char,
-) -> libc::c_int {
-    let mut success: libc::c_int = 0i32;
+) -> bool {
+    let mut success = false;
    let mut filename: *mut libc::c_char = ptr::null_mut();
    let mut filecontent: *mut libc::c_char = ptr::null_mut();
    let mut filebytes: size_t = 0i32 as size_t;
    let mut armored_key: *mut libc::c_char = ptr::null_mut();
    let mut norm_sc: *mut libc::c_char = ptr::null_mut();
-    if !(msg_id <= 9i32 as libc::c_uint || setup_code.is_null()) {
-        let msg = dc_get_msg(context, msg_id);
-        if msg.is_err()
-            || !dc_msg_is_setupmessage(msg.as_ref().unwrap())
-            || {
-                filename = dc_msg_get_file(msg.as_ref().unwrap());
-                filename.is_null()
-            }
-            || *filename.offset(0isize) as libc::c_int == 0i32
-        {
-            error!(context, 0, "Message is no Autocrypt Setup Message.",);
-        } else if 0
-            == dc_read_file(
-                context,
-                filename,
-                &mut filecontent as *mut *mut libc::c_char as *mut *mut libc::c_void,
-                &mut filebytes,
-            )
-            || filecontent.is_null()
-            || filebytes <= 0
-        {
-            error!(context, 0, "Cannot read Autocrypt Setup Message file.",);
+    if msg_id <= 9i32 as libc::c_uint || setup_code.is_null() {
+        return false;
+    }
+    let msg = dc_get_msg(context, msg_id);
+    if msg.is_err()
+        || !dc_msg_is_setupmessage(msg.as_ref().unwrap())
+        || {
+            filename = dc_msg_get_file(context, msg.as_ref().unwrap());
+            filename.is_null()
+        }
+        || *filename.offset(0isize) as libc::c_int == 0i32
+    {
+        error!(context, "Message is no Autocrypt Setup Message.",);
+    } else if 0
+        == dc_read_file(
+            context,
+            filename,
+            &mut filecontent as *mut *mut libc::c_char as *mut *mut libc::c_void,
+            &mut filebytes,
+        )
+        || filecontent.is_null()
+        || filebytes <= 0
+    {
+        error!(context, "Cannot read Autocrypt Setup Message file.",);
+    } else {
+        norm_sc = dc_normalize_setup_code(context, setup_code);
+        if norm_sc.is_null() {
+            warn!(context, "Cannot normalize Setup Code.",);
        } else {
-            norm_sc = dc_normalize_setup_code(context, setup_code);
-            if norm_sc.is_null() {
-                warn!(context, 0, "Cannot normalize Setup Code.",);
-            } else {
-                armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent);
-                if armored_key.is_null() {
-                    warn!(context, 0, "Cannot decrypt Autocrypt Setup Message.",);
-                } else if set_self_key(context, armored_key, 1) {
-                    /*set default*/
-                    /* error already logged */
-                    success = 1i32
-                }
+            armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent);
+            if armored_key.is_null() {
+                warn!(context, "Cannot decrypt Autocrypt Setup Message.",);
+            } else if set_self_key(context, armored_key, 1) {
+                /*set default*/
+                /* error already logged */
+                success = true
            }
        }
    }
+
    free(armored_key as *mut libc::c_void);
    free(filecontent as *mut libc::c_void);
    free(filename as *mut libc::c_void);
@@ -343,7 +335,7 @@ fn set_self_key(
        .and_then(|(k, h)| k.split_key().map(|pub_key| (k, pub_key, h)));

    if keys.is_none() {
-        error!(context, 0, "File does not contain a valid private key.",);
+        error!(context, "File does not contain a valid private key.",);
        return false;
    }

@@ -373,13 +365,13 @@ fn set_self_key(
            return false;
        }
    } else {
-        error!(context, 0, "File does not contain a private key.",);
+        error!(context, "File does not contain a private key.",);
    }

    let self_addr = context.sql.get_config(context, "configured_addr");

    if self_addr.is_none() {
-        error!(context, 0, "Missing self addr");
+        error!(context, "Missing self addr");
        return false;
    }

@@ -391,7 +383,7 @@ fn set_self_key(
        set_default,
        &context.sql,
    ) {
-        error!(context, 0, "Cannot save keypair.");
+        error!(context, "Cannot save keypair.");
        return false;
    }

@@ -449,9 +441,10 @@ pub unsafe fn dc_decrypt_setup_file(
            || binary_bytes == 0)
        {
            /* decrypt symmetrically */
-            if let Some(plain) =
-                dc_pgp_symm_decrypt(passphrase, binary as *const libc::c_void, binary_bytes)
-            {
+            if let Some(plain) = dc_pgp_symm_decrypt(
+                as_str(passphrase),
+                std::slice::from_raw_parts(binary as *const u8, binary_bytes),
+            ) {
                let payload_c = CString::new(plain).unwrap();
                payload = strdup(payload_c.as_ptr());
            }
@@ -502,30 +495,27 @@ pub unsafe fn dc_normalize_setup_code(
 pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
    let mut ok_to_continue = true;
    let mut success: libc::c_int = 0;
-    let mut ongoing_allocated_here: libc::c_int = 0;
    let what: libc::c_int;

-    if !(0 == dc_alloc_ongoing(context)) {
-        ongoing_allocated_here = 1;
+    if dc_alloc_ongoing(context) {
        what = job.param.get_int(Param::Cmd).unwrap_or_default();
        let param1_s = job.param.get(Param::Arg).unwrap_or_default();
        let param1 = CString::yolo(param1_s);
        let _param2 = CString::yolo(job.param.get(Param::Arg2).unwrap_or_default());

        if strlen(param1.as_ptr()) == 0 {
-            error!(context, 0, "No Import/export dir/file given.",);
+            error!(context, "No Import/export dir/file given.",);
        } else {
-            info!(context, 0, "Import/export process started.",);
+            info!(context, "Import/export process started.",);
            context.call_cb(Event::IMEX_PROGRESS, 10 as uintptr_t, 0 as uintptr_t);
            if !context.sql.is_open() {
-                error!(context, 0, "Import/export: Database not opened.",);
+                error!(context, "Import/export: Database not opened.",);
            } else {
                if what == 1 || what == 11 {
                    /* before we export anything, make sure the private key exists */
                    if e2ee::ensure_secret_key_exists(context).is_err() {
                        error!(
                            context,
-                            0,
                            "Import/export: Cannot create private key or private key not available.",
                        );
                        ok_to_continue = false;
@@ -537,25 +527,25 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
                    match what {
                        1 => {
                            if 0 != export_self_keys(context, param1.as_ptr()) {
-                                info!(context, 0, "Import/export completed.",);
+                                info!(context, "Import/export completed.",);
                                success = 1
                            }
                        }
                        2 => {
                            if 0 != import_self_keys(context, param1.as_ptr()) {
-                                info!(context, 0, "Import/export completed.",);
+                                info!(context, "Import/export completed.",);
                                success = 1
                            }
                        }
                        11 => {
                            if 0 != export_backup(context, param1.as_ptr()) {
-                                info!(context, 0, "Import/export completed.",);
+                                info!(context, "Import/export completed.",);
                                success = 1
                            }
                        }
                        12 => {
                            if 0 != import_backup(context, param1.as_ptr()) {
-                                info!(context, 0, "Import/export completed.",);
+                                info!(context, "Import/export completed.",);
                                success = 1
                            }
                        }
@@ -564,9 +554,6 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
                }
            }
        }
-    }
-
-    if 0 != ongoing_allocated_here {
        dc_free_ongoing(context);
    }
    context.call_cb(
@@ -585,7 +572,6 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
 unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char) -> libc::c_int {
    info!(
        context,
-        0,
        "Import \"{}\" to \"{}\".",
        as_str(backup_to_import),
        context
@@ -594,8 +580,8 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
            .map_or("<<None>>", |p| p.to_str().unwrap())
    );

-    if 0 != dc_is_configured(context) {
-        error!(context, 0, "Cannot import backups to accounts in use.");
+    if dc_is_configured(context) {
+        error!(context, "Cannot import backups to accounts in use.");
        return 0;
    }
    &context.sql.close(&context);
@@ -603,7 +589,7 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
    if dc_file_exist(context, context.get_dbfile().unwrap()) {
        error!(
            context,
-            0, "Cannot import backups: Cannot delete the old file.",
+            "Cannot import backups: Cannot delete the old file.",
        );
        return 0;
    }
@@ -630,7 +616,7 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
        .unwrap_or_default() as usize;
    info!(
        context,
-        0, "***IMPORT-in-progress: total_files_cnt={:?}", total_files_cnt,
+        "***IMPORT-in-progress: total_files_cnt={:?}", total_files_cnt,
    );

    let res = context.sql.query_map(
@@ -678,7 +664,6 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
                }
                error!(
                    context,
-                    0,
                    "Storage full? Cannot write file {} with {} bytes.",
                    &pathNfilename,
                    file_blob.len(),
@@ -725,7 +710,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
    let buffer = CString::yolo(res);
    let dest_pathNfilename = dc_get_fine_pathNfilename(context, dir, buffer.as_ptr());
    if dest_pathNfilename.is_null() {
-        error!(context, 0, "Cannot get backup file name.",);
+        error!(context, "Cannot get backup file name.",);

        return success;
    }
@@ -737,7 +722,6 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
    let mut closed = true;
    info!(
        context,
-        0,
        "Backup \"{}\" to \"{}\".",
        context
            .get_dbfile()
@@ -781,7 +765,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                if let Ok(dir_handle) = std::fs::read_dir(dir) {
                    total_files_cnt += dir_handle.filter(|r| r.is_ok()).count();

-                    info!(context, 0, "EXPORT: total_files_cnt={}", total_files_cnt);
+                    info!(context, "EXPORT: total_files_cnt={}", total_files_cnt);
                    if total_files_cnt > 0 {
                        // scan directory, pass 2: copy files
                        if let Ok(dir_handle) = std::fs::read_dir(dir) {
@@ -827,7 +811,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                                                {
                                                    continue;
                                                } else {
-                                                    info!(context, 0, "EXPORTing filename={}", name);
+                                                    info!(context, "EXPORTing filename={}", name);
                                                    let curr_pathNfilename = format!(
                                                        "{}/{}",
                                                        as_str(context.get_blobdir()),
@@ -843,7 +827,6 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                                                        if stmt.execute(params![name, buf]).is_err() {
                                                            error!(
                                                                context,
-                                                                0,
                                                                "Disk full? Cannot add file \"{}\" to backup.",
                                                                &curr_pathNfilename,
                                                            );
@@ -863,13 +846,12 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                        } else {
                            error!(
                                context,
-                                0,
                                "Backup: Cannot copy from blob-directory \"{}\".",
                                as_str(context.get_blobdir()),
                            );
                        }
                    } else {
-                        info!(context, 0, "Backup: No files to copy.",);
+                        info!(context, "Backup: No files to copy.",);
                        ok_to_continue = true;
                    }
                    if ok_to_continue {
@@ -888,7 +870,6 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                } else {
                    error!(
                        context,
-                        0,
                        "Backup: Cannot get info for blob-directory \"{}\".",
                        as_str(context.get_blobdir())
                    );
@@ -953,7 +934,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                    dir_name,
                    name_c.as_ptr(),
                );
-                info!(context, 0, "Checking: {}", as_str(path_plus_name));
+                info!(context, "Checking: {}", as_str(path_plus_name));
                free(buf as *mut libc::c_void);
                buf = ptr::null_mut();
                if 0 == dc_read_file(
@@ -997,7 +978,6 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                {
                    info!(
                        context,
-                        0,
                        "Treating \"{}\" as a legacy private key.",
                        as_str(path_plus_name),
                    );
@@ -1011,7 +991,6 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
            if imported_cnt == 0i32 {
                error!(
                    context,
-                    0,
                    "No private keys found in \"{}\".",
                    as_str(dir_name),
                );
@@ -1019,7 +998,6 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
        } else {
            error!(
                context,
-                0,
                "Import: Cannot open directory \"{}\".",
                as_str(dir_name),
            );
@@ -1119,10 +1097,10 @@ unsafe fn export_key_to_asc_file(
            id,
        )
    }
-    info!(context, 0, "Exporting key {}", as_str(file_name),);
+    info!(context, "Exporting key {}", as_str(file_name),);
    dc_delete_file(context, as_path(file_name));
    if !key.write_asc_to_file(file_name, context) {
-        error!(context, 0, "Cannot write key to {}", as_str(file_name),);
+        error!(context, "Cannot write key to {}", as_str(file_name),);
    } else {
        context.call_cb(
            Event::IMEX_FILE_WRITTEN,
--- a/src/dc_loginparam.rs
+++ b/src/dc_loginparam.rs
@@ -1,214 +0,0 @@
-use std::borrow::Cow;
-
-use crate::context::Context;
-use crate::sql::Sql;
-
-#[derive(Default, Debug)]
-#[allow(non_camel_case_types)]
-pub struct dc_loginparam_t {
-    pub addr: String,
-    pub mail_server: String,
-    pub mail_user: String,
-    pub mail_pw: String,
-    pub mail_port: i32,
-    pub send_server: String,
-    pub send_user: String,
-    pub send_pw: String,
-    pub send_port: i32,
-    pub server_flags: i32,
-}
-
-impl dc_loginparam_t {
-    pub fn addr_str(&self) -> &str {
-        self.addr.as_str()
-    }
-}
-
-pub fn dc_loginparam_new() -> dc_loginparam_t {
-    Default::default()
-}
-
-pub fn dc_loginparam_read(
-    context: &Context,
-    sql: &Sql,
-    prefix: impl AsRef<str>,
-) -> dc_loginparam_t {
-    let prefix = prefix.as_ref();
-
-    let key = format!("{}addr", prefix);
-    let addr = sql
-        .get_config(context, key)
-        .unwrap_or_default()
-        .trim()
-        .to_string();
-
-    let key = format!("{}mail_server", prefix);
-    let mail_server = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}mail_port", prefix);
-    let mail_port = sql.get_config_int(context, key).unwrap_or_default();
-
-    let key = format!("{}mail_user", prefix);
-    let mail_user = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}mail_pw", prefix);
-    let mail_pw = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}send_server", prefix);
-    let send_server = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}send_port", prefix);
-    let send_port = sql.get_config_int(context, key).unwrap_or_default();
-
-    let key = format!("{}send_user", prefix);
-    let send_user = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}send_pw", prefix);
-    let send_pw = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}server_flags", prefix);
-    let server_flags = sql.get_config_int(context, key).unwrap_or_default();
-
-    dc_loginparam_t {
-        addr: addr.to_string(),
-        mail_server,
-        mail_user,
-        mail_pw,
-        mail_port,
-        send_server,
-        send_user,
-        send_pw,
-        send_port,
-        server_flags,
-    }
-}
-
-pub fn dc_loginparam_write(
-    context: &Context,
-    loginparam: &dc_loginparam_t,
-    sql: &Sql,
-    prefix: impl AsRef<str>,
-) {
-    let prefix = prefix.as_ref();
-
-    let key = format!("{}addr", prefix);
-    sql.set_config(context, key, Some(&loginparam.addr)).ok();
-
-    let key = format!("{}mail_server", prefix);
-    sql.set_config(context, key, Some(&loginparam.mail_server))
-        .ok();
-
-    let key = format!("{}mail_port", prefix);
-    sql.set_config_int(context, key, loginparam.mail_port).ok();
-
-    let key = format!("{}mail_user", prefix);
-    sql.set_config(context, key, Some(&loginparam.mail_user))
-        .ok();
-
-    let key = format!("{}mail_pw", prefix);
-    sql.set_config(context, key, Some(&loginparam.mail_pw)).ok();
-
-    let key = format!("{}send_server", prefix);
-    sql.set_config(context, key, Some(&loginparam.send_server))
-        .ok();
-
-    let key = format!("{}send_port", prefix);
-    sql.set_config_int(context, key, loginparam.send_port).ok();
-
-    let key = format!("{}send_user", prefix);
-    sql.set_config(context, key, Some(&loginparam.send_user))
-        .ok();
-
-    let key = format!("{}send_pw", prefix);
-    sql.set_config(context, key, Some(&loginparam.send_pw)).ok();
-
-    let key = format!("{}server_flags", prefix);
-    sql.set_config_int(context, key, loginparam.server_flags)
-        .ok();
-}
-
-fn unset_empty(s: &String) -> Cow<String> {
-    if s.is_empty() {
-        Cow::Owned("unset".to_string())
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
-pub fn dc_loginparam_get_readable(loginparam: &dc_loginparam_t) -> String {
-    let unset = "0";
-    let pw = "***";
-
-    let flags_readable = get_readable_flags(loginparam.server_flags);
-
-    format!(
-        "{} {}:{}:{}:{} {}:{}:{}:{} {}",
-        unset_empty(&loginparam.addr),
-        unset_empty(&loginparam.mail_user),
-        if !loginparam.mail_pw.is_empty() {
-            pw
-        } else {
-            unset
-        },
-        unset_empty(&loginparam.mail_server),
-        loginparam.mail_port,
-        unset_empty(&loginparam.send_user),
-        if !loginparam.send_pw.is_empty() {
-            pw
-        } else {
-            unset
-        },
-        unset_empty(&loginparam.send_server),
-        loginparam.send_port,
-        flags_readable,
-    )
-}
-
-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 = 0;
-            if 1 << bit == 0x2 {
-                res += "OAUTH2 ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x4 {
-                res += "AUTH_NORMAL ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x100 {
-                res += "IMAP_STARTTLS ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x200 {
-                res += "IMAP_SSL ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x400 {
-                res += "IMAP_PLAIN ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x10000 {
-                res += "SMTP_STARTTLS ";
-                flag_added = 1
-            }
-            if 1 << bit == 0x20000 {
-                res += "SMTP_SSL ";
-                flag_added = 1
-            }
-            if 1 << bit == 0x40000 {
-                res += "SMTP_PLAIN ";
-                flag_added = 1
-            }
-            if 0 == flag_added {
-                res += &format!("{:#0x}", 1 << bit);
-            }
-        }
-    }
-    if res.is_empty() {
-        res += "0";
-    }
-
-    res
-}
--- a/src/dc_mimefactory.rs
+++ b/src/dc_mimefactory.rs
@@ -37,8 +37,8 @@ pub struct dc_mimefactory_t<'a> {
    pub timestamp: i64,
    pub rfc724_mid: *mut libc::c_char,
    pub loaded: dc_mimefactory_loaded_t,
-    pub msg: Message<'a>,
-    pub chat: Option<Chat<'a>>,
+    pub msg: Message,
+    pub chat: Option<Chat>,
    pub increation: libc::c_int,
    pub in_reply_to: *mut libc::c_char,
    pub references: *mut libc::c_char,
@@ -148,7 +148,7 @@ pub unsafe fn dc_mimefactory_load_msg(
                    for row in rows {
                        let (authname, addr) = row?;
                        let addr_c = addr.strdup();
-                        if clist_search_string_nocase(factory.recipients_addr, addr_c) == 0 {
+                        if !clist_search_string_nocase(factory.recipients_addr, addr_c) {
                            clist_insert_after(
                                factory.recipients_names,
                                (*factory.recipients_names).last,
@@ -183,7 +183,7 @@ pub unsafe fn dc_mimefactory_load_msg(
                .unwrap_or_default();

            if !email_to_remove.is_empty() && email_to_remove != self_addr {
-                if clist_search_string_nocase(factory.recipients_addr, email_to_remove_c) == 0 {
+                if !clist_search_string_nocase(factory.recipients_addr, email_to_remove_c) {
                    clist_insert_after(
                        factory.recipients_names,
                        (*factory.recipients_names).last,
@@ -225,7 +225,7 @@ pub unsafe fn dc_mimefactory_load_msg(
        Err(err) => {
            error!(
                context,
-                0, "mimefactory: failed to load mime_in_reply_to: {:?}", err
+                "mimefactory: failed to load mime_in_reply_to: {:?}", err
            );
        }
    }
@@ -335,7 +335,10 @@ pub unsafe fn dc_mimefactory_load_mdn<'a>(
 }

 // TODO should return bool /rtn
-pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_int {
+pub unsafe fn dc_mimefactory_render(
+    context: &Context,
+    factory: &mut dc_mimefactory_t,
+) -> libc::c_int {
    let subject: *mut mailimf_subject;
    let mut ok_to_continue = true;
    let imf_fields: *mut mailimf_fields;
@@ -548,7 +551,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                        dc_encode_header_words(name.as_ptr()),
                    ),
                );
-                if command == 5 {
+                if command == DC_CMD_MEMBER_REMOVED_FROM_GROUP {
                    let email_to_remove = factory
                        .msg
                        .param
@@ -567,7 +570,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                            ),
                        );
                    }
-                } else if command == 4 {
+                } else if command == DC_CMD_MEMBER_ADDED_TO_GROUP {
                    let msg = &factory.msg;
                    do_gossip = 1;
                    let email_to_add = msg.param.get(Param::Arg).unwrap_or_default().strdup();
@@ -586,8 +589,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                    }
                    if 0 != msg.param.get_int(Param::Arg2).unwrap_or_default() & 0x1 {
                        info!(
-                            msg.context,
-                            0,
+                            context,
                            "sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>",
                            "vg-member-added",
                        );
@@ -599,7 +601,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                            ),
                        );
                    }
-                } else if command == 2 {
+                } else if command == DC_CMD_GROUPNAME_CHANGED {
                    let msg = &factory.msg;

                    let value_to_add = msg.param.get(Param::Arg).unwrap_or_default().strdup();
@@ -612,7 +614,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                            value_to_add,
                        ),
                    );
-                } else if command == 3 {
+                } else if command == DC_CMD_GROUPIMAGE_CHANGED {
                    let msg = &factory.msg;
                    grpimage = msg.param.get(Param::Arg);
                    if grpimage.is_none() {
@@ -626,7 +628,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                    }
                }
            }
-            if command == 8 {
+            if command == DC_CMD_LOCATION_STREAMING_ENABLED {
                mailimf_fields_add(
                    imf_fields,
                    mailimf_field_new_custom(
@@ -637,7 +639,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                    ),
                );
            }
-            if command == 6 {
+            if command == DC_CMD_AUTOCRYPT_SETUP_MESSAGE {
                mailimf_fields_add(
                    imf_fields,
                    mailimf_field_new_custom(
@@ -650,13 +652,12 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                    .stock_str(StockMessage::AcSetupMsgBody)
                    .strdup();
            }
-            if command == 7 {
+            if command == DC_CMD_SECUREJOIN_MESSAGE {
                let msg = &factory.msg;
                let step = msg.param.get(Param::Arg).unwrap_or_default().strdup();
                if strlen(step) > 0 {
                    info!(
-                        msg.context,
-                        0,
+                        context,
                        "sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>",
                        as_str(step),
                    );
@@ -726,12 +727,14 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                }
            }
            if let Some(grpimage) = grpimage {
-                let mut meta = dc_msg_new_untyped(factory.context);
+                info!(factory.context, "setting group image '{}'", grpimage);
+                let mut meta = dc_msg_new_untyped();
                meta.type_0 = Viewtype::Image;
                meta.param.set(Param::File, grpimage);

                let mut filename_as_sent = ptr::null_mut();
                meta_part = build_body_file(
+                    context,
                    &meta,
                    b"group-image\x00" as *const u8 as *const libc::c_char,
                    &mut filename_as_sent,
@@ -834,7 +837,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i

            /* add attachment part */
            if chat::msgtype_has_file(factory.msg.type_0) {
-                if !is_file_size_okay(&factory.msg) {
+                if !is_file_size_okay(context, &factory.msg) {
                    let error: *mut libc::c_char = dc_mprintf(
                        b"Message exceeds the recommended %i MB.\x00" as *const u8
                            as *const libc::c_char,
@@ -845,7 +848,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                    ok_to_continue = false;
                } else {
                    let file_part: *mut mailmime =
-                        build_body_file(&factory.msg, ptr::null(), ptr::null_mut());
+                        build_body_file(context, &factory.msg, ptr::null(), ptr::null_mut());
                    if !file_part.is_null() {
                        mailmime_smart_add_part(message, file_part);
                        parts += 1
@@ -893,12 +896,9 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                        mailmime_smart_add_part(message, kml_mime_part);
                    }

-                    if location::is_sending_locations_to_chat(
-                        factory.msg.context,
-                        factory.msg.chat_id,
-                    ) {
+                    if location::is_sending_locations_to_chat(context, factory.msg.chat_id) {
                        if let Ok((kml_file, last_added_location_id)) =
-                            location::get_kml(factory.msg.context, factory.msg.chat_id)
+                            location::get_kml(context, factory.msg.chat_id)
                        {
                            let content_type = mailmime_content_new_with_str(
                                b"application/vnd.google-earth.kml+xml\x00" as *const u8
@@ -951,7 +951,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                    .stock_str(StockMessage::EncryptedMsg)
                    .into_owned()
            } else {
-                to_string(dc_msg_get_summarytext(&mut factory.msg, 32))
+                to_string(dc_msg_get_summarytext(context, &mut factory.msg, 32))
            };
            let p2 = factory
                .context
@@ -995,7 +995,8 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
                    e.as_ptr(),
                );
            } else {
-                subject_str = get_subject(factory.chat.as_ref(), &mut factory.msg, afwd_email)
+                subject_str =
+                    get_subject(context, factory.chat.as_ref(), &mut factory.msg, afwd_email)
            }
            subject = mailimf_subject_new(dc_encode_header_words(subject_str));
            mailimf_fields_add(
@@ -1061,6 +1062,7 @@ pub unsafe fn dc_mimefactory_render(factory: &mut dc_mimefactory_t) -> libc::c_i
 }

 unsafe fn get_subject(
+    context: &Context,
    chat: Option<&Chat>,
    msg: &mut Message,
    afwd_email: libc::c_int,
@@ -1070,7 +1072,6 @@ unsafe fn get_subject(
    }

    let chat = chat.unwrap();
-    let context = chat.context;
    let ret: *mut libc::c_char;

    let raw_subject = {
@@ -1083,7 +1084,7 @@ unsafe fn get_subject(
    } else {
        b"\x00" as *const u8 as *const libc::c_char
    };
-    if msg.param.get_int(Param::Cmd).unwrap_or_default() == 6 {
+    if msg.param.get_int(Param::Cmd).unwrap_or_default() == DC_CMD_AUTOCRYPT_SETUP_MESSAGE {
        ret = context.stock_str(StockMessage::AcSetupMsgSubject).strdup()
    } else if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
        ret = format!(
@@ -1135,6 +1136,7 @@ unsafe fn build_body_text(text: *mut libc::c_char) -> *mut mailmime {

 #[allow(non_snake_case)]
 unsafe fn build_body_file(
+    context: &Context,
    msg: &Message,
    mut base_name: *const libc::c_char,
    ret_file_name_as_sent: *mut *mut libc::c_char,
@@ -1218,7 +1220,7 @@ unsafe fn build_body_file(
            /* 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 ... */
-            needs_ext = dc_needs_ext_header(filename_to_send);
+            needs_ext = dc_needs_ext_header(as_str(filename_to_send));
            mime_fields = mailmime_fields_new_filename(
                MAILMIME_DISPOSITION_TYPE_ATTACHMENT as libc::c_int,
                if needs_ext {
@@ -1255,7 +1257,7 @@ unsafe fn build_body_file(
                                        strdup(
                                            b"filename*\x00" as *const u8 as *const libc::c_char,
                                        ),
-                                        dc_encode_ext_header(filename_to_send),
+                                        dc_encode_ext_header(as_str(filename_to_send)).strdup(),
                                    ),
                                );
                            if !parm.is_null() {
@@ -1287,7 +1289,7 @@ unsafe fn build_body_file(
                ) as *mut libc::c_void,
            );
            mime_sub = mailmime_new_empty(content, mime_fields);
-            mailmime_set_body_file(mime_sub, dc_get_abs_path(msg.context, path_filename));
+            mailmime_set_body_file(mime_sub, dc_get_abs_path(context, path_filename));
            if !ret_file_name_as_sent.is_null() {
                *ret_file_name_as_sent = dc_strdup(filename_to_send)
            }
@@ -1304,10 +1306,10 @@ unsafe fn build_body_file(
 /*******************************************************************************
 * Render
 ******************************************************************************/
-unsafe fn is_file_size_okay(msg: &Message) -> bool {
+unsafe fn is_file_size_okay(context: &Context, msg: &Message) -> bool {
    let mut file_size_okay = true;
    let path = msg.param.get(Param::File).unwrap_or_default();
-    let bytes = dc_get_filebytes(msg.context, &path);
+    let bytes = dc_get_filebytes(context, &path);

    if bytes > (49 * 1024 * 1024 / 4 * 3) {
        file_size_okay = false;
--- a/src/dc_mimeparser.rs
+++ b/src/dc_mimeparser.rs
@@ -32,10 +32,10 @@ dc_mimeparser_t has no deep dependencies to Context or to the database
 #[repr(C)]
 pub struct dc_mimepart_t {
    pub type_0: Viewtype,
-    pub is_meta: libc::c_int,
+    pub is_meta: bool,
    pub int_mimetype: libc::c_int,
    pub msg: Option<String>,
-    pub msg_raw: *mut libc::c_char,
+    pub msg_raw: Option<String>,
    pub bytes: libc::c_int,
    pub param: Params,
 }
@@ -50,11 +50,11 @@ pub struct dc_mimeparser_t<'a> {
    pub header: HashMap<String, *mut mailimf_field>,
    pub header_root: *mut mailimf_fields,
    pub header_protected: *mut mailimf_fields,
-    pub subject: *mut libc::c_char,
+    pub subject: Option<String>,
    pub is_send_by_messenger: bool,
-    pub decrypting_failed: libc::c_int,
+    pub decrypting_failed: bool,
    pub e2ee_helper: E2eeHelper,
-    pub is_forwarded: libc::c_int,
+    pub is_forwarded: bool,
    pub context: &'a Context,
    pub reports: Vec<*mut mailmime>,
    pub is_system_message: libc::c_int,
@@ -69,11 +69,11 @@ pub fn dc_mimeparser_new(context: &Context) -> dc_mimeparser_t {
        header: Default::default(),
        header_root: std::ptr::null_mut(),
        header_protected: std::ptr::null_mut(),
-        subject: std::ptr::null_mut(),
+        subject: None,
        is_send_by_messenger: false,
-        decrypting_failed: 0,
+        decrypting_failed: false,
        e2ee_helper: Default::default(),
-        is_forwarded: 0,
+        is_forwarded: false,
        context,
        reports: Vec::new(),
        is_system_message: 0,
@@ -87,10 +87,7 @@ pub unsafe fn dc_mimeparser_unref(mimeparser: &mut dc_mimeparser_t) {
 }

 unsafe fn dc_mimeparser_empty(mimeparser: &mut dc_mimeparser_t) {
-    for part in mimeparser.parts.drain(..) {
-        dc_mimepart_unref(part);
-    }
-    assert!(mimeparser.parts.is_empty());
+    mimeparser.parts = vec![];
    mimeparser.header_root = ptr::null_mut();
    mimeparser.header.clear();
    if !mimeparser.header_protected.is_null() {
@@ -99,26 +96,20 @@ unsafe fn dc_mimeparser_empty(mimeparser: &mut dc_mimeparser_t) {
    }
    mimeparser.is_send_by_messenger = false;
    mimeparser.is_system_message = 0i32;
-    free(mimeparser.subject as *mut libc::c_void);
-    mimeparser.subject = ptr::null_mut();
+    mimeparser.subject = None;
    if !mimeparser.mimeroot.is_null() {
        mailmime_free(mimeparser.mimeroot);
        mimeparser.mimeroot = ptr::null_mut()
    }
-    mimeparser.is_forwarded = 0i32;
+    mimeparser.is_forwarded = false;
    mimeparser.reports.clear();
-    mimeparser.decrypting_failed = 0i32;
+    mimeparser.decrypting_failed = false;
    mimeparser.e2ee_helper.thanks();

    mimeparser.location_kml = None;
    mimeparser.message_kml = None;
 }

-unsafe fn dc_mimepart_unref(mut mimepart: dc_mimepart_t) {
-    mimepart.msg = None;
-    free(mimepart.msg_raw as *mut libc::c_void);
-    mimepart.msg_raw = ptr::null_mut();
-}
 const DC_MIMETYPE_AC_SETUP_FILE: i32 = 111;

 pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_mimeparser_t<'a> {
@@ -141,7 +132,9 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
        dc_mimeparser_parse_mime_recursive(mimeparser_ref, mimeparser_ref.mimeroot);
        let field: *mut mailimf_field = dc_mimeparser_lookup_field(&mimeparser, "Subject");
        if !field.is_null() && (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int {
-            mimeparser.subject = dc_decode_header_words((*(*field).fld_data.fld_subject).sbj_value)
+            let subj = (*(*field).fld_data.fld_subject).sbj_value;
+
+            mimeparser.subject = as_opt_str(subj).map(dc_decode_header_words_safe);
        }
        if !dc_mimeparser_lookup_optional_field(&mut mimeparser, "Chat-Version").is_null() {
            mimeparser.is_send_by_messenger = true
@@ -169,8 +162,7 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
                let mut i = 0;
                while i != mimeparser.parts.len() {
                    if mimeparser.parts[i].int_mimetype != 111 {
-                        let part = mimeparser.parts.remove(i);
-                        dc_mimepart_unref(part);
+                        mimeparser.parts.remove(i);
                    } else {
                        i += 1;
                    }
@@ -196,7 +188,7 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
                if mimeparser.parts.len() >= 2 {
                    let imgpart = &mut mimeparser.parts[1];
                    if imgpart.type_0 == Viewtype::Image {
-                        imgpart.is_meta = 1i32
+                        imgpart.is_meta = true;
                    }
                }
            }
@@ -212,7 +204,7 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
                        || filepart.type_0 == Viewtype::Voice
                        || filepart.type_0 == Viewtype::Video
                        || filepart.type_0 == Viewtype::File)
-                    && 0 == filepart.is_meta
+                    && !filepart.is_meta
            };

            if need_drop {
@@ -225,55 +217,49 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
                mimeparser.parts[0].msg = None;

                // swap new with old
-                let old = std::mem::replace(&mut mimeparser.parts[0], filepart);
-
-                // unref old one
-                dc_mimepart_unref(old);
+                std::mem::replace(&mut mimeparser.parts[0], filepart);
            }
        }
-        if !mimeparser.subject.is_null() {
+        if let Some(ref subject) = mimeparser.subject {
            let mut prepend_subject: libc::c_int = 1i32;
-            if 0 == mimeparser.decrypting_failed {
-                let p: *mut libc::c_char = strchr(mimeparser.subject, ':' as i32);
-                if p.wrapping_offset_from(mimeparser.subject) == 2
-                    || p.wrapping_offset_from(mimeparser.subject) == 3
+            if !mimeparser.decrypting_failed {
+                let colon = subject.find(':');
+                if colon == Some(2)
+                    || colon == Some(3)
                    || mimeparser.is_send_by_messenger
-                    || !strstr(
-                        mimeparser.subject,
-                        b"Chat:\x00" as *const u8 as *const libc::c_char,
-                    )
-                    .is_null()
+                    || subject.contains("Chat:")
                {
                    prepend_subject = 0i32
                }
            }
            if 0 != prepend_subject {
-                let subj: *mut libc::c_char = dc_strdup(mimeparser.subject);
-                let p_0: *mut libc::c_char = strchr(subj, '[' as i32);
-                if !p_0.is_null() {
-                    *p_0 = 0i32 as libc::c_char
+                let subj = if let Some(n) = subject.find('[') {
+                    &subject[0..n]
+                } else {
+                    subject
                }
-                dc_trim(subj);
-                if 0 != *subj.offset(0isize) {
+                .trim();
+
+                if !subj.is_empty() {
+                    let subj_c = CString::yolo(subj);
                    for part in mimeparser.parts.iter_mut() {
                        if part.type_0 == Viewtype::Text {
                            let msg_c = part.msg.as_ref().unwrap().strdup();
                            let new_txt: *mut libc::c_char = dc_mprintf(
                                b"%s \xe2\x80\x93 %s\x00" as *const u8 as *const libc::c_char,
-                                subj,
+                                subj_c.as_ptr(),
                                msg_c,
                            );
                            free(msg_c.cast());
-                            part.msg = Some(to_string(new_txt));
+                            part.msg = Some(to_string_lossy(new_txt));
                            free(new_txt.cast());
                            break;
                        }
                    }
                }
-                free(subj as *mut libc::c_void);
            }
        }
-        if 0 != mimeparser.is_forwarded {
+        if mimeparser.is_forwarded {
            for part in mimeparser.parts.iter_mut() {
                part.param.set_int(Param::Forwarded, 1);
            }
@@ -301,7 +287,7 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
                }
            }
        }
-        if 0 == mimeparser.decrypting_failed {
+        if !mimeparser.decrypting_failed {
            let dn_field: *const mailimf_optional_field = dc_mimeparser_lookup_optional_field(
                &mimeparser,
                "Chat-Disposition-Notification-To",
@@ -350,10 +336,12 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
    if dc_mimeparser_get_last_nonmeta(&mut mimeparser).is_none() && mimeparser.reports.is_empty() {
        let mut part_5 = dc_mimepart_new();
        part_5.type_0 = Viewtype::Text;
-        if !mimeparser.subject.is_null() && !mimeparser.is_send_by_messenger {
-            part_5.msg = Some(to_string(mimeparser.subject));
-        } else {
-            part_5.msg = Some("".into());
+        part_5.msg = Some("".into());
+
+        if let Some(ref subject) = mimeparser.subject {
+            if !mimeparser.is_send_by_messenger {
+                part_5.msg = Some(subject.to_string())
+            }
        }
        mimeparser.parts.push(part_5);
    };
@@ -366,10 +354,10 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
 unsafe fn dc_mimepart_new() -> dc_mimepart_t {
    dc_mimepart_t {
        type_0: Viewtype::Unknown,
-        is_meta: 0,
+        is_meta: false,
        int_mimetype: 0,
        msg: None,
-        msg_raw: std::ptr::null_mut(),
+        msg_raw: None,
        bytes: 0,
        param: Params::new(),
    }
@@ -378,11 +366,7 @@ unsafe fn dc_mimepart_new() -> dc_mimepart_t {
 pub fn dc_mimeparser_get_last_nonmeta<'a>(
    mimeparser: &'a mut dc_mimeparser_t,
 ) -> Option<&'a mut dc_mimepart_t> {
-    mimeparser
-        .parts
-        .iter_mut()
-        .rev()
-        .find(|part| part.is_meta == 0)
+    mimeparser.parts.iter_mut().rev().find(|part| !part.is_meta)
 }

 /*the result must be freed*/
@@ -470,7 +454,7 @@ unsafe fn dc_mimeparser_parse_mime_recursive(
        {
            info!(
                mimeparser.context,
-                0, "Protected headers found in text/rfc822-headers attachment: Will be ignored.",
+                "Protected headers found in text/rfc822-headers attachment: Will be ignored.",
            );
            return 0i32;
        }
@@ -484,7 +468,7 @@ unsafe fn dc_mimeparser_parse_mime_recursive(
            ) != MAILIMF_NO_ERROR as libc::c_int
                || mimeparser.header_protected.is_null()
            {
-                warn!(mimeparser.context, 0, "Protected headers parsing error.",);
+                warn!(mimeparser.context, "Protected headers parsing error.",);
            } else {
                hash_header(
                    &mut mimeparser.header,
@@ -495,7 +479,6 @@ unsafe fn dc_mimeparser_parse_mime_recursive(
        } else {
            info!(
                mimeparser.context,
-                0,
                "Protected headers found in MIME header: Will be ignored as we already found an outer one."
            );
        }
@@ -596,12 +579,12 @@ unsafe fn dc_mimeparser_parse_mime_recursive(
                        .stock_str(StockMessage::CantDecryptMsgBody);

                    let txt = format!("[{}]", msg_body);
-                    part.msg_raw = txt.strdup();
+                    part.msg_raw = Some(txt.clone());
                    part.msg = Some(txt);

                    mimeparser.parts.push(part);
                    any_part_added = 1i32;
-                    mimeparser.decrypting_failed = 1i32
+                    mimeparser.decrypting_failed = true;
                }
                46 => {
                    cur = (*(*mime).mm_data.mm_multipart.mm_mp_list).first;
@@ -677,7 +660,6 @@ unsafe fn dc_mimeparser_parse_mime_recursive(
                    if plain_cnt == 1i32 && html_cnt == 1i32 {
                        warn!(
                            mimeparser.context,
-                            0i32,
                            "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
@@ -1082,7 +1064,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                                );

                                let (res, _, _) = encoding.decode(data);
-                                info!(mimeparser.context, 0, "decoded message: '{}'", res);
+                                info!(mimeparser.context, "decoded message: '{}'", res);
                                if res.is_empty() {
                                    /* no error - but nothing to add */
                                    ok_to_continue = false;
@@ -1095,7 +1077,6 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                            } else {
                                warn!(
                                    mimeparser.context,
-                                    0,
                                    "Cannot convert {} bytes from \"{}\" to \"utf-8\".",
                                    decoded_data_bytes as libc::c_int,
                                    as_str(charset),
@@ -1124,13 +1105,18 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                                part.type_0 = Viewtype::Text;
                                part.int_mimetype = mime_type;
                                part.msg = Some(simplified_txt);
-                                part.msg_raw =
-                                    strndup(decoded_data, decoded_data_bytes as libc::c_ulong);
+                                part.msg_raw = {
+                                    let raw_c =
+                                        strndup(decoded_data, decoded_data_bytes as libc::c_ulong);
+                                    let raw = to_string_lossy(raw_c);
+                                    free(raw_c.cast());
+                                    Some(raw)
+                                };
                                do_add_single_part(mimeparser, part);
                            }

                            if simplifier.unwrap().is_forwarded {
-                                mimeparser.is_forwarded = 1i32
+                                mimeparser.is_forwarded = true;
                            }
                        }
                    }
@@ -1180,7 +1166,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                                                    9,
                                                ) == 0i32
                                            {
-                                                filename_parts += &to_string(
+                                                filename_parts += &to_string_lossy(
                                                    (*(*dsp_param).pa_data.pa_parameter).pa_value,
                                                );
                                            } else if (*dsp_param).pa_type
@@ -1209,8 +1195,8 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                        }
                        if !filename_parts.is_empty() {
                            free(desired_filename as *mut libc::c_void);
-                            let parts_c = CString::yolo(filename_parts);
-                            desired_filename = dc_decode_ext_header(parts_c.as_ptr());
+                            desired_filename =
+                                dc_decode_ext_header(filename_parts.as_bytes()).strdup();
                        }
                        if desired_filename.is_null() {
                            let param = mailmime_find_ct_parameter(
@@ -1284,7 +1270,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                                    mimeparser,
                                    msg_type,
                                    mime_type,
-                                    raw_mime,
+                                    as_str(raw_mime),
                                    decoded_data,
                                    decoded_data_bytes,
                                    desired_filename,
@@ -1312,7 +1298,7 @@ unsafe fn do_add_single_file_part(
    parser: &mut dc_mimeparser_t,
    msg_type: Viewtype,
    mime_type: libc::c_int,
-    raw_mime: *const libc::c_char,
+    raw_mime: &str,
    decoded_data: *const libc::c_char,
    decoded_data_bytes: size_t,
    desired_filename: *const libc::c_char,
@@ -1338,7 +1324,7 @@ unsafe fn do_add_single_file_part(
            part.int_mimetype = mime_type;
            part.bytes = decoded_data_bytes as libc::c_int;
            part.param.set(Param::File, as_str(pathNfilename));
-            part.param.set(Param::MimeType, as_str(raw_mime));
+            part.param.set(Param::MimeType, raw_mime);
            if mime_type == 80 {
                assert!(!decoded_data.is_null(), "invalid image data");
                let data = std::slice::from_raw_parts(
@@ -1654,10 +1640,8 @@ pub unsafe fn dc_mimeparser_repl_msg_by_error(
    }
    let part = &mut mimeparser.parts[0];
    part.type_0 = Viewtype::Text;
-    part.msg = Some(format!("[{}]", to_string(error_msg)));
-    for part in mimeparser.parts.drain(1..) {
-        dc_mimepart_unref(part);
-    }
+    part.msg = Some(format!("[{}]", to_string_lossy(error_msg)));
+    mimeparser.parts.truncate(1);
    assert_eq!(mimeparser.parts.len(), 1);
 }

@@ -1814,10 +1798,7 @@ mod tests {
            let raw = b"Content-Type: multipart/mixed; boundary=\"==break==\";\nSubject: outer-subject\nX-Special-A: special-a\nFoo: Bar\nChat-Version: 0.0\n\n--==break==\nContent-Type: text/plain; protected-headers=\"v1\";\nSubject: inner-subject\nX-Special-B: special-b\nFoo: Xy\nChat-Version: 1.0\n\ntest1\n\n--==break==--\n\n\x00";
            let mut mimeparser = dc_mimeparser_parse(&context.ctx, &raw[..]);

-            assert_eq!(
-                &to_string(mimeparser.subject as *const libc::c_char),
-                "inner-subject",
-            );
+            assert_eq!(mimeparser.subject, Some("inner-subject".into()));

            let mut of: *mut mailimf_optional_field =
                dc_mimeparser_lookup_optional_field(&mimeparser, "X-Special-A");
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1,3 +1,4 @@
+use std::ffi::CString;
 use std::ptr;

 use itertools::join;
@@ -15,7 +16,6 @@ use crate::constants::*;
 use crate::contact::*;
 use crate::context::{do_heuristics_moves, Context};
 use crate::dc_mimeparser::*;
-use crate::dc_securejoin::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::error::Result;
@@ -24,6 +24,7 @@ use crate::location;
 use crate::message::*;
 use crate::param::*;
 use crate::peerstate::*;
+use crate::securejoin::handle_securejoin_handshake;
 use crate::sql;
 use crate::stock::StockMessage;
 use crate::types::*;
@@ -40,7 +41,6 @@ pub unsafe fn dc_receive_imf(
 ) {
    info!(
        context,
-        0,
        "Receiving message {}/{}...",
        if !server_folder.as_ref().is_empty() {
            server_folder.as_ref()
@@ -60,7 +60,7 @@ pub unsafe fn dc_receive_imf(

    if mime_parser.header.is_empty() {
        // Error - even adding an empty record won't help as we do not know the message ID
-        info!(context, 0, "No header.");
+        info!(context, "No header.");
        return;
    }

@@ -188,7 +188,7 @@ pub unsafe fn dc_receive_imf(
            &mut created_db_entries,
            &mut create_event_to_send,
        ) {
-            info!(context, 0, "{}", err);
+            info!(context, "{}", err);

            cleanup(
                context,
@@ -242,7 +242,6 @@ pub unsafe fn dc_receive_imf(

    info!(
        context,
-        0,
        "received message {} has Message-Id: {}",
        server_uid,
        to_string(rfc724_mid)
@@ -400,7 +399,7 @@ unsafe fn add_parts(
            msgrmsg = 1;
            *chat_id = 0;
            allow_creation = 1;
-            let handshake = dc_handle_securejoin_handshake(context, mime_parser, *from_id);
+            let handshake = handle_securejoin_handshake(context, mime_parser, *from_id);
            if 0 != handshake & DC_HANDSHAKE_STOP_NORMAL_PROCESSING {
                *hidden = 1;
                *add_delete_job = handshake & DC_HANDSHAKE_ADD_DELETE_JOB;
@@ -446,10 +445,7 @@ unsafe fn add_parts(
            // check if the message belongs to a mailing list
            if dc_mimeparser_is_mailinglist_message(mime_parser) {
                *chat_id = 3;
-                info!(
-                    context,
-                    0, "Message belongs to a mailing list and is ignored.",
-                );
+                info!(context, "Message belongs to a mailing list and is ignored.",);
            }
        }

@@ -481,7 +477,7 @@ unsafe fn add_parts(
                    Contact::scaleup_origin_by_id(context, *from_id, Origin::IncomingReplyTo);
                    info!(
                        context,
-                        0, "Message is a reply to a known message, mark sender as known.",
+                        "Message is a reply to a known message, mark sender as known.",
                    );
                    if !incoming_origin.is_verified() {
                        *incoming_origin = Origin::IncomingReplyTo;
@@ -625,7 +621,7 @@ unsafe fn add_parts(
            |mut stmt, conn| {
                for i in 0..icnt {
                    let part = &mut mime_parser.parts[i];
-                    if part.is_meta != 0 {
+                    if part.is_meta {
                        continue;
                    }

@@ -641,14 +637,19 @@ unsafe fn add_parts(
                        }
                    }
                    if part.type_0 == Viewtype::Text {
+                        let msg_raw =
+                            CString::yolo(part.msg_raw.as_ref().cloned().unwrap_or_default());
+                        let subject_c = CString::yolo(
+                            mime_parser
+                                .subject
+                                .as_ref()
+                                .map(|s| s.to_string())
+                                .unwrap_or("".into()),
+                        );
                        txt_raw = dc_mprintf(
                            b"%s\n\n%s\x00" as *const u8 as *const libc::c_char,
-                            if !mime_parser.subject.is_null() {
-                                mime_parser.subject
-                            } else {
-                                b"\x00" as *const u8 as *const libc::c_char
-                            },
-                            part.msg_raw,
+                            subject_c.as_ptr(),
+                            msg_raw.as_ptr(),
                        )
                    }
                    if 0 != mime_parser.is_system_message {
@@ -718,7 +719,7 @@ unsafe fn add_parts(

    info!(
        context,
-        0, "Message has {} parts and is assigned to chat #{}.", icnt, *chat_id,
+        "Message has {} parts and is assigned to chat #{}.", icnt, *chat_id,
    );

    // check event to send
@@ -918,7 +919,7 @@ unsafe fn handle_reports(
    }
 }

-unsafe fn save_locations(
+fn save_locations(
    context: &Context,
    mime_parser: &dc_mimeparser_t,
    chat_id: u32,
@@ -956,7 +957,7 @@ unsafe fn save_locations(
                            insert_msg_id,
                            newest_location_id,
                        ) {
-                            error!(context, 0, "Failed to set msg_location_id: {:?}", err);
+                            error!(context, "Failed to set msg_location_id: {:?}", err);
                        }
                    }
                    send_event = true;
@@ -1034,7 +1035,6 @@ unsafe fn create_or_lookup_group(
    let group_explicitly_left: bool;
    let mut chat_id = 0;
    let mut chat_id_blocked = Blocked::Not;
-    let mut chat_id_verified = 0;
    let mut grpid = "".to_string();
    let mut grpname = std::ptr::null_mut();
    let to_ids_cnt = to_ids.len();
@@ -1045,7 +1045,7 @@ unsafe fn create_or_lookup_group(
    // pointer somewhere into mime_parser, must not be freed
    let mut X_MrAddToGrp = std::ptr::null_mut();
    let mut X_MrGrpNameChanged = 0;
-    let mut X_MrGrpImageChanged = std::ptr::null();
+    let mut X_MrGrpImageChanged = "".to_string();
    let mut better_msg: String = From::from("");
    let mut failure_reason = std::ptr::null_mut();

@@ -1074,7 +1074,6 @@ unsafe fn create_or_lookup_group(
    }
    set_better_msg(mime_parser, &better_msg);

-    // search the grpid in the header
    let optional_field = dc_mimeparser_lookup_optional_field(mime_parser, "Chat-Group-ID");
    if !optional_field.is_null() {
        grpid = to_string((*optional_field).fld_value)
@@ -1169,7 +1168,8 @@ unsafe fn create_or_lookup_group(
            let optional_field =
                dc_mimeparser_lookup_optional_field(mime_parser, "Chat-Group-Image");
            if !optional_field.is_null() {
-                X_MrGrpImageChanged = (*optional_field).fld_value
+                // fld_value is a pointer somewhere into mime_parser, must not be freed
+                X_MrGrpImageChanged = as_str((*optional_field).fld_value).to_string();
            }
            better_msg = context.stock_system_msg(
                StockMessage::MsgAddMember,
@@ -1193,14 +1193,11 @@ unsafe fn create_or_lookup_group(
                let optional_field =
                    dc_mimeparser_lookup_optional_field(mime_parser, "Chat-Group-Image");
                if !optional_field.is_null() {
-                    X_MrGrpImageChanged = (*optional_field).fld_value;
+                    // fld_value is a pointer somewhere into mime_parser, must not be freed
+                    X_MrGrpImageChanged = as_str((*optional_field).fld_value).to_string();
                    mime_parser.is_system_message = DC_CMD_GROUPIMAGE_CHANGED;
                    better_msg = context.stock_system_msg(
-                        if strcmp(
-                            X_MrGrpImageChanged,
-                            b"0\x00" as *const u8 as *const libc::c_char,
-                        ) == 0
-                        {
+                        if X_MrGrpImageChanged == "0" {
                            StockMessage::MsgGrpImgDeleted
                        } else {
                            StockMessage::MsgGrpImgChanged
@@ -1216,14 +1213,9 @@ unsafe fn create_or_lookup_group(
    set_better_msg(mime_parser, &better_msg);

    // check, if we have a chat with this group ID
-    chat_id = chat::get_chat_id_by_grpid(
-        context,
-        &grpid,
-        Some(&mut chat_id_blocked),
-        &mut chat_id_verified,
-    );
+    let (mut chat_id, chat_id_verified, _blocked) = chat::get_chat_id_by_grpid(context, &grpid);
    if chat_id != 0 {
-        if 0 != chat_id_verified
+        if chat_id_verified
            && 0 == check_verified_properties(
                context,
                mime_parser,
@@ -1320,6 +1312,7 @@ unsafe fn create_or_lookup_group(
    if !X_MrAddToGrp.is_null() || !X_MrRemoveFromGrp.is_null() {
        recreate_member_list = 1;
    } else if 0 != X_MrGrpNameChanged && !grpname.is_null() && strlen(grpname) < 200 {
+        info!(context, "updating grpname for chat {}", chat_id);
        if sql::execute(
            context,
            &context.sql,
@@ -1331,49 +1324,39 @@ unsafe fn create_or_lookup_group(
            context.call_cb(Event::CHAT_MODIFIED, chat_id as uintptr_t, 0);
        }
    }
-    if !X_MrGrpImageChanged.is_null() {
-        let mut ok = 0;
-        let mut grpimage = ptr::null_mut();
-        if strcmp(
-            X_MrGrpImageChanged,
-            b"0\x00" as *const u8 as *const libc::c_char,
-        ) == 0
-        {
-            ok = 1
+    if !X_MrGrpImageChanged.is_empty() {
+        info!(
+            context,
+            "grp-image-change {} chat {}", X_MrGrpImageChanged, chat_id
+        );
+        let mut changed = false;
+        let mut grpimage = "".to_string();
+        if X_MrGrpImageChanged == "0" {
+            changed = true;
        } else {
            for part in &mut mime_parser.parts {
                if part.type_0 == Viewtype::Image {
                    grpimage = part
                        .param
                        .get(Param::File)
-                        .map(|s| s.strdup())
-                        .unwrap_or_else(|| std::ptr::null_mut());
-                    ok = 1
+                        .map(|s| s.to_string())
+                        .unwrap_or_else(|| "".to_string());
+                    info!(context, "found image {:?}", grpimage);
+                    changed = true;
                }
            }
        }
-        if 0 != ok {
-            info!(
-                context,
-                0,
-                "New group image set to {}.",
-                if !grpimage.is_null() {
-                    "DELETED".to_string()
-                } else {
-                    to_string(grpimage)
-                },
-            );
+        if changed {
+            info!(context, "New group image set to '{}'.", grpimage);
            if let Ok(mut chat) = Chat::load_from_db(context, chat_id) {
-                if grpimage.is_null() {
+                if grpimage.is_empty() {
                    chat.param.remove(Param::ProfileImage);
                } else {
-                    chat.param.set(Param::ProfileImage, as_str(grpimage));
+                    chat.param.set(Param::ProfileImage, grpimage);
                }
-                chat.update_param().unwrap();
+                chat.update_param(context).unwrap();
                send_EVENT_CHAT_MODIFIED = 1;
            }
-
-            free(grpimage as *mut libc::c_void);
        }
    }

@@ -1574,8 +1557,8 @@ unsafe fn create_or_lookup_adhoc_group(
    }

    // use subject as initial chat name
-    if !mime_parser.subject.is_null() && 0 != *mime_parser.subject.offset(0isize) as libc::c_int {
-        grpname = dc_strdup(mime_parser.subject)
+    if let Some(subject) = mime_parser.subject.as_ref().filter(|s| !s.is_empty()) {
+        grpname = subject.strdup();
    } else {
        grpname = context
            .stock_string_repl_int(StockMessage::Member, member_ids.len() as libc::c_int)
@@ -1682,10 +1665,7 @@ fn hex_hash(s: impl AsRef<str>) -> String {
 }

 #[allow(non_snake_case)]
-unsafe fn search_chat_ids_by_contact_ids(
-    context: &Context,
-    unsorted_contact_ids: &Vec<u32>,
-) -> Vec<u32> {
+fn search_chat_ids_by_contact_ids(context: &Context, unsorted_contact_ids: &Vec<u32>) -> 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);
    let mut chat_ids = Vec::with_capacity(23);
@@ -1702,7 +1682,13 @@ unsafe fn search_chat_ids_by_contact_ids(
            let contact_ids_str = join(contact_ids.iter().map(|x| x.to_string()), ",");
            context.sql.query_map(
                format!(
-                    "SELECT DISTINCT cc.chat_id, cc.contact_id  FROM chats_contacts cc  LEFT JOIN chats c ON c.id=cc.chat_id  WHERE cc.chat_id IN(SELECT chat_id FROM chats_contacts WHERE contact_id IN({}))   AND c.type=120   AND cc.contact_id!=1 ORDER BY cc.chat_id, cc.contact_id;",
+                    "SELECT DISTINCT cc.chat_id, cc.contact_id \
+                       FROM chats_contacts cc \
+                       LEFT JOIN chats c ON c.id=cc.chat_id \
+                       WHERE cc.chat_id IN(SELECT chat_id FROM chats_contacts WHERE contact_id IN({})) \
+                         AND c.type=120 \
+                         AND cc.contact_id!=1 \
+                       ORDER BY cc.chat_id, cc.contact_id;",
                    contact_ids_str
                ),
                params![],
@@ -1714,15 +1700,15 @@ unsafe fn search_chat_ids_by_contact_ids(

                    for row in rows {
                        let (chat_id, contact_id) = row?;
-                        if chat_id as u32 != last_chat_id {
+                        if chat_id != last_chat_id {
                            if matches == contact_ids.len() && mismatches == 0 {
                                chat_ids.push(last_chat_id);
                            }
-                            last_chat_id = chat_id as u32;
+                            last_chat_id = chat_id;
                            matches = 0;
                            mismatches = 0;
                        }
-                        if contact_id == contact_ids[matches] {
+                        if matches < contact_ids.len() && contact_id == contact_ids[matches] {
                            matches += 1;
                        } else {
                            mismatches += 1;
@@ -1750,7 +1736,7 @@ unsafe fn check_verified_properties(
 ) -> libc::c_int {
    let verify_fail = |reason: String| {
        *failure_reason = format!("{}. See \"Info\" for details.", reason).strdup();
-        warn!(context, 0, "{}", reason);
+        warn!(context, "{}", reason);
    };

    let contact = match Contact::load_from_db(context, from_id) {
@@ -1774,7 +1760,8 @@ unsafe fn check_verified_properties(
        let peerstate = Peerstate::from_addr(context, &context.sql, contact.get_addr());

        if peerstate.is_none()
-            || contact.is_verified_ex(peerstate.as_ref()) != VerifiedStatus::BidirectVerified
+            || contact.is_verified_ex(context, peerstate.as_ref())
+                != VerifiedStatus::BidirectVerified
        {
            verify_fail("The sender of this message is not verified.".into());
            return 0;
@@ -1821,13 +1808,7 @@ unsafe fn check_verified_properties(
                || peerstate.verified_key_fingerprint != peerstate.public_key_fingerprint
                    && peerstate.verified_key_fingerprint != peerstate.gossip_key_fingerprint
            {
-                info!(
-                    context,
-                    0,
-                    "{} has verfied {}.",
-                    contact.get_addr(),
-                    to_addr,
-                );
+                info!(context, "{} has verfied {}.", contact.get_addr(), to_addr,);
                let fp = peerstate.gossip_key_fingerprint.clone();
                if let Some(fp) = fp {
                    peerstate.set_verified(0, &fp, 2);
--- a/src/dc_securejoin.rs
+++ b/src/dc_securejoin.rs
--- a/src/dc_strencode.rs
+++ b/src/dc_strencode.rs
@@ -1,83 +1,31 @@
-use std::ffi::{CStr, CString};
+use std::borrow::Cow;
+use std::ffi::CString;
 use std::ptr;

 use charset::Charset;
 use mmime::mailmime_decode::*;
 use mmime::mmapstring::*;
 use mmime::other::*;
+use percent_encoding::{percent_decode, utf8_percent_encode, AsciiSet, CONTROLS};

 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;

-#[inline]
-fn isalnum(c: libc::c_int) -> libc::c_int {
-    if c < std::u8::MAX as libc::c_int {
-        (c as u8 as char).is_ascii_alphanumeric() as libc::c_int
-    } else {
-        0
-    }
-}
-
-/* ******************************************************************************
- * URL encoding and decoding, RFC 3986
- ******************************************************************************/
-unsafe fn int_2_uppercase_hex(code: libc::c_char) -> libc::c_char {
-    static mut HEX: [libc::c_char; 17] = [
-        48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 0,
-    ];
-
-    HEX[(code as libc::c_int & 15i32) as usize]
-}
-
-pub unsafe fn dc_urldecode(to_decode: *const libc::c_char) -> *mut libc::c_char {
-    let mut pstr: *const libc::c_char = to_decode;
-    if to_decode.is_null() {
-        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
-    }
-    let buf: *mut libc::c_char = malloc(strlen(to_decode).wrapping_add(1)) as *mut libc::c_char;
-    let mut pbuf: *mut libc::c_char = buf;
-    assert!(!buf.is_null());
-
-    while 0 != *pstr {
-        if *pstr as libc::c_int == '%' as i32 {
-            if 0 != *pstr.offset(1isize) as libc::c_int && 0 != *pstr.offset(2isize) as libc::c_int
-            {
-                let fresh5 = pbuf;
-                pbuf = pbuf.offset(1);
-                *fresh5 = ((hex_2_int(*pstr.offset(1isize)) as libc::c_int) << 4i32
-                    | hex_2_int(*pstr.offset(2isize)) as libc::c_int)
-                    as libc::c_char;
-                pstr = pstr.offset(2isize)
-            }
-        } else if *pstr as libc::c_int == '+' as i32 {
-            let fresh6 = pbuf;
-            pbuf = pbuf.offset(1);
-            *fresh6 = ' ' as i32 as libc::c_char
-        } else {
-            let fresh7 = pbuf;
-            pbuf = pbuf.offset(1);
-            *fresh7 = *pstr
-        }
-        pstr = pstr.offset(1isize)
-    }
-    *pbuf = '\u{0}' as i32 as libc::c_char;
-
-    buf
-}
-
-fn hex_2_int(ch: libc::c_char) -> libc::c_char {
-    let ch = ch as u8 as char;
-    if !ch.is_ascii_hexdigit() {
-        return (ch.to_ascii_lowercase() as i32 - 'a' as i32 + 10) as libc::c_char;
-    }
-
-    match ch.to_digit(16) {
-        Some(res) => res as libc::c_char,
-        None => 0,
-    }
-}
-
+/**
+ * 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 unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut libc::c_char {
    let mut ok_to_continue = true;
    let mut ret_str: *mut libc::c_char = ptr::null_mut();
@@ -290,374 +238,88 @@ pub unsafe fn dc_decode_header_words(in_0: *const libc::c_char) -> *mut libc::c_
    out
 }

-#[cfg(test)]
-unsafe fn dc_encode_modified_utf7(
-    mut to_encode: *const libc::c_char,
-    change_spaces: libc::c_int,
-) -> *mut libc::c_char {
-    let mut utf8pos: libc::c_uint;
-    let mut utf8total: libc::c_uint;
-    let mut c: libc::c_uint;
-    let mut utf7mode: libc::c_uint;
-    let mut bitstogo: libc::c_uint;
-    let mut utf16flag: libc::c_uint;
-    let mut ucs4: libc::c_ulong = 0;
-    let mut bitbuf: libc::c_ulong = 0;
-    let mut dst: *mut libc::c_char;
-    let res: *mut libc::c_char;
-    if to_encode.is_null() {
-        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
-    }
-    res = malloc(2usize.wrapping_mul(strlen(to_encode)).wrapping_add(1)) as *mut libc::c_char;
-    dst = res;
-    assert!(!dst.is_null());
-
-    utf7mode = 0i32 as libc::c_uint;
-    utf8total = 0i32 as libc::c_uint;
-    bitstogo = 0i32 as libc::c_uint;
-    utf8pos = 0i32 as libc::c_uint;
-    loop {
-        c = *to_encode as libc::c_uchar as libc::c_uint;
-        if !(c != '\u{0}' as i32 as libc::c_uint) {
-            break;
-        }
-        to_encode = to_encode.offset(1isize);
-        // normal character?
-        if c >= ' ' as i32 as libc::c_uint
-            && c <= '~' as i32 as libc::c_uint
-            && (c != '_' as i32 as libc::c_uint || 0 == change_spaces)
-        {
-            if 0 != utf7mode {
-                if 0 != bitstogo {
-                    let fresh8 = dst;
-                    dst = dst.offset(1);
-                    *fresh8 = BASE64CHARS
-                        [(bitbuf << (6i32 as libc::c_uint).wrapping_sub(bitstogo) & 0x3f) as usize]
-                }
-                let fresh9 = dst;
-                dst = dst.offset(1);
-                *fresh9 = '-' as i32 as libc::c_char;
-                utf7mode = 0i32 as libc::c_uint;
-                utf8pos = 0i32 as libc::c_uint;
-                bitstogo = 0i32 as libc::c_uint;
-                utf8total = 0i32 as libc::c_uint
-            }
-            if 0 != change_spaces && c == ' ' as i32 as libc::c_uint {
-                let fresh10 = dst;
-                dst = dst.offset(1);
-                *fresh10 = '_' as i32 as libc::c_char
-            } else {
-                let fresh11 = dst;
-                dst = dst.offset(1);
-                *fresh11 = c as libc::c_char
-            }
-            if c == '&' as i32 as libc::c_uint {
-                let fresh12 = dst;
-                dst = dst.offset(1);
-                *fresh12 = '-' as i32 as libc::c_char
-            }
+pub fn dc_decode_header_words_safe(input: &str) -> String {
+    static FROM_ENCODING: &[u8] = b"iso-8859-1\x00";
+    static TO_ENCODING: &[u8] = b"utf-8\x00";
+    let mut out = ptr::null_mut();
+    let mut cur_token = 0;
+    let input_c = CString::yolo(input);
+    unsafe {
+        let r = mailmime_encoded_phrase_parse(
+            FROM_ENCODING.as_ptr().cast(),
+            input_c.as_ptr(),
+            input.len(),
+            &mut cur_token,
+            TO_ENCODING.as_ptr().cast(),
+            &mut out,
+        );
+        if r as u32 != MAILIMF_NO_ERROR || out.is_null() {
+            input.to_string()
        } else {
-            if 0 == utf7mode {
-                let fresh13 = dst;
-                dst = dst.offset(1);
-                *fresh13 = '&' as i32 as libc::c_char;
-                utf7mode = 1i32 as libc::c_uint
-            }
-            // encode ascii characters as themselves
-            if c < 0x80i32 as libc::c_uint {
-                ucs4 = c as libc::c_ulong
-            } else if 0 != utf8total {
-                ucs4 = ucs4 << 6i32 | c as libc::c_ulong & 0x3f;
-                utf8pos = utf8pos.wrapping_add(1);
-                if utf8pos < utf8total {
-                    continue;
-                }
-            } else {
-                utf8pos = 1i32 as libc::c_uint;
-                if c < 0xe0i32 as libc::c_uint {
-                    utf8total = 2i32 as libc::c_uint;
-                    ucs4 = (c & 0x1fi32 as libc::c_uint) as libc::c_ulong
-                } else if c < 0xf0i32 as libc::c_uint {
-                    utf8total = 3i32 as libc::c_uint;
-                    ucs4 = (c & 0xfi32 as libc::c_uint) as libc::c_ulong
-                } else {
-                    utf8total = 4i32 as libc::c_uint;
-                    ucs4 = (c & 0x3i32 as libc::c_uint) as libc::c_ulong
-                }
-                continue;
-            }
-            utf8total = 0i32 as libc::c_uint;
-            loop {
-                if ucs4 >= 0x10000 {
-                    ucs4 = ucs4.wrapping_sub(0x10000);
-                    bitbuf = bitbuf << 16 | (ucs4 >> 10).wrapping_add(0xd800);
-                    ucs4 = (ucs4 & 0x3ff).wrapping_add(0xdc00);
-                    utf16flag = 1i32 as libc::c_uint
-                } else {
-                    bitbuf = bitbuf << 16 | ucs4;
-                    utf16flag = 0i32 as libc::c_uint
-                }
-                bitstogo = bitstogo.wrapping_add(16i32 as libc::c_uint);
-                while bitstogo >= 6i32 as libc::c_uint {
-                    bitstogo = bitstogo.wrapping_sub(6i32 as libc::c_uint);
-                    let fresh14 = dst;
-                    dst = dst.offset(1);
-                    *fresh14 = BASE64CHARS[(if 0 != bitstogo {
-                        bitbuf >> bitstogo
-                    } else {
-                        bitbuf
-                    } & 0x3f) as usize]
-                }
-                if !(0 != utf16flag) {
-                    break;
-                }
-            }
+            let res = to_string(out);
+            free(out.cast());
+            res
        }
    }
-    if 0 != utf7mode {
-        if 0 != bitstogo {
-            let fresh15 = dst;
-            dst = dst.offset(1);
-            *fresh15 = BASE64CHARS
-                [(bitbuf << (6i32 as libc::c_uint).wrapping_sub(bitstogo) & 0x3f) as usize]
-        }
-        let fresh16 = dst;
-        dst = dst.offset(1);
-        *fresh16 = '-' as i32 as libc::c_char
-    }
-    *dst = '\u{0}' as i32 as libc::c_char;
-
-    res
 }

-/* ******************************************************************************
- * Encode/decode modified UTF-7 as needed for IMAP, see RFC 2192
- ******************************************************************************/
+pub fn dc_needs_ext_header(to_check: impl AsRef<str>) -> bool {
+    let to_check = to_check.as_ref();

-// UTF7 modified base64 alphabet
-#[cfg(test)]
-static mut BASE64CHARS: [libc::c_char; 65] = [
-    65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
-    89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
-    115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 44, 0,
-];
-
-#[cfg(test)]
-unsafe fn dc_decode_modified_utf7(
-    to_decode: *const libc::c_char,
-    change_spaces: libc::c_int,
-) -> *mut libc::c_char {
-    let mut c: libc::c_uint;
-    let mut i: libc::c_uint;
-    let mut bitcount: libc::c_uint;
-    let mut ucs4: libc::c_ulong;
-    let mut utf16: libc::c_ulong;
-    let mut bitbuf: libc::c_ulong;
-    let mut base64: [libc::c_uchar; 256] = [0; 256];
-    let mut src: *const libc::c_char;
-    let mut dst: *mut libc::c_char;
-    let res: *mut libc::c_char;
-    if to_decode.is_null() {
-        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+    if to_check.is_empty() {
+        return false;
    }
-    res = malloc(4usize.wrapping_mul(strlen(to_decode)).wrapping_add(1)) as *mut libc::c_char;
-    dst = res;
-    src = to_decode;
-    assert!(!dst.is_null());

-    libc::memset(
-        base64.as_mut_ptr() as *mut libc::c_void,
-        64,
-        ::std::mem::size_of::<[libc::c_uchar; 256]>(),
-    );
-    i = 0i32 as libc::c_uint;
-    while (i as libc::c_ulong) < ::std::mem::size_of::<[libc::c_char; 65]>() as libc::c_ulong {
-        base64[BASE64CHARS[i as usize] as libc::c_uint as usize] = i as libc::c_uchar;
-        i = i.wrapping_add(1)
-    }
-    while *src as libc::c_int != '\u{0}' as i32 {
-        let fresh17 = src;
-        src = src.offset(1);
-        c = *fresh17 as libc::c_uint;
-        if c != '&' as i32 as libc::c_uint || *src as libc::c_int == '-' as i32 {
-            if 0 != change_spaces && c == '_' as i32 as libc::c_uint {
-                let fresh18 = dst;
-                dst = dst.offset(1);
-                *fresh18 = ' ' as i32 as libc::c_char
-            } else {
-                let fresh19 = dst;
-                dst = dst.offset(1);
-                *fresh19 = c as libc::c_char
-            }
-            if c == '&' as i32 as libc::c_uint {
-                src = src.offset(1isize)
-            }
-        } else {
-            bitbuf = 0;
-            bitcount = 0i32 as libc::c_uint;
-            ucs4 = 0;
-            loop {
-                c = base64[*src as libc::c_uchar as usize] as libc::c_uint;
-                if !(c != 64i32 as libc::c_uint) {
-                    break;
-                }
-                src = src.offset(1isize);
-                bitbuf = bitbuf << 6i32 | c as libc::c_ulong;
-                bitcount = bitcount.wrapping_add(6i32 as libc::c_uint);
-                // enough bits for a UTF-16 character?
-                if !(bitcount >= 16i32 as libc::c_uint) {
-                    continue;
-                }
-                bitcount = bitcount.wrapping_sub(16i32 as libc::c_uint);
-                utf16 = if 0 != bitcount {
-                    bitbuf >> bitcount
-                } else {
-                    bitbuf
-                } & 0xffff;
-
-                // convert UTF16 to UCS4
-                if utf16 >= 0xd800 && utf16 <= 0xdbff {
-                    ucs4 = utf16.wrapping_sub(0xd800) << 10i32
-                } else {
-                    if utf16 >= 0xdc00 && utf16 <= 0xdfff {
-                        ucs4 = ucs4.wrapping_add(utf16.wrapping_sub(0xdc00).wrapping_add(0x10000))
-                    } else {
-                        ucs4 = utf16
-                    }
-                    if ucs4 <= 0x7f {
-                        *dst.offset(0isize) = ucs4 as libc::c_char;
-                        dst = dst.offset(1isize)
-                    } else if ucs4 <= 0x7ff {
-                        *dst.offset(0isize) = (0xc0 | ucs4 >> 6i32) as libc::c_char;
-                        *dst.offset(1isize) = (0x80 | ucs4 & 0x3f) as libc::c_char;
-                        dst = dst.offset(2isize)
-                    } else if ucs4 <= 0xffff {
-                        *dst.offset(0isize) = (0xe0 | ucs4 >> 12i32) as libc::c_char;
-                        *dst.offset(1isize) = (0x80 | ucs4 >> 6i32 & 0x3f) as libc::c_char;
-                        *dst.offset(2isize) = (0x80 | ucs4 & 0x3f) as libc::c_char;
-                        dst = dst.offset(3isize)
-                    } else {
-                        *dst.offset(0isize) = (0xf0 | ucs4 >> 18i32) as libc::c_char;
-                        *dst.offset(1isize) = (0x80 | ucs4 >> 12i32 & 0x3f) as libc::c_char;
-                        *dst.offset(2isize) = (0x80 | ucs4 >> 6i32 & 0x3f) as libc::c_char;
-                        *dst.offset(3isize) = (0x80 | ucs4 & 0x3f) as libc::c_char;
-                        dst = dst.offset(4isize)
-                    }
-                }
-            }
-            if *src as libc::c_int == '-' as i32 {
-                src = src.offset(1isize)
-            }
-        }
-    }
-    *dst = '\u{0}' as i32 as libc::c_char;
-
-    res
+    to_check.chars().any(|c| {
+        !(c.is_ascii_alphanumeric()
+            || c == '-'
+            || c == '_'
+            || c == '_'
+            || c == '.'
+            || c == '~'
+            || c == '%')
+    })
 }

-pub unsafe fn dc_needs_ext_header(mut to_check: *const libc::c_char) -> bool {
-    if !to_check.is_null() {
-        while 0 != *to_check {
-            if 0 == isalnum(*to_check as libc::c_int)
-                && *to_check as libc::c_int != '-' as i32
-                && *to_check as libc::c_int != '_' as i32
-                && *to_check as libc::c_int != '.' as i32
-                && *to_check as libc::c_int != '~' as i32
-            {
-                return true;
-            }
-            to_check = to_check.offset(1isize)
-        }
-    }
+const EXT_ASCII_ST: &AsciiSet = &CONTROLS
+    .add(b' ')
+    .add(b'-')
+    .add(b'_')
+    .add(b'.')
+    .add(b'~')
+    .add(b'%');

-    false
+/// Encode an UTF-8 string to the extended header format.
+pub fn dc_encode_ext_header(to_encode: impl AsRef<str>) -> String {
+    let encoded = utf8_percent_encode(to_encode.as_ref(), &EXT_ASCII_ST);
+    format!("utf-8''{}", encoded)
 }

-pub unsafe fn dc_encode_ext_header(to_encode: *const libc::c_char) -> *mut libc::c_char {
-    let mut pstr: *const libc::c_char = to_encode;
-    if to_encode.is_null() {
-        return dc_strdup(b"utf-8\'\'\x00" as *const u8 as *const libc::c_char);
-    }
-    let buf: *mut libc::c_char = malloc(
-        strlen(b"utf-8\'\'\x00" as *const u8 as *const libc::c_char)
-            .wrapping_add(strlen(to_encode).wrapping_mul(3))
-            .wrapping_add(1),
-    ) as *mut libc::c_char;
-    assert!(!buf.is_null());
-
-    let mut pbuf: *mut libc::c_char = buf;
-    strcpy(pbuf, b"utf-8\'\'\x00" as *const u8 as *const libc::c_char);
-    pbuf = pbuf.offset(strlen(pbuf) as isize);
-    while 0 != *pstr {
-        if 0 != isalnum(*pstr as libc::c_int)
-            || *pstr as libc::c_int == '-' as i32
-            || *pstr as libc::c_int == '_' as i32
-            || *pstr as libc::c_int == '.' as i32
-            || *pstr as libc::c_int == '~' as i32
-        {
-            let fresh20 = pbuf;
-            pbuf = pbuf.offset(1);
-            *fresh20 = *pstr
-        } else {
-            let fresh21 = pbuf;
-            pbuf = pbuf.offset(1);
-            *fresh21 = '%' as i32 as libc::c_char;
-            let fresh22 = pbuf;
-            pbuf = pbuf.offset(1);
-            *fresh22 = int_2_uppercase_hex((*pstr as libc::c_int >> 4i32) as libc::c_char);
-            let fresh23 = pbuf;
-            pbuf = pbuf.offset(1);
-            *fresh23 = int_2_uppercase_hex((*pstr as libc::c_int & 15i32) as libc::c_char)
-        }
-        pstr = pstr.offset(1isize)
-    }
-    *pbuf = '\u{0}' as i32 as libc::c_char;
-
-    buf
-}
-
-pub unsafe fn dc_decode_ext_header(to_decode: *const libc::c_char) -> *mut libc::c_char {
-    let mut decoded: *mut libc::c_char = ptr::null_mut();
-    let mut charset: *mut libc::c_char = ptr::null_mut();
-    let mut p2: *const libc::c_char;
-    if !to_decode.is_null() {
-        // get char set
-        p2 = strchr(to_decode, '\'' as i32);
-        if !(p2.is_null() || p2 == to_decode) {
-            /*no empty charset allowed*/
-            charset =
-                dc_null_terminate(to_decode, p2.wrapping_offset_from(to_decode) as libc::c_int);
-            p2 = p2.offset(1isize);
+/// Decode an extended-header-format strings to UTF-8.
+pub fn dc_decode_ext_header(to_decode: &[u8]) -> Cow<str> {
+    if let Some(index) = bytes!(b'\'').find(to_decode) {
+        let (charset, rest) = to_decode.split_at(index);
+        if !charset.is_empty() {
            // skip language
-            p2 = strchr(p2, '\'' as i32);
-            if !p2.is_null() {
-                p2 = p2.offset(1isize);
-                decoded = dc_urldecode(p2);
-                if !charset.is_null()
-                    && strcmp(charset, b"utf-8\x00" as *const u8 as *const libc::c_char) != 0i32
-                    && strcmp(charset, b"UTF-8\x00" as *const u8 as *const libc::c_char) != 0i32
-                {
-                    if let Some(encoding) =
-                        Charset::for_label(CStr::from_ptr(charset).to_str().unwrap().as_bytes())
-                    {
-                        let data =
-                            std::slice::from_raw_parts(decoded as *const u8, strlen(decoded));
+            if let Some(index2) = bytes!(b'\'').find(&rest[1..]) {
+                let decoded = percent_decode(&rest[index2 + 2..]);

-                        let (res, _, _) = encoding.decode(data);
-                        free(decoded as *mut _);
-                        let r = std::ffi::CString::new(res.as_bytes()).unwrap();
-                        decoded = dc_strdup(r.as_ptr());
+                if charset != b"utf-8" && charset != b"UTF-8" {
+                    if let Some(encoding) = Charset::for_label(charset) {
+                        let bytes = decoded.collect::<Vec<u8>>();
+                        let (res, _, _) = encoding.decode(&bytes);
+                        return Cow::Owned(res.into_owned());
+                    } else {
+                        return decoded.decode_utf8_lossy();
                    }
+                } else {
+                    return decoded.decode_utf8_lossy();
                }
            }
        }
    }
-    free(charset as *mut libc::c_void);
-    if !decoded.is_null() {
-        decoded
-    } else {
-        dc_strdup(to_decode)
-    }
+
+    String::from_utf8_lossy(to_decode)
 }

 unsafe fn print_hex(target: *mut libc::c_char, cur: *const libc::c_char) {
@@ -672,16 +334,8 @@ unsafe fn print_hex(target: *mut libc::c_char, cur: *const libc::c_char) {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
    use std::ffi::CStr;

-    #[test]
-    fn test_isalnum() {
-        assert_eq!(isalnum(0), 0);
-        assert_eq!(isalnum('5' as libc::c_int), 1);
-        assert_eq!(isalnum('Q' as libc::c_int), 1);
-    }
-
    #[test]
    fn test_dc_decode_header_words() {
        unsafe {
@@ -742,99 +396,43 @@ mod tests {

    #[test]
    fn test_dc_encode_ext_header() {
-        unsafe {
-            let mut buf1 = dc_encode_ext_header(
-                b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char,
-            );
-            assert_eq!(
-                CStr::from_ptr(buf1).to_str().unwrap(),
-                "utf-8\'\'Bj%C3%B6rn%20Petersen"
-            );
-            let buf2 = dc_decode_ext_header(buf1);
-            assert_eq!(
-                strcmp(
-                    buf2,
-                    b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char,
-                ),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
-            free(buf2 as *mut libc::c_void);
+        let buf1 = dc_encode_ext_header("Björn Petersen");
+        assert_eq!(&buf1, "utf-8\'\'Bj%C3%B6rn%20Petersen");
+        let buf2 = dc_decode_ext_header(buf1.as_bytes());
+        assert_eq!(&buf2, "Björn Petersen",);

-            buf1 = dc_decode_ext_header(
-                b"iso-8859-1\'en\'%A3%20rates\x00" as *const u8 as *const libc::c_char,
-            );
-            assert_eq!(
-                strcmp(
-                    buf1,
-                    b"\xc2\xa3 rates\x00" as *const u8 as *const libc::c_char,
-                ),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
+        let buf1 = dc_decode_ext_header(b"iso-8859-1\'en\'%A3%20rates");
+        assert_eq!(buf1, "£ rates",);

-            buf1 = dc_decode_ext_header(b"wrong\'format\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(
-                strcmp(
-                    buf1,
-                    b"wrong\'format\x00" as *const u8 as *const libc::c_char,
-                ),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
+        let buf1 = dc_decode_ext_header(b"wrong\'format");
+        assert_eq!(buf1, "wrong\'format",);

-            buf1 = dc_decode_ext_header(b"\'\'\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(
-                strcmp(buf1, b"\'\'\x00" as *const u8 as *const libc::c_char),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
+        let buf1 = dc_decode_ext_header(b"\'\'");
+        assert_eq!(buf1, "\'\'");

-            buf1 = dc_decode_ext_header(b"x\'\'\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(strcmp(buf1, b"\x00" as *const u8 as *const libc::c_char), 0);
-            free(buf1 as *mut libc::c_void);
+        let buf1 = dc_decode_ext_header(b"x\'\'");
+        assert_eq!(buf1, "");

-            buf1 = dc_decode_ext_header(b"\'\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(
-                strcmp(buf1, b"\'\x00" as *const u8 as *const libc::c_char),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
+        let buf1 = dc_decode_ext_header(b"\'");
+        assert_eq!(buf1, "\'");

-            buf1 = dc_decode_ext_header(b"\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(strcmp(buf1, b"\x00" as *const u8 as *const libc::c_char), 0);
-            free(buf1 as *mut libc::c_void);
-        }
+        let buf1 = dc_decode_ext_header(b"");
+        assert_eq!(buf1, "");
+
+        // regressions
+        assert_eq!(
+            dc_decode_ext_header(dc_encode_ext_header("%0A").as_bytes()),
+            "%0A"
+        );
    }

    #[test]
    fn test_dc_needs_ext_header() {
-        unsafe {
-            assert_eq!(
-                dc_needs_ext_header(b"Bj\xc3\xb6rn\x00" as *const u8 as *const libc::c_char),
-                true
-            );
-            assert_eq!(
-                dc_needs_ext_header(b"Bjoern\x00" as *const u8 as *const libc::c_char),
-                false
-            );
-            assert_eq!(
-                dc_needs_ext_header(b"\x00" as *const u8 as *const libc::c_char),
-                false
-            );
-            assert_eq!(
-                dc_needs_ext_header(b" \x00" as *const u8 as *const libc::c_char),
-                true
-            );
-            assert_eq!(
-                dc_needs_ext_header(b"a b\x00" as *const u8 as *const libc::c_char),
-                true
-            );
-            assert_eq!(
-                dc_needs_ext_header(0 as *const u8 as *const libc::c_char),
-                false
-            );
-        }
+        assert_eq!(dc_needs_ext_header("Björn"), true);
+        assert_eq!(dc_needs_ext_header("Bjoern"), false);
+        assert_eq!(dc_needs_ext_header(""), false);
+        assert_eq!(dc_needs_ext_header(" "), true);
+        assert_eq!(dc_needs_ext_header("a b"), true);
    }

    #[test]
@@ -849,69 +447,20 @@ mod tests {
        assert_eq!(to_string(hex.as_ptr() as *const _), "=3A");
    }

-    #[test]
-    fn test_dc_urlencode_urldecode() {
-        unsafe {
-            let buf1 = percent_encode(b"Bj\xc3\xb6rn Petersen", NON_ALPHANUMERIC)
-                .to_string()
-                .strdup();
+    use proptest::prelude::*;

-            assert_eq!(
-                CStr::from_ptr(buf1 as *const libc::c_char)
-                    .to_str()
-                    .unwrap(),
-                "Bj%C3%B6rn%20Petersen"
-            );
-
-            let buf2 = dc_urldecode(buf1);
-
-            assert_eq!(
-                strcmp(
-                    buf2,
-                    b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char
-                ),
-                0
-            );
-
-            free(buf1 as *mut libc::c_void);
-            free(buf2 as *mut libc::c_void);
+    proptest! {
+        #[test]
+        fn test_ext_header_roundtrip(buf: String) {
+            let encoded = dc_encode_ext_header(&buf);
+            let decoded = dc_decode_ext_header(encoded.as_bytes());
+            assert_eq!(buf, decoded);
        }
-    }

-    #[test]
-    fn test_dc_encode_decode_modified_utf7() {
-        unsafe {
-            let buf1 = dc_encode_modified_utf7(
-                b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char,
-                1,
-            );
-
-            assert_eq!(
-                CStr::from_ptr(buf1 as *const libc::c_char)
-                    .to_str()
-                    .unwrap(),
-                "Bj&APY-rn_Petersen"
-            );
-
-            let buf2 = dc_decode_modified_utf7(buf1, 1);
-
-            assert_eq!(
-                strcmp(
-                    buf2,
-                    b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char
-                ),
-                0
-            );
-
-            free(buf1 as *mut libc::c_void);
-            free(buf2 as *mut libc::c_void);
+        #[test]
+        fn test_ext_header_decode_anything(buf: Vec<u8>) {
+            // make sure this never panics
+            let _decoded = dc_decode_ext_header(&buf);
        }
    }
-    #[test]
-    fn test_hex_to_int() {
-        assert_eq!(hex_2_int(b'A' as libc::c_char), 10);
-        assert_eq!(hex_2_int(b'a' as libc::c_char), 10);
-        assert_eq!(hex_2_int(b'4' as libc::c_char), 4);
-        assert_eq!(hex_2_int(b'K' as libc::c_char), 20);
-    }
 }
--- a/src/dc_token.rs
+++ b/src/dc_token.rs
@@ -1,50 +0,0 @@
-use crate::context::Context;
-use crate::dc_tools::*;
-use crate::sql;
-
-// Token namespaces
-#[allow(non_camel_case_types)]
-type dc_tokennamespc_t = usize;
-pub const DC_TOKEN_AUTH: dc_tokennamespc_t = 110;
-pub const DC_TOKEN_INVITENUMBER: dc_tokennamespc_t = 100;
-
-// Functions to read/write token from/to the database. A token is any string associated with a key.
-
-pub fn dc_token_save(
-    context: &Context,
-    namespc: dc_tokennamespc_t,
-    foreign_id: u32,
-    token: &str,
-) -> bool {
-    // foreign_id may be 0
-    sql::execute(
-        context,
-        &context.sql,
-        "INSERT INTO tokens (namespc, foreign_id, token, timestamp) VALUES (?, ?, ?, ?);",
-        params![namespc as i32, foreign_id as i32, token, time()],
-    )
-    .is_ok()
-}
-
-pub fn dc_token_lookup(
-    context: &Context,
-    namespc: dc_tokennamespc_t,
-    foreign_id: u32,
-) -> Option<String> {
-    context.sql.query_row_col::<_, String>(
-        context,
-        "SELECT token FROM tokens WHERE namespc=? AND foreign_id=?;",
-        params![namespc as i32, foreign_id as i32],
-        0,
-    )
-}
-
-pub fn dc_token_exists(context: &Context, namespc: dc_tokennamespc_t, token: &str) -> bool {
-    context
-        .sql
-        .exists(
-            "SELECT id FROM tokens WHERE namespc=? AND token=?;",
-            params![namespc as i32, token],
-        )
-        .unwrap_or_default()
-}
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -83,14 +83,6 @@ pub unsafe fn dc_atoi_null_is_0(s: *const libc::c_char) -> libc::c_int {
    }
 }

-pub fn dc_atof(s: *const libc::c_char) -> libc::c_double {
-    if s.is_null() {
-        return 0.;
-    }
-
-    as_str(s).parse().unwrap_or_default()
-}
-
 pub unsafe fn dc_str_replace(
    haystack: *mut *mut libc::c_char,
    needle: *const libc::c_char,
@@ -105,21 +97,6 @@ pub unsafe fn dc_str_replace(
    *haystack = haystack_s.replace(&needle_s, &replacement_s).strdup();
 }

-pub unsafe fn dc_ftoa(f: libc::c_double) -> *mut libc::c_char {
-    // hack around printf(%f) that may return `,` as decimal point on mac
-    let test: *mut libc::c_char = dc_mprintf(b"%f\x00" as *const u8 as *const libc::c_char, 1.2f64);
-    *test.offset(2isize) = 0 as libc::c_char;
-    let mut str: *mut libc::c_char = dc_mprintf(b"%f\x00" as *const u8 as *const libc::c_char, f);
-    dc_str_replace(
-        &mut str,
-        test.offset(1isize),
-        b".\x00" as *const u8 as *const libc::c_char,
-    );
-    free(test as *mut libc::c_void);
-
-    str
-}
-
 unsafe fn dc_ltrim(buf: *mut libc::c_char) {
    let mut len: size_t;
    let mut cur: *const libc::c_uchar;
@@ -284,11 +261,18 @@ pub unsafe fn dc_replace_bad_utf8_chars(buf: *mut libc::c_char) {
 pub fn dc_truncate(buf: &str, approx_chars: usize, do_unwrap: bool) -> Cow<str> {
    let ellipse = if do_unwrap { "..." } else { "[...]" };

-    if approx_chars > 0 && buf.len() > approx_chars + ellipse.len() {
-        if let Some(index) = buf[..approx_chars].rfind(|c| c == ' ' || c == '\n') {
+    let count = buf.chars().count();
+    if approx_chars > 0 && count > approx_chars + ellipse.len() {
+        let end_pos = buf
+            .char_indices()
+            .nth(approx_chars)
+            .map(|(n, _)| n)
+            .unwrap_or_default();
+
+        if let Some(index) = buf[..end_pos].rfind(|c| c == ' ' || c == '\n') {
            Cow::Owned(format!("{}{}", &buf[..index + 1], ellipse))
        } else {
-            Cow::Owned(format!("{}{}", &buf[..approx_chars], ellipse))
+            Cow::Owned(format!("{}{}", &buf[..end_pos], ellipse))
        }
    } else {
        Cow::Borrowed(buf)
@@ -458,21 +442,10 @@ pub unsafe fn clist_free_content(haystack: *const clist) {
 pub unsafe fn clist_search_string_nocase(
    haystack: *const clist,
    needle: *const libc::c_char,
-) -> libc::c_int {
-    let mut iter = (*haystack).first;
-
-    while !iter.is_null() {
-        if strcasecmp((*iter).data as *const libc::c_char, needle) == 0 {
-            return 1;
-        }
-        iter = if !iter.is_null() {
-            (*iter).next
-        } else {
-            ptr::null_mut()
-        }
-    }
-
-    0
+) -> bool {
+    (&*haystack)
+        .into_iter()
+        .any(|data| strcasecmp(data.cast(), needle) == 0)
 }

 /* date/time tools */
@@ -517,7 +490,7 @@ pub fn dc_gm2local_offset() -> i64 {
 }

 /* timesmearing */
-pub unsafe fn dc_smeared_time(context: &Context) -> i64 {
+pub fn dc_smeared_time(context: &Context) -> i64 {
    /* function returns a corrected time(NULL) */
    let mut now = time();
    let ts = *context.last_smeared_timestamp.clone().read().unwrap();
@@ -653,6 +626,21 @@ pub unsafe fn dc_create_outgoing_rfc724_mid(
    ret
 }

+/// Generate globally-unique message-id for a new outgoing message.
+///
+/// Note: Do not add a counter or any private data as as this may give
+/// unneeded information to the receiver
+pub fn dc_create_outgoing_rfc724_mid_safe(grpid: Option<&str>, from_addr: &str) -> String {
+    let hostname = from_addr
+        .find('@')
+        .map(|k| &from_addr[k..])
+        .unwrap_or("@nohost");
+    match grpid {
+        Some(grpid) => format!("Gr.{}.{}{}", grpid, dc_create_id(), hostname),
+        None => format!("Mr.{}.{}{}", dc_create_id(), dc_create_id(), hostname),
+    }
+}
+
 /// Extract the group id (grpid) from a message id (mid)
 ///
 /// # Arguments
@@ -855,16 +843,19 @@ pub fn dc_get_filebytes(context: &Context, path: impl AsRef<std::path::Path>) ->

 pub fn dc_delete_file(context: &Context, path: impl AsRef<std::path::Path>) -> bool {
    let path_abs = dc_get_abs_path_safe(context, &path);
-    let res = if path_abs.is_file() {
-        fs::remove_file(path_abs)
-    } else {
-        fs::remove_dir_all(path_abs)
-    };
+    if !path_abs.is_file() {
+        warn!(
+            context,
+            "Will not delete directory \"{}\".",
+            path.as_ref().display()
+        );
+        return false;
+    }

-    match res {
+    match fs::remove_file(path_abs) {
        Ok(_) => true,
        Err(_err) => {
-            warn!(context, 0, "Cannot delete \"{}\".", path.as_ref().display());
+            warn!(context, "Cannot delete \"{}\".", path.as_ref().display());
            false
        }
    }
@@ -882,7 +873,6 @@ pub fn dc_copy_file(
        Err(_) => {
            error!(
                context,
-                0,
                "Cannot copy \"{}\" to \"{}\".",
                src.as_ref().display(),
                dest.as_ref().display(),
@@ -900,7 +890,6 @@ pub fn dc_create_folder(context: &Context, path: impl AsRef<std::path::Path>) ->
            Err(_err) => {
                warn!(
                    context,
-                    0,
                    "Cannot create directory \"{}\".",
                    path.as_ref().display(),
                );
@@ -933,7 +922,6 @@ pub fn dc_write_file_safe<P: AsRef<std::path::Path>>(
    if let Err(_err) = fs::write(&path_abs, buf) {
        warn!(
            context,
-            0,
            "Cannot write {} bytes to \"{}\".",
            buf.len(),
            path.as_ref().display(),
@@ -971,7 +959,6 @@ pub fn dc_read_file_safe<P: AsRef<std::path::Path>>(context: &Context, path: P)
        Err(_err) => {
            warn!(
                context,
-                0,
                "Cannot read \"{}\" or file is empty.",
                path.as_ref().display()
            );
@@ -1383,6 +1370,32 @@ impl FromStr for EmailAddress {
    }
 }

+/// Utility to check if a in the binary represantion of listflags
+/// the bit at position bitindex is 1.
+///
+///
+/// # Example
+///
+/// ```
+/// use std::convert::TryInto;
+/// use deltachat::dc_tools::listflags_has;
+/// use deltachat::constants::{DC_GCL_ADD_SELF, DC_GCL_VERIFIED_ONLY};
+/// let listflags: u32 = 0x1101;
+/// 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) == 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) == false);
+/// ```
+pub fn listflags_has(listflags: u32, bitindex: usize) -> bool {
+    let listflags = listflags as usize;
+    (listflags & bitindex) == bitindex
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -1479,23 +1492,6 @@ mod tests {
        }
    }

-    #[test]
-    fn test_dc_atof() {
-        let f: libc::c_double = dc_atof(b"1.23\x00" as *const u8 as *const libc::c_char);
-        assert!(f > 1.22f64);
-        assert!(f < 1.24f64);
-    }
-
-    #[test]
-    fn test_dc_ftoa() {
-        unsafe {
-            let s: *mut libc::c_char = dc_ftoa(1.23f64);
-            assert!(dc_atof(s) > 1.22f64);
-            assert!(dc_atof(s) < 1.24f64);
-            free(s as *mut libc::c_void);
-        }
-    }
-
    #[test]
    fn test_rust_ftoa() {
        assert_eq!("1.22", format!("{}", 1.22));
@@ -1543,6 +1539,36 @@ mod tests {
        assert_eq!(dc_truncate("123456", 4, true), "123456");
    }

+    #[test]
+    fn test_dc_truncate_edge() {
+        assert_eq!(dc_truncate("", 4, false), "");
+        assert_eq!(dc_truncate("", 4, true), "");
+
+        assert_eq!(dc_truncate("\n  hello \n world", 4, false), "\n  [...]");
+        assert_eq!(dc_truncate("\n  hello \n world", 4, true), "\n  ...");
+
+        assert_eq!(
+            dc_truncate("𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ", 1, false),
+            "𐠈[...]"
+        );
+        assert_eq!(
+            dc_truncate("𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ", 0, false),
+            "𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ"
+        );
+
+        // 9 characters, so no truncation
+        assert_eq!(
+            dc_truncate("𑒀ὐ￠🜀\u{1e01b}A a🟠", 6, false),
+            "𑒀ὐ￠🜀\u{1e01b}A a🟠",
+        );
+
+        // 12 characters, truncation
+        assert_eq!(
+            dc_truncate("𑒀ὐ￠🜀\u{1e01b}A a🟠bcd", 6, false),
+            "𑒀ὐ￠🜀\u{1e01b}A[...]",
+        );
+    }
+
    #[test]
    fn test_dc_null_terminate_1() {
        unsafe {
@@ -1880,4 +1906,37 @@ mod tests {
        assert_eq!(EmailAddress::new("u@.tt").is_ok(), false);
        assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
    }
+
+    use proptest::prelude::*;
+
+    proptest! {
+        #[test]
+        fn test_dc_truncate(
+            buf: String,
+            approx_chars in 0..10000usize,
+            do_unwrap: bool,
+        ) {
+            let res = dc_truncate(&buf, approx_chars, do_unwrap);
+            let el_len = if do_unwrap { 3 } else { 5 };
+            let l = res.chars().count();
+            if approx_chars > 0 {
+                assert!(
+                    l <= approx_chars + el_len,
+                    "buf: '{}' - res: '{}' - len {}, approx {}",
+                    &buf, &res, res.len(), approx_chars
+                );
+            } else {
+                assert_eq!(&res, &buf);
+            }
+
+            if approx_chars > 0 && buf.chars().count() > approx_chars + el_len {
+                let l = res.len();
+                if do_unwrap {
+                    assert_eq!(&res[l-3..l], "...", "missing ellipsis in {}", &res);
+                } else {
+                    assert_eq!(&res[l-5..l], "[...]", "missing ellipsis in {}", &res);
+                }
+            }
+        }
+    }
 }
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -23,13 +23,13 @@ use crate::aheader::*;
 use crate::config::Config;
 use crate::context::Context;
 use crate::dc_mimeparser::*;
-use crate::dc_securejoin::*;
 use crate::dc_tools::*;
 use crate::error::*;
 use crate::key::*;
 use crate::keyring::*;
 use crate::peerstate::*;
 use crate::pgp::*;
+use crate::securejoin::handle_degrade_event;
 use crate::types::*;
 use crate::x::*;

@@ -91,7 +91,7 @@ impl E2eeHelper {

            if let Some(addr) = addr {
                let pubkey_ret = load_or_generate_self_public_key(context, &addr).map_err(|err| {
-                    error!(context, 0, "Failed to load public key: {}", err);
+                    error!(context, "Failed to load public key: {}", err);
                    err
                });
                if let Ok(public_key) = pubkey_ret {
@@ -113,7 +113,7 @@ impl E2eeHelper {
                                    let peerstate = peerstate.unwrap();
                                    info!(
                                        context,
-                                        0, "dc_e2ee_encrypt {} has peerstate", recipient_addr
+                                        "dc_e2ee_encrypt {} has peerstate", recipient_addr
                                    );
                                    if let Some(key) = peerstate.peek_key(min_verified as usize) {
                                        keyring.add_owned(key.clone());
@@ -122,7 +122,6 @@ impl E2eeHelper {
                                } else {
                                    info!(
                                        context,
-                                        0,
                                        "dc_e2ee_encrypt {} HAS NO peerstate {}",
                                        recipient_addr,
                                        peerstate.is_some()
@@ -299,8 +298,10 @@ impl E2eeHelper {
                                ok_to_continue = false;
                            } else {
                                if let Some(ctext_v) = dc_pgp_pk_encrypt(
-                                    (*plain).str_0 as *const libc::c_void,
-                                    (*plain).len,
+                                    std::slice::from_raw_parts(
+                                        (*plain).str_0 as *const u8,
+                                        (*plain).len,
+                                    ),
                                    &keyring,
                                    sign_key.as_ref(),
                                ) {
@@ -440,7 +441,7 @@ impl E2eeHelper {
                    }
                    if let Some(ref peerstate) = peerstate {
                        if peerstate.degrade_event.is_some() {
-                            dc_handle_degrade_event(context, &peerstate);
+                            handle_degrade_event(context, &peerstate);
                        }
                        if let Some(ref key) = peerstate.gossip_key {
                            public_keyring_for_validate.add_ref(key);
@@ -606,7 +607,7 @@ fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef<str
    let start = std::time::Instant::now();
    info!(
        context,
-        0, "Generating keypair with {} bits, e={} ...", 2048, 65537,
+        "Generating keypair with {} bits, e={} ...", 2048, 65537,
    );
    match dc_pgp_create_keypair(&self_addr) {
        Some((public_key, private_key)) => {
@@ -621,7 +622,6 @@ fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef<str
                true => {
                    info!(
                        context,
-                        0,
                        "Keypair generated in {:.3}s.",
                        start.elapsed().as_secs()
                    );
@@ -681,7 +681,7 @@ unsafe fn update_gossip_peerstates(
                        }
                        if let Some(peerstate) = peerstate {
                            if peerstate.degrade_event.is_some() {
-                                dc_handle_degrade_event(context, &peerstate);
+                                handle_degrade_event(context, &peerstate);
                            }
                        }

@@ -689,7 +689,6 @@ unsafe fn update_gossip_peerstates(
                    } else {
                        info!(
                            context,
-                            0,
                            "Ignoring gossipped \"{}\" as the address is not in To/Cc list.",
                            &header.addr,
                        );
@@ -907,8 +906,7 @@ unsafe fn decrypt_part(

                /*if we already have fingerprints, do not add more; this ensures, only the fingerprints from the outer-most part are collected */
                if let Some(plain) = dc_pgp_pk_decrypt(
-                    decoded_data as *const libc::c_void,
-                    decoded_data_bytes,
+                    std::slice::from_raw_parts(decoded_data as *const u8, decoded_data_bytes),
                    &private_keyring,
                    &public_keyring_for_validate,
                    add_signatures,
@@ -1027,7 +1025,7 @@ unsafe fn contains_report(mime: *mut mailmime) -> bool {
 /// [Config::ConfiguredAddr] is configured, this address is returned.
 pub fn ensure_secret_key_exists(context: &Context) -> Result<String> {
    let self_addr = context
-        .get_config(Config::ConfiguredAddr)
+        .get_config(&Config::ConfiguredAddr)
        .ok_or(format_err!(concat!(
            "Failed to get self address, ",
            "cannot ensure secret key if not configured."
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -8,8 +8,8 @@ use std::time::{Duration, SystemTime};

 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_loginparam::*;
 use crate::dc_tools::CStringExt;
+use crate::login_param::LoginParam;
 use crate::oauth2::dc_get_oauth2_access_token;
 use crate::types::*;

@@ -472,12 +472,9 @@ impl Imap {
    }

    fn unsetup_handle(&self, context: &Context) {
-        info!(context, 0, "IMAP unsetup_handle starts");
+        info!(context, "IMAP unsetup_handle starts");

-        info!(
-            context,
-            0, "IMAP unsetup_handle step 1 (closing down stream)."
-        );
+        info!(context, "IMAP unsetup_handle step 1 (closing down stream).");
        let stream = self.stream.write().unwrap().take();
        if let Some(stream) = stream {
            if let Err(err) = stream.shutdown(net::Shutdown::Both) {
@@ -487,7 +484,7 @@ impl Imap {

        info!(
            context,
-            0, "IMAP unsetup_handle step 2 (acquiring session.lock)"
+            "IMAP unsetup_handle step 2 (acquiring session.lock)"
        );
        if let Some(mut session) = self.session.lock().unwrap().take() {
            if let Err(err) = session.close() {
@@ -495,10 +492,10 @@ impl Imap {
            }
        }

-        info!(context, 0, "IMAP unsetup_handle step 3 (clearing config).");
+        info!(context, "IMAP unsetup_handle step 3 (clearing config).");
        self.config.write().unwrap().selected_folder = None;
        self.config.write().unwrap().selected_mailbox = None;
-        info!(context, 0, "IMAP unsetup_handle step 4 (disconnected).",);
+        info!(context, "IMAP unsetup_handle step 4 (disconnected).",);
    }

    fn free_connect_params(&self) {
@@ -516,7 +513,7 @@ impl Imap {
        cfg.watch_folder = None;
    }

-    pub fn connect(&self, context: &Context, lp: &dc_loginparam_t) -> bool {
+    pub fn connect(&self, context: &Context, lp: &LoginParam) -> bool {
        if lp.mail_server.is_empty() || lp.mail_user.is_empty() || lp.mail_pw.is_empty() {
            return false;
        }
@@ -548,19 +545,17 @@ impl Imap {
        }

        let (teardown, can_idle, has_xlist) = match &mut *self.session.lock().unwrap() {
-            Some(ref mut session) => {
-                if let Ok(caps) = session.capabilities() {
+            Some(ref mut session) => match session.capabilities() {
+                Ok(caps) => {
                    if !context.sql.is_open() {
-                        warn!(context, 0, "IMAP-LOGIN as {} ok but ABORTING", lp.mail_user,);
+                        warn!(context, "IMAP-LOGIN as {} ok but ABORTING", lp.mail_user,);
                        (true, false, false)
                    } else {
-                        let can_idle = caps.has("IDLE");
-                        let has_xlist = caps.has("XLIST");
-                        let caps_list = caps.iter().fold(String::new(), |mut s, c| {
-                            s += " ";
-                            s += c;
-                            s
-                        });
+                        let can_idle = caps.has_str("IDLE");
+                        let has_xlist = caps.has_str("XLIST");
+                        let caps_list = caps
+                            .iter()
+                            .fold(String::new(), |s, c| s + &format!(" {:?}", c));
                        log_event!(
                            context,
                            Event::IMAP_CONNECTED,
@@ -571,10 +566,12 @@ impl Imap {
                        );
                        (false, can_idle, has_xlist)
                    }
-                } else {
+                }
+                Err(err) => {
+                    info!(context, "CAPABILITY command error: {}", err);
                    (true, false, false)
                }
-            }
+            },
            None => (true, false, false),
        };

@@ -647,7 +644,7 @@ impl Imap {
        // deselect existing folder, if needed (it's also done implicitly by SELECT, however, without EXPUNGE then)
        if self.config.read().unwrap().selected_folder_needs_expunge {
            if let Some(ref folder) = self.config.read().unwrap().selected_folder {
-                info!(context, 0, "Expunge messages in \"{}\".", 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
@@ -677,7 +674,6 @@ impl Imap {
                    Err(err) => {
                        info!(
                            context,
-                            0,
                            "Cannot select folder: {}; {:?}.",
                            folder.as_ref(),
                            err
@@ -714,7 +710,6 @@ impl Imap {
        if !self.is_connected() {
            info!(
                context,
-                0,
                "Cannot fetch from \"{}\" - not connected.",
                folder.as_ref()
            );
@@ -725,7 +720,6 @@ impl Imap {
        if self.select_folder(context, Some(&folder)) == 0 {
            info!(
                context,
-                0,
                "Cannot select folder \"{}\" for fetching.",
                folder.as_ref()
            );
@@ -742,7 +736,6 @@ impl Imap {
        if mailbox.uid_validity.is_none() {
            error!(
                context,
-                0,
                "Cannot get UIDVALIDITY for folder \"{}\".",
                folder.as_ref(),
            );
@@ -754,7 +747,7 @@ impl Imap {
            // first time this folder is selected or UIDVALIDITY has changed, init lastseenuid and save it to config

            if mailbox.exists == 0 {
-                info!(context, 0, "Folder \"{}\" is empty.", folder.as_ref());
+                info!(context, "Folder \"{}\" is empty.", folder.as_ref());

                // set lastseenuid=0 for empty folders.
                // id we do not do this here, we'll miss the first message
@@ -773,7 +766,6 @@ impl Imap {
                        self.should_reconnect.store(true, Ordering::Relaxed);
                        info!(
                            context,
-                            0,
                            "No result returned for folder \"{}\".",
                            folder.as_ref()
                        );
@@ -796,7 +788,6 @@ impl Imap {
            self.set_config_last_seen_uid(context, &folder, uid_validity, last_seen_uid);
            info!(
                context,
-                0,
                "lastseenuid initialized to {} for {}@{}",
                last_seen_uid,
                folder.as_ref(),
@@ -815,7 +806,7 @@ impl Imap {
            match session.uid_fetch(set, PREFETCH_FLAGS) {
                Ok(list) => list,
                Err(err) => {
-                    warn!(context, 0, "failed to fetch uids: {}", err);
+                    warn!(context, "failed to fetch uids: {}", err);
                    return 0;
                }
            }
@@ -843,7 +834,6 @@ impl Imap {
                    if self.fetch_single_msg(context, &folder, cur_uid) == 0 {
                        info!(
                            context,
-                            0,
                            "Read error for message {} from \"{}\", trying over later.",
                            message_id,
                            folder.as_ref()
@@ -855,7 +845,6 @@ impl Imap {
                    // check failed
                    info!(
                        context,
-                        0,
                        "Skipping message {} from \"{}\" by precheck.",
                        message_id,
                        folder.as_ref(),
@@ -876,7 +865,6 @@ impl Imap {
        if read_errors > 0 {
            warn!(
                context,
-                0,
                "{} mails read from \"{}\" with {} errors.",
                read_cnt,
                folder.as_ref(),
@@ -885,7 +873,6 @@ impl Imap {
        } else {
            info!(
                context,
-                0,
                "{} mails read from \"{}\".",
                read_cnt,
                folder.as_ref()
@@ -930,7 +917,6 @@ impl Imap {
                    self.should_reconnect.store(true, Ordering::Relaxed);
                    warn!(
                        context,
-                        0,
                        "Error on fetching message #{} from folder \"{}\"; retry={}; error={}.",
                        server_uid,
                        folder.as_ref(),
@@ -947,7 +933,6 @@ impl Imap {
        if msgs.is_empty() {
            warn!(
                context,
-                0,
                "Message #{} does not exist in folder \"{}\".",
                server_uid,
                folder.as_ref()
@@ -1001,7 +986,7 @@ impl Imap {

        let watch_folder = self.config.read().unwrap().watch_folder.clone();
        if self.select_folder(context, watch_folder.as_ref()) == 0 {
-            warn!(context, 0, "IMAP-IDLE not setup.",);
+            warn!(context, "IMAP-IDLE not setup.",);

            return self.fake_idle(context);
        }
@@ -1011,7 +996,7 @@ impl Imap {
            let (sender, receiver) = std::sync::mpsc::channel();
            let v = self.watch.clone();

-            info!(context, 0, "IMAP-IDLE SPAWNING");
+            info!(context, "IMAP-IDLE SPAWNING");
            std::thread::spawn(move || {
                let &(ref lock, ref cvar) = &*v;
                if let Some(ref mut session) = &mut *session.lock().unwrap() {
@@ -1046,18 +1031,15 @@ impl Imap {

        let handle_res = |res| match res {
            Ok(()) => {
-                info!(context, 0, "IMAP-IDLE has data.");
+                info!(context, "IMAP-IDLE has data.");
            }
            Err(err) => match err {
                imap::error::Error::ConnectionLost => {
-                    info!(
-                        context,
-                        0, "IMAP-IDLE wait cancelled, we will reconnect soon."
-                    );
+                    info!(context, "IMAP-IDLE wait cancelled, we will reconnect soon.");
                    self.should_reconnect.store(true, Ordering::Relaxed);
                }
                _ => {
-                    warn!(context, 0, "IMAP-IDLE returns unknown value: {}", err);
+                    warn!(context, "IMAP-IDLE returns unknown value: {}", err);
                }
            },
        };
@@ -1073,7 +1055,7 @@ impl Imap {
                    if let Ok(res) = worker.as_ref().unwrap().try_recv() {
                        handle_res(res);
                    } else {
-                        info!(context, 0, "IMAP-IDLE interrupted");
+                        info!(context, "IMAP-IDLE interrupted");
                    }

                    drop(worker.take());
@@ -1091,7 +1073,7 @@ impl Imap {
        let fake_idle_start_time = SystemTime::now();
        let mut wait_long = false;

-        info!(context, 0, "IMAP-fake-IDLEing...");
+        info!(context, "IMAP-fake-IDLEing...");

        let mut do_fake_idle = true;
        while do_fake_idle {
@@ -1167,7 +1149,6 @@ impl Imap {
        } else if folder.as_ref() == dest_folder.as_ref() {
            info!(
                context,
-                0,
                "Skip moving message; message {}/{} is already in {}...",
                folder.as_ref(),
                uid,
@@ -1178,7 +1159,6 @@ impl Imap {
        } else {
            info!(
                context,
-                0,
                "Moving message {}/{} to {}...",
                folder.as_ref(),
                uid,
@@ -1188,7 +1168,6 @@ impl Imap {
            if self.select_folder(context, Some(folder.as_ref())) == 0 {
                warn!(
                    context,
-                    0,
                    "Cannot select folder {} for moving message.",
                    folder.as_ref()
                );
@@ -1202,7 +1181,6 @@ impl Imap {
                        Err(err) => {
                            info!(
                                context,
-                                0,
                                "Cannot move message, fallback to COPY/DELETE {}/{} to {}: {}",
                                folder.as_ref(),
                                uid,
@@ -1223,7 +1201,7 @@ impl Imap {
                            Ok(_) => true,
                            Err(err) => {
                                eprintln!("error copy: {:?}", err);
-                                info!(context, 0, "Cannot copy message.",);
+                                info!(context, "Cannot copy message.",);

                                false
                            }
@@ -1234,7 +1212,7 @@ impl Imap {

                    if copied {
                        if self.add_flag(context, uid, "\\Deleted") == 0 {
-                            warn!(context, 0, "Cannot mark message as \"Deleted\".",);
+                            warn!(context, "Cannot mark message as \"Deleted\".",);
                        }
                        self.config.write().unwrap().selected_folder_needs_expunge = true;
                        res = DC_SUCCESS;
@@ -1271,7 +1249,7 @@ impl Imap {
                Err(err) => {
                    warn!(
                        context,
-                        0, "IMAP failed to store: ({}, {}) {:?}", set, query, err
+                        "IMAP failed to store: ({}, {}) {:?}", set, query, err
                    );
                }
            }
@@ -1294,7 +1272,6 @@ impl Imap {
        } else if self.is_connected() {
            info!(
                context,
-                0,
                "Marking message {}/{} as seen...",
                folder.as_ref(),
                uid,
@@ -1303,12 +1280,11 @@ impl Imap {
            if self.select_folder(context, Some(folder.as_ref())) == 0 {
                warn!(
                    context,
-                    0,
                    "Cannot select folder {} for setting SEEN flag.",
                    folder.as_ref(),
                );
            } else if self.add_flag(context, uid, "\\Seen") == 0 {
-                warn!(context, 0, "Cannot mark message as seen.",);
+                warn!(context, "Cannot mark message as seen.",);
            } else {
                res = DC_SUCCESS
            }
@@ -1335,7 +1311,6 @@ impl Imap {
        } else if self.is_connected() {
            info!(
                context,
-                0,
                "Marking message {}/{} as $MDNSent...",
                folder.as_ref(),
                uid,
@@ -1344,7 +1319,6 @@ impl Imap {
            if self.select_folder(context, Some(folder.as_ref())) == 0 {
                warn!(
                    context,
-                    0,
                    "Cannot select folder {} for setting $MDNSent flag.",
                    folder.as_ref()
                );
@@ -1411,16 +1385,16 @@ impl Imap {
                        };

                        if res == DC_SUCCESS {
-                            info!(context, 0, "$MDNSent just set and MDN will be sent.");
+                            info!(context, "$MDNSent just set and MDN will be sent.");
                        } else {
-                            info!(context, 0, "$MDNSent already set and MDN already sent.");
+                            info!(context, "$MDNSent already set and MDN already sent.");
                        }
                    }
                } else {
                    res = DC_SUCCESS;
                    info!(
                        context,
-                        0, "Cannot store $MDNSent flags, risk sending duplicate MDN.",
+                        "Cannot store $MDNSent flags, risk sending duplicate MDN.",
                    );
                }
            }
@@ -1451,7 +1425,6 @@ impl Imap {
        } else {
            info!(
                context,
-                0,
                "Marking message \"{}\", {}/{} for deletion...",
                message_id.as_ref(),
                folder.as_ref(),
@@ -1461,7 +1434,6 @@ impl Imap {
            if self.select_folder(context, Some(&folder)) == 0 {
                warn!(
                    context,
-                    0,
                    "Cannot select folder {} for deleting message.",
                    folder.as_ref()
                );
@@ -1482,7 +1454,6 @@ impl Imap {
                            {
                                warn!(
                                    context,
-                                    0,
                                    "Cannot delete on IMAP, {}/{} does not match {}.",
                                    folder.as_ref(),
                                    server_uid,
@@ -1496,7 +1467,6 @@ impl Imap {

                            warn!(
                                context,
-                                0,
                                "Cannot delete on IMAP, {}/{} not found.",
                                folder.as_ref(),
                                server_uid,
@@ -1508,7 +1478,7 @@ impl Imap {

                // mark the message for deletion
                if self.add_flag(context, *server_uid, "\\Deleted") == 0 {
-                    warn!(context, 0, "Cannot mark message as \"Deleted\".");
+                    warn!(context, "Cannot mark message as \"Deleted\".");
                } else {
                    self.config.write().unwrap().selected_folder_needs_expunge = true;
                    success = true
@@ -1528,7 +1498,7 @@ impl Imap {
            return;
        }

-        info!(context, 0, "Configuring IMAP-folders.");
+        info!(context, "Configuring IMAP-folders.");

        let folders = self.list_folders(context).unwrap();
        let delimiter = self.config.read().unwrap().imap_delimiter;
@@ -1547,21 +1517,19 @@ impl Imap {
            });

        if mvbox_folder.is_none() && 0 != (flags as usize & DC_CREATE_MVBOX) {
-            info!(context, 0, "Creating MVBOX-folder \"DeltaChat\"...",);
+            info!(context, "Creating MVBOX-folder \"DeltaChat\"...",);

            if let Some(ref mut session) = &mut *self.session.lock().unwrap() {
                match session.create("DeltaChat") {
                    Ok(_) => {
                        mvbox_folder = Some("DeltaChat".into());

-                        info!(context, 0, "MVBOX-folder created.",);
+                        info!(context, "MVBOX-folder created.",);
                    }
                    Err(err) => {
                        warn!(
                            context,
-                            0,
-                            "Cannot create MVBOX-folder, using trying INBOX subfolder. ({})",
-                            err
+                            "Cannot create MVBOX-folder, using trying INBOX subfolder. ({})", err
                        );

                        match session.create(&fallback_folder) {
@@ -1569,11 +1537,11 @@ impl Imap {
                                mvbox_folder = Some(fallback_folder);
                                info!(
                                    context,
-                                    0, "MVBOX-folder created as INBOX subfolder. ({})", err
+                                    "MVBOX-folder created as INBOX subfolder. ({})", err
                                );
                            }
                            Err(err) => {
-                                warn!(context, 0, "Cannot create MVBOX-folder. ({})", err);
+                                warn!(context, "Cannot create MVBOX-folder. ({})", err);
                            }
                        }
                    }
@@ -1619,13 +1587,13 @@ impl Imap {
            match session.list(Some(""), Some("*")) {
                Ok(list) => {
                    if list.is_empty() {
-                        warn!(context, 0, "Folder list is empty.",);
+                        warn!(context, "Folder list is empty.",);
                    }
                    Some(list)
                }
                Err(err) => {
                    eprintln!("list error: {:?}", err);
-                    warn!(context, 0, "Cannot get folder list.",);
+                    warn!(context, "Cannot get folder list.",);

                    None
                }
--- a/src/job.rs
+++ b/src/job.rs
@@ -10,11 +10,11 @@ use crate::configure::*;
 use crate::constants::*;
 use crate::context::Context;
 use crate::dc_imex::*;
-use crate::dc_loginparam::*;
 use crate::dc_mimefactory::*;
 use crate::dc_tools::*;
 use crate::imap::*;
 use crate::location;
+use crate::login_param::LoginParam;
 use crate::message::*;
 use crate::param::*;
 use crate::sql;
@@ -25,13 +25,22 @@ use crate::x::*;
 #[derive(Debug, Display, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
 #[repr(i32)]
 enum Thread {
+    Unknown = 0,
    Imap = 100,
    Smtp = 5000,
 }

+impl Default for Thread {
+    fn default() -> Self {
+        Thread::Unknown
+    }
+}
+
 #[derive(Debug, Display, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
 #[repr(i32)]
 pub enum Action {
+    Unknown = 0,
+
    // Jobs in the INBOX-thread, range from DC_IMAP_THREAD..DC_IMAP_THREAD+999
    Housekeeping = 105, // low priority ...
    DeleteMsgOnImap = 110,
@@ -50,11 +59,19 @@ pub enum Action {
    SendMsgToSmtp = 5901, // ... high priority
 }

+impl Default for Action {
+    fn default() -> Self {
+        Action::Unknown
+    }
+}
+
 impl From<Action> for Thread {
    fn from(action: Action) -> Thread {
        use Action::*;

        match action {
+            Unknown => Thread::Unknown,
+
            Housekeeping => Thread::Imap,
            DeleteMsgOnImap => Thread::Imap,
            MarkseenMdnOnImap => Thread::Imap,
@@ -111,31 +128,19 @@ impl Job {

    #[allow(non_snake_case)]
    fn do_DC_JOB_SEND(&mut self, context: &Context) {
-        let ok_to_continue;
-        let mut filename = ptr::null_mut();
-        let mut buf = ptr::null_mut();
-        let mut buf_bytes = 0;
-
        /* connect to SMTP server, if not yet done */
        if !context.smtp.lock().unwrap().is_connected() {
-            let loginparam = dc_loginparam_read(context, &context.sql, "configured_");
+            let loginparam = LoginParam::from_database(context, "configured_");
            let connected = context.smtp.lock().unwrap().connect(context, &loginparam);

            if !connected {
                self.try_again_later(3i32, None);
-                ok_to_continue = false;
-            } else {
-                ok_to_continue = true;
+                return;
            }
-        } else {
-            ok_to_continue = true;
        }
-        if ok_to_continue {
-            let filename_s = self.param.get(Param::File).unwrap_or_default();
-            filename = unsafe { filename_s.strdup() };
-            if unsafe { strlen(filename) } == 0 {
-                warn!(context, 0, "Missing file name for job {}", self.job_id,);
-            } else if 0 != unsafe { dc_read_file(context, filename, &mut buf, &mut buf_bytes) } {
+
+        if let Some(filename) = self.param.get(Param::File) {
+            if let Some(body) = dc_read_file_safe(context, filename) {
                if let Some(recipients) = self.param.get(Param::Recipients) {
                    let recipients_list = recipients
                        .split("\x1e")
@@ -147,78 +152,61 @@ impl Job {
                            }
                        })
                        .collect::<Vec<_>>();
+
                    /* if there is a msg-id and it does not exist in the db, cancel sending.
                    this happends if dc_delete_msgs() was called
                    before the generated mime was sent out */
-                    let ok_to_continue1;
-                    if 0 != self.foreign_id {
-                        if 0 == unsafe { dc_msg_exists(context, self.foreign_id) } {
-                            warn!(
-                                context,
-                                0,
-                                "Message {} for job {} does not exist",
-                                self.foreign_id,
-                                self.job_id,
-                            );
-                            ok_to_continue1 = false;
-                        } else {
-                            ok_to_continue1 = true;
-                        }
-                    } else {
-                        ok_to_continue1 = true;
-                    }
-                    if ok_to_continue1 {
-                        /* send message */
-                        let body = unsafe {
-                            std::slice::from_raw_parts(buf as *const u8, buf_bytes).to_vec()
-                        };
+                    if 0 != self.foreign_id && !dc_msg_exists(context, self.foreign_id) {
+                        warn!(
+                            context,
+                            "Message {} for job {} does not exist", self.foreign_id, self.job_id,
+                        );
+                        return;
+                    };

-                        // hold the smtp lock during sending of a job and
-                        // its ok/error response processing. Note that if a message
-                        // was sent we need to mark it in the database as we
-                        // otherwise might send it twice.
-                        let mut sock = context.smtp.lock().unwrap();
-                        if 0 == sock.send(context, recipients_list, body) {
-                            sock.disconnect();
-                            self.try_again_later(-1i32, Some(as_str(sock.error)));
-                        } else {
-                            dc_delete_file(context, filename_s);
-                            if 0 != self.foreign_id {
-                                dc_update_msg_state(
+                    // hold the smtp lock during sending of a job and
+                    // its ok/error response processing. Note that if a message
+                    // was sent we need to mark it in the database as we
+                    // otherwise might send it twice.
+                    let mut sock = context.smtp.lock().unwrap();
+                    if 0 == sock.send(context, recipients_list, body) {
+                        sock.disconnect();
+                        self.try_again_later(-1i32, sock.error.clone());
+                    } else {
+                        dc_delete_file(context, filename);
+                        if 0 != self.foreign_id {
+                            dc_update_msg_state(
+                                context,
+                                self.foreign_id,
+                                MessageState::OutDelivered,
+                            );
+                            let chat_id: i32 = context
+                                .sql
+                                .query_row_col(
                                    context,
-                                    self.foreign_id,
-                                    MessageState::OutDelivered,
-                                );
-                                let chat_id: i32 = context
-                                    .sql
-                                    .query_row_col(
-                                        context,
-                                        "SELECT chat_id FROM msgs WHERE id=?",
-                                        params![self.foreign_id as i32],
-                                        0,
-                                    )
-                                    .unwrap_or_default();
-                                context.call_cb(
-                                    Event::MSG_DELIVERED,
-                                    chat_id as uintptr_t,
-                                    self.foreign_id as uintptr_t,
-                                );
-                            }
+                                    "SELECT chat_id FROM msgs WHERE id=?",
+                                    params![self.foreign_id as i32],
+                                    0,
+                                )
+                                .unwrap_or_default();
+                            context.call_cb(
+                                Event::MSG_DELIVERED,
+                                chat_id as uintptr_t,
+                                self.foreign_id as uintptr_t,
+                            );
                        }
                    }
                } else {
-                    warn!(context, 0, "Missing recipients for job {}", self.job_id,);
+                    warn!(context, "Missing recipients for job {}", self.job_id,);
                }
            }
        }
-        unsafe { free(buf) };
-        unsafe { free(filename.cast()) };
    }

    // this value does not increase the number of tries
-    fn try_again_later(&mut self, try_again: libc::c_int, pending_error: Option<&str>) {
+    fn try_again_later(&mut self, try_again: libc::c_int, pending_error: Option<String>) {
        self.try_again = try_again;
-        self.pending_error = pending_error.map(|s| s.to_string());
+        self.pending_error = pending_error;
    }

    #[allow(non_snake_case)]
@@ -289,7 +277,7 @@ impl Job {
                if dc_rfc724_mid_cnt(context, msg.rfc724_mid) != 1 {
                    info!(
                        context,
-                        0, "The message is deleted from the server when all parts are deleted.",
+                        "The message is deleted from the server when all parts are deleted.",
                    );
                    delete_from_server = 0i32
                }
@@ -452,18 +440,17 @@ pub fn perform_imap_fetch(context: &Context) {
        .unwrap_or_else(|| 1)
        == 0
    {
-        info!(context, 0, "INBOX-watch disabled.",);
+        info!(context, "INBOX-watch disabled.",);
        return;
    }
-    info!(context, 0, "INBOX-fetch started...",);
+    info!(context, "INBOX-fetch started...",);
    inbox.fetch(context);
    if inbox.should_reconnect() {
-        info!(context, 0, "INBOX-fetch aborted, starting over...",);
+        info!(context, "INBOX-fetch aborted, starting over...",);
        inbox.fetch(context);
    }
    info!(
        context,
-        0,
        "INBOX-fetch done in {:.4} ms.",
        start.elapsed().as_nanos() as f64 / 1000.0,
    );
@@ -477,13 +464,13 @@ pub fn perform_imap_idle(context: &Context) {
    if *context.perform_inbox_jobs_needed.clone().read().unwrap() {
        info!(
            context,
-            0, "INBOX-IDLE will not be started because of waiting jobs."
+            "INBOX-IDLE will not be started because of waiting jobs."
        );
        return;
    }
-    info!(context, 0, "INBOX-IDLE started...");
+    info!(context, "INBOX-IDLE started...");
    inbox.idle(context);
-    info!(context, 0, "INBOX-IDLE ended.");
+    info!(context, "INBOX-IDLE ended.");
 }

 pub fn perform_mvbox_fetch(context: &Context) {
@@ -560,16 +547,16 @@ pub fn perform_smtp_jobs(context: &Context) {
        state.perform_jobs_needed = 0;

        if state.suspended {
-            info!(context, 0, "SMTP-jobs suspended.",);
+            info!(context, "SMTP-jobs suspended.",);
            return;
        }
        state.doing_jobs = true;
        probe_smtp_network
    };

-    info!(context, 0, "SMTP-jobs started...",);
+    info!(context, "SMTP-jobs started...",);
    job_perform(context, Thread::Smtp, probe_smtp_network);
-    info!(context, 0, "SMTP-jobs ended.");
+    info!(context, "SMTP-jobs ended.");

    {
        let &(ref lock, _) = &*context.smtp_state.clone();
@@ -580,7 +567,7 @@ pub fn perform_smtp_jobs(context: &Context) {
 }

 pub fn perform_smtp_idle(context: &Context) {
-    info!(context, 0, "SMTP-idle started...",);
+    info!(context, "SMTP-idle started...",);
    {
        let &(ref lock, ref cvar) = &*context.smtp_state.clone();
        let mut state = lock.lock().unwrap();
@@ -588,7 +575,7 @@ pub fn perform_smtp_idle(context: &Context) {
        if state.perform_jobs_needed == 1 {
            info!(
                context,
-                0, "SMTP-idle will not be started because of waiting jobs.",
+                "SMTP-idle will not be started because of waiting jobs.",
            );
        } else {
            let dur = get_next_wakeup_time(context, Thread::Smtp);
@@ -606,7 +593,7 @@ pub fn perform_smtp_idle(context: &Context) {
        }
    }

-    info!(context, 0, "SMTP-idle ended.",);
+    info!(context, "SMTP-idle ended.",);
 }

 fn get_next_wakeup_time(context: &Context, thread: Thread) -> Duration {
@@ -665,7 +652,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
    if mimefactory.is_err() || mimefactory.as_ref().unwrap().from_addr.is_null() {
        warn!(
            context,
-            0, "Cannot load data to send, maybe the message is deleted in between.",
+            "Cannot load data to send, maybe the message is deleted in between.",
        );
    } else {
        let mut mimefactory = mimefactory.unwrap();
@@ -690,12 +677,12 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
                            mimefactory.msg.param.set_int(Param::Height, height as i32);
                        }
                    }
-                    dc_msg_save_param_to_disk(&mut mimefactory.msg);
+                    dc_msg_save_param_to_disk(context, &mut mimefactory.msg);
                }
            }
        }
        /* create message */
-        if 0 == dc_mimefactory_render(&mut mimefactory) {
+        if 0 == dc_mimefactory_render(context, &mut mimefactory) {
            dc_set_msg_failed(context, msg_id, as_opt_str(mimefactory.error));
        } else if 0
            != mimefactory
@@ -707,7 +694,6 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
        {
            warn!(
                context,
-                0,
                "e2e encryption unavailable {} - {:?}",
                msg_id,
                mimefactory.msg.param.get_int(Param::GuranteeE2ee),
@@ -719,9 +705,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
            );
        } else {
            /* unrecoverable */
-            if clist_search_string_nocase(mimefactory.recipients_addr, mimefactory.from_addr)
-                == 0i32
-            {
+            if !clist_search_string_nocase(mimefactory.recipients_addr, mimefactory.from_addr) {
                clist_insert_after(
                    mimefactory.recipients_names,
                    (*mimefactory.recipients_names).last,
@@ -740,7 +724,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
                if let Err(err) =
                    location::set_kml_sent_timestamp(context, mimefactory.msg.chat_id, time())
                {
-                    error!(context, 0, "Failed to set kml sent_timestamp: {:?}", err);
+                    error!(context, "Failed to set kml sent_timestamp: {:?}", err);
                }
                if !mimefactory.msg.hidden {
                    if let Err(err) = location::set_msg_location_id(
@@ -748,7 +732,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
                        mimefactory.msg.id,
                        mimefactory.out_last_added_location_id,
                    ) {
-                        error!(context, 0, "Failed to set msg_location_id: {:?}", err);
+                        error!(context, "Failed to set msg_location_id: {:?}", err);
                    }
                }
            }
@@ -761,7 +745,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
                    == 0
            {
                mimefactory.msg.param.set_int(Param::GuranteeE2ee, 1);
-                dc_msg_save_param_to_disk(&mut mimefactory.msg);
+                dc_msg_save_param_to_disk(context, &mut mimefactory.msg);
            }
            success = add_smtp_job(context, Action::SendMsgToSmtp, &mut mimefactory);
        }
@@ -771,14 +755,14 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
 }

 pub fn perform_imap_jobs(context: &Context) {
-    info!(context, 0, "dc_perform_imap_jobs starting.",);
+    info!(context, "dc_perform_imap_jobs starting.",);

    let probe_imap_network = *context.probe_imap_network.clone().read().unwrap();
    *context.probe_imap_network.write().unwrap() = false;
    *context.perform_inbox_jobs_needed.write().unwrap() = false;

    job_perform(context, Thread::Imap, probe_imap_network);
-    info!(context, 0, "dc_perform_imap_jobs ended.",);
+    info!(context, "dc_perform_imap_jobs ended.",);
 }

 fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
@@ -826,14 +810,13 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
    match jobs {
        Ok(ref _res) => {}
        Err(ref err) => {
-            info!(context, 0, "query failed: {:?}", err);
+            info!(context, "query failed: {:?}", err);
        }
    }

    for mut job in jobs.unwrap_or_default() {
        info!(
            context,
-            0,
            "{}-job #{}, action {} started...",
            if thread == Thread::Imap {
                "INBOX"
@@ -871,6 +854,9 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
            job.try_again = 0;

            match job.action {
+                Action::Unknown => {
+                    warn!(context, "Unknown job id found");
+                }
                Action::SendMsgToSmtp => job.do_DC_JOB_SEND(context),
                Action::DeleteMsgOnImap => job.do_DC_JOB_DELETE_MSG_ON_IMAP(context),
                Action::MarkseenMsgOnImap => job.do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context),
@@ -913,7 +899,6 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
            // just try over next loop unconditionally, the ui typically interrupts idle when the file (video) is ready
            info!(
                context,
-                0,
                "{}-job #{} not yet ready and will be delayed.",
                if thread == Thread::Imap {
                    "INBOX"
@@ -931,7 +916,6 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                job.update(context);
                info!(
                    context,
-                    0,
                    "{}-job #{} not succeeded on try #{}, retry in ADD_TIME+{} (in {} seconds).",
                    if thread == Thread::Imap {
                        "INBOX"
@@ -1008,7 +992,7 @@ fn connect_to_inbox(context: &Context, inbox: &Imap) -> libc::c_int {

 fn send_mdn(context: &Context, msg_id: uint32_t) {
    if let Ok(mut mimefactory) = unsafe { dc_mimefactory_load_mdn(context, msg_id) } {
-        if 0 != unsafe { dc_mimefactory_render(&mut mimefactory) } {
+        if 0 != unsafe { dc_mimefactory_render(context, &mut mimefactory) } {
            add_smtp_job(context, Action::SendMdn, &mut mimefactory);
        }
    }
@@ -1030,7 +1014,6 @@ fn add_smtp_job(context: &Context, action: Action, mimefactory: &dc_mimefactory_
    if pathNfilename.is_null() {
        error!(
            context,
-            0,
            "Could not find free file name for message with ID <{}>.",
            to_string(mimefactory.rfc724_mid),
        );
@@ -1046,7 +1029,6 @@ fn add_smtp_job(context: &Context, action: Action, mimefactory: &dc_mimefactory_
    {
        error!(
            context,
-            0,
            "Could not write message <{}> to \"{}\".",
            to_string(mimefactory.rfc724_mid),
            as_str(pathNfilename),
@@ -1089,6 +1071,11 @@ pub fn job_add(
    param: Params,
    delay_seconds: i64,
 ) {
+    if action == Action::Unknown {
+        error!(context, "Invalid action passed to job_add");
+        return;
+    }
+
    let timestamp = time();
    let thread: Thread = action.into();

@@ -1109,11 +1096,12 @@ pub fn job_add(
    match thread {
        Thread::Imap => interrupt_imap_idle(context),
        Thread::Smtp => interrupt_smtp_idle(context),
+        Thread::Unknown => {}
    }
 }

 pub fn interrupt_smtp_idle(context: &Context) {
-    info!(context, 0, "Interrupting SMTP-idle...",);
+    info!(context, "Interrupting SMTP-idle...",);

    let &(ref lock, ref cvar) = &*context.smtp_state.clone();
    let mut state = lock.lock().unwrap();
@@ -1124,7 +1112,7 @@ pub fn interrupt_smtp_idle(context: &Context) {
 }

 pub fn interrupt_imap_idle(context: &Context) {
-    info!(context, 0, "Interrupting IMAP-IDLE...",);
+    info!(context, "Interrupting IMAP-IDLE...",);

    *context.perform_inbox_jobs_needed.write().unwrap() = true;
    context.inbox.read().unwrap().interrupt_idle();
--- a/src/job_thread.rs
+++ b/src/job_thread.rs
@@ -30,7 +30,7 @@ impl JobThread {
    }

    pub fn suspend(&self, context: &Context) {
-        info!(context, 0, "Suspending {}-thread.", self.name,);
+        info!(context, "Suspending {}-thread.", self.name,);
        {
            self.state.0.lock().unwrap().suspended = true;
        }
@@ -45,7 +45,7 @@ impl JobThread {
    }

    pub fn unsuspend(&self, context: &Context) {
-        info!(context, 0, "Unsuspending {}-thread.", self.name);
+        info!(context, "Unsuspending {}-thread.", self.name);

        let &(ref lock, ref cvar) = &*self.state.clone();
        let mut state = lock.lock().unwrap();
@@ -60,7 +60,7 @@ impl JobThread {
            self.state.0.lock().unwrap().jobs_needed = 1;
        }

-        info!(context, 0, "Interrupting {}-IDLE...", self.name);
+        info!(context, "Interrupting {}-IDLE...", self.name);

        self.imap.interrupt_idle();

@@ -86,16 +86,15 @@ impl JobThread {
        if use_network {
            let start = std::time::Instant::now();
            if self.connect_to_imap(context) {
-                info!(context, 0, "{}-fetch started...", self.name);
+                info!(context, "{}-fetch started...", self.name);
                self.imap.fetch(context);

                if self.imap.should_reconnect() {
-                    info!(context, 0, "{}-fetch aborted, starting over...", self.name,);
+                    info!(context, "{}-fetch aborted, starting over...", self.name,);
                    self.imap.fetch(context);
                }
                info!(
                    context,
-                    0,
                    "{}-fetch done in {:.3} ms.",
                    self.name,
                    start.elapsed().as_millis(),
@@ -142,7 +141,6 @@ impl JobThread {
            if 0 != state.jobs_needed {
                info!(
                    context,
-                    0,
                    "{}-IDLE will not be started as it was interrupted while not ideling.",
                    self.name,
                );
@@ -172,9 +170,9 @@ impl JobThread {
        }

        self.connect_to_imap(context);
-        info!(context, 0, "{}-IDLE started...", self.name,);
+        info!(context, "{}-IDLE started...", self.name,);
        self.imap.idle(context);
-        info!(context, 0, "{}-IDLE ended.", self.name);
+        info!(context, "{}-IDLE ended.", self.name);

        self.state.0.lock().unwrap().using_handle = false;
    }
--- a/src/key.rs
+++ b/src/key.rs
@@ -1,7 +1,6 @@
 use std::collections::BTreeMap;
 use std::ffi::{CStr, CString};
 use std::io::Cursor;
-use std::slice;

 use libc;
 use pgp::composed::{Deserializable, SignedPublicKey, SignedSecretKey};
@@ -106,15 +105,6 @@ impl Key {
        }
    }

-    pub fn from_binary(data: *const u8, len: libc::c_int, key_type: KeyType) -> Option<Self> {
-        if data.is_null() || len == 0 {
-            return None;
-        }
-
-        let bytes = unsafe { slice::from_raw_parts(data, len as usize) };
-        Self::from_slice(bytes, key_type)
-    }
-
    pub fn from_armored_string(
        data: &str,
        key_type: KeyType,
@@ -245,7 +235,7 @@ impl Key {
                    file_content_c.as_bytes().len(),
                )
            } {
-            error!(context, 0, "Cannot write key to {}", to_string(file));
+            error!(context, "Cannot write key to {}", to_string(file));
            false
        } else {
            true
@@ -449,6 +439,27 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
        assert_eq!(private_key, private_key2);
    }

+    #[test]
+    fn test_from_slice_bad_data() {
+        let mut bad_data: [u8; 4096] = [0; 4096];
+
+        for i in 0..4096 {
+            bad_data[i] = (i & 0xff) as u8;
+        }
+
+        for j in 0..(4096 / 40) {
+            let bad_key = Key::from_slice(
+                &bad_data[j..j + 4096 / 2 + j],
+                if 0 != j & 1 {
+                    KeyType::Public
+                } else {
+                    KeyType::Private
+                },
+            );
+            assert!(bad_key.is_none());
+        }
+    }
+
    #[test]
    #[ignore] // is too expensive
    fn test_ascii_roundtrip() {
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,6 +16,8 @@ extern crate rusqlite;
 extern crate strum;
 #[macro_use]
 extern crate strum_macros;
+#[macro_use]
+extern crate jetscii;

 #[macro_use]
 mod log;
@@ -53,15 +55,15 @@ pub mod x;
 pub mod dc_array;
 mod dc_dehtml;
 pub mod dc_imex;
-mod dc_loginparam;
 mod dc_mimefactory;
 pub mod dc_mimeparser;
 pub mod dc_receive_imf;
-pub mod dc_securejoin;
 mod dc_simplify;
 mod dc_strencode;
-mod dc_token;
 pub mod dc_tools;
+mod login_param;
+pub mod securejoin;
+mod token;

 #[cfg(test)]
 mod test_utils;
--- a/src/location.rs
+++ b/src/location.rs
@@ -84,7 +84,6 @@ impl Kml {
                Err(e) => {
                    error!(
                        context,
-                        0,
                        "Location parsing: Error at position {}: {:?}",
                        reader.buffer_position(),
                        e
@@ -216,11 +215,11 @@ pub fn send_locations_to_chat(context: &Context, chat_id: u32, seconds: i64) {
        .is_ok()
        {
            if 0 != seconds && !is_sending_locations_before {
-                msg = dc_msg_new(context, Viewtype::Text);
+                msg = dc_msg_new(Viewtype::Text);
                msg.text =
                    Some(context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0));
                msg.param.set_int(Param::Cmd, 8);
-                unsafe { chat::send_msg(context, chat_id, &mut msg).unwrap() };
+                chat::send_msg(context, chat_id, &mut msg).unwrap();
            } else if 0 == seconds && is_sending_locations_before {
                let stock_str =
                    context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
@@ -266,16 +265,16 @@ pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> l
    if latitude == 0.0 && longitude == 0.0 {
        return 1;
    }
+    let mut continue_streaming = false;

-    context.sql.query_map(
+    if let Ok(chats) = context.sql.query_map(
        "SELECT id FROM chats WHERE locations_send_until>?;",
-        params![time()], |row| row.get::<_, i32>(0),
-        |chats| {
-            let mut continue_streaming = false;
-
-            for chat in chats {
-                let chat_id = chat?;
-                context.sql.execute(
+        params![time()],
+        |row| row.get::<_, i32>(0),
+        |chats| chats.collect::<Result<Vec<_>, _>>().map_err(Into::into),
+    ) {
+        for chat_id in chats {
+            if let Err(err) = context.sql.execute(
                    "INSERT INTO locations  \
                     (latitude, longitude, accuracy, timestamp, chat_id, from_id) VALUES (?,?,?,?,?,?);",
                    params![
@@ -286,16 +285,19 @@ pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> l
                        chat_id,
                        1,
                    ]
-                )?;
+            ) {
+                warn!(context, "failed to store location {:?}", err);
+            } else {
                continue_streaming = true;
            }
-            if continue_streaming {
-                context.call_cb(Event::LOCATION_CHANGED, 1, 0);
-            };
-            schedule_MAYBE_SEND_LOCATIONS(context, 0);
-            Ok(continue_streaming as libc::c_int)
        }
-    ).unwrap_or_default()
+        if continue_streaming {
+            context.call_cb(Event::LOCATION_CHANGED, 1, 0);
+        };
+        schedule_MAYBE_SEND_LOCATIONS(context, 0);
+    }
+
+    continue_streaming as libc::c_int
 }

 pub fn get_range(
@@ -546,76 +548,81 @@ pub fn job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context: &Context, _job: &Job) {
    let mut continue_streaming: libc::c_int = 1;
    info!(
        context,
-        0, " ----------------- MAYBE_SEND_LOCATIONS -------------- ",
+        " ----------------- MAYBE_SEND_LOCATIONS -------------- ",
    );

-    context
-        .sql
-        .query_map(
-            "SELECT id, locations_send_begin, locations_last_sent \
-             FROM chats \
-             WHERE locations_send_until>?;",
-            params![now],
-            |row| {
-                let chat_id: i32 = row.get(0)?;
-                let locations_send_begin: i64 = row.get(1)?;
-                let locations_last_sent: i64 = row.get(2)?;
-                continue_streaming = 1;
+    if let Ok(rows) = context.sql.query_map(
+        "SELECT id, locations_send_begin, locations_last_sent \
+         FROM chats \
+         WHERE locations_send_until>?;",
+        params![now],
+        |row| {
+            let chat_id: i32 = row.get(0)?;
+            let locations_send_begin: i64 = row.get(1)?;
+            let locations_last_sent: i64 = row.get(2)?;
+            continue_streaming = 1;

-                // be a bit tolerant as the timer may not align exactly with time(NULL)
-                if now - locations_last_sent < (60 - 3) {
-                    Ok(None)
-                } else {
-                    Ok(Some((chat_id, locations_send_begin, locations_last_sent)))
-                }
-            },
-            |rows| {
-                context.sql.prepare(
-                    "SELECT id \
-                     FROM locations \
-                     WHERE from_id=? \
-                     AND timestamp>=? \
-                     AND timestamp>? \
-                     AND independent=0 \
-                     ORDER BY timestamp;",
-                    |mut stmt_locations, _| {
-                        for (chat_id, locations_send_begin, locations_last_sent) in
-                            rows.filter_map(|r| match r {
-                                Ok(Some(v)) => Some(v),
-                                _ => None,
-                            })
-                        {
-                            // TODO: do I need to reset?
+            // be a bit tolerant as the timer may not align exactly with time(NULL)
+            if now - locations_last_sent < (60 - 3) {
+                Ok(None)
+            } else {
+                Ok(Some((chat_id, locations_send_begin, locations_last_sent)))
+            }
+        },
+        |rows| {
+            rows.filter_map(|v| v.transpose())
+                .collect::<Result<Vec<_>, _>>()
+                .map_err(Into::into)
+        },
+    ) {
+        let msgs = context
+            .sql
+            .prepare(
+                "SELECT id \
+                 FROM locations \
+                 WHERE from_id=? \
+                 AND timestamp>=? \
+                 AND timestamp>? \
+                 AND independent=0 \
+                 ORDER BY timestamp;",
+                |mut stmt_locations, _| {
+                    let msgs = rows
+                        .into_iter()
+                        .filter_map(|(chat_id, locations_send_begin, locations_last_sent)| {
                            if !stmt_locations
                                .exists(params![1, locations_send_begin, locations_last_sent,])
                                .unwrap_or_default()
                            {
                                // if there is no new location, there's nothing to send.
                                // however, maybe we want to bypass this test eg. 15 minutes
-                                continue;
+                                None
+                            } else {
+                                // pending locations are attached automatically to every message,
+                                // so also to this empty text message.
+                                // DC_CMD_LOCATION is only needed to create a nicer subject.
+                                //
+                                // for optimisation and to avoid flooding the sending queue,
+                                // we could sending these messages only if we're really online.
+                                // the easiest way to determine this, is to check for an empty message queue.
+                                // (might not be 100%, however, as positions are sent combined later
+                                // and dc_set_location() is typically called periodically, this is ok)
+                                let mut msg = dc_msg_new(Viewtype::Text);
+                                msg.hidden = true;
+                                msg.param.set_int(Param::Cmd, 9);
+                                Some((chat_id, msg))
                            }
-                            // pending locations are attached automatically to every message,
-                            // so also to this empty text message.
-                            // DC_CMD_LOCATION is only needed to create a nicer subject.
-                            //
-                            // for optimisation and to avoid flooding the sending queue,
-                            // we could sending these messages only if we're really online.
-                            // the easiest way to determine this, is to check for an empty message queue.
-                            // (might not be 100%, however, as positions are sent combined later
-                            // and dc_set_location() is typically called periodically, this is ok)
-                            let mut msg = dc_msg_new(context, Viewtype::Text);
-                            msg.hidden = true;
-                            msg.param.set_int(Param::Cmd, 9);
-                            // TODO: handle cleanup on error
-                            unsafe { chat::send_msg(context, chat_id as u32, &mut msg).unwrap() };
-                        }
-                        Ok(())
-                    },
-                )
-            },
-        )
-        .unwrap(); // TODO: Better error handling
+                        })
+                        .collect::<Vec<_>>();
+                    Ok(msgs)
+                },
+            )
+            .unwrap_or_default(); // TODO: Better error handling

+        for (chat_id, mut msg) in msgs.into_iter() {
+            // TODO: better error handling
+            chat::send_msg(context, chat_id as u32, &mut msg).unwrap();
+        }
+    }
    if 0 != continue_streaming {
        schedule_MAYBE_SEND_LOCATIONS(context, 0x1);
    }
--- a/src/log.rs
+++ b/src/log.rs
@@ -1,46 +1,31 @@
 #[macro_export]
 macro_rules! info {
-    ($ctx:expr, $data1:expr, $msg:expr) => {
-        info!($ctx, $data1, $msg,)
+    ($ctx:expr,  $msg:expr) => {
+        info!($ctx, $msg,)
+    };
+    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        log_event!($ctx, $crate::constants::Event::INFO, 0, $msg, $($args),*);
    };
-    ($ctx:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        #[allow(unused_unsafe)]
-        unsafe {
-            let formatted = format!($msg, $($args),*);
-            let formatted_c =  std::ffi::CString::new(formatted).unwrap();
-            $ctx.call_cb($crate::constants::Event::INFO, $data1 as libc::uintptr_t,
-                     formatted_c.as_ptr() as libc::uintptr_t);
-    }};
 }

 #[macro_export]
 macro_rules! warn {
-    ($ctx:expr, $data1:expr, $msg:expr) => {
-        warn!($ctx, $data1, $msg,)
+    ($ctx:expr, $msg:expr) => {
+        warn!($ctx, $msg,)
+    };
+    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        log_event!($ctx, $crate::constants::Event::WARNING, 0, $msg, $($args),*);
    };
-    ($ctx:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        #[allow(unused_unsafe)]
-        unsafe {
-            let formatted = format!($msg, $($args),*);
-            let formatted_c = std::ffi::CString::new(formatted).unwrap();
-            $ctx.call_cb($crate::constants::Event::WARNING, $data1 as libc::uintptr_t,
-                         formatted_c.as_ptr() as libc::uintptr_t);
-        }};
 }

 #[macro_export]
 macro_rules! error {
-    ($ctx:expr, $data1:expr, $msg:expr) => {
-        error!($ctx, $data1, $msg,)
+    ($ctx:expr, $msg:expr) => {
+        error!($ctx, $msg,)
+    };
+    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        log_event!($ctx, $crate::constants::Event::ERROR, 0, $msg, $($args),*);
    };
-    ($ctx:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        #[allow(unused_unsafe)]
-        unsafe {
-        let formatted = format!($msg, $($args),*);
-        let formatted_c = std::ffi::CString::new(formatted).unwrap();
-        $ctx.call_cb($crate::constants::Event::ERROR, $data1 as libc::uintptr_t,
-                     formatted_c.as_ptr() as libc::uintptr_t);
-    }};
 }

 #[macro_export]
@@ -49,11 +34,16 @@ macro_rules! log_event {
        log_event!($ctx, $data1, $msg,)
    };
    ($ctx:expr, $event:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        #[allow(unused_unsafe)]
-        unsafe {
-            let formatted = format!($msg, $($args),*);
-            let formatted_c = std::ffi::CString::new(formatted).unwrap();
-            $ctx.call_cb($event, $data1 as libc::uintptr_t,
-                         formatted_c.as_ptr() as libc::uintptr_t);
-    }};
+        let formatted = format!($msg, $($args),*);
+        let formatted_c = std::ffi::CString::new(formatted).unwrap();
+        $ctx.call_cb($event, $data1 as libc::uintptr_t,
+                     formatted_c.as_ptr() as libc::uintptr_t);
+    };
+}
+
+#[macro_export]
+macro_rules! emit_event {
+    ($ctx:expr, $event:expr, $data1:expr, $data2:expr) => {
+        $ctx.call_cb($event, $data1 as libc::uintptr_t, $data2 as libc::uintptr_t);
+    };
 }
--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -0,0 +1,206 @@
+use std::borrow::Cow;
+use std::fmt;
+
+use crate::context::Context;
+use crate::error::Error;
+
+#[derive(Default, Debug)]
+pub struct LoginParam {
+    pub addr: String,
+    pub mail_server: String,
+    pub mail_user: String,
+    pub mail_pw: String,
+    pub mail_port: i32,
+    pub send_server: String,
+    pub send_user: String,
+    pub send_pw: String,
+    pub send_port: i32,
+    pub server_flags: i32,
+}
+
+impl LoginParam {
+    /// Create a new `LoginParam` with default values.
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// Read the login parameters from the database.
+    pub fn from_database(context: &Context, prefix: impl AsRef<str>) -> Self {
+        let prefix = prefix.as_ref();
+        let sql = &context.sql;
+
+        let key = format!("{}addr", prefix);
+        let addr = sql
+            .get_config(context, key)
+            .unwrap_or_default()
+            .trim()
+            .to_string();
+
+        let key = format!("{}mail_server", prefix);
+        let mail_server = sql.get_config(context, key).unwrap_or_default();
+
+        let key = format!("{}mail_port", prefix);
+        let mail_port = sql.get_config_int(context, key).unwrap_or_default();
+
+        let key = format!("{}mail_user", prefix);
+        let mail_user = sql.get_config(context, key).unwrap_or_default();
+
+        let key = format!("{}mail_pw", prefix);
+        let mail_pw = sql.get_config(context, key).unwrap_or_default();
+
+        let key = format!("{}send_server", prefix);
+        let send_server = sql.get_config(context, key).unwrap_or_default();
+
+        let key = format!("{}send_port", prefix);
+        let send_port = sql.get_config_int(context, key).unwrap_or_default();
+
+        let key = format!("{}send_user", prefix);
+        let send_user = sql.get_config(context, key).unwrap_or_default();
+
+        let key = format!("{}send_pw", prefix);
+        let send_pw = sql.get_config(context, key).unwrap_or_default();
+
+        let key = format!("{}server_flags", prefix);
+        let server_flags = sql.get_config_int(context, key).unwrap_or_default();
+
+        LoginParam {
+            addr: addr.to_string(),
+            mail_server,
+            mail_user,
+            mail_pw,
+            mail_port,
+            send_server,
+            send_user,
+            send_pw,
+            send_port,
+            server_flags,
+        }
+    }
+
+    pub fn addr_str(&self) -> &str {
+        self.addr.as_str()
+    }
+
+    /// Save this loginparam to the database.
+    pub fn save_to_database(
+        &self,
+        context: &Context,
+        prefix: impl AsRef<str>,
+    ) -> Result<(), Error> {
+        let prefix = prefix.as_ref();
+        let sql = &context.sql;
+
+        let key = format!("{}addr", prefix);
+        sql.set_config(context, key, Some(&self.addr))?;
+
+        let key = format!("{}mail_server", prefix);
+        sql.set_config(context, key, Some(&self.mail_server))?;
+
+        let key = format!("{}mail_port", prefix);
+        sql.set_config_int(context, key, self.mail_port)?;
+
+        let key = format!("{}mail_user", prefix);
+        sql.set_config(context, key, Some(&self.mail_user))?;
+
+        let key = format!("{}mail_pw", prefix);
+        sql.set_config(context, key, Some(&self.mail_pw))?;
+
+        let key = format!("{}send_server", prefix);
+        sql.set_config(context, key, Some(&self.send_server))?;
+
+        let key = format!("{}send_port", prefix);
+        sql.set_config_int(context, key, self.send_port)?;
+
+        let key = format!("{}send_user", prefix);
+        sql.set_config(context, key, Some(&self.send_user))?;
+
+        let key = format!("{}send_pw", prefix);
+        sql.set_config(context, key, Some(&self.send_pw))?;
+
+        let key = format!("{}server_flags", prefix);
+        sql.set_config_int(context, key, self.server_flags)?;
+
+        Ok(())
+    }
+}
+
+impl fmt::Display for LoginParam {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let unset = "0";
+        let pw = "***";
+
+        let flags_readable = get_readable_flags(self.server_flags);
+
+        write!(
+            f,
+            "{} {}:{}:{}:{} {}:{}:{}:{} {}",
+            unset_empty(&self.addr),
+            unset_empty(&self.mail_user),
+            if !self.mail_pw.is_empty() { pw } else { unset },
+            unset_empty(&self.mail_server),
+            self.mail_port,
+            unset_empty(&self.send_user),
+            if !self.send_pw.is_empty() { pw } else { unset },
+            unset_empty(&self.send_server),
+            self.send_port,
+            flags_readable,
+        )
+    }
+}
+
+fn unset_empty(s: &String) -> Cow<String> {
+    if s.is_empty() {
+        Cow::Owned("unset".to_string())
+    } else {
+        Cow::Borrowed(s)
+    }
+}
+
+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 = 0;
+            if 1 << bit == 0x2 {
+                res += "OAUTH2 ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x4 {
+                res += "AUTH_NORMAL ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x100 {
+                res += "IMAP_STARTTLS ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x200 {
+                res += "IMAP_SSL ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x400 {
+                res += "IMAP_PLAIN ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x10000 {
+                res += "SMTP_STARTTLS ";
+                flag_added = 1
+            }
+            if 1 << bit == 0x20000 {
+                res += "SMTP_SSL ";
+                flag_added = 1
+            }
+            if 1 << bit == 0x40000 {
+                res += "SMTP_PLAIN ";
+                flag_added = 1
+            }
+            if 0 == flag_added {
+                res += &format!("{:#0x}", 1 << bit);
+            }
+        }
+    }
+    if res.is_empty() {
+        res += "0";
+    }
+
+    res
+}
--- a/src/message.rs
+++ b/src/message.rs
@@ -38,6 +38,12 @@ pub enum MessageState {
    OutMdnRcvd = 28,
 }

+impl Default for MessageState {
+    fn default() -> Self {
+        MessageState::Undefined
+    }
+}
+
 impl From<MessageState> for LotState {
    fn from(s: MessageState) -> Self {
        use MessageState::*;
@@ -131,7 +137,7 @@ impl Lot {
 /// approx. max. length returned by dc_msg_get_text()
 /// approx. max. length returned by dc_get_msg_info()
 #[derive(Clone)]
-pub struct Message<'a> {
+pub struct Message {
    pub id: u32,
    pub from_id: u32,
    pub to_id: u32,
@@ -144,7 +150,6 @@ pub struct Message<'a> {
    pub timestamp_sent: i64,
    pub timestamp_rcvd: i64,
    pub text: Option<String>,
-    pub context: &'a Context,
    pub rfc724_mid: *mut libc::c_char,
    pub in_reply_to: *mut libc::c_char,
    pub server_folder: Option<String>,
@@ -159,7 +164,6 @@ pub struct Message<'a> {

 // handle messages
 pub unsafe fn dc_get_msg_info(context: &Context, msg_id: u32) -> *mut libc::c_char {
-    let mut p: *mut libc::c_char;
    let mut ret = String::new();

    let msg = dc_msg_load_from_db(context, msg_id);
@@ -265,7 +269,7 @@ pub unsafe fn dc_get_msg_info(context: &Context, msg_id: u32) -> *mut libc::c_ch
        _ => {}
    }

-    p = dc_msg_get_file(&msg);
+    let p = dc_msg_get_file(context, &msg);
    if !p.is_null() && 0 != *p.offset(0isize) as libc::c_int {
        ret += &format!(
            "\nFile: {}, {}, bytes\n",
@@ -279,9 +283,7 @@ pub unsafe fn dc_get_msg_info(context: &Context, msg_id: u32) -> *mut libc::c_ch
        ret += "Type: ";
        ret += &format!("{}", msg.type_0);
        ret += "\n";
-        p = dc_msg_get_filemime(&msg);
-        ret += &format!("Mimetype: {}\n", as_str(p));
-        free(p as *mut libc::c_void);
+        ret += &format!("Mimetype: {}\n", &dc_msg_get_filemime(&msg));
    }
    let w = msg.param.get_int(Param::Width).unwrap_or_default();
    let h = msg.param.get_int(Param::Height).unwrap_or_default();
@@ -307,11 +309,11 @@ pub unsafe fn dc_get_msg_info(context: &Context, msg_id: u32) -> *mut libc::c_ch
    ret.strdup()
 }

-pub unsafe fn dc_msg_new_untyped<'a>(context: &'a Context) -> Message<'a> {
-    dc_msg_new(context, Viewtype::Unknown)
+pub fn dc_msg_new_untyped() -> Message {
+    dc_msg_new(Viewtype::Unknown)
 }

-pub fn dc_msg_new<'a>(context: &'a Context, viewtype: Viewtype) -> Message<'a> {
+pub fn dc_msg_new(viewtype: Viewtype) -> Message {
    Message {
        id: 0,
        from_id: 0,
@@ -325,7 +327,6 @@ pub fn dc_msg_new<'a>(context: &'a Context, viewtype: Viewtype) -> Message<'a> {
        timestamp_sent: 0,
        timestamp_rcvd: 0,
        text: None,
-        context,
        rfc724_mid: std::ptr::null_mut(),
        in_reply_to: std::ptr::null_mut(),
        server_folder: None,
@@ -338,7 +339,7 @@ pub fn dc_msg_new<'a>(context: &'a Context, viewtype: Viewtype) -> Message<'a> {
    }
 }

-impl<'a> Drop for Message<'a> {
+impl Drop for Message {
    fn drop(&mut self) {
        unsafe {
            free(self.rfc724_mid.cast());
@@ -347,16 +348,16 @@ impl<'a> Drop for Message<'a> {
    }
 }

-pub unsafe fn dc_msg_get_filemime(msg: &Message) -> *mut libc::c_char {
+pub fn dc_msg_get_filemime(msg: &Message) -> String {
    if let Some(m) = msg.param.get(Param::MimeType) {
-        return m.strdup();
+        return m.to_string();
    } else if let Some(file) = msg.param.get(Param::File) {
        if let Some((_, mime)) = dc_msg_guess_msgtype_from_suffix(Path::new(file)) {
-            return mime.strdup();
+            return mime.to_string();
        }
    }

-    "application/octet-stream".strdup()
+    "application/octet-stream".to_string()
 }

 pub fn dc_msg_guess_msgtype_from_suffix(path: &Path) -> Option<(Viewtype, &str)> {
@@ -377,11 +378,11 @@ pub fn dc_msg_guess_msgtype_from_suffix(path: &Path) -> Option<(Viewtype, &str)>
    KNOWN.get(extension).map(|x| *x)
 }

-pub unsafe fn dc_msg_get_file(msg: &Message) -> *mut libc::c_char {
+pub unsafe fn dc_msg_get_file(context: &Context, msg: &Message) -> *mut libc::c_char {
    let mut file_abs = ptr::null_mut();

    if let Some(file_rel) = msg.param.get(Param::File) {
-        file_abs = dc_get_abs_path(msg.context, file_rel);
+        file_abs = dc_get_abs_path(context, file_rel);
    }
    if !file_abs.is_null() {
        file_abs
@@ -437,7 +438,7 @@ pub fn dc_msg_get_timestamp(msg: &Message) -> i64 {
    }
 }

-pub fn dc_msg_load_from_db<'a>(context: &'a Context, id: u32) -> Result<Message<'a>, Error> {
+pub fn dc_msg_load_from_db(context: &Context, id: u32) -> Result<Message, Error> {
    context.sql.query_row(
        "SELECT  \
         m.id,rfc724_mid,m.mime_in_reply_to,m.server_folder,m.server_uid,m.move_state,m.chat_id,  \
@@ -448,8 +449,7 @@ pub fn dc_msg_load_from_db<'a>(context: &'a Context, id: u32) -> Result<Message<
        params![id as i32],
        |row| {
            unsafe {
-                let mut msg = dc_msg_new_untyped(context);
-                msg.context = context;
+                let mut msg = dc_msg_new_untyped();
                msg.id = row.get::<_, i32>(0)? as u32;
                msg.rfc724_mid = row.get::<_, String>(1)?.strdup();
                msg.in_reply_to = match row.get::<_, Option<String>>(2)? {
@@ -474,12 +474,11 @@ pub fn dc_msg_load_from_db<'a>(context: &'a Context, id: u32) -> Result<Message<
                    if let Ok(t) = String::from_utf8(buf.to_vec()) {
                        text = t;
                    } else {
-                        warn!(context, 0, "dc_msg_load_from_db: could not get text column as non-lossy utf8 id {}", id);
+                        warn!(context, "dc_msg_load_from_db: could not get text column as non-lossy utf8 id {}", id);
                        text = String::from_utf8_lossy(buf).into_owned();
                    }
                } else {
-                    warn!(context, 0, "dc_msg_load_from_db: could not get text column for id {}", id);
-                    text = "[ Could not read from db ]".to_string();
+                    text = "".to_string();
                }
                msg.text = Some(text);

@@ -577,7 +576,7 @@ pub fn dc_markseen_msgs(context: &Context, msg_ids: *const u32, msg_cnt: usize)
    );

    if msgs.is_err() {
-        warn!(context, 0, "markseen_msgs failed: {:?}", msgs);
+        warn!(context, "markseen_msgs failed: {:?}", msgs);
        return false;
    }
    let mut send_event = false;
@@ -587,7 +586,7 @@ pub fn dc_markseen_msgs(context: &Context, msg_ids: *const u32, msg_cnt: usize)
        if curr_blocked == Blocked::Not {
            if curr_state == MessageState::InFresh || curr_state == MessageState::InNoticed {
                dc_update_msg_state(context, id, MessageState::InSeen);
-                info!(context, 0, "Seen message #{}.", id);
+                info!(context, "Seen message #{}.", id);

                job_add(
                    context,
@@ -641,7 +640,7 @@ pub fn dc_star_msgs(
        .is_ok()
 }

-pub fn dc_get_msg<'a>(context: &'a Context, msg_id: u32) -> Result<Message<'a>, Error> {
+pub fn dc_get_msg(context: &Context, msg_id: u32) -> Result<Message, Error> {
    dc_msg_load_from_db(context, msg_id)
 }

@@ -699,11 +698,10 @@ pub unsafe fn dc_msg_get_filename(msg: &Message) -> *mut libc::c_char {
    }
 }

-pub unsafe fn dc_msg_get_filebytes(msg: &Message) -> uint64_t {
+pub fn dc_msg_get_filebytes(context: &Context, msg: &Message) -> uint64_t {
    if let Some(file) = msg.param.get(Param::File) {
-        return dc_get_filebytes(msg.context, &file);
+        return dc_get_filebytes(context, &file);
    }
-
    0
 }

@@ -728,14 +726,14 @@ pub fn dc_msg_get_showpadlock(msg: &Message) -> libc::c_int {
    0
 }

-pub unsafe fn dc_msg_get_summary<'a>(msg: &mut Message<'a>, chat: Option<&Chat<'a>>) -> Lot {
+pub fn dc_msg_get_summary(context: &Context, msg: &mut Message, chat: Option<&Chat>) -> Lot {
    let mut ret = Lot::new();

    let chat_loaded: Chat;
    let chat = if let Some(chat) = chat {
        chat
    } else {
-        if let Ok(chat) = Chat::load_from_db(msg.context, msg.chat_id) {
+        if let Ok(chat) = Chat::load_from_db(context, msg.chat_id) {
            chat_loaded = chat;
            &chat_loaded
        } else {
@@ -746,17 +744,18 @@ pub unsafe fn dc_msg_get_summary<'a>(msg: &mut Message<'a>, chat: Option<&Chat<'
    let contact = if msg.from_id != DC_CONTACT_ID_SELF as libc::c_uint
        && ((*chat).typ == Chattype::Group || (*chat).typ == Chattype::VerifiedGroup)
    {
-        Contact::get_by_id((*chat).context, msg.from_id).ok()
+        Contact::get_by_id(context, msg.from_id).ok()
    } else {
        None
    };

-    ret.fill(msg, chat, contact.as_ref(), msg.context);
+    ret.fill(msg, chat, contact.as_ref(), context);

    ret
 }

 pub unsafe fn dc_msg_get_summarytext(
+    context: &Context,
    msg: &mut Message,
    approx_characters: usize,
 ) -> *mut libc::c_char {
@@ -765,7 +764,7 @@ pub unsafe fn dc_msg_get_summarytext(
        msg.text.as_ref(),
        &mut msg.param,
        approx_characters,
-        msg.context,
+        context,
    )
    .strdup()
 }
@@ -896,7 +895,7 @@ pub fn dc_msg_is_setupmessage(msg: &Message) -> bool {
    msg.param.get_int(Param::Cmd) == Some(6)
 }

-pub unsafe fn dc_msg_get_setupcodebegin(msg: &Message) -> *mut libc::c_char {
+pub unsafe fn dc_msg_get_setupcodebegin(context: &Context, msg: &Message) -> *mut libc::c_char {
    let mut filename: *mut libc::c_char = ptr::null_mut();
    let mut buf: *mut libc::c_char = ptr::null_mut();
    let mut buf_bytes: size_t = 0i32 as size_t;
@@ -906,11 +905,11 @@ pub unsafe fn dc_msg_get_setupcodebegin(msg: &Message) -> *mut libc::c_char {
    let mut buf_setupcodebegin: *const libc::c_char = ptr::null();
    let mut ret: *mut libc::c_char = ptr::null_mut();
    if dc_msg_is_setupmessage(msg) {
-        filename = dc_msg_get_file(msg);
+        filename = dc_msg_get_file(context, msg);
        if !(filename.is_null() || *filename.offset(0isize) as libc::c_int == 0i32) {
            if !(0
                == dc_read_file(
-                    msg.context,
+                    context,
                    filename,
                    &mut buf as *mut *mut libc::c_char as *mut *mut libc::c_void,
                    &mut buf_bytes,
@@ -975,6 +974,7 @@ pub fn dc_msg_set_duration(msg: &mut Message, duration: libc::c_int) {
 }

 pub fn dc_msg_latefiling_mediasize(
+    context: &Context,
    msg: &mut Message,
    width: libc::c_int,
    height: libc::c_int,
@@ -987,20 +987,20 @@ pub fn dc_msg_latefiling_mediasize(
    if duration > 0 {
        msg.param.set_int(Param::Duration, duration);
    }
-    dc_msg_save_param_to_disk(msg);
+    dc_msg_save_param_to_disk(context, msg);
 }

-pub fn dc_msg_save_param_to_disk(msg: &mut Message) -> bool {
+pub fn dc_msg_save_param_to_disk(context: &Context, msg: &mut Message) -> bool {
    sql::execute(
-        msg.context,
-        &msg.context.sql,
+        context,
+        &context.sql,
        "UPDATE msgs SET param=? WHERE id=?;",
        params![msg.param.to_string(), msg.id as i32],
    )
    .is_ok()
 }

-pub fn dc_msg_new_load<'a>(context: &'a Context, msg_id: u32) -> Result<Message<'a>, Error> {
+pub fn dc_msg_new_load(context: &Context, msg_id: u32) -> Result<Message, Error> {
    dc_msg_load_from_db(context, msg_id)
 }

@@ -1030,25 +1030,23 @@ The value is also used for CC:-summaries */

 // Context functions to work with messages

-pub unsafe fn dc_msg_exists(context: &Context, msg_id: u32) -> libc::c_int {
-    if msg_id <= 9 {
-        return 0;
+pub fn dc_msg_exists(context: &Context, msg_id: u32) -> bool {
+    if msg_id <= DC_CHAT_ID_LAST_SPECIAL {
+        return false;
    }

-    let chat_id: Option<i32> = context.sql.query_row_col(
+    let chat_id: Option<u32> = context.sql.query_row_col(
        context,
        "SELECT chat_id FROM msgs WHERE id=?;",
-        params![msg_id as i32],
+        params![msg_id],
        0,
    );

    if let Some(chat_id) = chat_id {
-        if chat_id != 3 {
-            return 1;
-        }
+        chat_id != DC_CHAT_ID_TRASH
+    } else {
+        false
    }
-
-    0
 }

 pub fn dc_update_msg_move_state(
@@ -1074,7 +1072,7 @@ pub fn dc_set_msg_failed(context: &Context, msg_id: u32, error: Option<impl AsRe
        }
        if let Some(error) = error {
            msg.param.set(Param::Error, error.as_ref());
-            error!(context, 0, "{}", error.as_ref());
+            error!(context, "{}", error.as_ref());
        }

        if sql::execute(
@@ -1203,7 +1201,7 @@ pub fn dc_get_real_msg_cnt(context: &Context) -> libc::c_int {
    ) {
        Ok(res) => res,
        Err(err) => {
-            error!(context, 0, "dc_get_real_msg_cnt() failed. {}", err);
+            error!(context, "dc_get_real_msg_cnt() failed. {}", err);
            0
        }
    }
@@ -1219,7 +1217,7 @@ pub fn dc_get_deaddrop_msg_cnt(context: &Context) -> size_t {
    ) {
        Ok(res) => res as size_t,
        Err(err) => {
-            error!(context, 0, "dc_get_deaddrop_msg_cnt() failed. {}", err);
+            error!(context, "dc_get_deaddrop_msg_cnt() failed. {}", err);
            0
        }
    }
@@ -1234,7 +1232,7 @@ pub fn dc_rfc724_mid_cnt(context: &Context, rfc724_mid: *const libc::c_char) ->
    ) {
        Ok(res) => res,
        Err(err) => {
-            error!(context, 0, "dc_get_rfc724_mid_cnt() failed. {}", err);
+            error!(context, "dc_get_rfc724_mid_cnt() failed. {}", err);
            0
        }
    }
@@ -1288,7 +1286,7 @@ pub fn dc_update_server_uid(
    ) {
        Ok(_) => {}
        Err(err) => {
-            warn!(context, 0, "msg: failed to update server_uid: {}", err);
+            warn!(context, "msg: failed to update server_uid: {}", err);
        }
    }
 }
@@ -1321,7 +1319,7 @@ mod tests {

        let chat = chat::create_by_contact_id(ctx, contact).unwrap();

-        let mut msg = dc_msg_new(ctx, Viewtype::Text);
+        let mut msg = dc_msg_new(Viewtype::Text);

        let msg_id = chat::prepare_msg(ctx, chat, &mut msg).unwrap();

--- a/src/oauth2.rs
+++ b/src/oauth2.rs
@@ -97,10 +97,7 @@ pub fn dc_get_oauth2_access_token(

        let (redirect_uri, token_url, update_redirect_uri_on_success) =
            if refresh_token.is_none() || refresh_token_for != code.as_ref() {
-                info!(
-                    context,
-                    0, "Generate OAuth2 refresh_token and access_token...",
-                );
+                info!(context, "Generate OAuth2 refresh_token and access_token...",);
                (
                    context
                        .sql
@@ -112,7 +109,7 @@ pub fn dc_get_oauth2_access_token(
            } else {
                info!(
                    context,
-                    0, "Regenerate OAuth2 access_token by refresh_token...",
+                    "Regenerate OAuth2 access_token by refresh_token...",
                );
                (
                    context
@@ -134,7 +131,7 @@ pub fn dc_get_oauth2_access_token(
        if response.is_err() {
            warn!(
                context,
-                0, "Error calling OAuth2 at {}: {:?}", token_url, response
+                "Error calling OAuth2 at {}: {:?}", token_url, response
            );
            return None;
        }
@@ -142,7 +139,6 @@ pub fn dc_get_oauth2_access_token(
        if !response.status().is_success() {
            warn!(
                context,
-                0,
                "Error calling OAuth2 at {}: {:?}",
                token_url,
                response.status()
@@ -154,7 +150,7 @@ pub fn dc_get_oauth2_access_token(
        if parsed.is_err() {
            warn!(
                context,
-                0, "Failed to parse OAuth2 JSON response from {}: error: {:?}", token_url, parsed
+                "Failed to parse OAuth2 JSON response from {}: error: {:?}", token_url, parsed
            );
            return None;
        }
@@ -195,12 +191,12 @@ pub fn dc_get_oauth2_access_token(
                    .ok();
            }
        } else {
-            warn!(context, 0, "Failed to find OAuth2 access token");
+            warn!(context, "Failed to find OAuth2 access token");
        }

        response.access_token
    } else {
-        warn!(context, 0, "Internal OAuth2 error: 2");
+        warn!(context, "Internal OAuth2 error: 2");

        None
    }
@@ -268,17 +264,12 @@ impl Oauth2 {
        // }
        let response = reqwest::Client::new().get(&userinfo_url).send();
        if response.is_err() {
-            warn!(context, 0, "Error getting userinfo: {:?}", response);
+            warn!(context, "Error getting userinfo: {:?}", response);
            return None;
        }
        let mut response = response.unwrap();
        if !response.status().is_success() {
-            warn!(
-                context,
-                0,
-                "Error getting userinfo: {:?}",
-                response.status()
-            );
+            warn!(context, "Error getting userinfo: {:?}", response.status());
            return None;
        }

@@ -286,19 +277,19 @@ impl Oauth2 {
        if parsed.is_err() {
            warn!(
                context,
-                0, "Failed to parse userinfo JSON response: {:?}", parsed
+                "Failed to parse userinfo JSON response: {:?}", parsed
            );
            return None;
        }
        if let Ok(response) = parsed {
            let addr = response.get("email");
            if addr.is_none() {
-                warn!(context, 0, "E-mail missing in userinfo.");
+                warn!(context, "E-mail missing in userinfo.");
            }

            addr.map(|addr| addr.to_string())
        } else {
-            warn!(context, 0, "Failed to parse userinfo.");
+            warn!(context, "Failed to parse userinfo.");
            None
        }
    }
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -178,8 +178,11 @@ impl<'a> Peerstate<'a> {
                     OR gossip_key_fingerprint=? COLLATE NOCASE  \
                     ORDER BY public_key_fingerprint=? DESC;";

-        let fp = fingerprint.as_bytes();
-        Self::from_stmt(context, query, params![fp, fp, fp])
+        Self::from_stmt(
+            context,
+            query,
+            params![fingerprint, fingerprint, fingerprint],
+        )
    }

    fn from_stmt<P>(context: &'a Context, query: &str, params: P) -> Option<Self>
@@ -523,6 +526,10 @@ mod tests {
        // clear to_save, as that is not persissted
        peerstate.to_save = None;
        assert_eq!(peerstate, peerstate_new);
+        let peerstate_new2 =
+            Peerstate::from_fingerprint(&ctx.ctx, &ctx.ctx.sql, &pub_key.fingerprint())
+                .expect("failed to load peerstate from db");
+        assert_eq!(peerstate, peerstate_new2);
    }

    #[test]
--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -1,6 +1,5 @@
 use std::collections::HashSet;
 use std::convert::TryInto;
-use std::ffi::CStr;
 use std::io::Cursor;
 use std::ptr;

@@ -188,15 +187,11 @@ pub fn dc_pgp_create_keypair(addr: impl AsRef<str>) -> Option<(Key, Key)> {
 }

 pub fn dc_pgp_pk_encrypt(
-    plain_text: *const libc::c_void,
-    plain_bytes: size_t,
+    plain: &[u8],
    public_keys_for_encryption: &Keyring,
    private_key_for_signing: Option<&Key>,
 ) -> Option<String> {
-    assert!(!plain_text.is_null() && !plain_bytes > 0, "invalid input");
-
-    let bytes = unsafe { std::slice::from_raw_parts(plain_text as *const u8, plain_bytes) };
-    let lit_msg = Message::new_literal_bytes("", bytes);
+    let lit_msg = Message::new_literal_bytes("", plain);
    let pkeys: Vec<&SignedPublicKey> = public_keys_for_encryption
        .keys()
        .into_iter()
@@ -227,16 +222,11 @@ pub fn dc_pgp_pk_encrypt(
 }

 pub fn dc_pgp_pk_decrypt(
-    ctext: *const libc::c_void,
-    ctext_bytes: size_t,
+    ctext: &[u8],
    private_keys_for_decryption: &Keyring,
    public_keys_for_validation: &Keyring,
    ret_signature_fingerprints: Option<&mut HashSet<String>>,
 ) -> Option<Vec<u8>> {
-    assert!(!ctext.is_null() && ctext_bytes > 0, "invalid input");
-
-    let ctext = unsafe { std::slice::from_raw_parts(ctext as *const u8, ctext_bytes) };
-
    // TODO: proper error handling
    if let Ok((msg, _)) = Message::from_armor_single(Cursor::new(ctext)) {
        let skeys: Vec<&SignedSecretKey> = private_keys_for_decryption
@@ -283,44 +273,25 @@ pub fn dc_pgp_pk_decrypt(
 }

 /// Symmetric encryption.
-pub fn dc_pgp_symm_encrypt(
-    passphrase: *const libc::c_char,
-    plain: *const libc::c_void,
-    plain_bytes: size_t,
-) -> Option<String> {
-    assert!(!passphrase.is_null(), "invalid passphrase");
-    assert!(!plain.is_null() && !plain_bytes > 0, "invalid input");
-
-    let pw = unsafe { CStr::from_ptr(passphrase).to_str().unwrap() };
-    let bytes = unsafe { std::slice::from_raw_parts(plain as *const u8, plain_bytes) };
-
+pub fn dc_pgp_symm_encrypt(passphrase: &str, plain: &[u8]) -> Option<String> {
    let mut rng = thread_rng();
-    let lit_msg = Message::new_literal_bytes("", bytes);
+    let lit_msg = Message::new_literal_bytes("", plain);

    let s2k = StringToKey::new_default(&mut rng);
-    let msg = lit_msg.encrypt_with_password(&mut rng, s2k, Default::default(), || pw.into());
+    let msg =
+        lit_msg.encrypt_with_password(&mut rng, s2k, Default::default(), || passphrase.into());

    msg.and_then(|msg| msg.to_armored_string(None)).ok()
 }

 /// Symmetric decryption.
-pub fn dc_pgp_symm_decrypt(
-    passphrase: *const libc::c_char,
-    ctext: *const libc::c_void,
-    ctext_bytes: size_t,
-) -> Option<Vec<u8>> {
-    assert!(!passphrase.is_null(), "invalid passphrase");
-    assert!(!ctext.is_null() && !ctext_bytes > 0, "invalid input");
-
-    let pw = unsafe { CStr::from_ptr(passphrase).to_str().unwrap() };
-    let bytes = unsafe { std::slice::from_raw_parts(ctext as *const u8, ctext_bytes) };
-
-    let enc_msg = Message::from_bytes(Cursor::new(bytes));
+pub fn dc_pgp_symm_decrypt(passphrase: &str, ctext: &[u8]) -> Option<Vec<u8>> {
+    let enc_msg = Message::from_bytes(Cursor::new(ctext));

    enc_msg
        .and_then(|msg| {
            let mut decryptor = msg
-                .decrypt_with_password(|| pw.into())
+                .decrypt_with_password(|| passphrase.into())
                .expect("failed decryption");
            decryptor.next().expect("no message")
        })
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -37,7 +37,7 @@ impl Into<Lot> for Error {
 pub fn check_qr(context: &Context, qr: impl AsRef<str>) -> Lot {
    let qr = qr.as_ref();

-    info!(context, 0, "Scanned QR code: {}", qr);
+    info!(context, "Scanned QR code: {}", qr);

    if qr.starts_with(OPENPGP4FPR_SCHEME) {
        decode_openpgp(context, qr)
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -0,0 +1,778 @@
+use mmime::mailimf_types::*;
+use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
+use std::ptr;
+
+use crate::aheader::EncryptPreference;
+use crate::chat::{self, Chat};
+use crate::configure::*;
+use crate::constants::*;
+use crate::contact::*;
+use crate::context::Context;
+use crate::dc_mimeparser::*;
+use crate::dc_tools::*;
+use crate::e2ee::*;
+use crate::error::Error;
+use crate::key::*;
+use crate::lot::LotState;
+use crate::message::*;
+use crate::param::*;
+use crate::peerstate::*;
+use crate::qr::check_qr;
+use crate::stock::StockMessage;
+use crate::token;
+use crate::types::*;
+
+pub const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.');
+
+macro_rules! progress {
+    ($context:tt, $event:expr, $contact_id:expr, $progress:expr) => {
+        assert!(
+            $progress >= 0 && $progress <= 1000,
+            "value in range 0..1000 expected with: 0=error, 1..999=progress, 1000=success"
+        );
+        $context.call_cb($event, $contact_id as uintptr_t, $progress as uintptr_t);
+    };
+}
+
+macro_rules! joiner_progress {
+    ($context:tt, $contact_id:expr, $progress:expr) => {
+        progress!(
+            $context,
+            Event::SECUREJOIN_JOINER_PROGRESS,
+            $contact_id,
+            $progress
+        );
+    };
+}
+
+macro_rules! inviter_progress {
+    ($context:tt, $contact_id:expr, $progress:expr) => {
+        progress!(
+            $context,
+            Event::SECUREJOIN_INVITER_PROGRESS,
+            $contact_id,
+            $progress
+        );
+    };
+}
+
+macro_rules! get_qr_attr {
+    ($context:tt, $attr:ident) => {
+        $context
+            .bob
+            .read()
+            .unwrap()
+            .qr_scan
+            .as_ref()
+            .unwrap()
+            .$attr
+            .as_ref()
+            .unwrap()
+    };
+}
+
+pub fn dc_get_securejoin_qr(context: &Context, group_chat_id: uint32_t) -> Option<String> {
+    /* =========================================================
+    ====             Alice - the inviter side            ====
+    ====   Step 1 in "Setup verified contact" protocol   ====
+    ========================================================= */
+
+    let fingerprint: String;
+
+    ensure_secret_key_exists(context).ok();
+    let invitenumber = token::lookup_or_new(context, token::Namespace::InviteNumber, group_chat_id);
+    let auth = token::lookup_or_new(context, token::Namespace::Auth, group_chat_id);
+    let self_addr = match context.sql.get_config(context, "configured_addr") {
+        Some(addr) => addr,
+        None => {
+            error!(context, "Not configured, cannot generate QR code.",);
+            return None;
+        }
+    };
+
+    let self_name = context
+        .sql
+        .get_config(context, "displayname")
+        .unwrap_or_default();
+
+    fingerprint = match get_self_fingerprint(context) {
+        Some(fp) => fp,
+        None => {
+            return None;
+        }
+    };
+
+    let self_addr_urlencoded =
+        utf8_percent_encode(&self_addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
+    let self_name_urlencoded =
+        utf8_percent_encode(&self_name, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
+
+    let qr = if 0 != group_chat_id {
+        if let Ok(chat) = Chat::load_from_db(context, group_chat_id) {
+            let group_name = chat.get_name();
+            let group_name_urlencoded =
+                utf8_percent_encode(&group_name, NON_ALPHANUMERIC).to_string();
+
+            Some(format!(
+                "OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}",
+                fingerprint,
+                self_addr_urlencoded,
+                &group_name_urlencoded,
+                &chat.grpid,
+                &invitenumber,
+                &auth,
+            ))
+        } else {
+            error!(context, "Cannot get QR-code for chat-id {}", group_chat_id,);
+            return None;
+        }
+    } else {
+        Some(format!(
+            "OPENPGP4FPR:{}#a={}&n={}&i={}&s={}",
+            fingerprint, self_addr_urlencoded, self_name_urlencoded, &invitenumber, &auth,
+        ))
+    };
+
+    info!(context, "Generated QR code: {}", qr.as_ref().unwrap());
+
+    qr
+}
+
+fn get_self_fingerprint(context: &Context) -> Option<String> {
+    if let Some(self_addr) = context.sql.get_config(context, "configured_addr") {
+        if let Some(key) = Key::from_self_public(context, self_addr, &context.sql) {
+            return Some(key.fingerprint());
+        }
+    }
+    None
+}
+
+pub fn dc_join_securejoin(context: &Context, qr: &str) -> uint32_t {
+    let cleanup =
+        |context: &Context, contact_chat_id: u32, ongoing_allocated: bool, join_vg: bool| {
+            let mut bob = context.bob.write().unwrap();
+            bob.expects = 0;
+            let ret_chat_id = if bob.status == DC_BOB_SUCCESS {
+                if join_vg {
+                    chat::get_chat_id_by_grpid(
+                        context,
+                        bob.qr_scan.as_ref().unwrap().text2.as_ref().unwrap(),
+                    )
+                    .0
+                } else {
+                    contact_chat_id
+                }
+            } else {
+                0
+            };
+            bob.qr_scan = None;
+
+            if ongoing_allocated {
+                dc_free_ongoing(context);
+            }
+            ret_chat_id as uint32_t
+        };
+    /* ==========================================================
+    ====             Bob - the joiner's side             =====
+    ====   Step 2 in "Setup verified contact" protocol   =====
+    ========================================================== */
+    let mut contact_chat_id: uint32_t = 0;
+    let mut join_vg: bool = false;
+
+    info!(context, "Requesting secure-join ...",);
+    ensure_secret_key_exists(context).ok();
+    if !dc_alloc_ongoing(context) {
+        return cleanup(&context, contact_chat_id, false, join_vg);
+    }
+    let qr_scan = check_qr(context, &qr);
+    if qr_scan.state != LotState::QrAskVerifyContact && qr_scan.state != LotState::QrAskVerifyGroup
+    {
+        error!(context, "Unknown QR code.",);
+        return cleanup(&context, contact_chat_id, true, join_vg);
+    }
+    contact_chat_id = chat::create_by_contact_id(context, qr_scan.id).unwrap_or_default();
+    if contact_chat_id == 0 {
+        error!(context, "Unknown contact.",);
+        return cleanup(&context, contact_chat_id, true, join_vg);
+    }
+    if check_exit(context) {
+        return cleanup(&context, contact_chat_id, true, join_vg);
+    }
+    join_vg = qr_scan.get_state() == LotState::QrAskVerifyGroup;
+    {
+        let mut bob = context.bob.write().unwrap();
+        bob.status = 0;
+        bob.qr_scan = Some(qr_scan);
+    }
+    if fingerprint_equals_sender(
+        context,
+        context
+            .bob
+            .read()
+            .unwrap()
+            .qr_scan
+            .as_ref()
+            .unwrap()
+            .fingerprint
+            .as_ref()
+            .unwrap(),
+        contact_chat_id,
+    ) {
+        info!(context, "Taking protocol shortcut.");
+        context.bob.write().unwrap().expects = DC_VC_CONTACT_CONFIRM;
+        joiner_progress!(context, chat_id_2_contact_id(context, contact_chat_id), 400);
+        let own_fingerprint = get_self_fingerprint(context).unwrap();
+        send_handshake_msg(
+            context,
+            contact_chat_id,
+            if join_vg {
+                "vg-request-with-auth"
+            } else {
+                "vc-request-with-auth"
+            },
+            get_qr_attr!(context, auth).to_string(),
+            Some(own_fingerprint),
+            if join_vg {
+                get_qr_attr!(context, text2).to_string()
+            } else {
+                "".to_string()
+            },
+        );
+    } else {
+        context.bob.write().unwrap().expects = DC_VC_AUTH_REQUIRED;
+        send_handshake_msg(
+            context,
+            contact_chat_id,
+            if join_vg { "vg-request" } else { "vc-request" },
+            get_qr_attr!(context, invitenumber),
+            None,
+            "",
+        );
+    }
+
+    // Bob -> Alice
+    while !check_exit(&context) {
+        std::thread::sleep(std::time::Duration::new(0, 3_000_000));
+    }
+    cleanup(&context, contact_chat_id, true, join_vg)
+}
+
+fn check_exit(context: &Context) -> bool {
+    context
+        .running_state
+        .clone()
+        .read()
+        .unwrap()
+        .shall_stop_ongoing
+}
+
+fn send_handshake_msg(
+    context: &Context,
+    contact_chat_id: uint32_t,
+    step: &str,
+    param2: impl AsRef<str>,
+    fingerprint: Option<String>,
+    grpid: impl AsRef<str>,
+) {
+    let mut msg = dc_msg_new_untyped();
+    msg.type_0 = Viewtype::Text;
+    msg.text = Some(format!("Secure-Join: {}", step));
+    msg.hidden = true;
+    msg.param.set_int(Param::Cmd, 7);
+    if step.is_empty() {
+        msg.param.remove(Param::Arg);
+    } else {
+        msg.param.set(Param::Arg, step);
+    }
+    if !param2.as_ref().is_empty() {
+        msg.param.set(Param::Arg2, param2);
+    }
+    if let Some(fp) = fingerprint {
+        msg.param.set(Param::Arg3, fp);
+    }
+    if !grpid.as_ref().is_empty() {
+        msg.param.set(Param::Arg4, grpid.as_ref());
+    }
+    if step == "vg-request" || step == "vc-request" {
+        msg.param.set_int(
+            Param::ForcePlaintext,
+            ForcePlaintext::AddAutocryptHeader as i32,
+        );
+    } else {
+        msg.param.set_int(Param::GuranteeE2ee, 1);
+    }
+    // TODO. handle cleanup on error
+    chat::send_msg(context, contact_chat_id, &mut msg).unwrap();
+}
+
+fn chat_id_2_contact_id(context: &Context, contact_chat_id: uint32_t) -> uint32_t {
+    let contacts = chat::get_chat_contacts(context, contact_chat_id);
+    if contacts.len() == 1 {
+        contacts[0]
+    } else {
+        0
+    }
+}
+
+fn fingerprint_equals_sender(
+    context: &Context,
+    fingerprint: impl AsRef<str>,
+    contact_chat_id: u32,
+) -> bool {
+    let contacts = chat::get_chat_contacts(context, contact_chat_id);
+
+    if contacts.len() == 1 {
+        if let Ok(contact) = Contact::load_from_db(context, contacts[0]) {
+            if let Some(peerstate) = Peerstate::from_addr(context, &context.sql, contact.get_addr())
+            {
+                let fingerprint_normalized = dc_normalize_fingerprint(fingerprint.as_ref());
+                if peerstate.public_key_fingerprint.is_some()
+                    && &fingerprint_normalized == peerstate.public_key_fingerprint.as_ref().unwrap()
+                {
+                    return true;
+                }
+            }
+        }
+    }
+    false
+}
+
+/* library private: secure-join */
+pub fn handle_securejoin_handshake(
+    context: &Context,
+    mimeparser: &dc_mimeparser_t,
+    contact_id: uint32_t,
+) -> libc::c_int {
+    let own_fingerprint: String;
+
+    if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
+        return 0;
+    }
+    let step = match lookup_field(mimeparser, "Secure-Join") {
+        Some(s) => s,
+        None => {
+            return 0;
+        }
+    };
+    info!(
+        context,
+        ">>>>>>>>>>>>>>>>>>>>>>>>> secure-join message \'{}\' received", step,
+    );
+    let (contact_chat_id, contact_chat_id_blocked) =
+        chat::create_or_lookup_by_contact_id(context, contact_id, Blocked::Not).unwrap_or_default();
+
+    if contact_chat_id_blocked != Blocked::Not {
+        chat::unblock(context, contact_chat_id);
+    }
+    let mut ret: libc::c_int = DC_HANDSHAKE_STOP_NORMAL_PROCESSING;
+    let join_vg = step.starts_with("vg-");
+
+    match step.as_str() {
+        "vg-request" | "vc-request" => {
+            /* =========================================================
+            ====             Alice - the inviter side            ====
+            ====   Step 3 in "Setup verified contact" protocol   ====
+            ========================================================= */
+            // this message may be unencrypted (Bob, the joinder and the sender, might not have Alice's key yet)
+            // it just ensures, we have Bobs key now. If we do _not_ have the key because eg. MitM has removed it,
+            // send_message() will fail with the error "End-to-end-encryption unavailable unexpectedly.", so, there is no additional check needed here.
+            // verify that the `Secure-Join-Invitenumber:`-header matches invitenumber written to the QR code
+            let invitenumber = match lookup_field(mimeparser, "Secure-Join-Invitenumber") {
+                Some(n) => n,
+                None => {
+                    warn!(context, "Secure-join denied (invitenumber missing).",);
+                    return ret;
+                }
+            };
+            if !token::exists(context, token::Namespace::InviteNumber, &invitenumber) {
+                warn!(context, "Secure-join denied (bad invitenumber).",);
+                return ret;
+            }
+            info!(context, "Secure-join requested.",);
+
+            inviter_progress!(context, contact_id, 300);
+            send_handshake_msg(
+                context,
+                contact_chat_id,
+                &format!("{}-auth-required", &step[..2]),
+                "",
+                None,
+                "",
+            );
+        }
+        "vg-auth-required" | "vc-auth-required" => {
+            let cond = {
+                let bob = context.bob.read().unwrap();
+                let scan = bob.qr_scan.as_ref();
+                scan.is_none()
+                    || bob.expects != DC_VC_AUTH_REQUIRED
+                    || join_vg && scan.unwrap().state != LotState::QrAskVerifyGroup
+            };
+
+            if cond {
+                warn!(context, "auth-required message out of sync.",);
+                // no error, just aborted somehow or a mail from another handshake
+                return ret;
+            }
+            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
+            let auth = get_qr_attr!(context, auth).to_string();
+
+            if !encrypted_and_signed(mimeparser, &scanned_fingerprint_of_alice) {
+                could_not_establish_secure_connection(
+                    context,
+                    contact_chat_id,
+                    if mimeparser.e2ee_helper.encrypted {
+                        "No valid signature."
+                    } else {
+                        "Not encrypted."
+                    },
+                );
+                end_bobs_joining(context, DC_BOB_ERROR);
+                return ret;
+            }
+            if !fingerprint_equals_sender(context, &scanned_fingerprint_of_alice, contact_chat_id) {
+                could_not_establish_secure_connection(
+                    context,
+                    contact_chat_id,
+                    "Fingerprint mismatch on joiner-side.",
+                );
+                end_bobs_joining(context, DC_BOB_ERROR);
+                return ret;
+            }
+            info!(context, "Fingerprint verified.",);
+            own_fingerprint = get_self_fingerprint(context).unwrap();
+            joiner_progress!(context, contact_id, 400);
+            context.bob.write().unwrap().expects = DC_VC_CONTACT_CONFIRM;
+
+            send_handshake_msg(
+                context,
+                contact_chat_id,
+                &format!("{}-request-with-auth", &step[..2]),
+                auth,
+                Some(own_fingerprint),
+                if join_vg {
+                    get_qr_attr!(context, text2).to_string()
+                } else {
+                    "".to_string()
+                },
+            );
+        }
+        "vg-request-with-auth" | "vc-request-with-auth" => {
+            /* ============================================================
+            ====              Alice - the inviter side              ====
+            ====   Steps 5+6 in "Setup verified contact" protocol   ====
+            ====  Step 6 in "Out-of-band verified groups" protocol  ====
+            ============================================================ */
+            // verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob
+            let fingerprint = match lookup_field(mimeparser, "Secure-Join-Fingerprint") {
+                Some(fp) => fp,
+                None => {
+                    could_not_establish_secure_connection(
+                        context,
+                        contact_chat_id,
+                        "Fingerprint not provided.",
+                    );
+                    return ret;
+                }
+            };
+            if !encrypted_and_signed(mimeparser, &fingerprint) {
+                could_not_establish_secure_connection(
+                    context,
+                    contact_chat_id,
+                    "Auth not encrypted.",
+                );
+                return ret;
+            }
+            if !fingerprint_equals_sender(context, &fingerprint, contact_chat_id) {
+                could_not_establish_secure_connection(
+                    context,
+                    contact_chat_id,
+                    "Fingerprint mismatch on inviter-side.",
+                );
+                return ret;
+            }
+            info!(context, "Fingerprint verified.",);
+            // verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code
+            let auth_0 = match lookup_field(mimeparser, "Secure-Join-Auth") {
+                Some(auth) => auth,
+                None => {
+                    could_not_establish_secure_connection(
+                        context,
+                        contact_chat_id,
+                        "Auth not provided.",
+                    );
+                    return ret;
+                }
+            };
+            if !token::exists(context, token::Namespace::Auth, &auth_0) {
+                could_not_establish_secure_connection(context, contact_chat_id, "Auth invalid.");
+                return ret;
+            }
+            if mark_peer_as_verified(context, fingerprint).is_err() {
+                could_not_establish_secure_connection(
+                    context,
+                    contact_chat_id,
+                    "Fingerprint mismatch on inviter-side.",
+                );
+                return ret;
+            }
+            Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinInvited);
+            info!(context, "Auth verified.",);
+            secure_connection_established(context, contact_chat_id);
+            emit_event!(context, Event::CONTACTS_CHANGED, contact_id, 0);
+            inviter_progress!(context, contact_id, 600);
+            if join_vg {
+                let field_grpid = lookup_field(mimeparser, "Secure-Join-Group").unwrap_or_default();
+                let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, &field_grpid);
+                if group_chat_id == 0 {
+                    error!(context, "Chat {} not found.", &field_grpid);
+                    return ret;
+                } else {
+                    chat::add_contact_to_chat_ex(context, group_chat_id, contact_id, 0x1i32);
+                }
+            } else {
+                send_handshake_msg(context, contact_chat_id, "vc-contact-confirm", "", None, "");
+                inviter_progress!(context, contact_id, 1000);
+            }
+        }
+        "vg-member-added" | "vc-contact-confirm" => {
+            if join_vg {
+                ret = DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING;
+            }
+            if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM {
+                info!(context, "Message belongs to a different handshake.",);
+                return ret;
+            }
+            let cond = {
+                let bob = context.bob.read().unwrap();
+                let scan = bob.qr_scan.as_ref();
+                scan.is_none() || join_vg && scan.unwrap().state != LotState::QrAskVerifyGroup
+            };
+            if cond {
+                warn!(
+                    context,
+                    "Message out of sync or belongs to a different handshake.",
+                );
+                return ret;
+            }
+            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
+
+            let vg_expect_encrypted = if join_vg {
+                let group_id = get_qr_attr!(context, text2).to_string();
+                let (_, is_verified_group, _) = chat::get_chat_id_by_grpid(context, group_id);
+                // when joining a non-verified group
+                // the vg-member-added message may be unencrypted
+                // when not all group members have keys or prefer encryption.
+                // So only expect encryption if this is a verified group
+                is_verified_group
+            } else {
+                // setup contact is always encrypted
+                true
+            };
+            if vg_expect_encrypted
+                && !encrypted_and_signed(mimeparser, &scanned_fingerprint_of_alice)
+            {
+                could_not_establish_secure_connection(
+                    context,
+                    contact_chat_id,
+                    "Contact confirm message not encrypted.",
+                );
+                end_bobs_joining(context, DC_BOB_ERROR);
+                return ret;
+            }
+
+            if mark_peer_as_verified(context, &scanned_fingerprint_of_alice).is_err() {
+                could_not_establish_secure_connection(
+                    context,
+                    contact_chat_id,
+                    "Fingerprint mismatch on joiner-side.",
+                );
+                return ret;
+            }
+            Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinJoined);
+            emit_event!(context, Event::CONTACTS_CHANGED, 0, 0);
+            let cg_member_added =
+                lookup_field(mimeparser, "Chat-Group-Member-Added").unwrap_or_default();
+            if join_vg && !addr_equals_self(context, cg_member_added) {
+                info!(context, "Message belongs to a different handshake (scaled up contact anyway to allow creation of group).");
+                return ret;
+            }
+            secure_connection_established(context, contact_chat_id);
+            context.bob.write().unwrap().expects = 0;
+            if join_vg {
+                send_handshake_msg(
+                    context,
+                    contact_chat_id,
+                    "vg-member-added-received",
+                    "",
+                    None,
+                    "",
+                );
+            }
+            end_bobs_joining(context, DC_BOB_SUCCESS);
+        }
+        "vg-member-added-received" => {
+            /* ============================================================
+            ====              Alice - the inviter side              ====
+            ====  Step 8 in "Out-of-band verified groups" protocol  ====
+            ============================================================ */
+            if let Ok(contact) = Contact::get_by_id(context, contact_id) {
+                if contact.is_verified(context) == VerifiedStatus::Unverified {
+                    warn!(context, "vg-member-added-received invalid.",);
+                    return ret;
+                }
+                inviter_progress!(context, contact_id, 800);
+                inviter_progress!(context, contact_id, 1000);
+            } else {
+                warn!(context, "vg-member-added-received invalid.",);
+                return ret;
+            }
+        }
+        _ => {
+            warn!(context, "invalid step: {}", step);
+        }
+    }
+    if ret == DC_HANDSHAKE_STOP_NORMAL_PROCESSING {
+        ret |= DC_HANDSHAKE_ADD_DELETE_JOB;
+    }
+    ret
+}
+
+fn end_bobs_joining(context: &Context, status: libc::c_int) {
+    context.bob.write().unwrap().status = status;
+    dc_stop_ongoing_process(context);
+}
+
+fn secure_connection_established(context: &Context, contact_chat_id: uint32_t) {
+    let contact_id: uint32_t = chat_id_2_contact_id(context, contact_chat_id);
+    let contact = Contact::get_by_id(context, contact_id);
+    let addr = if let Ok(ref contact) = contact {
+        contact.get_addr()
+    } else {
+        "?"
+    };
+    let msg = context.stock_string_repl_str(StockMessage::ContactVerified, addr);
+    chat::add_device_msg(context, contact_chat_id, msg);
+    emit_event!(context, Event::CHAT_MODIFIED, contact_chat_id, 0);
+}
+
+fn lookup_field(mimeparser: &dc_mimeparser_t, key: &str) -> Option<String> {
+    let field: *mut mailimf_field = dc_mimeparser_lookup_field(mimeparser, key);
+    unsafe {
+        let mut value: *const libc::c_char = ptr::null();
+        if field.is_null()
+            || (*field).fld_type != MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int
+            || (*field).fld_data.fld_optional_field.is_null()
+            || {
+                value = (*(*field).fld_data.fld_optional_field).fld_value;
+                value.is_null()
+            }
+        {
+            return None;
+        }
+        Some(as_str(value).to_string())
+    }
+}
+
+fn could_not_establish_secure_connection(
+    context: &Context,
+    contact_chat_id: uint32_t,
+    details: &str,
+) {
+    let contact_id = chat_id_2_contact_id(context, contact_chat_id);
+    let contact = Contact::get_by_id(context, contact_id);
+    let msg = context.stock_string_repl_str(
+        StockMessage::ContactNotVerified,
+        if let Ok(ref contact) = contact {
+            contact.get_addr()
+        } else {
+            "?"
+        },
+    );
+
+    chat::add_device_msg(context, contact_chat_id, &msg);
+    error!(context, "{} ({})", &msg, details);
+}
+
+fn mark_peer_as_verified(context: &Context, fingerprint: impl AsRef<str>) -> Result<(), Error> {
+    if let Some(ref mut peerstate) =
+        Peerstate::from_fingerprint(context, &context.sql, fingerprint.as_ref())
+    {
+        if peerstate.set_verified(1, fingerprint.as_ref(), 2) {
+            peerstate.prefer_encrypt = EncryptPreference::Mutual;
+            peerstate.to_save = Some(ToSave::All);
+            peerstate.save_to_db(&context.sql, false);
+            return Ok(());
+        }
+    }
+    bail!(
+        "could not mark peer as verified for fingerprint {}",
+        fingerprint.as_ref()
+    );
+}
+
+/* ******************************************************************************
+ * Tools: Misc.
+ ******************************************************************************/
+
+fn encrypted_and_signed(
+    mimeparser: &dc_mimeparser_t,
+    expected_fingerprint: impl AsRef<str>,
+) -> bool {
+    if !mimeparser.e2ee_helper.encrypted {
+        warn!(mimeparser.context, "Message not encrypted.",);
+        false
+    } else if mimeparser.e2ee_helper.signatures.len() <= 0 {
+        warn!(mimeparser.context, "Message not signed.",);
+        false
+    } else if expected_fingerprint.as_ref().is_empty() {
+        warn!(mimeparser.context, "Fingerprint for comparison missing.",);
+        false
+    } else if !mimeparser
+        .e2ee_helper
+        .signatures
+        .contains(expected_fingerprint.as_ref())
+    {
+        warn!(
+            mimeparser.context,
+            "Message does not match expected fingerprint {}.",
+            expected_fingerprint.as_ref(),
+        );
+        false
+    } else {
+        true
+    }
+}
+
+pub fn handle_degrade_event(context: &Context, peerstate: &Peerstate) {
+    // - we do not issue an warning for DC_DE_ENCRYPTION_PAUSED as this is quite normal
+    // - currently, we do not issue an extra warning for DC_DE_VERIFICATION_LOST - this always comes
+    //   together with DC_DE_FINGERPRINT_CHANGED which is logged, the idea is not to bother
+    //   with things they cannot fix, so the user is just kicked from the verified group
+    //   (and he will know this and can fix this)
+    if Some(DegradeEvent::FingerprintChanged) == peerstate.degrade_event {
+        let contact_id: i32 = context
+            .sql
+            .query_row_col(
+                context,
+                "SELECT id FROM contacts WHERE addr=?;",
+                params![&peerstate.addr],
+                0,
+            )
+            .unwrap_or_default();
+        if contact_id > 0 {
+            let (contact_chat_id, _) =
+                chat::create_or_lookup_by_contact_id(context, contact_id as u32, Blocked::Deaddrop)
+                    .unwrap_or_default();
+
+            let peeraddr: &str = match peerstate.addr {
+                Some(ref addr) => &addr,
+                None => "",
+            };
+            let msg = context.stock_string_repl_str(StockMessage::ContactSetupChanged, peeraddr);
+
+            chat::add_device_msg(context, contact_chat_id, msg);
+            emit_event!(context, Event::CHAT_MODIFIED, contact_chat_id, 0);
+        }
+    }
+}
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -4,7 +4,7 @@ use lettre::*;
 use crate::constants::Event;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_loginparam::*;
+use crate::login_param::LoginParam;
 use crate::oauth2::*;

 pub struct Smtp {
@@ -12,7 +12,7 @@ pub struct Smtp {
    transport_connected: bool,
    /// Email address we are sending from.
    from: Option<EmailAddress>,
-    pub error: *mut libc::c_char,
+    pub error: Option<String>,
 }

 impl Smtp {
@@ -22,7 +22,7 @@ impl Smtp {
            transport: None,
            transport_connected: false,
            from: None,
-            error: std::ptr::null_mut(),
+            error: None,
        }
    }

@@ -43,9 +43,9 @@ impl Smtp {
    }

    /// Connect using the provided login params
-    pub fn connect(&mut self, context: &Context, lp: &dc_loginparam_t) -> bool {
+    pub fn connect(&mut self, context: &Context, lp: &LoginParam) -> bool {
        if self.is_connected() {
-            warn!(context, 0, "SMTP already connected.");
+            warn!(context, "SMTP already connected.");
            return true;
        }

@@ -119,7 +119,7 @@ impl Smtp {
                true
            }
            Err(err) => {
-                warn!(context, 0, "SMTP: failed to establish connection {:?}", err);
+                warn!(context, "SMTP: failed to establish connection {:?}", err);
                false
            }
        }
@@ -151,7 +151,8 @@ impl Smtp {
                    1
                }
                Err(err) => {
-                    warn!(context, 0, "SMTP failed to send message: {}", err);
+                    warn!(context, "SMTP failed to send message: {}", err);
+                    self.error = Some(format!("{}", err));
                    0
                }
            }
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -35,7 +35,7 @@ impl Sql {
        self.in_use.remove();
        // drop closes the connection

-        info!(context, 0, "Database closed.");
+        info!(context, "Database closed.");
    }

    // return true on success, false on failure
@@ -176,7 +176,7 @@ impl Sql {
                rusqlite::types::Type::Null,
            ))) => None,
            Err(err) => {
-                error!(context, 0, "sql: Failed query_row: {}", err);
+                error!(context, "sql: Failed query_row: {}", err);
                None
            }
        }
@@ -193,7 +193,7 @@ impl Sql {
        value: Option<&str>,
    ) -> Result<()> {
        if !self.is_open() {
-            error!(context, 0, "set_config(): Database not ready.");
+            error!(context, "set_config(): Database not ready.");
            return Err(Error::SqlNoConnection);
        }

@@ -227,7 +227,7 @@ impl Sql {
        match res {
            Ok(_) => Ok(()),
            Err(err) => {
-                error!(context, 0, "set_config(): Cannot change value. {:?}", &err);
+                error!(context, "set_config(): Cannot change value. {:?}", &err);
                Err(err.into())
            }
        }
@@ -259,6 +259,20 @@ impl Sql {
        self.get_config(context, key).and_then(|s| s.parse().ok())
    }

+    pub fn get_config_bool(&self, context: &Context, key: impl AsRef<str>) -> bool {
+        // Not the most obvious way to encode bool as string, but it is matter
+        // of backward compatibility.
+        self.get_config_int(context, key).unwrap_or_default() > 0
+    }
+
+    pub fn set_config_bool<T>(&self, context: &Context, key: T, value: bool) -> Result<()>
+    where
+        T: AsRef<str>,
+    {
+        let value = if value { Some("1") } else { None };
+        self.set_config(context, key, value)
+    }
+
    pub fn set_config_int64(
        &self,
        context: &Context,
@@ -303,7 +317,6 @@ fn open(
    if sql.is_open() {
        error!(
            context,
-            0,
            "Cannot open, database \"{:?}\" already opened.",
            dbfile.as_ref(),
        );
@@ -337,7 +350,6 @@ fn open(
        if !sql.table_exists("config") {
            info!(
                context,
-                0,
                "First time init: creating tables in {:?}.",
                dbfile.as_ref(),
            );
@@ -453,7 +465,6 @@ fn open(
            {
                error!(
                    context,
-                    0,
                    "Cannot create tables in new database \"{:?}\".",
                    dbfile.as_ref(),
                );
@@ -674,7 +685,7 @@ fn open(
            sql.set_config_int(context, "dbversion", 46)?;
        }
        if dbversion < 47 {
-            info!(context, 0, "[migration] v47");
+            info!(context, "[migration] v47");
            sql.execute(
                "ALTER TABLE jobs ADD COLUMN tries INTEGER DEFAULT 0;",
                params![],
@@ -683,7 +694,7 @@ fn open(
            sql.set_config_int(context, "dbversion", 47)?;
        }
        if dbversion < 48 {
-            info!(context, 0, "[migration] v48");
+            info!(context, "[migration] v48");
            sql.execute(
                "ALTER TABLE msgs ADD COLUMN move_state INTEGER DEFAULT 1;",
                params![],
@@ -693,7 +704,7 @@ fn open(
            sql.set_config_int(context, "dbversion", 48)?;
        }
        if dbversion < 49 {
-            info!(context, 0, "[migration] v49");
+            info!(context, "[migration] v49");
            sql.execute(
                "ALTER TABLE chats ADD COLUMN gossiped_timestamp INTEGER DEFAULT 0;",
                params![],
@@ -702,7 +713,7 @@ fn open(
            sql.set_config_int(context, "dbversion", 49)?;
        }
        if dbversion < 50 {
-            info!(context, 0, "[migration] v50");
+            info!(context, "[migration] v50");
            if 0 != exists_before_update {
                sql.set_config_int(context, "show_emails", 2)?;
            }
@@ -710,7 +721,7 @@ fn open(
            sql.set_config_int(context, "dbversion", 50)?;
        }
        if dbversion < 53 {
-            info!(context, 0, "[migration] v53");
+            info!(context, "[migration] v53");
            sql.execute(
                "CREATE TABLE locations ( id INTEGER PRIMARY KEY AUTOINCREMENT, latitude REAL DEFAULT 0.0, longitude REAL DEFAULT 0.0, accuracy REAL DEFAULT 0.0, timestamp INTEGER DEFAULT 0, chat_id INTEGER DEFAULT 0, from_id INTEGER DEFAULT 0);",
                params![]
@@ -743,7 +754,7 @@ fn open(
            sql.set_config_int(context, "dbversion", 53)?;
        }
        if dbversion < 54 {
-            info!(context, 0, "[migration] v54");
+            info!(context, "[migration] v54");
            sql.execute(
                "ALTER TABLE msgs ADD COLUMN location_id INTEGER DEFAULT 0;",
                params![],
@@ -783,7 +794,7 @@ fn open(
            // 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, 0, "[open] update file paths");
+            info!(context, "[open] update file paths");

            let repl_from = sql
                .get_config(context, "backup_for")
@@ -810,7 +821,7 @@ fn open(
        }
    }

-    info!(context, 0, "Opened {:?}.", dbfile.as_ref(),);
+    info!(context, "Opened {:?}.", dbfile.as_ref(),);

    Ok(())
 }
@@ -825,7 +836,6 @@ where
        Err(err) => {
            error!(
                context,
-                0,
                "execute failed: {:?} for {}",
                &err,
                querystr.as_ref()
@@ -842,7 +852,6 @@ pub fn try_execute(context: &Context, sql: &Sql, querystr: impl AsRef<str>) -> R
        Err(err) => {
            warn!(
                context,
-                0,
                "Try-execute for \"{}\" failed: {}",
                querystr.as_ref(),
                &err,
@@ -886,7 +895,7 @@ pub fn get_rowid_with_conn(
        Err(err) => {
            error!(
                context,
-                0, "sql: Failed to retrieve rowid: {} in {}", err, query
+                "sql: Failed to retrieve rowid: {} in {}", err, query
            );
            0
        }
@@ -933,7 +942,7 @@ pub fn get_rowid2_with_conn(
    ) {
        Ok(id) => id,
        Err(err) => {
-            error!(context, 0, "sql: Failed to retrieve rowid2: {}", err);
+            error!(context, "sql: Failed to retrieve rowid2: {}", err);
            0
        }
    }
@@ -943,7 +952,7 @@ pub fn housekeeping(context: &Context) {
    let mut files_in_use = HashSet::new();
    let mut unreferenced_count = 0;

-    info!(context, 0, "Start housekeeping...");
+    info!(context, "Start housekeeping...");
    maybe_add_from_param(
        context,
        &mut files_in_use,
@@ -983,10 +992,10 @@ pub fn housekeeping(context: &Context) {
            },
        )
        .unwrap_or_else(|err| {
-            warn!(context, 0, "sql: failed query: {}", err);
+            warn!(context, "sql: failed query: {}", err);
        });

-    info!(context, 0, "{} files in use.", files_in_use.len(),);
+    info!(context, "{} files in use.", files_in_use.len(),);
    /* go through directory and delete unused files */
    let p = std::path::Path::new(as_str(context.get_blobdir()));
    match std::fs::read_dir(p) {
@@ -1015,17 +1024,16 @@ pub fn housekeeping(context: &Context) {

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

-                        if created || modified || accessed {
+                        if recently_created || recently_modified || recently_accessed {
                            info!(
                                context,
-                                0,
                                "Housekeeping: Keeping new unreferenced file #{}: {:?}",
                                unreferenced_count,
                                entry.file_name(),
@@ -1037,7 +1045,6 @@ pub fn housekeeping(context: &Context) {
                }
                info!(
                    context,
-                    0,
                    "Housekeeping: Deleting unreferenced file #{}: {:?}",
                    unreferenced_count,
                    entry.file_name()
@@ -1049,7 +1056,6 @@ pub fn housekeeping(context: &Context) {
        Err(err) => {
            warn!(
                context,
-                0,
                "Housekeeping: Cannot open {}. ({})",
                as_str(context.get_blobdir()),
                err
@@ -1057,7 +1063,7 @@ pub fn housekeeping(context: &Context) {
        }
    }

-    info!(context, 0, "Housekeeping done.",);
+    info!(context, "Housekeeping done.",);
 }

 fn is_file_in_use(files_in_use: &HashSet<String>, namespc_opt: Option<&str>, name: &str) -> bool {
@@ -1090,15 +1096,22 @@ fn maybe_add_from_param(
 ) {
    context
        .sql
-        .query_row(query, NO_PARAMS, |row| {
-            let param: Params = row.get::<_, String>(0)?.parse().unwrap_or_default();
-            if let Some(file) = param.get(param_id) {
-                maybe_add_file(files_in_use, file);
-            }
-            Ok(())
-        })
+        .query_map(
+            query,
+            NO_PARAMS,
+            |row| row.get::<_, String>(0),
+            |rows| {
+                for row in rows {
+                    let param: Params = row?.parse().unwrap_or_default();
+                    if let Some(file) = param.get(param_id) {
+                        maybe_add_file(files_in_use, file);
+                    }
+                }
+                Ok(())
+            },
+        )
        .unwrap_or_else(|err| {
-            warn!(context, 0, "sql: failed to add_from_param: {}", err);
+            warn!(context, "sql: failed to add_from_param: {}", err);
        });
 }

--- a/src/token.rs
+++ b/src/token.rs
@@ -0,0 +1,58 @@
+//! Functions to read/write token from/to the database. A token is any string associated with a key.
+
+use deltachat_derive::*;
+
+use crate::context::Context;
+use crate::dc_tools::*;
+use crate::sql;
+
+// Token namespaces
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
+#[repr(i32)]
+pub enum Namespace {
+    Unknown = 0,
+    Auth = 110,
+    InviteNumber = 100,
+}
+
+impl Default for Namespace {
+    fn default() -> Self {
+        Namespace::Unknown
+    }
+}
+
+pub fn save(context: &Context, namespace: Namespace, foreign_id: u32) -> String {
+    // foreign_id may be 0
+    let token = dc_create_id();
+    sql::execute(
+        context,
+        &context.sql,
+        "INSERT INTO tokens (namespc, foreign_id, token, timestamp) VALUES (?, ?, ?, ?);",
+        params![namespace, foreign_id as i32, &token, time()],
+    )
+    .ok();
+    token
+}
+
+pub fn lookup(context: &Context, namespace: Namespace, foreign_id: u32) -> Option<String> {
+    context.sql.query_row_col::<_, String>(
+        context,
+        "SELECT token FROM tokens WHERE namespc=? AND foreign_id=?;",
+        params![namespace, foreign_id as i32],
+        0,
+    )
+}
+
+pub fn lookup_or_new(context: &Context, namespace: Namespace, foreign_id: u32) -> String {
+    lookup(context, namespace, foreign_id).unwrap_or_else(|| save(context, namespace, foreign_id))
+}
+
+pub fn exists(context: &Context, namespace: Namespace, token: &str) -> bool {
+    context
+        .sql
+        .exists(
+            "SELECT id FROM tokens WHERE namespc=? AND token=?;",
+            params![namespace, token],
+        )
+        .unwrap_or_default()
+}
--- a/src/top_evil_rs.py
+++ b/src/top_evil_rs.py
@@ -6,19 +6,21 @@ import os
 import re

 if __name__ == "__main__":
+    if Path('src/top_evil_rs.py').exists():
+        os.chdir('src')
    filestats = []
    for fn in Path(".").glob("**/*.rs"):
        s = fn.read_text()
        s = re.sub(r"(?m)///.*$", "", s)  # remove comments
        unsafe = s.count("unsafe")
        free = s.count("free(")
-        gotoblocks = s.count("current_block =")
+        gotoblocks = s.count("ok_to_continue") + s.count('OK_TO_CONTINUE')
        filestats.append((fn, unsafe, free, gotoblocks))

    sum_unsafe, sum_free, sum_gotoblocks = 0, 0, 0

    for fn, unsafe, free, gotoblocks in reversed(sorted(filestats, key=lambda x: sum(x[1:]))):
-        print("{0: <30} unsafe: {1: >3} free: {2: >3} goto-blocks: {3: >3}".format(str(fn), unsafe, free, gotoblocks))
+        print("{0: <30} unsafe: {1: >3} free: {2: >3} ok_to_continue: {3: >3}".format(str(fn), unsafe, free, gotoblocks))
        sum_unsafe += unsafe
        sum_free += free
        sum_gotoblocks += gotoblocks
@@ -27,5 +29,5 @@ if __name__ == "__main__":
    print()
    print("total unsafe:", sum_unsafe)
    print("total free:", sum_free)
-    print("total gotoblocks:", sum_gotoblocks)
+    print("total ok_to_continue:", sum_gotoblocks)

--- a/tests/stress.rs
+++ b/tests/stress.rs
@@ -1,7 +1,6 @@
 //! Stress some functions for testing; if used as a lib, this file is obsolete.

 use std::collections::HashSet;
-use std::ffi::CString;
 use std::ptr;

 use tempfile::{tempdir, TempDir};
@@ -13,7 +12,6 @@ use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::dc_imex::*;
 use deltachat::dc_tools::*;
-use deltachat::key::*;
 use deltachat::keyring::*;
 use deltachat::oauth2::*;
 use deltachat::pgp::*;
@@ -92,7 +90,7 @@ unsafe fn stress_functions(context: &Context) {
        assert!(dc_delete_file(context, "$BLOBDIR/dada"));
        assert!(dc_create_folder(context, "$BLOBDIR/foobar-folder"));
        assert!(dc_file_exist(context, "$BLOBDIR/foobar-folder",));
-        assert!(dc_delete_file(context, "$BLOBDIR/foobar-folder"));
+        assert!(!dc_delete_file(context, "$BLOBDIR/foobar-folder"));
        let fn0: *mut libc::c_char = dc_get_fine_pathNfilename(
            context,
            b"$BLOBDIR\x00" as *const u8 as *const libc::c_char,
@@ -130,7 +128,7 @@ unsafe fn stress_functions(context: &Context) {
        free(fn1 as *mut libc::c_void);
    }

-    let res = context.get_config(config::Config::SysConfigKeys).unwrap();
+    let res = context.get_config(&config::Config::SysConfigKeys).unwrap();

    assert!(!res.contains(" probably_never_a_key "));
    assert!(res.contains(" addr "));
@@ -462,167 +460,111 @@ unsafe fn stress_functions(context: &Context) {
 #[test]
 #[ignore] // is too expensive
 fn test_encryption_decryption() {
-    unsafe {
-        let mut bad_data: [libc::c_uchar; 4096] = [0; 4096];
-        let mut i_0: libc::c_int = 0i32;
-        while i_0 < 4096i32 {
-            bad_data[i_0 as usize] = (i_0 & 0xffi32) as libc::c_uchar;
-            i_0 += 1
-        }
-        let mut j: libc::c_int = 0i32;
+    let (public_key, private_key) = dc_pgp_create_keypair("foo@bar.de").unwrap();

-        while j < 4096 / 40 {
-            let bad_key = Key::from_binary(
-                &mut *bad_data.as_mut_ptr().offset(j as isize) as *const u8,
-                4096 / 2 + j,
-                if 0 != j & 1 {
-                    KeyType::Public
-                } else {
-                    KeyType::Private
-                },
-            );
+    private_key.split_key().unwrap();

-            assert!(bad_key.is_none());
-            j += 1
-        }
+    let (public_key2, private_key2) = dc_pgp_create_keypair("two@zwo.de").unwrap();

-        let (public_key, private_key) = dc_pgp_create_keypair("foo@bar.de").unwrap();
+    assert_ne!(public_key, public_key2);

-        private_key.split_key().unwrap();
+    let original_text = b"This is a test";
+    let mut keyring = Keyring::default();
+    keyring.add_owned(public_key.clone());
+    keyring.add_ref(&public_key2);

-        let (public_key2, private_key2) = dc_pgp_create_keypair("two@zwo.de").unwrap();
+    let ctext_signed = dc_pgp_pk_encrypt(original_text, &keyring, Some(&private_key)).unwrap();
+    assert!(!ctext_signed.is_empty());
+    assert!(ctext_signed.starts_with("-----BEGIN PGP MESSAGE-----"));

-        assert_ne!(public_key, public_key2);
+    let ctext_unsigned = dc_pgp_pk_encrypt(original_text, &keyring, None).unwrap();
+    assert!(!ctext_unsigned.is_empty());
+    assert!(ctext_unsigned.starts_with("-----BEGIN PGP MESSAGE-----"));

-        let original_text: *const libc::c_char =
-            b"This is a test\x00" as *const u8 as *const libc::c_char;
-        let mut keyring = Keyring::default();
-        keyring.add_owned(public_key.clone());
-        keyring.add_ref(&public_key2);
+    let mut keyring = Keyring::default();
+    keyring.add_owned(private_key);

-        let ctext = dc_pgp_pk_encrypt(
-            original_text as *const libc::c_void,
-            strlen(original_text),
-            &keyring,
-            Some(&private_key),
-        )
-        .unwrap();
+    let mut public_keyring = Keyring::default();
+    public_keyring.add_ref(&public_key);

-        assert!(!ctext.is_empty());
-        assert!(ctext.starts_with("-----BEGIN PGP MESSAGE-----"));
+    let mut public_keyring2 = Keyring::default();
+    public_keyring2.add_owned(public_key2.clone());

-        let ctext_signed_bytes = ctext.len();
-        let ctext_signed = CString::yolo(ctext);
+    let mut valid_signatures: HashSet<String> = Default::default();

-        let ctext = dc_pgp_pk_encrypt(
-            original_text as *const libc::c_void,
-            strlen(original_text),
-            &keyring,
-            None,
-        )
-        .unwrap();
-        assert!(!ctext.is_empty());
-        assert!(ctext.starts_with("-----BEGIN PGP MESSAGE-----"));
+    let plain = dc_pgp_pk_decrypt(
+        ctext_signed.as_bytes(),
+        &keyring,
+        &public_keyring,
+        Some(&mut valid_signatures),
+    )
+    .unwrap();

-        let ctext_unsigned_bytes = ctext.len();
-        let ctext_unsigned = CString::yolo(ctext);
+    assert_eq!(plain, original_text,);
+    assert_eq!(valid_signatures.len(), 1);

-        let mut keyring = Keyring::default();
-        keyring.add_owned(private_key);
+    valid_signatures.clear();

-        let mut public_keyring = Keyring::default();
-        public_keyring.add_ref(&public_key);
+    let empty_keyring = Keyring::default();
+    let plain = dc_pgp_pk_decrypt(
+        ctext_signed.as_bytes(),
+        &keyring,
+        &empty_keyring,
+        Some(&mut valid_signatures),
+    )
+    .unwrap();
+    assert_eq!(plain, original_text);
+    assert_eq!(valid_signatures.len(), 0);

-        let mut public_keyring2 = Keyring::default();
-        public_keyring2.add_owned(public_key2.clone());
+    valid_signatures.clear();

-        let mut valid_signatures: HashSet<String> = Default::default();
+    let plain = dc_pgp_pk_decrypt(
+        ctext_signed.as_bytes(),
+        &keyring,
+        &public_keyring2,
+        Some(&mut valid_signatures),
+    )
+    .unwrap();
+    assert_eq!(plain, original_text);
+    assert_eq!(valid_signatures.len(), 0);

-        let plain = dc_pgp_pk_decrypt(
-            ctext_signed.as_ptr() as *const _,
-            ctext_signed_bytes,
-            &keyring,
-            &public_keyring,
-            Some(&mut valid_signatures),
-        )
-        .unwrap();
+    valid_signatures.clear();

-        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
-        assert_eq!(valid_signatures.len(), 1);
+    public_keyring2.add_ref(&public_key);

-        valid_signatures.clear();
+    let plain = dc_pgp_pk_decrypt(
+        ctext_signed.as_bytes(),
+        &keyring,
+        &public_keyring2,
+        Some(&mut valid_signatures),
+    )
+    .unwrap();
+    assert_eq!(plain, original_text);
+    assert_eq!(valid_signatures.len(), 1);

-        let empty_keyring = Keyring::default();
-        let plain = dc_pgp_pk_decrypt(
-            ctext_signed.as_ptr() as *const _,
-            ctext_signed_bytes,
-            &keyring,
-            &empty_keyring,
-            Some(&mut valid_signatures),
-        )
-        .unwrap();
-        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
-        assert_eq!(valid_signatures.len(), 0);
+    valid_signatures.clear();

-        valid_signatures.clear();
+    let plain = dc_pgp_pk_decrypt(
+        ctext_unsigned.as_bytes(),
+        &keyring,
+        &public_keyring,
+        Some(&mut valid_signatures),
+    )
+    .unwrap();

-        let plain = dc_pgp_pk_decrypt(
-            ctext_signed.as_ptr() as *const _,
-            ctext_signed_bytes,
-            &keyring,
-            &public_keyring2,
-            Some(&mut valid_signatures),
-        )
-        .unwrap();
-        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
-        assert_eq!(valid_signatures.len(), 0);
+    assert_eq!(plain, original_text);

-        valid_signatures.clear();
+    valid_signatures.clear();

-        public_keyring2.add_ref(&public_key);
+    let mut keyring = Keyring::default();
+    keyring.add_ref(&private_key2);
+    let mut public_keyring = Keyring::default();
+    public_keyring.add_ref(&public_key);

-        let plain = dc_pgp_pk_decrypt(
-            ctext_signed.as_ptr() as *const _,
-            ctext_signed_bytes,
-            &keyring,
-            &public_keyring2,
-            Some(&mut valid_signatures),
-        )
-        .unwrap();
-        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
-        assert_eq!(valid_signatures.len(), 1);
+    let plain =
+        dc_pgp_pk_decrypt(ctext_signed.as_bytes(), &keyring, &public_keyring, None).unwrap();

-        valid_signatures.clear();
-
-        let plain = dc_pgp_pk_decrypt(
-            ctext_unsigned.as_ptr() as *const _,
-            ctext_unsigned_bytes,
-            &keyring,
-            &public_keyring,
-            Some(&mut valid_signatures),
-        )
-        .unwrap();
-
-        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
-
-        valid_signatures.clear();
-
-        let mut keyring = Keyring::default();
-        keyring.add_ref(&private_key2);
-        let mut public_keyring = Keyring::default();
-        public_keyring.add_ref(&public_key);
-
-        let plain = dc_pgp_pk_decrypt(
-            ctext_signed.as_ptr() as *const _,
-            ctext_signed_bytes,
-            &keyring,
-            &public_keyring,
-            None,
-        )
-        .unwrap();
-
-        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
-    }
+    assert_eq!(plain, original_text);
 }

 unsafe extern "C" fn cb(
Author	SHA1	Message	Date
jikstra	1ab014f96f	Start implementing Ui config on top of the Config enum	2019-09-14 21:44:59 +02:00
B. Petersen	70a69d5313	cargo fmt	2019-09-13 11:02:34 +02:00
B. Petersen	056faad029	Implement set/get_ui_config and use those methods if config string starts with 'ui.'	2019-09-12 21:53:37 +02:00
Floris Bruynooghe	aefddf7f5e	Remove context refrence from Contact struct This will allow the Rust Context API to be refactored without breaking the C API. Full details in #476 aka `a0b5e32f98`	2019-09-11 23:53:48 +02:00
Floris Bruynooghe	5ce27b16f1	Remove context refernce from Chatlist See #476 aka `a0b5e32f98` for full rationale. Tl;dr it allows us to evolve the Rust API while keeping the FFI API identical.	2019-09-11 23:53:48 +02:00
Floris Bruynooghe	8302d6833d	Remove context ref from Chat struct Leaving the C API untouched. See #476 aka `a0b5e32f98` for more extensive rationale.	2019-09-11 23:53:48 +02:00
holger krekel	649c2eb676	try running qr tests in a new process instead of with all the other tests	2019-09-11 22:42:51 +02:00
Floris Bruynooghe	a0b5e32f98	Remove the context reference from Message struct The Message struct had a reference to the context which made a few APIs a little easier. However it has surprising consequences a long way down the line as shown in #335: it means any object which has such a reference needs to keep open a lock if we want to do this refactor of no longer having a "closed" Context struct on the Rust API (which has many benefits which will simply that Context struct and is more the Rust way - RAII etc). By refactoring away the context reference on the rust API as done in here however, we push this behaviour of how these references are handled back to the C-API pointer behaviour: that is unsafe but just works in a C-like way. The resulting complexity in the FFI layer is also notably less than in the #335 alternative. As a consequence all APIs which require the context, now explicitly need to get the context passed in as an argument. It looks like this is certainly no downside and maybe even beneficial for further API refactors. For this strategy to work out the same should be done to dc_chatlist_t, dc_chat_t and dc_contact_t. But this working for dc_msg_t give a reasonable confidence that this is a good approach.	2019-09-11 21:48:40 +02:00
björn petersen	e73671a6ff	Merge pull request #485 from deltachat/really-fix-477 do not panic on bad-utf-8	2019-09-11 20:14:48 +02:00
björn petersen	9503aca78d	Merge branch 'master' into really-fix-477	2019-09-11 19:52:13 +02:00
björn petersen	dfaa8e4529	Merge pull request #490 from deltachat/fix/location-sql fix(location): do not sql recurse in location sending	2019-09-11 19:40:46 +02:00
björn petersen	cbc3579e9a	Merge pull request #489 from deltachat/no-recursive-delete do not recursive delete folders	2019-09-11 19:39:15 +02:00
dignifiedquire	dd2e3d35fd	fix(location): another nesting	2019-09-11 18:13:21 +02:00
dignifiedquire	ca9dccfcd7	fix(location): another nested sql	2019-09-11 17:57:59 +02:00
dignifiedquire	64b00fce7d	fix(location): do not sql recurse in location sending	2019-09-11 17:46:05 +02:00
B. Petersen	177ab0229a	do not call fs::remove_dir_all() implicitly on non-files; deleting folders is not needed and calling remove_dir_all() is considered harmful	2019-09-11 17:02:27 +02:00
Alexander Krotov	68b5e34fed	Merge pull request #488 from KAction/transfer Reduce indentation in dc_continue_key_transfer	2019-09-11 05:36:02 +00:00
Dmitry Bogatov	2eda839303	cargo-fmt	2019-09-11 02:21:39 +00:00
Dmitry Bogatov	71a01d3002	Reduce indentation in dc_continue_key_transfer Replace `if (ok) { }` pattern with `if (!ok) return` to reduce indentation level. Note: This commit fails CI due incorrect formatting. It is done deliberately to simplify review process.	2019-09-11 02:21:39 +00:00
Alexander Krotov	995548002b	Merge pull request #484 from link2xt/safe_test_encryption_decryption Safe test encryption decryption	2019-09-11 00:43:21 +00:00
Alexander Krotov	38ad16887b	Merge pull request #487 from KAction/top_evil Minor refactoring	2019-09-11 00:42:48 +00:00
Dmitry Bogatov	c20e8f7613	Use safe version of dc_decode_header_words on one call site	2019-09-10 23:31:29 +00:00
Dmitry Bogatov	5bd4606854	Implement safe version of `dc_decode_header_words'	2019-09-10 23:26:08 +00:00
Dmitry Bogatov	e7b198849d	Copy comment for dc_encode_headers_words from C code	2019-09-10 22:49:53 +00:00
Dmitry Bogatov	3ab0d74af2	Remove unused `unsafe' block in log_event! macro	2019-09-10 22:35:54 +00:00
Dmitry Bogatov	7ed5a8e72f	Reimplement logging macros in terms of `log_event!` Avoid copy-paste message formatting code in src/log.rs, forwarding all arguments of info! warn! error! macros to generic log_event! macro.	2019-09-10 22:34:38 +00:00
Dmitry Bogatov	57daa0f7f0	Remove useless argument of logging macros Previously, logging macros (info! warn! error!) accepted integer argument (data1), that was passed to callback function verbatim. In all call sites this argument was 0. With this change, that data1 argument is no longer part of macro interface, 0 is always passed to callback in internals of these macros.	2019-09-10 22:26:47 +00:00
Dmitry Bogatov	2dd3f169db	Use set_config_bool instead of set_config_int in boolean context	2019-09-10 22:26:47 +00:00
Dmitry Bogatov	b97b618b4b	Use sql.get_config_bool to simplify `dc_is_configured`	2019-09-10 22:26:47 +00:00
Dmitry Bogatov	bb12488200	Add Sql.{set,get}_config_bool methods Previously, boolean configurations were implemented on top of i32 (get_config_int, set_config_it) at call sites. Having one canonical location, containing boolean <-> database conversion may help to avoid serialization issues.	2019-09-10 22:26:47 +00:00
Alexander Krotov	706a97b013	Move part of test_encryption_decryption to key.rs	2019-09-11 00:40:46 +03:00
Dmitry Bogatov	1cdb9c733a	Change return type of `dc_is_configured' to bool	2019-09-10 19:08:55 +00:00
holger krekel	ffc525af9e	pragmatismatic: run flaky tests three times to see if we can get more "green" CI runs this way ... thanks to @the-compiler also modernize plugin usage	2019-09-10 20:51:52 +02:00
Dmitry Bogatov	1576dc1d13	top_evil_rs: check for all-caps version of ok_to_continue pattern	2019-09-10 17:34:17 +00:00
Dmitry Bogatov	4fbb5fbb25	Make it easier to run src/top_evil_rs.py from git root Currently, `src/top_evil_rs.py' script recursively scans current directory for Rust sources and print statistics about them. When run from git root, it also scans target/ directory, which is useless. This commit add cludge that checks if script is run from git root directory, and `chdir' into `src/' before performing actions. Unprincipled, but convenient.	2019-09-10 17:34:16 +00:00
B. Petersen	e9da21a02e	cargo fmt	2019-09-10 19:14:51 +02:00
B. Petersen	6c4d7ad8cc	do not panic on bad-utf-8	2019-09-10 16:48:54 +02:00
Alexander Krotov	f1c026c5ec	Pass passphrase to dc_pgp_symm_{en,de}crypt as &str	2019-09-10 15:58:42 +02:00
björn petersen	3d61c06ea9	Merge pull request #478 from deltachat/fix477 fix crash when msg_raw is None	2019-09-10 15:50:33 +02:00
Alexander Krotov	22c1ee1f55	cargo fmt	2019-09-10 16:29:41 +03:00
Alexander Krotov	971960a242	key.rs: remove unsafe Key.from_binary	2019-09-10 16:29:24 +03:00
Alexander Krotov	69f8973339	test_encryption_decryption: use safe from_slice instead of from_binary	2019-09-10 16:29:24 +03:00
B. Petersen	bf1d9b6d06	fix crash when msg_raw is None	2019-09-10 15:20:38 +02:00
Alexander Krotov	6a2368f83c	Return bool from dc_continue_key_transfer	2019-09-10 15:15:48 +02:00
Alexander Krotov	d0960f7f7f	Merge pull request #483 from link2xt/dc_msg_exists_safe Make dc_msg_exists safe and rusty	2019-09-10 15:15:33 +03:00
Alexander Krotov	e5ad697466	Make dc_msg_exists safe and rusty	2019-09-10 14:21:27 +03:00
Alexander Krotov	188eab5faf	Fix test_encryption_decryption It is broken since `28cae607a4`	2019-09-10 12:00:59 +02:00
holger krekel	2b257e3d0d	fix ffi	2019-09-09 19:45:43 +02:00
Alexander Krotov	77c9746be5	Make dc_msg_get_filemime safe	2019-09-09 19:45:43 +02:00
Alexander Krotov	28cae607a4	Pass buffers to pgp.rs as slices	2019-09-09 18:50:47 +02:00
Simon Laux	814281ed7d	fixes #463	2019-09-09 18:44:30 +02:00
holger krekel	5b0c8dd9dd	address @r10s and @flub review comments, and fix some docstrings/test meta docs	2019-09-09 18:07:32 +02:00
holger krekel	650d8c45ec	fix test, and cleanup according profile-image API	2019-09-09 18:07:32 +02:00
holger krekel	383d8980d6	add profile image API to python, tests, Rust fixes/cleanups	2019-09-09 18:07:32 +02:00
Simon Laux	6ea706c646	remove macro	2019-09-09 18:07:32 +02:00
Simon Laux	1ed2af08b8	cargo fmt	2019-09-09 18:07:32 +02:00
Simon Laux	7563a5abe0	remove closure Co-authored-by: @Jikstra	2019-09-09 18:07:32 +02:00
Simon Laux	0a8b187f80	fix remove chat profile img	2019-09-09 18:07:32 +02:00
björn petersen	275aa853f5	Merge pull request #471 from deltachat/fix417 fix crash when downloading message	2019-09-09 16:18:50 +02:00
Friedel Ziegelmayer	3614d57f9f	Merge pull request #469 from deltachat/refctor/strencode refactor(strencode): rustify some strencode methods	2019-09-09 11:52:30 +02:00
B. Petersen	1367873949	check bounds before accessing Vec	2019-09-09 01:47:50 +02:00
B. Petersen	d933183e0a	mark safe functions as such	2019-09-09 01:47:50 +02:00
B. Petersen	7e11def527	make code more readable	2019-09-09 00:01:15 +02:00
dignifiedquire	f3e53a05a6	refactor(loginparam): rename dc_loginparam -> login_param	2019-09-08 18:48:57 +02:00
dignifiedquire	dd381a5c1c	refactor(loginparam): simplify and rustify	2019-09-08 18:48:57 +02:00
dignifiedquire	8eee449305	refactor(token): rustify	2019-09-08 18:35:20 +02:00
dignifiedquire	96e02af0da	refactor: rename dc_token to token	2019-09-08 18:35:20 +02:00
dignifiedquire	60fb1478c3	refactor(strencode): rustify some strencode methods	2019-09-08 15:50:28 +02:00
Friedel Ziegelmayer	aa7d0679df	fix(tools): make sure dc_truncate can handle arbitrary utf8 valu… (#460 ) fix(tools): make sure dc_truncate can handle arbitrary utf8 values	2019-09-08 15:23:46 +02:00
dignifiedquire	8e3cc192a5	fix(tools): make sure dc_truncate can handle arbitrary utf8 values also adds proptests to make sure this is upheld Should close #433	2019-09-08 14:00:04 +02:00
Simon Laux	0f939995d1	fix(job): "invalid job action" check	2019-09-08 13:39:59 +02:00
björn petersen	2e1bc9b14e	Merge pull request #458 from deltachat/fix-unknown fix reading unknown origin	2019-09-08 12:24:51 +02:00
Friedel Ziegelmayer	fd1ac6ab2d	Remove some free() from Mozilla autoconfig (#457 ) Remove some free() from Mozilla autoconfig	2019-09-08 11:53:41 +02:00
Friedel Ziegelmayer	d224924dc8	Change type of function from `const char ' to &str (#451 ) Change type of function from `const char ' to &str	2019-09-08 11:51:16 +02:00
dignifiedquire	00e5ddd6f0	make enum reading from the db more robust	2019-09-08 11:29:40 +02:00
B. Petersen	c603ca0e7a	remove dead code	2019-09-08 07:26:07 +02:00
B. Petersen	d07ef01204	cargo fmt	2019-09-07 23:25:19 +02:00
B. Petersen	d8630b5029	fix reading of unknown/outdated origin	2019-09-07 22:21:38 +02:00
Alexander Krotov	3b397326f8	Store email parts as Rust str's	2019-09-07 20:23:08 +03:00
Alexander Krotov	81cabd08a9	Accept str instead of char* in read_autoconf_file	2019-09-07 20:20:25 +03:00
björn petersen	5663c7dec3	Merge pull request #453 from deltachat/fix-backup Fix backup and housekeeping	2019-09-07 15:38:01 +02:00
björn petersen	06673b2108	Merge pull request #455 from deltachat/fix-msg-loading Fix msg loading	2019-09-07 15:37:38 +02:00
dignifiedquire	6b7498a4b1	fix(contact): fix logic for create or add contact Closes #448	2019-09-07 14:07:56 +02:00
B. Petersen	7f4ef493b9	be tolerant when reading unexpected NULL from the database and treat this as an empty string, compatible to core-c	2019-09-07 13:54:43 +02:00
B. Petersen	d9d0dee0d5	fix: use empty string for messages without text everywhere	2019-09-07 13:40:50 +02:00
B. Petersen	9605370f0b	fix cmdline: sendimage and sendfile really accept only a file	2019-09-07 12:34:31 +02:00
Dmitry Bogatov	7d9fc682a0	cargo-fmt	2019-09-07 03:09:01 +00:00
Dmitry Bogatov	c4c08f2552	Remove ok_to_continue pattern from msg_prepare_raw() This commit will fail CI due incorrect formatting. It is done deliberately to simplify review process.	2019-09-07 03:06:13 +00:00
Dmitry Bogatov	400740fdba	Simplify prepare_msg_raw() using early return This commit will fail CI due incorrect formatting. It is done deliberately to simplify review process.	2019-09-07 03:03:35 +00:00
Dmitry Bogatov	42bce7c0bf	Remove last C string from prepare_msg_raw()	2019-09-07 02:54:28 +00:00
Dmitry Bogatov	a2281489a6	Create safe version of msgid-generating function	2019-09-07 02:35:13 +00:00
Dmitry Bogatov	9bf7b0bf96	Use more of Rust, less of C strings in prepare_msg_raw()	2019-09-07 01:39:26 +00:00
Dmitry Bogatov	1f82ba74aa	Remove redundant checks in prepare_msg_raw()	2019-09-06 23:24:39 +00:00
Dmitry Bogatov	1062ac6ade	Drop unsafe version of `get_parent_mime_headers` function	2019-09-06 23:15:31 +00:00
Dmitry Bogatov	aa5304a4f3	Use safe version of `get_parent_mime_headers()' function	2019-09-06 23:15:31 +00:00
Dmitry Bogatov	3a57ba1142	Implement safe version of `get_parent_mime_headers' function	2019-09-06 23:15:31 +00:00
Dmitry Bogatov	c0e7293360	Change return type of clist_search_string_nocase to `bool'	2019-09-06 23:15:31 +00:00
Dmitry Bogatov	dc1839760c	Simplify clist_search_string_nocase using Iterator interface	2019-09-06 23:15:31 +00:00
Dmitry Bogatov	a4e4b0fc17	Rustify type of dc_mimeparser_t.subject	2019-09-06 23:15:31 +00:00
Dmitry Bogatov	743e4deb36	Remove dc_mimepart_unref function Since there is no longer any manually-managed memory, associated with `dc_mimepart_t' structure, default Drop instances does everything automatically.	2019-09-06 23:15:30 +00:00
Dmitry Bogatov	1d75f8478c	Rustify type of dc_mimepart_t.msg_raw	2019-09-06 23:15:27 +00:00
B. Petersen	cc0428aa50	really check all rows when searching for referenced files	2019-09-06 15:15:06 +02:00
B. Petersen	4be481275f	clearer naming	2019-09-06 14:32:17 +02:00
Dmitry Bogatov	28cfe36f43	Change type of dc_mimeparser_t.decryption_failed to bool	2019-09-06 03:48:41 +00:00
Dmitry Bogatov	e0df78c5f7	Change type of dc_mimepart_t.is_meta to bool	2019-09-06 03:41:18 +00:00
Dmitry Bogatov	4d8b058b65	Change type of dc_mimeparser_t.is_forwarded to bool	2019-09-06 03:36:54 +00:00
Dmitry Bogatov	da25611758	Change type of function from `const char *' to &str	2019-09-06 03:05:12 +00:00
B. Petersen	27732c85af	mark actually safe function as such	2019-09-06 00:55:50 +02:00
B. Petersen	5ffc84eb59	remove unused functions	2019-09-06 00:55:50 +02:00
holger krekel	0a6e540394	rename dc_securejoin to securejoin.rs	2019-09-05 22:55:25 +02:00
holger krekel	9f09c73ec1	make secure_join flow more readable by using and adding a few macros, tiny api changes	2019-09-05 22:55:25 +02:00
holger krekel	4bbab876ae	majorly de-indent code structure in secure_join by introducing cleanup function, also majorly reducing unsafety in several places	2019-09-05 22:55:25 +02:00
holger krekel	b2fafeff19	use some BOB and VC constants instead of raw numbers	2019-09-05 22:55:25 +02:00
holger krekel	79510a83de	- remove many *libc::char usages, and c-pointer from fingerprint - rustify get_chat_id_by_grpid and streamline returned chat id handling (thereby apprently fixing the test, don't ask)	2019-09-05 22:55:25 +02:00
holger krekel	dd0afdfeb0	add QR based join-group API, with test and SEGFAULT fix to rust	2019-09-05 22:55:25 +02:00
holger krekel	b6997c4455	regen constants and improve high level API for QR setup contact	2019-09-05 22:55:25 +02:00
holger krekel	2920732435	(dignifiedquire, hpk, jikstra) - fix and test peerstate::from_fingerprint - add and test python API for secure-join QR + setup-contact	2019-09-05 22:55:25 +02:00
jikstra	b9cfcce284	fix ffi	2019-09-05 22:55:25 +02:00
jikstra	70d997964b	cargo fmt	2019-09-05 22:55:25 +02:00
jikstra	4ffe71e1df	Fix encoding for email & name, fix qrencode command in repl	2019-09-05 22:55:25 +02:00
jikstra	cc2339fbe2	Fix closure in dc_securejoin, make sure we return an empty string and never null, make dc_get_securejoin_qr return an Option<String> and move the logic to cast it to c_str into the ffi	2019-09-05 22:55:25 +02:00
Alexander Krotov	8fb859c0c4	Merge pull request #445 from deltachat/smtp_error Avoid panic on SMTP error	2019-09-05 20:22:24 +00:00
jikstra	5ff472dae0	Implement helper method to easily check if a bit flag is inside listflags. Make Contact::get_all use it Add method documentation and tests	2019-09-05 18:02:50 +02:00
holger krekel	6be4a6ed00	switch to counting ok_to_continue instead of current_blocks -- this still reflects structural problems or missing-rustification problems	2019-09-05 18:00:18 +02:00
Alexander Krotov	094d46293e	Set Smtp.error when SMTP fails to send message	2019-09-05 05:29:37 +03:00
Alexander Krotov	c8d945db56	Store Smtp.error as Option<String> Without this change, when SMTP password is incorrect, as_str(sock.error) is called with a null pointer, and as_str panics. Now it does not crash when the error is not set.	2019-09-05 05:28:57 +03:00
Alexander Krotov	f78f0079c1	Upgrade to the latest version of imap crate	2019-09-04 20:59:54 +02:00
Dmitry Bogatov	98d6bdb48a	Simplify control flow in dc_DC_JOB_SEND function Replace `ok_to_continue' control flow variables with early return from function, since there is no longer need to free memory manually.	2019-09-04 16:44:51 +02:00
Dmitry Bogatov	0391aebaeb	Remove C pointer manipulation from do_DC_JOB_SEND() This change removes several `unsafe' blocks by using safe version of `dc_read_file' function. Note, that logic is changed slightly: if get(Param::File) returns Some(""), it no longer triggers "missing filename warnings".	2019-09-04 16:44:51 +02:00
Alexander Krotov	46520edd87	Print error if CAPABILITY command fails.	2019-09-04 15:12:00 +02:00
Simon Laux	14daa99802	remove ok_to_continue7 comment	2019-09-04 15:07:45 +02:00
Simon Laux	4f9f67a477	switch to while instead of loop	2019-09-04 15:07:45 +02:00
Simon Laux	85f182067c	typo fixes in comments	2019-09-04 15:07:45 +02:00
Simon Laux	66ab6874f8	reorganize dc_job_do_DC_JOB_CONFIGURE_IMAP	2019-09-04 15:07:45 +02:00
Simon Laux	906b901e3d	move function order / filestructure like in c core	2019-09-04 15:07:45 +02:00
Alexander Krotov	65adff4bdd	Merge pull request #437 from KAction/spelling Fix minor spelling errors in python/README.rst	2019-09-04 10:55:58 +00:00
Dmitry Bogatov	e60fc0dc30	Fix minor spelling errors in python/README.rst	2019-09-04 06:19:21 +00:00
Alexander Krotov	ffd719962c	Merge pull request #430 from deltachat/latest-imap Update to the latest rust-imap	2019-09-03 17:12:12 +00:00
Alexander Krotov	489f25940f	Update to the latest rust-imap It uses imap-proto 0.8.1 instead of outdated 0.7.0.	2019-09-03 19:14:56 +03:00