use defined constants

rustify dc_job_send and use a Delay enum for try_again later logic
Merge branch 'master' into refactor-jobs
2026-04-06 15:42:10 +03:00 · 2019-08-19 18:34:07 +02:00 · 2019-08-19 11:34:08 +02:00 · 2019-08-19 09:30:53 +02:00 · 2019-08-19 08:40:02 +02:00 · 2019-08-18 13:58:52 +02:00
61 changed files with 6817 additions and 12014 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,5 @@
 version: 2.1
+
 executors:
  default:
    docker:
@@ -152,12 +153,11 @@ jobs:
            - wheelhouse

  upload_docs_wheels:
-    machine: true
+    machine: True
    steps:
      - checkout
      - attach_workspace:
          at: workspace
-      - run: pyenv global 3.5.2
      - run: ls -laR workspace
      - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse

--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,3 @@ __pycache__
 python/src/deltachat/capi*.so

 python/liveconfig*
-
-# ignore doxgen generated files
-deltachat-ffi/html
-deltachat-ffi/xml
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -221,7 +221,7 @@ name = "c2-chacha"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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 +382,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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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 +401,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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -463,7 +463,6 @@ version = "1.0.0-alpha.4"
 dependencies = [
 "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.10.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)",
 "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "charset 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -474,12 +473,12 @@ 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 (git+https://github.com/jonhoo/rust-imap?rev=281d2eb8ab50dc656ceff2ae749ca5045f334e15)",
+ "imap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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)",
+ "mmime 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -949,24 +948,23 @@ dependencies = [
 [[package]]
 name = "imap"
 version = "1.0.2"
-source = "git+https://github.com/jonhoo/rust-imap?rev=281d2eb8ab50dc656ceff2ae749ca5045f334e15#281d2eb8ab50dc656ceff2ae749ca5045f334e15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 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.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)",
+ "imap-proto 0.7.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 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (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.9.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1012,7 +1010,7 @@ dependencies = [

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

 [[package]]
@@ -1032,18 +1030,6 @@ 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"
@@ -1205,13 +1191,13 @@ dependencies = [

 [[package]]
 name = "mmime"
-version = "0.1.2-alpha.0"
-source = "git+https://github.com/dignifiedquire/mmime?rev=bccd2c2#bccd2c2c89e9241e05f321c963f638affdccad96"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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)",
@@ -1222,7 +1208,7 @@ name = "native-tls"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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)",
@@ -1270,23 +1256,13 @@ 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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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)",
@@ -1361,7 +1337,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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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)",
 ]
@@ -1531,7 +1507,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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
@@ -1654,7 +1630,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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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)",
 ]
@@ -1973,7 +1949,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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.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)",
@@ -2059,7 +2035,7 @@ name = "schannel"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -2232,20 +2208,6 @@ 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"
@@ -2380,7 +2342,7 @@ name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -2456,7 +2418,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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
@@ -2601,14 +2563,6 @@ 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"
@@ -2900,17 +2854,16 @@ 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 (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 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 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 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.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "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"
@@ -2930,13 +2883,12 @@ dependencies = [
 "checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10"
 "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum mmime 0.1.2-alpha.0 (git+https://github.com/dignifiedquire/mmime?rev=bccd2c2)" = "<none>"
+"checksum mmime 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a1246fa340840c36f1fca1507db82463fbc4c2f7763fe84bfde666c7381e0593"
 "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "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"
@@ -3035,8 +2987,6 @@ 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"
@@ -3077,7 +3027,6 @@ 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"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,8 +23,8 @@ num-derive = "0.2.5"
 num-traits = "0.2.6"
 native-tls = "0.2.3"
 lettre = "0.9.0"
-imap = { git = "https://github.com/jonhoo/rust-imap", rev = "281d2eb8ab50dc656ceff2ae749ca5045f334e15" }
-mmime = { git = "https://github.com/dignifiedquire/mmime", rev = "bccd2c2" }
+imap = "1.0.1"
+mmime = "0.1.0"
 base64 = "0.10"
 charset = "0.1"
 percent-encoding = "2.0"
@@ -35,7 +35,7 @@ failure = "0.1.5"
 failure_derive = "0.1.5"
 # TODO: make optional
 rustyline = "4.1.0"
-lazy_static = "1.4.0"
+lazy_static = "1.3.0"
 regex = "1.1.6"
 rusqlite = { version = "0.20", features = ["bundled"] }
 r2d2_sqlite = "0.12.0"
@@ -49,7 +49,6 @@ itertools = "0.8.0"
 image-meta = "0.1.0"
 quick-xml = "0.15.0"
 escaper = "0.1.0"
-bitflags = "1.1.0"

 [dev-dependencies]
 tempfile = "3.0"
--- a/ci_scripts/ci_upload.sh
+++ b/ci_scripts/ci_upload.sh
@@ -34,7 +34,7 @@ echo -----------------------
 # Bundle external shared libraries into the wheels
 pushd $WHEELHOUSEDIR

-pip3 install devpi-client
+pip install devpi-client
 devpi use https://m.devpi.net
 devpi login dc --password $DEVPI_LOGIN

--- a/ci_scripts/run_all.sh
+++ b/ci_scripts/run_all.sh
@@ -41,7 +41,7 @@ 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,py27,py35,py36,py37,auditwheels
    popd
 fi

--- a/deltachat-ffi/Doxyfile
+++ b/deltachat-ffi/Doxyfile
--- a/deltachat-ffi/Doxyfile-logo.png
+++ b/deltachat-ffi/Doxyfile-logo.png
--- a/deltachat-ffi/Doxyfile.css
+++ b/deltachat-ffi/Doxyfile.css
@@ -1,7 +0,0 @@
-
-/* the code snippet frame, defaults to white which tends to get badly readable in combination with explaining text around */
-div.fragment {
-	background-color: #e0e0e0;
-	border: 0;
-	padding: 1em;
-}
--- a/deltachat-ffi/README.md
+++ b/deltachat-ffi/README.md
@@ -1,10 +1 @@
 # Delta Chat C Interface
-
-## Documentation
-
-To generate the C Interface documentation,
-call doxygen in the `deltachat-ffi` directory
-and browse the `html` subdirectory.
-
-If thinks work,
-the documentation is also available online at <https://c.delta.chat>
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -1,22 +1,20 @@
 use std::ffi::CString;
-use std::ptr;
 use std::str::FromStr;

 use deltachat::chat::{self, Chat};
 use deltachat::chatlist::*;
 use deltachat::config;
-use deltachat::configure::*;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
+use deltachat::dc_configure::*;
 use deltachat::dc_imex::*;
+use deltachat::dc_location::*;
+use deltachat::dc_msg::*;
 use deltachat::dc_receive_imf::*;
 use deltachat::dc_tools::*;
-use deltachat::error::Error;
 use deltachat::job::*;
-use deltachat::location;
 use deltachat::lot::LotState;
-use deltachat::message::*;
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::sql;
@@ -95,7 +93,7 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
 unsafe fn dc_poke_eml_file(context: &Context, filename: *const libc::c_char) -> libc::c_int {
    /* mainly for testing, may be called by dc_import_spec() */
    let mut success: libc::c_int = 0i32;
-    let mut data: *mut libc::c_char = ptr::null_mut();
+    let mut data: *mut libc::c_char = 0 as *mut libc::c_char;
    let mut data_bytes: size_t = 0;
    if !(dc_read_file(
        context,
@@ -129,7 +127,7 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
    let ok_to_continue;
    let mut success: libc::c_int = 0;
    let real_spec: *mut libc::c_char;
-    let mut suffix: *mut libc::c_char = ptr::null_mut();
+    let mut suffix: *mut libc::c_char = 0 as *mut libc::c_char;
    let mut read_cnt: libc::c_int = 0;

    /* if `spec` is given, remember it for later usage; if it is not given, try to use the last one */
@@ -212,7 +210,7 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
    success
 }

-unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
+unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: *mut dc_msg_t) {
    let contact = Contact::get_by_id(context, dc_msg_get_from_id(msg)).expect("invalid contact");
    let contact_name = contact.get_name();
    let contact_id = contact.get_id();
@@ -262,7 +260,7 @@ unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
    free(msgtext as *mut libc::c_void);
 }

-unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error> {
+unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) {
    let mut lines_out = 0;
    for &msg_id in msglist {
        if msg_id == 9 as libc::c_uint {
@@ -281,8 +279,9 @@ unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error
                );
                lines_out += 1
            }
-            let msg = dc_get_msg(context, msg_id)?;
-            log_msg(context, "Msg", &msg);
+            let msg = dc_get_msg(context, msg_id);
+            log_msg(context, "Msg", msg);
+            dc_msg_unref(msg);
        }
    }
    if lines_out > 0 {
@@ -291,7 +290,6 @@ unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error
            0, "--------------------------------------------------------------------------------"
        );
    }
-    Ok(())
 }

 unsafe fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
@@ -498,9 +496,9 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
        "get-setupcodebegin" => {
            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
            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 msg: *mut dc_msg_t = dc_get_msg(context, msg_id);
+            if dc_msg_is_setupmessage(msg) {
+                let setupcodebegin = dc_msg_get_setupcodebegin(msg);
                println!(
                    "The setup code for setup message Msg#{} starts with: {}",
                    msg_id,
@@ -510,6 +508,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            } else {
                bail!("Msg#{} is no setup message.", msg_id,);
            }
+            dc_msg_unref(msg);
        }
        "continue-key-transfer" => {
            ensure!(
@@ -527,17 +526,17 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            }
        }
        "export-backup" => {
-            dc_imex(context, 11, context.get_blobdir(), ptr::null());
+            dc_imex(context, 11, context.get_blobdir(), 0 as *const libc::c_char);
        }
        "import-backup" => {
            ensure!(!arg1.is_empty(), "Argument <backup-file> missing.");
-            dc_imex(context, 12, arg1_c, ptr::null());
+            dc_imex(context, 12, arg1_c, 0 as *const libc::c_char);
        }
        "export-keys" => {
-            dc_imex(context, 1, context.get_blobdir(), ptr::null());
+            dc_imex(context, 1, context.get_blobdir(), 0 as *const libc::c_char);
        }
        "import-keys" => {
-            dc_imex(context, 2, context.get_blobdir(), ptr::null());
+            dc_imex(context, 2, context.get_blobdir(), 0 as *const libc::c_char);
        }
        "export-setup" => {
            let setup_code = dc_create_setup_code(context);
@@ -653,7 +652,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                    );
                }
            }
-            if location::is_sending_locations_to_chat(context, 0 as uint32_t) {
+            if dc_is_sending_locations_to_chat(context, 0 as uint32_t) {
                info!(context, 0, "Location streaming enabled.");
            }
            println!("{} chats", cnt);
@@ -689,11 +688,12 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                    ""
                },
            );
-            log_msglist(context, &msglist)?;
-            if let Ok(draft) = chat::get_draft(context, sel_chat.get_id()) {
-                log_msg(context, "Draft", &draft);
+            log_msglist(context, &msglist);
+            let draft = chat::get_draft(context, sel_chat.get_id());
+            if !draft.is_null() {
+                log_msg(context, "Draft", draft);
+                dc_msg_unref(draft);
            }
-
            println!(
                "{} messages.",
                chat::get_msg_cnt(context, sel_chat.get_id())
@@ -779,17 +779,14 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            println!(
                "{} contacts\nLocation streaming: {}",
                contacts.len(),
-                location::is_sending_locations_to_chat(
-                    context,
-                    sel_chat.as_ref().unwrap().get_id()
-                ),
+                dc_is_sending_locations_to_chat(context, sel_chat.as_ref().unwrap().get_id()),
            );
        }
        "getlocations" => {
            ensure!(sel_chat.is_some(), "No chat selected.");

            let contact_id = arg1.parse().unwrap_or_default();
-            let locations = location::get_range(
+            let locations = dc_get_locations(
                context,
                sel_chat.as_ref().unwrap().get_id(),
                contact_id,
@@ -823,7 +820,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            ensure!(!arg1.is_empty(), "No timeout given.");

            let seconds = arg1.parse()?;
-            location::send_locations_to_chat(context, sel_chat.as_ref().unwrap().get_id(), seconds);
+            dc_send_locations_to_chat(context, sel_chat.as_ref().unwrap().get_id(), seconds);
            println!(
                "Locations will be sent to Chat#{} for {} seconds. Use 'setlocation <lat> <lng>' to play around.",
                sel_chat.as_ref().unwrap().get_id(),
@@ -838,7 +835,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            let latitude = arg1.parse()?;
            let longitude = arg2.parse()?;

-            let continue_streaming = location::set(context, latitude, longitude, 0.);
+            let continue_streaming = dc_set_location(context, latitude, longitude, 0.);
            if 0 != continue_streaming {
                println!("Success, streaming should be continued.");
            } else {
@@ -846,7 +843,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            }
        }
        "dellocations" => {
-            location::delete_all(context)?;
+            dc_delete_all_locations(context);
        }
        "send" => {
            ensure!(sel_chat.is_some(), "No chat selected.");
@@ -864,7 +861,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            ensure!(sel_chat.is_some(), "No chat selected.");
            ensure!(!arg1.is_empty() && !arg2.is_empty(), "No file given.");

-            let mut msg = dc_msg_new(
+            let msg_0 = dc_msg_new(
                context,
                if arg0 == "sendimage" {
                    Viewtype::Image
@@ -872,9 +869,10 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                    Viewtype::File
                },
            );
-            dc_msg_set_file(&mut msg, arg1_c, ptr::null());
-            dc_msg_set_text(&mut msg, arg2_c);
-            chat::send_msg(context, sel_chat.as_ref().unwrap().get_id(), &mut msg)?;
+            dc_msg_set_file(msg_0, arg1_c, 0 as *const libc::c_char);
+            dc_msg_set_text(msg_0, arg2_c);
+            chat::send_msg(context, sel_chat.as_ref().unwrap().get_id(), msg_0)?;
+            dc_msg_unref(msg_0);
        }
        "listmsgs" => {
            ensure!(!arg1.is_empty(), "Argument <query> missing.");
@@ -887,23 +885,24 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E

            let msglist = dc_search_msgs(context, chat, arg1_c);

-            log_msglist(context, &msglist)?;
+            log_msglist(context, &msglist);
            println!("{} messages.", msglist.len());
        }
        "draft" => {
            ensure!(sel_chat.is_some(), "No chat selected.");

            if !arg1.is_empty() {
-                let mut draft = dc_msg_new(context, Viewtype::Text);
-                dc_msg_set_text(&mut draft, arg1_c);
+                let draft_0 = dc_msg_new(context, Viewtype::Text);
+                dc_msg_set_text(draft_0, arg1_c);
+                chat::set_draft(context, sel_chat.as_ref().unwrap().get_id(), draft_0);
+                dc_msg_unref(draft_0);
+                println!("Draft saved.");
+            } else {
                chat::set_draft(
                    context,
                    sel_chat.as_ref().unwrap().get_id(),
-                    Some(&mut draft),
+                    0 as *mut dc_msg_t,
                );
-                println!("Draft saved.");
-            } else {
-                chat::set_draft(context, sel_chat.as_ref().unwrap().get_id(), None);
                println!("Draft deleted.");
            }
        }
@@ -950,7 +949,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
        "listfresh" => {
            let msglist = dc_get_fresh_msgs(context);

-            log_msglist(context, &msglist)?;
+            log_msglist(context, &msglist);
            print!("{} fresh messages.", msglist.len());
        }
        "forward" => {
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -14,20 +14,17 @@ 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};

 use deltachat::config;
-use deltachat::configure::*;
 use deltachat::constants::*;
 use deltachat::context::*;
+use deltachat::dc_configure::*;
+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,7 +384,11 @@ impl Highlighter for DcHelper {
 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()));
+    let mut context = dc_context_new(
+        Some(receive_event),
+        0 as *mut libc::c_void,
+        Some("CLI".into()),
+    );

    unsafe { dc_cmdline_skip_auth() };

@@ -494,7 +495,7 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
        }
        "configure" => {
            start_threads(ctx.clone());
-            configure(&ctx.read().unwrap());
+            dc_configure(&ctx.read().unwrap());
        }
        "oauth2" => {
            if let Some(addr) = ctx.read().unwrap().get_config(config::Config::Addr) {
@@ -518,27 +519,30 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
        }
        "getqr" | "getbadqr" => {
            start_threads(ctx.clone());
-            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")
+            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
                    }
-                    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);
+                dc_join_securejoin(&ctx.read().unwrap(), arg1_c);
            }
        }
        "exit" | "quit" => return Ok(ExitResult::Exit),
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -8,10 +8,10 @@ use tempfile::tempdir;
 use deltachat::chat;
 use deltachat::chatlist::*;
 use deltachat::config;
-use deltachat::configure::*;
 use deltachat::constants::Event;
 use deltachat::contact::*;
 use deltachat::context::*;
+use deltachat::dc_configure::*;
 use deltachat::job::{
    perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
 };
@@ -87,7 +87,7 @@ fn main() {
        ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
            .unwrap();
        ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
-        configure(&ctx);
+        dc_configure(&ctx);

        thread::sleep(duration);

--- a/python/README.rst
+++ b/python/README.rst
@@ -72,10 +72,10 @@ 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 necessary because some tests generate RSA keys
+The release mode is neccessary because some tests generate RSA keys
 which is prohibitively slow in debug mode.

-After successful binding installation you can finally run the tests::
+After succcessul 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, DCLot
+from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .chatting import Contact, Chat, Message


@@ -176,7 +176,7 @@ class Account(object):
                      whose name or e-mail matches query.
        :param only_verified: if true only return verified contacts.
        :param with_self: if true the self-contact is also returned.
-        :returns: list of :class:`deltachat.chatting.Contact` objects.
+        :returns: list of :class:`deltachat.message.Message` objects.
        """
        flags = 0
        query = as_dc_charpointer(query)
@@ -329,56 +329,6 @@ 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).

@@ -542,18 +492,3 @@ 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
@@ -131,16 +131,6 @@ 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):
--- a/python/src/deltachat/const.py
+++ b/python/src/deltachat/const.py
@@ -13,15 +13,6 @@ 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
@@ -78,13 +69,15 @@ 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_QR|DC_MSG|DC_STATE_|DC_CONTACT_ID_|DC_GCL|DC_CHAT)\S+)\s+([x\d]+).*')
+    rex = re.compile(r'#define\s+((?:DC_EVENT_|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:
@@ -97,7 +90,7 @@ if __name__ == "__main__":
    if len(sys.argv) >= 2:
        deltah = sys.argv[1]
    else:
-        deltah = joinpath(dirname(dirname(dirname(here_dir))), "deltachat-ffi", "deltachat.h")
+        deltah = joinpath(dirname(dirname(dirname(here_dir))), "src", "deltachat.h")
    assert os.path.exists(deltah)

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


 def as_dc_charpointer(obj):
@@ -18,29 +17,3 @@ 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,15 +213,6 @@ 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, wait_securejoin_inviter_progress
+from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection


 class TestOfflineAccountBasic:
@@ -140,13 +140,6 @@ 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_delete_and_send_fails(self, ac1, chat1):
        chat1.delete()
        ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -313,16 +306,6 @@ 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):
@@ -563,29 +546,3 @@ 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)
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
+    py27
    py35
    lint
    auditwheels
--- a/src/chat.rs
+++ b/src/chat.rs
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -2,9 +2,9 @@ use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::*;
+use crate::dc_msg::*;
 use crate::error::Result;
 use crate::lot::Lot;
-use crate::message::*;
 use crate::stock::StockMessage;

 /// An object representing a single chatlist in memory.
@@ -195,9 +195,9 @@ impl<'a> Chatlist<'a> {

        if 0 != add_archived_link_item && dc_get_archived_cnt(context) > 0 {
            if ids.is_empty() && 0 != listflags & DC_GCL_ADD_ALLDONE_HINT {
-                ids.push((DC_CHAT_ID_ALLDONE_HINT, 0));
+                ids.push((DC_CHAT_ID_ALLDONE_HINT as u32, 0));
            }
-            ids.push((DC_CHAT_ID_ARCHIVED_LINK, 0));
+            ids.push((DC_CHAT_ID_ARCHIVED_LINK as u32, 0));
        }

        Ok(Chatlist { context, ids })
@@ -247,7 +247,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 unsafe fn get_summary(&self, index: usize, chat: Option<&Chat<'a>>) -> 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".
@@ -275,35 +275,29 @@ 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 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();
-                }
+            let lastmsg = dc_msg_new_untyped(self.context);
+            dc_msg_load_from_db(lastmsg, self.context, lastmsg_id);

-                Some(lastmsg)
-            } else {
-                None
+            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();
            }
+            lastmsg
        } else {
-            None
+            std::ptr::null_mut()
        };

-        if chat.id == DC_CHAT_ID_ARCHIVED_LINK {
+        if chat.id == DC_CHAT_ID_ARCHIVED_LINK as u32 {
            ret.text2 = None;
-        } else if lastmsg.is_none() || lastmsg.as_ref().unwrap().from_id == DC_CONTACT_ID_UNDEFINED
-        {
+        } else if lastmsg.is_null() || (*lastmsg).from_id == DC_CONTACT_ID_UNDEFINED as u32 {
            ret.text2 = Some(self.context.stock_str(StockMessage::NoMessages).to_string());
        } else {
-            ret.fill(
-                &mut lastmsg.unwrap(),
-                chat,
-                lastcontact.as_ref(),
-                self.context,
-            );
+            ret.fill(lastmsg, chat, lastcontact.as_ref(), self.context);
        }

+        dc_msg_unref(lastmsg);
+
        ret
    }
 }
--- a/src/config.rs
+++ b/src/config.rs
@@ -33,7 +33,6 @@ pub enum Config {
    E2eeEnabled,
    #[strum(props(default = "1"))]
    MdnsEnabled,
-    #[strum(props(default = "1"))]
    InboxWatch,
    #[strum(props(default = "1"))]
    SentboxWatch,
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -1,224 +0,0 @@
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
-
-use crate::context::Context;
-use crate::dc_loginparam::*;
-use crate::dc_tools::*;
-use crate::x::*;
-
-use super::read_autoconf_file;
-/* ******************************************************************************
- * Thunderbird's Autoconfigure
- ******************************************************************************/
-/* 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 out_imap_set: libc::c_int,
-    pub out_smtp_set: libc::c_int,
-    pub tag_server: libc::c_int,
-    pub tag_config: libc::c_int,
-}
-
-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);
-    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() {
-        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 mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
-    reader.trim_text(true);
-
-    let mut buf = Vec::new();
-
-    loop {
-        match reader.read_event(&mut buf) {
-            Ok(quick_xml::events::Event::Start(ref e)) => {
-                moz_autoconfigure_starttag_cb(e, &mut moz_ac, &reader)
-            }
-            Ok(quick_xml::events::Event::End(ref e)) => moz_autoconfigure_endtag_cb(e, &mut moz_ac),
-            Ok(quick_xml::events::Event::Text(ref e)) => {
-                moz_autoconfigure_text_cb(e, &mut moz_ac, &reader)
-            }
-            Err(e) => {
-                error!(
-                    context,
-                    0,
-                    "Configure xml: Error at position {}: {:?}",
-                    reader.buffer_position(),
-                    e
-                );
-            }
-            Ok(quick_xml::events::Event::Eof) => break,
-            _ => (),
-        }
-        buf.clear();
-    }
-
-    if moz_ac.out.mail_server.is_empty()
-        || moz_ac.out.mail_port == 0
-        || 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,);
-        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)
-}
-
-fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
-    event: &BytesText,
-    moz_ac: &mut moz_autoconfigure_t,
-    reader: &quick_xml::Reader<B>,
-) {
-    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 val = val
-        .trim()
-        .replace("%EMAILADDRESS%", addr)
-        .replace("%EMAILLOCALPART%", email_local)
-        .replace("%EMAILDOMAIN%", email_domain);
-
-    if moz_ac.tag_server == 1 {
-        match moz_ac.tag_config {
-            10 => moz_ac.out.mail_server = val,
-            11 => moz_ac.out.mail_port = val.parse().unwrap_or_default(),
-            12 => moz_ac.out.mail_user = val,
-            13 => {
-                let val_lower = val.to_lowercase();
-                if val_lower == "ssl" {
-                    moz_ac.out.server_flags |= 0x200
-                }
-                if val_lower == "starttls" {
-                    moz_ac.out.server_flags |= 0x100
-                }
-                if val_lower == "plain" {
-                    moz_ac.out.server_flags |= 0x400
-                }
-            }
-            _ => {}
-        }
-    } else if moz_ac.tag_server == 2 {
-        match moz_ac.tag_config {
-            10 => moz_ac.out.send_server = val,
-            11 => moz_ac.out.send_port = val.parse().unwrap_or_default(),
-            12 => moz_ac.out.send_user = val,
-            13 => {
-                let val_lower = val.to_lowercase();
-                if val_lower == "ssl" {
-                    moz_ac.out.server_flags |= 0x20000
-                }
-                if val_lower == "starttls" {
-                    moz_ac.out.server_flags |= 0x10000
-                }
-                if val_lower == "plain" {
-                    moz_ac.out.server_flags |= 0x40000
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-fn moz_autoconfigure_endtag_cb(event: &BytesEnd, moz_ac: &mut moz_autoconfigure_t) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "incomingserver" {
-        moz_ac.tag_server = 0;
-        moz_ac.tag_config = 0;
-        moz_ac.out_imap_set = 1;
-    } else if tag == "outgoingserver" {
-        moz_ac.tag_server = 0;
-        moz_ac.tag_config = 0;
-        moz_ac.out_smtp_set = 1;
-    } else {
-        moz_ac.tag_config = 0;
-    }
-}
-
-fn moz_autoconfigure_starttag_cb<B: std::io::BufRead>(
-    event: &BytesStart,
-    moz_ac: &mut moz_autoconfigure_t,
-    reader: &quick_xml::Reader<B>,
-) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "incomingserver" {
-        moz_ac.tag_server = if let Some(typ) = event.attributes().find(|attr| {
-            attr.as_ref()
-                .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "type")
-                .unwrap_or_default()
-        }) {
-            let typ = typ
-                .unwrap()
-                .unescape_and_decode_value(reader)
-                .unwrap_or_default()
-                .to_lowercase();
-
-            if typ == "imap" && moz_ac.out_imap_set == 0 {
-                1
-            } else {
-                0
-            }
-        } else {
-            0
-        };
-        moz_ac.tag_config = 0;
-    } else if tag == "outgoingserver" {
-        moz_ac.tag_server = if moz_ac.out_smtp_set == 0 { 2 } else { 0 };
-        moz_ac.tag_config = 0;
-    } else if tag == "hostname" {
-        moz_ac.tag_config = 10;
-    } else if tag == "port" {
-        moz_ac.tag_config = 11;
-    } else if tag == "sockettype" {
-        moz_ac.tag_config = 13;
-    } else if tag == "username" {
-        moz_ac.tag_config = 12;
-    }
-}
--- a/src/configure/auto_outlook.rs
+++ b/src/configure/auto_outlook.rs
@@ -1,213 +0,0 @@
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
-
-use crate::context::Context;
-use crate::dc_loginparam::*;
-use crate::dc_tools::*;
-use crate::x::*;
-use std::ptr;
-
-use super::read_autoconf_file;
-/* ******************************************************************************
- * Outlook's Autodiscover
- ******************************************************************************/
-#[repr(C)]
-struct outlk_autodiscover_t<'a> {
-    pub in_0: &'a dc_loginparam_t,
-    pub out: dc_loginparam_t,
-    pub out_imap_set: libc::c_int,
-    pub out_smtp_set: libc::c_int,
-    pub tag_config: libc::c_int,
-    pub config: [*mut libc::c_char; 6],
-    pub redirect: *mut libc::c_char,
-}
-
-pub unsafe fn outlk_autodiscover(
-    context: &Context,
-    url__: &str,
-    param_in: &dc_loginparam_t,
-) -> Option<dc_loginparam_t> {
-    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_imap_set: 0,
-        out_smtp_set: 0,
-        tag_config: 0,
-        config: [ptr::null_mut(); 6],
-        redirect: ptr::null_mut(),
-    };
-    let ok_to_continue;
-    let mut i = 0;
-    loop {
-        if !(i < 10) {
-            ok_to_continue = true;
-            break;
-        }
-        memset(
-            &mut outlk_ad as *mut outlk_autodiscover_t as *mut libc::c_void,
-            0,
-            ::std::mem::size_of::<outlk_autodiscover_t>(),
-        );
-        xml_raw = read_autoconf_file(context, url);
-        if xml_raw.is_null() {
-            ok_to_continue = false;
-            break;
-        }
-
-        let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
-        reader.trim_text(true);
-
-        let mut buf = Vec::new();
-
-        loop {
-            match reader.read_event(&mut buf) {
-                Ok(quick_xml::events::Event::Start(ref e)) => {
-                    outlk_autodiscover_starttag_cb(e, &mut outlk_ad)
-                }
-                Ok(quick_xml::events::Event::End(ref e)) => {
-                    outlk_autodiscover_endtag_cb(e, &mut outlk_ad)
-                }
-                Ok(quick_xml::events::Event::Text(ref e)) => {
-                    outlk_autodiscover_text_cb(e, &mut outlk_ad, &reader)
-                }
-                Err(e) => {
-                    error!(
-                        context,
-                        0,
-                        "Configure xml: Error at position {}: {:?}",
-                        reader.buffer_position(),
-                        e
-                    );
-                }
-                Ok(quick_xml::events::Event::Eof) => break,
-                _ => (),
-            }
-            buf.clear();
-        }
-
-        if !(!outlk_ad.config[5].is_null()
-            && 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int)
-        {
-            ok_to_continue = true;
-            break;
-        }
-        free(url as *mut libc::c_void);
-        url = dc_strdup(outlk_ad.config[5usize]);
-
-        outlk_clean_config(&mut outlk_ad);
-        free(xml_raw as *mut libc::c_void);
-        xml_raw = ptr::null_mut();
-        i += 1;
-    }
-
-    if ok_to_continue {
-        if outlk_ad.out.mail_server.is_empty()
-            || outlk_ad.out.mail_port == 0
-            || 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,);
-            free(url as *mut libc::c_void);
-            free(xml_raw as *mut libc::c_void);
-            outlk_clean_config(&mut outlk_ad);
-
-            return None;
-        }
-    }
-    free(url as *mut libc::c_void);
-    free(xml_raw as *mut libc::c_void);
-    outlk_clean_config(&mut outlk_ad);
-    Some(outlk_ad.out)
-}
-
-unsafe fn outlk_clean_config(mut outlk_ad: *mut outlk_autodiscover_t) {
-    for i in 0..6 {
-        free((*outlk_ad).config[i] as *mut libc::c_void);
-        (*outlk_ad).config[i] = ptr::null_mut();
-    }
-}
-
-fn outlk_autodiscover_text_cb<B: std::io::BufRead>(
-    event: &BytesText,
-    outlk_ad: &mut outlk_autodiscover_t,
-    reader: &quick_xml::Reader<B>,
-) {
-    let val = event.unescape_and_decode(reader).unwrap_or_default();
-
-    unsafe {
-        free(outlk_ad.config[outlk_ad.tag_config as usize].cast());
-        outlk_ad.config[outlk_ad.tag_config as usize] = val.trim().strdup();
-    }
-}
-
-unsafe fn outlk_autodiscover_endtag_cb(event: &BytesEnd, outlk_ad: &mut outlk_autodiscover_t) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "protocol" {
-        if !outlk_ad.config[1].is_null() {
-            let port = dc_atoi_null_is_0(outlk_ad.config[3]);
-            let ssl_on = (!outlk_ad.config[4].is_null()
-                && strcasecmp(
-                    outlk_ad.config[4],
-                    b"on\x00" as *const u8 as *const libc::c_char,
-                ) == 0) as libc::c_int;
-            let ssl_off = (!outlk_ad.config[4].is_null()
-                && strcasecmp(
-                    outlk_ad.config[4],
-                    b"off\x00" as *const u8 as *const libc::c_char,
-                ) == 0) as libc::c_int;
-            if strcasecmp(
-                outlk_ad.config[1],
-                b"imap\x00" as *const u8 as *const libc::c_char,
-            ) == 0
-                && outlk_ad.out_imap_set == 0
-            {
-                outlk_ad.out.mail_server = to_string(outlk_ad.config[2]);
-                outlk_ad.out.mail_port = port;
-                if 0 != ssl_on {
-                    outlk_ad.out.server_flags |= 0x200
-                } else if 0 != ssl_off {
-                    outlk_ad.out.server_flags |= 0x400
-                }
-                outlk_ad.out_imap_set = 1
-            } else if strcasecmp(
-                outlk_ad.config[1usize],
-                b"smtp\x00" as *const u8 as *const libc::c_char,
-            ) == 0
-                && outlk_ad.out_smtp_set == 0
-            {
-                outlk_ad.out.send_server = to_string(outlk_ad.config[2]);
-                outlk_ad.out.send_port = port;
-                if 0 != ssl_on {
-                    outlk_ad.out.server_flags |= 0x20000
-                } else if 0 != ssl_off {
-                    outlk_ad.out.server_flags |= 0x40000
-                }
-                outlk_ad.out_smtp_set = 1
-            }
-        }
-        outlk_clean_config(outlk_ad);
-    }
-    outlk_ad.tag_config = 0;
-}
-
-fn outlk_autodiscover_starttag_cb(event: &BytesStart, outlk_ad: &mut outlk_autodiscover_t) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "protocol" {
-        unsafe { outlk_clean_config(outlk_ad) };
-    } else if tag == "type" {
-        outlk_ad.tag_config = 1
-    } else if tag == "server" {
-        outlk_ad.tag_config = 2
-    } else if tag == "port" {
-        outlk_ad.tag_config = 3
-    } else if tag == "ssl" {
-        outlk_ad.tag_config = 4
-    } else if tag == "redirecturl" {
-        outlk_ad.tag_config = 5
-    };
-}
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -1,681 +0,0 @@
-use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
-
-use crate::constants::Event;
-use crate::constants::DC_CREATE_MVBOX;
-use crate::context::Context;
-use crate::dc_loginparam::*;
-use crate::dc_tools::*;
-use crate::e2ee;
-use crate::imap::*;
-use crate::job::*;
-use crate::oauth2::*;
-use crate::param::Params;
-use crate::types::*;
-
-mod auto_outlook;
-use auto_outlook::outlk_autodiscover;
-mod auto_mozilla;
-use auto_mozilla::moz_autoconfigure;
-
-macro_rules! progress {
-    ($context:tt, $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::CONFIGURE_PROGRESS,
-            $progress as uintptr_t,
-            0 as uintptr_t,
-        );
-    };
-}
-
-// connect
-pub unsafe fn configure(context: &Context) {
-    if dc_has_ongoing(context) {
-        warn!(
-            context,
-            0, "There is already another ongoing process running.",
-        );
-        return;
-    }
-    job_kill_action(context, Action::ConfigureImap);
-    job_add(context, Action::ConfigureImap, 0, Params::new(), 0);
-}
-
-/// Check if the context is already configured.
-pub fn dc_is_configured(context: &Context) -> libc::c_int {
-    if context
-        .sql
-        .get_config_int(context, "configured")
-        .unwrap_or_default()
-        > 0
-    {
-        1
-    } else {
-        0
-    }
-}
-
-/*******************************************************************************
- * Configure JOB
- ******************************************************************************/
-// the other dc_job_do_DC_JOB_*() functions are declared static in the c-file
-#[allow(non_snake_case, unused_must_use)]
-pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: &Job) {
-    let mut success = false;
-    let mut imap_connected_here = false;
-    let mut smtp_connected_here = false;
-    let mut ongoing_allocated_here = false;
-
-    let mut param_autoconfig: Option<dc_loginparam_t> = None;
-    if dc_alloc_ongoing(context) {
-        ongoing_allocated_here = true;
-        if !context.sql.is_open() {
-            error!(context, 0, "Cannot configure, database not opened.",);
-        } else {
-            context.inbox.read().unwrap().disconnect(context);
-            context
-                .sentbox_thread
-                .read()
-                .unwrap()
-                .imap
-                .disconnect(context);
-            context
-                .mvbox_thread
-                .read()
-                .unwrap()
-                .imap
-                .disconnect(context);
-            context.smtp.clone().lock().unwrap().disconnect();
-            info!(context, 0, "Configure ...",);
-
-            let s_a = context.running_state.clone();
-            let s = s_a.read().unwrap();
-
-            // Variables that are shared between steps:
-            let mut param: dc_loginparam_t = dc_loginparam_read(context, &context.sql, "");
-            // need all vars here to be mutable because rust thinks the same step could be called multiple times
-            // and also initialize, because otherwise rust thinks it's used while unitilized, even if thats not the case as the loop goes only forward
-            let mut param_domain = "undefined.undefined".to_owned();
-            let mut param_addr_urlencoded: String =
-                "Internal Error: this value should never be used".to_owned();
-            let mut keep_flags = std::i32::MAX;
-
-            const STEP_3_INDEX: u8 = 13;
-            let mut step_counter: u8 = 0;
-            while !s.shall_stop_ongoing {
-                step_counter = step_counter + 1;
-
-                let success = match step_counter {
-                    // Read login parameters from the database
-                    1 => {
-                        progress!(context, 1);
-                        if param.addr.is_empty() {
-                            error!(context, 0, "Please enter an email address.",);
-                        }
-                        !param.addr.is_empty()
-                    }
-                    // Step 1: Load the parameters and check email-address and password
-                    2 => {
-                        if 0 != param.server_flags & 0x2 {
-                            // the used oauth2 addr may differ, check this.
-                            // if dc_get_oauth2_addr() is not available in the oauth2 implementation,
-                            // just use the given one.
-                            progress!(context, 10);
-                            if let Some(oauth2_addr) =
-                                dc_get_oauth2_addr(context, &param.addr, &param.mail_pw)
-                                    .and_then(|e| e.parse().ok())
-                            {
-                                param.addr = oauth2_addr;
-                                context
-                                    .sql
-                                    .set_config(context, "addr", Some(param.addr.as_str()))
-                                    .ok();
-                            }
-                            progress!(context, 20);
-                        }
-                        true // no oauth? - just continue it's no error
-                    }
-                    3 => {
-                        if let Ok(parsed) = param.addr.parse() {
-                            let parsed: EmailAddress = parsed;
-                            param_domain = parsed.domain;
-                            param_addr_urlencoded =
-                                utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();
-                            true
-                        } else {
-                            error!(context, 0, "Bad email-address.");
-                            false
-                        }
-                    }
-                    // Step 2: Autoconfig
-                    4 => {
-                        progress!(context, 200);
-                        if param.mail_server.is_empty()
-                            && param.mail_port == 0
-                            /*&&param.mail_user.is_empty() -- the user can enter a loginname which is used by autoconfig then */
-                            && param.send_server.is_empty()
-                            && param.send_port == 0
-                            && param.send_user.is_empty()
-                            /*&&param.send_pw.is_empty() -- the password cannot be auto-configured and is no criterion for autoconfig or not */
-                            && param.server_flags & !0x2 == 0
-                        {
-                            keep_flags = param.server_flags & 0x2;
-                        } else {
-                            // Autoconfig is not needed so skip it.
-                            step_counter = STEP_3_INDEX - 1;
-                        }
-                        true
-                    }
-                    /* A.  Search configurations from the domain used in the email-address, prefer encrypted */
-                    5 => {
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "https://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
-                                param_domain, param_addr_urlencoded
-                            );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    6 => {
-                        progress!(context, 300);
-                        if param_autoconfig.is_none() {
-                            // the doc does not mention `emailaddress=`, however, Thunderbird adds it, see https://releases.mozilla.org/pub/thunderbird/ ,  which makes some sense
-                            let url = format!(
-                                            "https://{}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={}",
-                                            param_domain,
-                                            param_addr_urlencoded
-                                        );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* Outlook section start ------------- */
-                    /* Outlook uses always SSL but different domains (this comment describes the next two steps) */
-                    7 => {
-                        progress!(context, 310);
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "https://{}{}/autodiscover/autodiscover.xml",
-                                "", param_domain
-                            );
-                            param_autoconfig = outlk_autodiscover(context, &url, &param);
-                        }
-                        true
-                    }
-                    8 => {
-                        progress!(context, 320);
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "https://{}{}/autodiscover/autodiscover.xml",
-                                "autodiscover.", param_domain
-                            );
-                            param_autoconfig = outlk_autodiscover(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* ----------- Outlook section end */
-                    9 => {
-                        progress!(context, 330);
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
-                                param_domain, param_addr_urlencoded
-                            );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    10 => {
-                        progress!(context, 340);
-                        if param_autoconfig.is_none() {
-                            // do not transfer the email-address unencrypted
-                            let url = format!(
-                                "http://{}/.well-known/autoconfig/mail/config-v1.1.xml",
-                                param_domain
-                            );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* B.  If we have no configuration yet, search configuration in Thunderbird's centeral database */
-                    11 => {
-                        progress!(context, 350);
-                        if param_autoconfig.is_none() {
-                            /* always SSL for Thunderbird's database */
-                            let url =
-                                format!("https://autoconfig.thunderbird.net/v1.1/{}", param_domain);
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* C.  Do we have any result? */
-                    12 => {
-                        progress!(context, 500);
-                        if let Some(ref cfg) = param_autoconfig {
-                            let r = dc_loginparam_get_readable(cfg);
-                            info!(context, 0, "Got autoconfig: {}", r);
-                            if !cfg.mail_user.is_empty() {
-                                param.mail_user = cfg.mail_user.clone();
-                            }
-                            param.mail_server = cfg.mail_server.clone(); /* all other values are always NULL when entering autoconfig */
-                            param.mail_port = cfg.mail_port;
-                            param.send_server = cfg.send_server.clone();
-                            param.send_port = cfg.send_port;
-                            param.send_user = cfg.send_user.clone();
-                            param.server_flags = cfg.server_flags;
-                            /* although param_autoconfig's data are no longer needed from, it is important to keep the object as
-                            we may enter "deep guessing" if we could not read a configuration */
-                        }
-                        param.server_flags |= keep_flags;
-                        true
-                    }
-                    // Step 3: Fill missing fields with defaults
-                    13 => {
-                        // if you move this, don't forget to update STEP_3_INDEX, too
-                        if param.mail_server.is_empty() {
-                            param.mail_server = format!("imap.{}", param_domain,)
-                        }
-                        if param.mail_port == 0 {
-                            param.mail_port = if 0 != param.server_flags & (0x100 | 0x400) {
-                                143
-                            } else {
-                                993
-                            }
-                        }
-                        if param.mail_user.is_empty() {
-                            param.mail_user = param.addr.clone();
-                        }
-                        if param.send_server.is_empty() && !param.mail_server.is_empty() {
-                            param.send_server = param.mail_server.clone();
-                            if param.send_server.starts_with("imap.") {
-                                param.send_server = param.send_server.replacen("imap", "smtp", 1);
-                            }
-                        }
-                        if param.send_port == 0 {
-                            param.send_port = if 0 != param.server_flags & 0x10000 {
-                                587
-                            } else if 0 != param.server_flags & 0x40000 {
-                                25
-                            } else {
-                                465
-                            }
-                        }
-                        if param.send_user.is_empty() && !param.mail_user.is_empty() {
-                            param.send_user = param.mail_user.clone();
-                        }
-                        if param.send_pw.is_empty() && !param.mail_pw.is_empty() {
-                            param.send_pw = param.mail_pw.clone()
-                        }
-                        if !dc_exactly_one_bit_set(param.server_flags & (0x2 | 0x4)) {
-                            param.server_flags &= !(0x2 | 0x4);
-                            param.server_flags |= 0x4
-                        }
-                        if !dc_exactly_one_bit_set(param.server_flags & (0x100 | 0x200 | 0x400)) {
-                            param.server_flags &= !(0x100 | 0x200 | 0x400);
-                            param.server_flags |= if param.send_port == 143 { 0x100 } else { 0x200 }
-                        }
-                        if !dc_exactly_one_bit_set(
-                            param.server_flags & (0x10000 | 0x20000 | 0x40000),
-                        ) {
-                            param.server_flags &= !(0x10000 | 0x20000 | 0x40000);
-                            param.server_flags |= if param.send_port == 587 {
-                                0x10000
-                            } else if param.send_port == 25 {
-                                0x40000
-                            } else {
-                                0x20000
-                            }
-                        }
-                        /* do we have a complete configuration? */
-                        if param.mail_server.is_empty()
-                            || param.mail_port == 0
-                            || param.mail_user.is_empty()
-                            || param.mail_pw.is_empty()
-                            || param.send_server.is_empty()
-                            || param.send_port == 0
-                            || param.send_user.is_empty()
-                            || param.send_pw.is_empty()
-                            || param.server_flags == 0
-                        {
-                            error!(context, 0, "Account settings incomplete.");
-                            false
-                        } else {
-                            true
-                        }
-                    }
-                    14 => {
-                        progress!(context, 600);
-                        /* try to connect to IMAP - if we did not got an autoconfig,
-                        do some further tries with different settings and username variations */
-                        let ok_to_continue8;
-                        let mut username_variation = 0;
-                        loop {
-                            if !(username_variation <= 1) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            let r_0 = dc_loginparam_get_readable(&param);
-                            info!(context, 0, "Trying: {}", r_0,);
-
-                            if context.inbox.read().unwrap().connect(context, &param) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            if !param_autoconfig.is_none() {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            // probe STARTTLS/993
-                            if s.shall_stop_ongoing {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            progress!(context, 650 + username_variation * 30);
-                            param.server_flags &= !(0x100 | 0x200 | 0x400);
-                            param.server_flags |= 0x100;
-                            let r_1 = dc_loginparam_get_readable(&param);
-                            info!(context, 0, "Trying: {}", r_1,);
-
-                            if context.inbox.read().unwrap().connect(context, &param) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            // probe STARTTLS/143
-                            if s.shall_stop_ongoing {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            progress!(context, 660 + username_variation * 30);
-                            param.mail_port = 143;
-                            let r_2 = dc_loginparam_get_readable(&param);
-                            info!(context, 0, "Trying: {}", r_2,);
-
-                            if context.inbox.read().unwrap().connect(context, &param) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            if 0 != username_variation {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            // next probe round with only the localpart of the email-address as the loginname
-                            if s.shall_stop_ongoing {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            progress!(context, 670 + username_variation * 30);
-                            param.server_flags &= !(0x100 | 0x200 | 0x400);
-                            param.server_flags |= 0x200;
-                            param.mail_port = 993;
-
-                            if let Some(at) = param.mail_user.find('@') {
-                                param.mail_user = param.mail_user.split_at(at).0.to_string();
-                            }
-                            if let Some(at) = param.send_user.find('@') {
-                                param.send_user = param.send_user.split_at(at).0.to_string();
-                            }
-
-                            username_variation += 1
-                        }
-                        if ok_to_continue8 {
-                            // success, so we are connected and should disconnect in cleanup
-                            imap_connected_here = true;
-                        }
-                        ok_to_continue8
-                    }
-                    15 => {
-                        progress!(context, 800);
-                        let success;
-                        /* try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do a second try with STARTTLS-587 */
-                        if !context
-                            .smtp
-                            .clone()
-                            .lock()
-                            .unwrap()
-                            .connect(context, &param)
-                        {
-                            if !param_autoconfig.is_none() {
-                                success = false;
-                            } else if s.shall_stop_ongoing {
-                                success = false;
-                            } else {
-                                progress!(context, 850);
-                                param.server_flags &= !(0x10000 | 0x20000 | 0x40000);
-                                param.server_flags |= 0x10000;
-                                param.send_port = 587;
-                                let r_3 = dc_loginparam_get_readable(&param);
-                                info!(context, 0, "Trying: {}", r_3,);
-
-                                if !context
-                                    .smtp
-                                    .clone()
-                                    .lock()
-                                    .unwrap()
-                                    .connect(context, &param)
-                                {
-                                    if s.shall_stop_ongoing {
-                                        success = false;
-                                    } else {
-                                        progress!(context, 860);
-                                        param.server_flags &= !(0x10000 | 0x20000 | 0x40000);
-                                        param.server_flags |= 0x10000;
-                                        param.send_port = 25;
-                                        let r_4 = dc_loginparam_get_readable(&param);
-                                        info!(context, 0, "Trying: {}", r_4);
-
-                                        if !context
-                                            .smtp
-                                            .clone()
-                                            .lock()
-                                            .unwrap()
-                                            .connect(context, &param)
-                                        {
-                                            success = false;
-                                        } else {
-                                            success = true;
-                                        }
-                                    }
-                                } else {
-                                    success = true;
-                                }
-                            }
-                        } else {
-                            success = true;
-                        }
-                        if success {
-                            smtp_connected_here = true;
-                        }
-                        success
-                    }
-                    16 => {
-                        progress!(context, 900);
-                        let flags: libc::c_int = if 0
-                            != context
-                                .sql
-                                .get_config_int(context, "mvbox_watch")
-                                .unwrap_or_else(|| 1)
-                            || 0 != context
-                                .sql
-                                .get_config_int(context, "mvbox_move")
-                                .unwrap_or_else(|| 1)
-                        {
-                            DC_CREATE_MVBOX as i32
-                        } else {
-                            0
-                        };
-                        context
-                            .inbox
-                            .read()
-                            .unwrap()
-                            .configure_folders(context, flags);
-                        true
-                    }
-                    17 => {
-                        progress!(context, 910);
-                        /* configuration success - write back the configured parameters with the "configured_" prefix; also write the "configured"-flag */
-                        dc_loginparam_write(
-                            context,
-                            &param,
-                            &context.sql,
-                            "configured_", /*the trailing underscore is correct*/
-                        );
-                        context.sql.set_config_int(context, "configured", 1).ok();
-                        true
-                    }
-                    18 => {
-                        progress!(context, 920);
-                        // we generate the keypair just now - we could also postpone this until the first message is sent, however,
-                        // this may result in a unexpected and annoying delay when the user sends his very first message
-                        // (~30 seconds on a Moto G4 play) and might looks as if message sending is always that slow.
-                        e2ee::ensure_secret_key_exists(context);
-                        success = true;
-                        info!(context, 0, "Configure completed.");
-                        progress!(context, 940);
-                        break; // We are done here
-                    }
-
-                    _ => {
-                        error!(context, 0, "Internal error: step counter out of bound",);
-                        break;
-                    }
-                };
-
-                if !success {
-                    break;
-                }
-            }
-        }
-    }
-    if imap_connected_here {
-        context.inbox.read().unwrap().disconnect(context);
-    }
-    if smtp_connected_here {
-        context.smtp.clone().lock().unwrap().disconnect();
-    }
-
-    /*
-    if !success {
-        // disconnect if configure did not succeed
-        if imap_connected_here {
-            // context.inbox.read().unwrap().disconnect(context);
-        }
-        if smtp_connected_here {
-            // context.smtp.clone().lock().unwrap().disconnect();
-        }
-    } else {
-        assert!(imap_connected_here && smtp_connected_here);
-        info!(
-            context,
-            0, "Keeping IMAP/SMTP connections open after successful configuration"
-        );
-    }
-    */
-    if ongoing_allocated_here {
-        dc_free_ongoing(context);
-    }
-
-    progress!(context, (if success { 1000 } else { 0 }));
-}
-
-/*******************************************************************************
- * Ongoing process allocation/free/check
- ******************************************************************************/
-
-pub fn dc_alloc_ongoing(context: &Context) -> bool {
-    if dc_has_ongoing(context) {
-        warn!(
-            context,
-            0, "There is already another ongoing process running.",
-        );
-
-        false
-    } else {
-        let s_a = context.running_state.clone();
-        let mut s = s_a.write().unwrap();
-
-        s.ongoing_running = true;
-        s.shall_stop_ongoing = false;
-
-        true
-    }
-}
-
-pub fn dc_free_ongoing(context: &Context) {
-    let s_a = context.running_state.clone();
-    let mut s = s_a.write().unwrap();
-
-    s.ongoing_running = false;
-    s.shall_stop_ongoing = true;
-}
-
-fn dc_has_ongoing(context: &Context) -> bool {
-    let s_a = context.running_state.clone();
-    let s = s_a.read().unwrap();
-
-    s.ongoing_running || !s.shall_stop_ongoing
-}
-
-/*******************************************************************************
- * Connect to configured account
- ******************************************************************************/
-pub fn dc_connect_to_configured_imap(context: &Context, imap: &Imap) -> libc::c_int {
-    let mut ret_connected = 0;
-
-    if imap.is_connected() {
-        ret_connected = 1
-    } else if context
-        .sql
-        .get_config_int(context, "configured")
-        .unwrap_or_default()
-        == 0
-    {
-        warn!(context, 0, "Not configured, cannot connect.",);
-    } else {
-        let param = dc_loginparam_read(context, &context.sql, "configured_");
-        // the trailing underscore is correct
-
-        if imap.connect(context, &param) {
-            ret_connected = 2;
-        }
-    }
-
-    ret_connected
-}
-
-/*******************************************************************************
- * Configure a Context
- ******************************************************************************/
-
-/// Signal an ongoing process to stop.
-pub fn dc_stop_ongoing_process(context: &Context) {
-    let s_a = context.running_state.clone();
-    let mut s = s_a.write().unwrap();
-
-    if s.ongoing_running && !s.shall_stop_ongoing {
-        info!(context, 0, "Signaling the ongoing process to stop ASAP.",);
-        s.shall_stop_ongoing = true;
-    } else {
-        info!(context, 0, "No ongoing process to stop.",);
-    };
-}
-
-pub fn read_autoconf_file(context: &Context, url: *const libc::c_char) -> *mut libc::c_char {
-    info!(context, 0, "Testing {} ...", to_string(url));
-
-    match reqwest::Client::new()
-        .get(as_str(url))
-        .send()
-        .and_then(|mut res| res.text())
-    {
-        Ok(res) => unsafe { res.strdup() },
-        Err(_err) => {
-            info!(context, 0, "Can\'t read file.",);
-
-            std::ptr::null_mut()
-        }
-    }
-}
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -42,7 +42,7 @@ impl Default for Blocked {

 pub const DC_IMAP_SEEN: u32 = 0x1;

-pub const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
+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 +52,7 @@ pub const DC_GCL_ADD_ALLDONE_HINT: usize = 0x04;

 const DC_GCM_ADDDAYMARKER: usize = 0x01;

-pub const DC_GCL_VERIFIED_ONLY: usize = 0x01;
+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
@@ -65,19 +65,19 @@ const DC_IMEX_EXPORT_BACKUP: usize = 11;
 const DC_IMEX_IMPORT_BACKUP: usize = 12;

 /// virtual chat showing all messages belonging to chats flagged with chats.blocked=2
-pub(crate) const DC_CHAT_ID_DEADDROP: u32 = 1;
+pub(crate) const DC_CHAT_ID_DEADDROP: usize = 1;
 /// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again)
-pub const DC_CHAT_ID_TRASH: u32 = 3;
+pub const DC_CHAT_ID_TRASH: usize = 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;
+const DC_CHAT_ID_MSGS_IN_CREATION: usize = 4;
 /// virtual chat showing all messages flagged with msgs.starred=2
-const DC_CHAT_ID_STARRED: u32 = 5;
+const DC_CHAT_ID_STARRED: usize = 5;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ARCHIVED_LINK: u32 = 6;
+pub const DC_CHAT_ID_ARCHIVED_LINK: usize = 6;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ALLDONE_HINT: u32 = 7;
+pub const DC_CHAT_ID_ALLDONE_HINT: usize = 7;
 /// larger chat IDs are "real" chats, their messages are "real" messages.
-pub const DC_CHAT_ID_LAST_SPECIAL: u32 = 9;
+pub const DC_CHAT_ID_LAST_SPECIAL: usize = 9;

 #[derive(
    Debug,
@@ -106,29 +106,38 @@ impl Default for Chattype {
    }
 }

-pub const DC_MSG_ID_MARKER1: u32 = 1;
-const DC_MSG_ID_DAYMARKER: u32 = 9;
-pub const DC_MSG_ID_LAST_SPECIAL: u32 = 9;
+pub const DC_MSG_ID_MARKER1: usize = 1;
+const DC_MSG_ID_DAYMARKER: usize = 9;
+pub const DC_MSG_ID_LAST_SPECIAL: usize = 9;

 /// approx. max. length returned by dc_msg_get_text()
 const DC_MAX_GET_TEXT_LEN: usize = 30000;
 /// approx. max. length returned by dc_get_msg_info()
 const DC_MAX_GET_INFO_LEN: usize = 100000;

-pub const DC_CONTACT_ID_UNDEFINED: u32 = 0;
-pub const DC_CONTACT_ID_SELF: u32 = 1;
-const DC_CONTACT_ID_DEVICE: u32 = 2;
-pub const DC_CONTACT_ID_LAST_SPECIAL: u32 = 9;
+pub const DC_CONTACT_ID_UNDEFINED: usize = 0;
+pub const DC_CONTACT_ID_SELF: usize = 1;
+const DC_CONTACT_ID_DEVICE: usize = 2;
+pub const DC_CONTACT_ID_LAST_SPECIAL: usize = 9;

 pub const DC_CREATE_MVBOX: usize = 1;

+#[repr(i32)]
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
+pub enum Delay {
+    Do_not_try_again = 0,
+    At_once = -1,
+    Standard = 3,
+    Increation_poll = 2,
+}
+     
 // Flags for configuring IMAP and SMTP servers.
 // These flags are optional
 // and may be set together with the username, password etc.
 // via dc_set_config() using the key "server_flags".

 /// Force OAuth2 authorization. This flag does not skip automatic configuration.
-/// Before calling configure() with DC_LP_AUTH_OAUTH2 set,
+/// Before calling dc_configure() with DC_LP_AUTH_OAUTH2 set,
 /// the user has to confirm access at the URL returned by dc_get_oauth2_url().
 pub const DC_LP_AUTH_OAUTH2: usize = 0x2;

@@ -169,12 +178,6 @@ 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 {
@@ -288,7 +291,7 @@ pub enum Event {
    /// As most things are asynchronous, things may go wrong at any time and the user
    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
    ///
-    /// However, for ongoing processes (eg. configure())
+    /// However, for ongoing processes (eg. dc_configure())
    /// or for functions that are expected to fail (eg. dc_continue_key_transfer())
    /// it might be better to delay showing these events until the function has really
    /// failed (returned false). It should be sufficient to report only the _last_ error
@@ -406,7 +409,7 @@ pub enum Event {
    /// @return 0
    LOCATION_CHANGED = 2035,

-    /// Inform about the configuration progress started by configure().
+    /// Inform about the configuration progress started by dc_configure().
    ///
    /// @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
    /// @param data2 0
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -7,17 +7,19 @@ use crate::aheader::EncryptPreference;
 use crate::config::Config;
 use crate::constants::*;
 use crate::context::Context;
+use crate::dc_e2ee::*;
 use crate::dc_loginparam::*;
+use crate::dc_msg::MessageState;
 use crate::dc_tools::*;
-use crate::e2ee;
 use crate::error::Result;
 use crate::key::*;
-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;

@@ -150,7 +152,7 @@ pub enum VerifiedStatus {

 impl<'a> Contact<'a> {
    pub fn load_from_db(context: &'a Context, contact_id: u32) -> Result<Self> {
-        if contact_id == DC_CONTACT_ID_SELF {
+        if contact_id == DC_CONTACT_ID_SELF as u32 {
            let contact = Contact {
                context,
                id: contact_id,
@@ -477,10 +479,8 @@ impl<'a> Contact<'a> {

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

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

        Ok(ret)
@@ -603,7 +603,7 @@ impl<'a> Contact<'a> {
                    });
                ret += &p;
                if self_key.is_none() {
-                    e2ee::ensure_secret_key_exists(context)?;
+                    dc_ensure_secret_key_exists(context)?;
                    self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
                }
                let p = context.stock_str(StockMessage::FingerPrints);
@@ -655,7 +655,7 @@ impl<'a> Contact<'a> {
    /// May result in a `#DC_EVENT_CONTACTS_CHANGED` event.
    pub fn delete(context: &Context, contact_id: u32) -> Result<()> {
        ensure!(
-            contact_id > DC_CONTACT_ID_LAST_SPECIAL,
+            contact_id > DC_CONTACT_ID_LAST_SPECIAL as u32,
            "Can not delete special contact"
        );

@@ -780,7 +780,7 @@ impl<'a> Contact<'a> {
    /// 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> {
-        if self.id == DC_CONTACT_ID_SELF {
+        if self.id == DC_CONTACT_ID_SELF as u32 {
            return self.context.get_config(Config::Selfavatar);
        }
        // TODO: else get image_abs from contact param
@@ -810,7 +810,7 @@ impl<'a> Contact<'a> {
    pub fn is_verified_ex(&self, peerstate: Option<&Peerstate<'a>>) -> 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 {
+        if self.id == DC_CONTACT_ID_SELF as u32 {
            return VerifiedStatus::BidirectVerified;
        }

@@ -911,6 +911,7 @@ fn get_first_name<'a>(full_name: &'a str) -> &'a str {
 /// Returns false if addr is an invalid address, otherwise true.
 pub fn may_be_valid_addr(addr: &str) -> bool {
    let res = addr.parse::<EmailAddress>();
+    println!("{:?}", res);
    res.is_ok()
 }

--- a/src/context.rs
+++ b/src/context.rs
@@ -4,6 +4,8 @@ use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::dc_loginparam::*;
+use crate::dc_move::*;
+use crate::dc_msg::*;
 use crate::dc_receive_imf::*;
 use crate::dc_tools::*;
 use crate::imap::*;
@@ -11,7 +13,6 @@ use crate::job::*;
 use crate::job_thread::JobThread;
 use crate::key::*;
 use crate::lot::Lot;
-use crate::message::*;
 use crate::param::Params;
 use crate::smtp::*;
 use crate::sql::Sql;
@@ -227,7 +228,7 @@ unsafe fn cb_precheck_imf(
        if as_str(old_server_folder) != server_folder || old_server_uid != server_uid {
            dc_update_server_uid(context, rfc724_mid, server_folder, server_uid);
        }
-        do_heuristics_moves(context, server_folder, msg_id);
+        dc_do_heuristics_moves(context, server_folder, msg_id);
        if 0 != mark_seen {
            job_add(
                context,
@@ -299,11 +300,9 @@ pub unsafe fn dc_open(context: &Context, dbfile: &str, blobdir: Option<&str>) ->
    if 0 != dc_is_open(context) {
        return false;
    }
-
    *context.dbfile.write().unwrap() = Some(PathBuf::from(dbfile));
-    let blobdir = blobdir.unwrap_or_default();
-    if !blobdir.is_empty() {
-        let dir = dc_ensure_no_slash_safe(blobdir).strdup();
+    if blobdir.is_some() && !blobdir.unwrap().is_empty() {
+        let dir = dc_ensure_no_slash_safe(blobdir.unwrap()).strdup();
        *context.blobdir.write().unwrap() = dir;
    } else {
        let dir = dbfile.to_string() + "-blobs";
@@ -574,45 +573,6 @@ pub fn dc_is_mvbox(context: &Context, folder_name: impl AsRef<str>) -> bool {
    }
 }

-pub fn do_heuristics_moves(context: &Context, folder: &str, msg_id: u32) {
-    if context
-        .sql
-        .get_config_int(context, "mvbox_move")
-        .unwrap_or_else(|| 1)
-        == 0
-    {
-        return;
-    }
-
-    if !dc_is_inbox(context, folder) && !dc_is_sentbox(context, folder) {
-        return;
-    }
-
-    if let Ok(msg) = dc_msg_new_load(context, msg_id) {
-        if dc_msg_is_setupmessage(&msg) {
-            // do not move setup messages;
-            // there may be a non-delta device that wants to handle it
-            return;
-        }
-
-        if dc_is_mvbox(context, folder) {
-            dc_update_msg_move_state(context, msg.rfc724_mid, MoveState::Stay);
-        }
-
-        // 1 = dc message, 2 = reply to dc message
-        if 0 != msg.is_dc_message {
-            job_add(
-                context,
-                Action::MoveMsg,
-                msg.id as libc::c_int,
-                Params::new(),
-                0,
-            );
-            dc_update_msg_move_state(context, msg.rfc724_mid, MoveState::Moving);
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/src/dc_array.rs
+++ b/src/dc_array.rs
@@ -1,11 +1,12 @@
-use crate::location::Location;
+use crate::dc_location::dc_location;
+use crate::dc_tools::*;
 use crate::types::*;

 /* * the structure behind dc_array_t */
 #[derive(Clone)]
 #[allow(non_camel_case_types)]
 pub enum dc_array_t {
-    Locations(Vec<Location>),
+    Locations(Vec<dc_location>),
    Uint(Vec<u32>),
 }

@@ -19,6 +20,10 @@ impl dc_array_t {
        dc_array_t::Locations(Vec::with_capacity(capacity))
    }

+    pub fn into_raw(self) -> *mut Self {
+        Box::into_raw(Box::new(self))
+    }
+
    pub fn add_id(&mut self, item: uint32_t) {
        if let Self::Uint(array) = self {
            array.push(item);
@@ -27,7 +32,7 @@ impl dc_array_t {
        }
    }

-    pub fn add_location(&mut self, location: Location) {
+    pub fn add_location(&mut self, location: dc_location) {
        if let Self::Locations(array) = self {
            array.push(location)
        } else {
@@ -42,7 +47,7 @@ impl dc_array_t {
        }
    }

-    pub fn get_location(&self, index: usize) -> &Location {
+    pub fn get_location(&self, index: usize) -> &dc_location {
        if let Self::Locations(array) = self {
            &array[index]
        } else {
@@ -50,6 +55,34 @@ impl dc_array_t {
        }
    }

+    pub fn get_latitude(&self, index: usize) -> libc::c_double {
+        self.get_location(index).latitude
+    }
+
+    pub fn get_longitude(&self, index: size_t) -> libc::c_double {
+        self.get_location(index).longitude
+    }
+
+    pub fn get_accuracy(&self, index: size_t) -> libc::c_double {
+        self.get_location(index).accuracy
+    }
+
+    pub fn get_timestamp(&self, index: size_t) -> i64 {
+        self.get_location(index).timestamp
+    }
+
+    pub fn get_chat_id(&self, index: size_t) -> uint32_t {
+        self.get_location(index).chat_id
+    }
+
+    pub fn get_contact_id(&self, index: size_t) -> uint32_t {
+        self.get_location(index).contact_id
+    }
+
+    pub fn get_msg_id(&self, index: size_t) -> uint32_t {
+        self.get_location(index).msg_id
+    }
+
    pub fn is_empty(&self) -> bool {
        match self {
            Self::Locations(array) => array.is_empty(),
@@ -92,14 +125,6 @@ impl dc_array_t {
            panic!("Attempt to sort array of something other than uints");
        }
    }
-
-    pub fn as_ptr(&self) -> *const u32 {
-        if let dc_array_t::Uint(v) = self {
-            v.as_ptr()
-        } else {
-            panic!("Attempt to convert array of something other than uints to raw");
-        }
-    }
 }

 impl From<Vec<u32>> for dc_array_t {
@@ -108,56 +133,161 @@ impl From<Vec<u32>> for dc_array_t {
    }
 }

-impl From<Vec<Location>> for dc_array_t {
-    fn from(array: Vec<Location>) -> Self {
+impl From<Vec<dc_location>> for dc_array_t {
+    fn from(array: Vec<dc_location>) -> Self {
        dc_array_t::Locations(array)
    }
 }

+pub unsafe fn dc_array_unref(array: *mut dc_array_t) {
+    assert!(!array.is_null());
+    Box::from_raw(array);
+}
+
+pub unsafe fn dc_array_add_id(array: *mut dc_array_t, item: uint32_t) {
+    assert!(!array.is_null());
+    (*array).add_id(item);
+}
+
+pub unsafe fn dc_array_get_cnt(array: *const dc_array_t) -> size_t {
+    assert!(!array.is_null());
+    (*array).len()
+}
+
+pub unsafe fn dc_array_get_id(array: *const dc_array_t, index: size_t) -> uint32_t {
+    assert!(!array.is_null());
+    (*array).get_id(index)
+}
+
+pub unsafe fn dc_array_get_marker(array: *const dc_array_t, index: size_t) -> *mut libc::c_char {
+    assert!(!array.is_null());
+
+    if let dc_array_t::Locations(v) = &*array {
+        if let Some(s) = &v[index].marker {
+            s.strdup()
+        } else {
+            std::ptr::null_mut()
+        }
+    } else {
+        panic!("Not an array of locations");
+    }
+}
+
+/**
+ * Return the independent-state of the location at the given index.
+ * Independent locations do not belong to the track of the user.
+ *
+ * @memberof dc_array_t
+ * @param array The array object.
+ * @param index Index of the item. Must be between 0 and dc_array_get_cnt()-1.
+ * @return 0=Location belongs to the track of the user,
+ *     1=Location was reported independently.
+ */
+pub unsafe fn dc_array_is_independent(array: *const dc_array_t, index: size_t) -> libc::c_int {
+    assert!(!array.is_null());
+
+    if let dc_array_t::Locations(v) = &*array {
+        v[index].independent as libc::c_int
+    } else {
+        panic!("Attempt to get location independent field from array of something other than locations");
+    }
+}
+
+pub unsafe fn dc_array_search_id(
+    array: *const dc_array_t,
+    needle: uint32_t,
+    ret_index: *mut size_t,
+) -> bool {
+    assert!(!array.is_null());
+
+    if let Some(i) = (*array).search_id(needle) {
+        if !ret_index.is_null() {
+            *ret_index = i
+        }
+        true
+    } else {
+        false
+    }
+}
+
+pub unsafe fn dc_array_get_raw(array: *const dc_array_t) -> *const u32 {
+    assert!(!array.is_null());
+
+    if let dc_array_t::Uint(v) = &*array {
+        v.as_ptr()
+    } else {
+        panic!("Attempt to convert array of something other than uints to raw");
+    }
+}
+
+pub fn dc_array_new(initsize: size_t) -> *mut dc_array_t {
+    dc_array_t::new(initsize).into_raw()
+}
+
+#[cfg(test)]
+unsafe fn dc_array_empty(array: *mut dc_array_t) {
+    assert!(!array.is_null());
+
+    (*array).clear()
+}
+
+pub unsafe fn dc_array_duplicate(array: *const dc_array_t) -> *mut dc_array_t {
+    assert!(!array.is_null());
+
+    (*array).clone().into_raw()
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;

    #[test]
    fn test_dc_array() {
-        let mut arr = dc_array_t::new(7);
-        assert!(arr.is_empty());
+        unsafe {
+            let arr = dc_array_new(7 as size_t);
+            assert_eq!(dc_array_get_cnt(arr), 0);

-        for i in 0..1000 {
-            arr.add_id(i + 2);
+            for i in 0..1000 {
+                dc_array_add_id(arr, (i + 2) as uint32_t);
+            }
+
+            assert_eq!(dc_array_get_cnt(arr), 1000);
+
+            for i in 0..1000 {
+                assert_eq!(
+                    dc_array_get_id(arr, i as size_t),
+                    (i + 1i32 * 2i32) as libc::c_uint
+                );
+            }
+
+            dc_array_empty(arr);
+
+            assert_eq!(dc_array_get_cnt(arr), 0);
+
+            dc_array_add_id(arr, 13 as uint32_t);
+            dc_array_add_id(arr, 7 as uint32_t);
+            dc_array_add_id(arr, 666 as uint32_t);
+            dc_array_add_id(arr, 0 as uint32_t);
+            dc_array_add_id(arr, 5000 as uint32_t);
+
+            (*arr).sort_ids();
+
+            assert_eq!(dc_array_get_id(arr, 0 as size_t), 0);
+            assert_eq!(dc_array_get_id(arr, 1 as size_t), 7);
+            assert_eq!(dc_array_get_id(arr, 2 as size_t), 13);
+            assert_eq!(dc_array_get_id(arr, 3 as size_t), 666);
+
+            dc_array_unref(arr);
        }
-
-        assert_eq!(arr.len(), 1000);
-
-        for i in 0..1000 {
-            assert_eq!(arr.get_id(i), (i + 2) as u32);
-        }
-
-        arr.clear();
-
-        assert!(arr.is_empty());
-
-        arr.add_id(13);
-        arr.add_id(7);
-        arr.add_id(666);
-        arr.add_id(0);
-        arr.add_id(5000);
-
-        arr.sort_ids();
-
-        assert_eq!(arr.get_id(0), 0);
-        assert_eq!(arr.get_id(1), 7);
-        assert_eq!(arr.get_id(2), 13);
-        assert_eq!(arr.get_id(3), 666);
    }

    #[test]
    #[should_panic]
    fn test_dc_array_out_of_bounds() {
-        let mut arr = dc_array_t::new(7);
+        let arr = dc_array_new(7);
        for i in 0..1000 {
-            arr.add_id(i + 2);
+            unsafe { dc_array_add_id(arr, (i + 2) as uint32_t) };
        }
-        arr.get_id(1000);
+        unsafe { dc_array_get_id(arr, 1000) };
    }
 }
--- a/src/dc_configure.rs
+++ b/src/dc_configure.rs
--- a/src/dc_dehtml.rs
+++ b/src/dc_dehtml.rs
@@ -2,6 +2,9 @@ use lazy_static::lazy_static;
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};

+use crate::dc_tools::*;
+use crate::x::*;
+
 lazy_static! {
    static ref LINE_RE: regex::Regex = regex::Regex::new(r"(\r?\n)+").unwrap();
 }
@@ -21,20 +24,19 @@ enum AddText {

 // dc_dehtml() returns way too many lineends; however, an optimisation on this issue is not needed as
 // the lineends are typically remove in further processing by the caller
-pub fn dc_dehtml(buf_terminated: &str) -> String {
-    let buf_terminated = buf_terminated.trim();
-
-    if buf_terminated.is_empty() {
-        return "".into();
+pub unsafe fn dc_dehtml(buf_terminated: *mut libc::c_char) -> *mut libc::c_char {
+    dc_trim(buf_terminated);
+    if *buf_terminated.offset(0isize) as libc::c_int == 0i32 {
+        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
    }

    let mut dehtml = Dehtml {
-        strbuilder: String::with_capacity(buf_terminated.len()),
+        strbuilder: String::with_capacity(strlen(buf_terminated)),
        add_text: AddText::YesRemoveLineEnds,
        last_href: None,
    };

-    let mut reader = quick_xml::Reader::from_str(buf_terminated);
+    let mut reader = quick_xml::Reader::from_str(as_str(buf_terminated));

    let mut buf = Vec::new();

@@ -59,7 +61,7 @@ pub fn dc_dehtml(buf_terminated: &str) -> String {
        buf.clear();
    }

-    dehtml.strbuilder
+    dehtml.strbuilder.strdup()
 }

 fn dehtml_text_cb(event: &BytesText, dehtml: &mut Dehtml) {
--- a/src/dc_e2ee.rs
+++ b/src/dc_e2ee.rs
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -8,15 +8,15 @@ use rand::{thread_rng, Rng};

 use crate::chat;
 use crate::config::Config;
-use crate::configure::*;
 use crate::constants::*;
 use crate::context::Context;
+use crate::dc_configure::*;
+use crate::dc_e2ee::*;
+use crate::dc_msg::*;
 use crate::dc_tools::*;
-use crate::e2ee;
 use crate::error::*;
 use crate::job::*;
 use crate::key::*;
-use crate::message::*;
 use crate::param::*;
 use crate::pgp::*;
 use crate::sql::{self, Sql};
@@ -102,8 +102,8 @@ 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) {
+    let mut msg: *mut dc_msg_t = ptr::null_mut();
+    if dc_alloc_ongoing(context) == 0 {
        return std::ptr::null_mut();
    }
    let setup_code = dc_create_setup_code(context);
@@ -140,13 +140,14 @@ 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.type_0 = Viewtype::File;
-                        msg.param.set(Param::File, as_str(setup_file_name));
+                        (*msg).type_0 = Viewtype::File;
+                        (*msg).param.set(Param::File, as_str(setup_file_name));

-                        msg.param
+                        (*msg)
+                            .param
                            .set(Param::MimeType, "application/autocrypt-setup");
-                        msg.param.set_int(Param::Cmd, 6);
-                        msg.param.set_int(Param::ForcePlaintext, 2);
+                        (*msg).param.set_int(Param::Cmd, 6);
+                        (*msg).param.set_int(Param::ForcePlaintext, 2);

                        if !context
                            .running_state
@@ -155,7 +156,9 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                            .unwrap()
                            .shall_stop_ongoing
                        {
-                            if let Ok(msg_id) = chat::send_msg(context, chat_id, &mut msg) {
+                            if let Ok(msg_id) = chat::send_msg(context, chat_id, msg) {
+                                dc_msg_unref(msg);
+                                msg = ptr::null_mut();
                                info!(context, 0, "Wait for setup message being sent ...",);
                                loop {
                                    if context
@@ -168,12 +171,13 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                                        break;
                                    }
                                    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.",);
-                                            break;
-                                        }
+                                    msg = dc_get_msg(context, msg_id);
+                                    if 0 != dc_msg_is_sent(msg) {
+                                        info!(context, 0, "... setup message sent.",);
+                                        break;
                                    }
+                                    dc_msg_unref(msg);
+                                    msg = 0 as *mut dc_msg_t
                                }
                            }
                        }
@@ -183,6 +187,7 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
        }
    }
    free(setup_file_name as *mut libc::c_void);
+    dc_msg_unref(msg);
    dc_free_ongoing(context);

    setup_code.strdup()
@@ -196,7 +201,7 @@ pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result<Strin
        passphrase.len() >= 2,
        "Passphrase must be at least 2 chars long."
    );
-    let self_addr = e2ee::ensure_secret_key_exists(context)?;
+    let self_addr = dc_ensure_secret_key_exists(context)?;
    let private_key = Key::from_self_private(context, self_addr, &context.sql)
        .ok_or(format_err!("Failed to get private key."))?;
    let ac_headers = match context
@@ -279,17 +284,18 @@ pub unsafe fn dc_continue_key_transfer(
    setup_code: *const libc::c_char,
 ) -> libc::c_int {
    let mut success: libc::c_int = 0i32;
+    let mut msg: *mut dc_msg_t = ptr::null_mut();
    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())
+        msg = dc_get_msg(context, msg_id);
+        if msg.is_null()
+            || !dc_msg_is_setupmessage(msg)
            || {
-                filename = dc_msg_get_file(msg.as_ref().unwrap());
+                filename = dc_msg_get_file(msg);
                filename.is_null()
            }
            || *filename.offset(0isize) as libc::c_int == 0i32
@@ -325,6 +331,7 @@ pub unsafe fn dc_continue_key_transfer(
    free(armored_key as *mut libc::c_void);
    free(filecontent as *mut libc::c_void);
    free(filename as *mut libc::c_void);
+    dc_msg_unref(msg);
    free(norm_sc as *mut libc::c_void);

    success
@@ -502,9 +509,11 @@ 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 dc_alloc_ongoing(context) {
+    if !(0 == dc_alloc_ongoing(context)) {
+        ongoing_allocated_here = 1;
        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);
@@ -520,7 +529,7 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
            } 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() {
+                    if dc_ensure_secret_key_exists(context).is_err() {
                        error!(
                            context,
                            0,
@@ -562,6 +571,9 @@ 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(
@@ -707,7 +719,7 @@ The macro avoids weird values of 0% or 100% while still working. */
 // TODO should return bool /rtn
 #[allow(non_snake_case)]
 unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_int {
-    let mut ok_to_continue: bool;
+    let mut current_block: u64;
    let mut success: libc::c_int = 0;

    let mut delete_dest_file: libc::c_int = 0;
@@ -763,30 +775,51 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                .is_err()
                {
                    /* error already logged */
-                    ok_to_continue = false;
+                    current_block = 11487273724841241105;
                } else {
-                    ok_to_continue = true;
+                    current_block = 14648156034262866959;
                }
            } else {
-                ok_to_continue = true;
+                current_block = 14648156034262866959;
            }
-            if ok_to_continue {
-                let mut total_files_cnt = 0;
-                let dir = std::path::Path::new(as_str(context.get_blobdir()));
-                if let Ok(dir_handle) = std::fs::read_dir(dir) {
-                    total_files_cnt += dir_handle.filter(|r| r.is_ok()).count();
+            match current_block {
+                11487273724841241105 => {}
+                _ => {
+                    let mut total_files_cnt = 0;
+                    let dir = std::path::Path::new(as_str(context.get_blobdir()));
+                    let dir_handle = std::fs::read_dir(dir);
+                    if dir_handle.is_err() {
+                        error!(
+                            context,
+                            0,
+                            "Backup: Cannot get info for blob-directory \"{}\".",
+                            as_str(context.get_blobdir()),
+                        );
+                    } else {
+                        let dir_handle = dir_handle.unwrap();
+                        total_files_cnt += dir_handle.filter(|r| r.is_ok()).count();

-                    info!(context, 0, "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) {
-                            sql.prepare(
+                        info!(context, 0, "EXPORT: total_files_cnt={}", total_files_cnt);
+                        if total_files_cnt > 0 {
+                            // scan directory, pass 2: copy files
+                            let dir_handle = std::fs::read_dir(dir);
+                            if dir_handle.is_err() {
+                                error!(
+                                    context,
+                                    0,
+                                    "Backup: Cannot copy from blob-directory \"{}\".",
+                                    as_str(context.get_blobdir()),
+                                );
+                            } else {
+                                let dir_handle = dir_handle.unwrap();
+
+                                sql.prepare(
                                    "INSERT INTO backup_blobs (file_name, file_content) VALUES (?, ?);",
                                    move |mut stmt, _| {
                                        let mut processed_files_cnt = 0;
                                        for entry in dir_handle {
                                            if entry.is_err() {
-                                                ok_to_continue = true;
+                                                current_block = 2631791190359682872;
                                                break;
                                            }
                                            let entry = entry.unwrap();
@@ -798,7 +831,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                                                .shall_stop_ongoing
                                            {
                                                delete_dest_file = 1;
-                                                ok_to_continue = false;
+                                                current_block = 11487273724841241105;
                                                break;
                                            } else {
                                                processed_files_cnt += 1;
@@ -843,7 +876,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                                                                &curr_pathNfilename,
                                                            );
                                                            /* this is not recoverable! writing to the sqlite database should work! */
-                                                            ok_to_continue = false;
+                                                            current_block = 11487273724841241105;
                                                            break;
                                                        }
                                                    } else {
@@ -855,39 +888,29 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
                                        Ok(())
                                    }
                                ).unwrap();
+                            }
                        } else {
-                            error!(
-                                context,
-                                0,
-                                "Backup: Cannot copy from blob-directory \"{}\".",
-                                as_str(context.get_blobdir()),
-                            );
+                            info!(context, 0, "Backup: No files to copy.",);
+                            current_block = 2631791190359682872;
                        }
-                    } else {
-                        info!(context, 0, "Backup: No files to copy.",);
-                        ok_to_continue = true;
-                    }
-                    if ok_to_continue {
-                        if sql
-                            .set_config_int(context, "backup_time", now as i32)
-                            .is_ok()
-                        {
-                            context.call_cb(
-                                Event::IMEX_FILE_WRITTEN,
-                                dest_pathNfilename as uintptr_t,
-                                0,
-                            );
-                            success = 1;
+                        match current_block {
+                            11487273724841241105 => {}
+                            _ => {
+                                if sql
+                                    .set_config_int(context, "backup_time", now as i32)
+                                    .is_ok()
+                                {
+                                    context.call_cb(
+                                        Event::IMEX_FILE_WRITTEN,
+                                        dest_pathNfilename as uintptr_t,
+                                        0,
+                                    );
+                                    success = 1;
+                                }
+                            }
                        }
                    }
-                } else {
-                    error!(
-                        context,
-                        0,
-                        "Backup: Cannot get info for blob-directory \"{}\".",
-                        as_str(context.get_blobdir())
-                    );
-                };
+                }
            }
        }
    }
@@ -927,7 +950,16 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
    let mut buf2_headerline: *const libc::c_char = ptr::null_mut();
    if !dir_name.is_null() {
        let dir = std::path::Path::new(as_str(dir_name));
-        if let Ok(dir_handle) = std::fs::read_dir(dir) {
+        let dir_handle = std::fs::read_dir(dir);
+        if dir_handle.is_err() {
+            error!(
+                context,
+                0,
+                "Import: Cannot open directory \"{}\".",
+                as_str(dir_name),
+            );
+        } else {
+            let dir_handle = dir_handle.unwrap();
            for entry in dir_handle {
                if entry.is_err() {
                    break;
@@ -966,9 +998,9 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                if dc_split_armored_data(
                    buf2,
                    &mut buf2_headerline,
-                    ptr::null_mut(),
-                    ptr::null_mut(),
-                    ptr::null_mut(),
+                    0 as *mut *const libc::c_char,
+                    0 as *mut *const libc::c_char,
+                    0 as *mut *const libc::c_char,
                ) && strcmp(
                    buf2_headerline,
                    b"-----BEGIN PGP PUBLIC KEY BLOCK-----\x00" as *const u8 as *const libc::c_char,
@@ -1011,13 +1043,6 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                    as_str(dir_name),
                );
            }
-        } else {
-            error!(
-                context,
-                0,
-                "Import: Cannot open directory \"{}\".",
-                as_str(dir_name),
-            );
        }
    }

--- a/src/dc_location.rs
+++ b/src/dc_location.rs
@@ -0,0 +1,778 @@
+use quick_xml;
+use quick_xml::events::{BytesEnd, BytesStart, BytesText};
+
+use crate::chat;
+use crate::constants::Event;
+use crate::constants::*;
+use crate::context::*;
+use crate::dc_msg::*;
+use crate::dc_tools::*;
+use crate::job::*;
+use crate::param::*;
+use crate::sql;
+use crate::stock::StockMessage;
+use crate::types::*;
+use crate::x::*;
+
+// location handling
+#[derive(Clone, Default)]
+#[allow(non_camel_case_types)]
+pub struct dc_location {
+    pub location_id: uint32_t,
+    pub latitude: libc::c_double,
+    pub longitude: libc::c_double,
+    pub accuracy: libc::c_double,
+    pub timestamp: i64,
+    pub contact_id: uint32_t,
+    pub msg_id: uint32_t,
+    pub chat_id: uint32_t,
+    pub marker: Option<String>,
+    pub independent: uint32_t,
+}
+
+impl dc_location {
+    pub fn new() -> Self {
+        dc_location {
+            location_id: 0,
+            latitude: 0.0,
+            longitude: 0.0,
+            accuracy: 0.0,
+            timestamp: 0,
+            contact_id: 0,
+            msg_id: 0,
+            chat_id: 0,
+            marker: None,
+            independent: 0,
+        }
+    }
+}
+
+#[derive(Clone)]
+#[allow(non_camel_case_types)]
+pub struct dc_kml_t {
+    pub addr: *mut libc::c_char,
+    pub locations: Option<Vec<dc_location>>,
+    pub tag: libc::c_int,
+    pub curr: dc_location,
+}
+
+impl dc_kml_t {
+    pub fn new() -> Self {
+        dc_kml_t {
+            addr: std::ptr::null_mut(),
+            locations: None,
+            tag: 0,
+            curr: dc_location::new(),
+        }
+    }
+}
+
+// location streaming
+pub unsafe fn dc_send_locations_to_chat(context: &Context, chat_id: uint32_t, seconds: i64) {
+    let now = time();
+    let mut msg: *mut dc_msg_t = 0 as *mut dc_msg_t;
+    let is_sending_locations_before: bool;
+    if !(seconds < 0 || chat_id <= 9i32 as libc::c_uint) {
+        is_sending_locations_before = dc_is_sending_locations_to_chat(context, chat_id);
+        if sql::execute(
+            context,
+            &context.sql,
+            "UPDATE chats    \
+             SET locations_send_begin=?,        \
+             locations_send_until=?  \
+             WHERE id=?",
+            params![
+                if 0 != seconds { now } else { 0 },
+                if 0 != seconds { now + seconds } else { 0 },
+                chat_id as i32,
+            ],
+        )
+        .is_ok()
+        {
+            if 0 != seconds && !is_sending_locations_before {
+                msg = dc_msg_new(context, Viewtype::Text);
+                (*msg).text =
+                    Some(context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0));
+                (*msg).param.set_int(Param::Cmd, 8);
+                chat::send_msg(context, chat_id, msg).unwrap();
+            } else if 0 == seconds && is_sending_locations_before {
+                let stock_str =
+                    context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
+                chat::add_device_msg(context, chat_id, stock_str);
+            }
+            context.call_cb(
+                Event::CHAT_MODIFIED,
+                chat_id as uintptr_t,
+                0i32 as uintptr_t,
+            );
+            if 0 != seconds {
+                schedule_MAYBE_SEND_LOCATIONS(context, 0i32);
+                job_add(
+                    context,
+                    Action::MaybeSendLocationsEnded,
+                    chat_id as libc::c_int,
+                    Params::new(),
+                    seconds + 1,
+                );
+            }
+        }
+    }
+    dc_msg_unref(msg);
+}
+
+/*******************************************************************************
+ * job to send locations out to all chats that want them
+ ******************************************************************************/
+#[allow(non_snake_case)]
+unsafe fn schedule_MAYBE_SEND_LOCATIONS(context: &Context, flags: libc::c_int) {
+    if 0 != flags & 0x1 || !job_action_exists(context, Action::MaybeSendLocations) {
+        job_add(context, Action::MaybeSendLocations, 0, Params::new(), 60);
+    };
+}
+
+pub fn dc_is_sending_locations_to_chat(context: &Context, chat_id: u32) -> bool {
+    context
+        .sql
+        .exists(
+            "SELECT id  FROM chats  WHERE (? OR id=?)   AND locations_send_until>?;",
+            params![if chat_id == 0 { 1 } else { 0 }, chat_id as i32, time()],
+        )
+        .unwrap_or_default()
+}
+
+pub fn dc_set_location(
+    context: &Context,
+    latitude: libc::c_double,
+    longitude: libc::c_double,
+    accuracy: libc::c_double,
+) -> libc::c_int {
+    if latitude == 0.0 && longitude == 0.0 {
+        return 1;
+    }
+
+    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(
+                    "INSERT INTO locations  \
+                     (latitude, longitude, accuracy, timestamp, chat_id, from_id) VALUES (?,?,?,?,?,?);",
+                    params![
+                        latitude,
+                        longitude,
+                        accuracy,
+                        time(),
+                        chat_id,
+                        1,
+                    ]
+                )?;
+                continue_streaming = true;
+            }
+            if continue_streaming {
+                context.call_cb(Event::LOCATION_CHANGED, 1, 0);
+            };
+            unsafe { schedule_MAYBE_SEND_LOCATIONS(context, 0) };
+            Ok(continue_streaming as libc::c_int)
+        }
+    ).unwrap_or_default()
+}
+
+pub fn dc_get_locations(
+    context: &Context,
+    chat_id: uint32_t,
+    contact_id: uint32_t,
+    timestamp_from: i64,
+    mut timestamp_to: i64,
+) -> Vec<dc_location> {
+    if timestamp_to == 0 {
+        timestamp_to = time() + 10;
+    }
+
+    context
+        .sql
+        .query_map(
+            "SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \
+             m.id, l.from_id, l.chat_id, m.txt \
+             FROM locations l  LEFT JOIN msgs m ON l.id=m.location_id  WHERE (? OR l.chat_id=?) \
+             AND (? OR l.from_id=?) \
+             AND (l.independent=1 OR (l.timestamp>=? AND l.timestamp<=?)) \
+             ORDER BY l.timestamp DESC, l.id DESC, m.id DESC;",
+            params![
+                if chat_id == 0 { 1 } else { 0 },
+                chat_id as i32,
+                if contact_id == 0 { 1 } else { 0 },
+                contact_id as i32,
+                timestamp_from,
+                timestamp_to,
+            ],
+            |row| {
+                let msg_id = row.get(6)?;
+                let txt: String = row.get(9)?;
+                let marker = if msg_id != 0 && is_marker(&txt) {
+                    Some(txt)
+                } else {
+                    None
+                };
+
+                let loc = dc_location {
+                    location_id: row.get(0)?,
+                    latitude: row.get(1)?,
+                    longitude: row.get(2)?,
+                    accuracy: row.get(3)?,
+                    timestamp: row.get(4)?,
+                    independent: row.get(5)?,
+                    msg_id,
+                    contact_id: row.get(7)?,
+                    chat_id: row.get(8)?,
+                    marker,
+                };
+                Ok(loc)
+            },
+            |locations| {
+                let mut ret = Vec::new();
+
+                for location in locations {
+                    ret.push(location?);
+                }
+                Ok(ret)
+            },
+        )
+        .unwrap_or_default()
+}
+
+fn is_marker(txt: &str) -> bool {
+    txt.len() == 1 && txt.chars().next().unwrap() != ' '
+}
+
+pub fn dc_delete_all_locations(context: &Context) -> bool {
+    if sql::execute(context, &context.sql, "DELETE FROM locations;", params![]).is_err() {
+        return false;
+    }
+    context.call_cb(Event::LOCATION_CHANGED, 0, 0);
+    true
+}
+
+pub fn dc_get_location_kml(
+    context: &Context,
+    chat_id: uint32_t,
+    last_added_location_id: *mut uint32_t,
+) -> *mut libc::c_char {
+    let mut success: libc::c_int = 0;
+    let now = time();
+    let mut location_count: libc::c_int = 0;
+    let mut ret = String::new();
+
+    let self_addr = context
+        .sql
+        .get_config(context, "configured_addr")
+        .unwrap_or_default();
+
+    if let Ok((locations_send_begin, locations_send_until, locations_last_sent)) = context.sql.query_row(
+        "SELECT locations_send_begin, locations_send_until, locations_last_sent  FROM chats  WHERE id=?;",
+        params![chat_id as i32], |row| {
+            let send_begin: i64 = row.get(0)?;
+            let send_until: i64 = row.get(1)?;
+            let last_sent: i64 = row.get(2)?;
+
+            Ok((send_begin, send_until, last_sent))
+        }
+    ) {
+        if !(locations_send_begin == 0 || now > locations_send_until) {
+            ret += &format!(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
+                self_addr,
+            );
+
+            context.sql.query_map(
+                "SELECT id, latitude, longitude, accuracy, timestamp\
+                 FROM locations  WHERE from_id=? \
+                 AND timestamp>=? \
+                 AND (timestamp>=? OR timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
+                 AND independent=0 \
+                 GROUP BY timestamp \
+                 ORDER BY timestamp;",
+                params![1, locations_send_begin, locations_last_sent, 1],
+                |row| {
+                    let location_id: i32 = row.get(0)?;
+                    let latitude: f64 = row.get(1)?;
+                    let longitude: f64 = row.get(2)?;
+                    let accuracy: f64 = row.get(3)?;
+                    let timestamp = unsafe { get_kml_timestamp(row.get(4)?) };
+
+                    Ok((location_id, latitude, longitude, accuracy, timestamp))
+                },
+                |rows| {
+                    for row in rows {
+                        let (location_id, latitude, longitude, accuracy, timestamp) = row?;
+                        ret += &format!(
+                            "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n\x00",
+                            as_str(timestamp),
+                            accuracy,
+                            longitude,
+                            latitude
+                        );
+                        location_count += 1;
+                        if !last_added_location_id.is_null() {
+                            unsafe { *last_added_location_id = location_id as u32 };
+                        }
+                        unsafe { free(timestamp as *mut libc::c_void) };
+                    }
+                    Ok(())
+                }
+            ).unwrap(); // TODO: better error handling
+        }
+    }
+
+    if location_count > 0 {
+        ret += "</Document>\n</kml>";
+        success = 1;
+    }
+
+    if 0 != success {
+        unsafe { ret.strdup() }
+    } else {
+        std::ptr::null_mut()
+    }
+}
+
+/*******************************************************************************
+ * create kml-files
+ ******************************************************************************/
+unsafe fn get_kml_timestamp(utc: i64) -> *mut libc::c_char {
+    // Returns a string formatted as YYYY-MM-DDTHH:MM:SSZ. The trailing `Z` indicates UTC.
+    let res = chrono::NaiveDateTime::from_timestamp(utc, 0)
+        .format("%Y-%m-%dT%H:%M:%SZ")
+        .to_string();
+    res.strdup()
+}
+
+pub unsafe fn dc_get_message_kml(
+    timestamp: i64,
+    latitude: libc::c_double,
+    longitude: libc::c_double,
+) -> *mut libc::c_char {
+    let timestamp_str = get_kml_timestamp(timestamp);
+    let latitude_str = dc_ftoa(latitude);
+    let longitude_str = dc_ftoa(longitude);
+
+    let ret = dc_mprintf(
+        b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
+         <kml xmlns=\"http://www.opengis.net/kml/2.2\">\n\
+         <Document>\n\
+         <Placemark>\
+         <Timestamp><when>%s</when></Timestamp>\
+         <Point><coordinates>%s,%s</coordinates></Point>\
+         </Placemark>\n\
+         </Document>\n\
+         </kml>\x00" as *const u8 as *const libc::c_char,
+        timestamp_str,
+        longitude_str, // reverse order!
+        latitude_str,
+    );
+
+    free(latitude_str as *mut libc::c_void);
+    free(longitude_str as *mut libc::c_void);
+    free(timestamp_str as *mut libc::c_void);
+
+    ret
+}
+
+pub fn dc_set_kml_sent_timestamp(context: &Context, chat_id: u32, timestamp: i64) -> bool {
+    sql::execute(
+        context,
+        &context.sql,
+        "UPDATE chats SET locations_last_sent=? WHERE id=?;",
+        params![timestamp, chat_id as i32],
+    )
+    .is_ok()
+}
+
+pub fn dc_set_msg_location_id(context: &Context, msg_id: u32, location_id: u32) -> bool {
+    sql::execute(
+        context,
+        &context.sql,
+        "UPDATE msgs SET location_id=? WHERE id=?;",
+        params![location_id, msg_id as i32],
+    )
+    .is_ok()
+}
+
+pub unsafe fn dc_save_locations(
+    context: &Context,
+    chat_id: u32,
+    contact_id: u32,
+    locations_opt: &Option<Vec<dc_location>>,
+    independent: libc::c_int,
+) -> u32 {
+    if chat_id <= 9 || locations_opt.is_none() {
+        return 0;
+    }
+
+    let locations = locations_opt.as_ref().unwrap();
+    context
+        .sql
+        .prepare2(
+            "SELECT id FROM locations WHERE timestamp=? AND from_id=?",
+            "INSERT INTO locations\
+             (timestamp, from_id, chat_id, latitude, longitude, accuracy, independent) \
+             VALUES (?,?,?,?,?,?,?);",
+            |mut stmt_test, mut stmt_insert, conn| {
+                let mut newest_timestamp = 0;
+                let mut newest_location_id = 0;
+
+                for location in locations {
+                    let exists =
+                        stmt_test.exists(params![location.timestamp, contact_id as i32])?;
+
+                    if 0 != independent || !exists {
+                        stmt_insert.execute(params![
+                            location.timestamp,
+                            contact_id as i32,
+                            chat_id as i32,
+                            location.latitude,
+                            location.longitude,
+                            location.accuracy,
+                            independent,
+                        ])?;
+
+                        if location.timestamp > newest_timestamp {
+                            newest_timestamp = location.timestamp;
+                            newest_location_id = sql::get_rowid2_with_conn(
+                                context,
+                                conn,
+                                "locations",
+                                "timestamp",
+                                location.timestamp,
+                                "from_id",
+                                contact_id as i32,
+                            );
+                        }
+                    }
+                }
+                Ok(newest_location_id)
+            },
+        )
+        .unwrap_or_default()
+}
+
+pub unsafe fn dc_kml_parse(
+    context: &Context,
+    content: *const libc::c_char,
+    content_bytes: size_t,
+) -> dc_kml_t {
+    let mut kml = dc_kml_t::new();
+
+    if content_bytes > (1 * 1024 * 1024) {
+        warn!(
+            context,
+            0, "A kml-files with {} bytes is larger than reasonably expected.", content_bytes,
+        );
+        return kml;
+    }
+
+    let content_null = dc_null_terminate(content, content_bytes as libc::c_int);
+    if !content_null.is_null() {
+        let mut reader = quick_xml::Reader::from_str(as_str(content_null));
+        reader.trim_text(true);
+
+        kml.locations = Some(Vec::with_capacity(100));
+
+        let mut buf = Vec::new();
+
+        loop {
+            match reader.read_event(&mut buf) {
+                Ok(quick_xml::events::Event::Start(ref e)) => kml_starttag_cb(e, &mut kml, &reader),
+                Ok(quick_xml::events::Event::End(ref e)) => kml_endtag_cb(e, &mut kml),
+                Ok(quick_xml::events::Event::Text(ref e)) => kml_text_cb(e, &mut kml, &reader),
+                Err(e) => {
+                    error!(
+                        context,
+                        0,
+                        "Location parsing: Error at position {}: {:?}",
+                        reader.buffer_position(),
+                        e
+                    );
+                }
+                Ok(quick_xml::events::Event::Eof) => break,
+                _ => (),
+            }
+            buf.clear();
+        }
+    }
+
+    free(content_null.cast());
+
+    kml
+}
+
+fn kml_text_cb<B: std::io::BufRead>(
+    event: &BytesText,
+    kml: &mut dc_kml_t,
+    reader: &quick_xml::Reader<B>,
+) {
+    if 0 != kml.tag & (0x4 | 0x10) {
+        let val = event.unescape_and_decode(reader).unwrap_or_default();
+
+        let val = val
+            .replace("\n", "")
+            .replace("\r", "")
+            .replace("\t", "")
+            .replace(" ", "");
+
+        if 0 != kml.tag & 0x4 && val.len() >= 19 {
+            // YYYY-MM-DDTHH:MM:SSZ
+            // 0   4  7  10 13 16 19
+            match chrono::NaiveDateTime::parse_from_str(&val, "%Y-%m-%dT%H:%M:%SZ") {
+                Ok(res) => {
+                    kml.curr.timestamp = res.timestamp();
+                    if kml.curr.timestamp > time() {
+                        kml.curr.timestamp = time();
+                    }
+                }
+                Err(_err) => {
+                    kml.curr.timestamp = time();
+                }
+            }
+        } else if 0 != kml.tag & 0x10 {
+            let parts = val.splitn(2, ',').collect::<Vec<_>>();
+            if parts.len() == 2 {
+                kml.curr.longitude = parts[0].parse().unwrap_or_default();
+                kml.curr.latitude = parts[1].parse().unwrap_or_default();
+            }
+        }
+    }
+}
+
+fn kml_endtag_cb(event: &BytesEnd, kml: &mut dc_kml_t) {
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+
+    if tag == "placemark" {
+        if 0 != kml.tag & 0x1
+            && 0 != kml.curr.timestamp
+            && 0. != kml.curr.latitude
+            && 0. != kml.curr.longitude
+        {
+            if let Some(ref mut locations) = kml.locations {
+                locations.push(std::mem::replace(&mut kml.curr, dc_location::new()));
+            }
+        }
+        kml.tag = 0
+    };
+}
+
+fn kml_starttag_cb<B: std::io::BufRead>(
+    event: &BytesStart,
+    kml: &mut dc_kml_t,
+    reader: &quick_xml::Reader<B>,
+) {
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+    if tag == "document" {
+        if let Some(addr) = event.attributes().find(|attr| {
+            attr.as_ref()
+                .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "addr")
+                .unwrap_or_default()
+        }) {
+            kml.addr = unsafe {
+                addr.unwrap()
+                    .unescape_and_decode_value(reader)
+                    .unwrap_or_default()
+                    .strdup()
+            };
+        }
+    } else if tag == "placemark" {
+        kml.tag = 0x1;
+        kml.curr.timestamp = 0;
+        kml.curr.latitude = 0 as libc::c_double;
+        kml.curr.longitude = 0.0f64;
+        kml.curr.accuracy = 0.0f64
+    } else if tag == "timestamp" && 0 != kml.tag & 0x1 {
+        kml.tag = 0x1 | 0x2
+    } else if tag == "when" && 0 != kml.tag & 0x2 {
+        kml.tag = 0x1 | 0x2 | 0x4
+    } else if tag == "point" && 0 != kml.tag & 0x1 {
+        kml.tag = 0x1 | 0x8
+    } else if tag == "coordinates" && 0 != kml.tag & 0x8 {
+        kml.tag = 0x1 | 0x8 | 0x10;
+        if let Some(acc) = event.attributes().find(|attr| {
+            attr.as_ref()
+                .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "accuracy")
+                .unwrap_or_default()
+        }) {
+            let v = acc
+                .unwrap()
+                .unescape_and_decode_value(reader)
+                .unwrap_or_default();
+
+            kml.curr.accuracy = v.trim().parse().unwrap_or_default();
+        }
+    }
+}
+
+pub unsafe fn dc_kml_unref(kml: &mut dc_kml_t) {
+    free(kml.addr as *mut libc::c_void);
+}
+
+#[allow(non_snake_case)]
+pub unsafe fn dc_job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context: &Context, _job: &Job) {
+    let now = time();
+    let mut continue_streaming: libc::c_int = 1;
+    info!(
+        context,
+        0, " ----------------- 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;
+
+                // 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?
+                            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;
+                            }
+                            // 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 = 1;
+                            (*msg).param.set_int(Param::Cmd, 9);
+                            // TODO: handle cleanup on error
+                            chat::send_msg(context, chat_id as u32, msg).unwrap();
+                            dc_msg_unref(msg);
+                        }
+                        Ok(())
+                    },
+                )
+            },
+        )
+        .unwrap(); // TODO: Better error handling
+
+    if 0 != continue_streaming {
+        schedule_MAYBE_SEND_LOCATIONS(context, 0x1);
+    }
+}
+
+#[allow(non_snake_case)]
+pub unsafe fn dc_job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context: &Context, job: &mut Job) {
+    // this function is called when location-streaming _might_ have ended for a chat.
+    // the function checks, if location-streaming is really ended;
+    // if so, a device-message is added if not yet done.
+
+    let chat_id = (*job).foreign_id;
+
+    if let Ok((send_begin, send_until)) = context.sql.query_row(
+        "SELECT locations_send_begin, locations_send_until  FROM chats  WHERE id=?",
+        params![chat_id as i32],
+        |row| Ok((row.get::<_, i64>(0)?, row.get::<_, i64>(1)?)),
+    ) {
+        if !(send_begin != 0 && time() <= send_until) {
+            // still streaming -
+            // may happen as several calls to dc_send_locations_to_chat()
+            // do not un-schedule pending DC_MAYBE_SEND_LOC_ENDED jobs
+            if !(send_begin == 0 && send_until == 0) {
+                // not streaming, device-message already sent
+                if context.sql.execute(
+                    "UPDATE chats    SET locations_send_begin=0, locations_send_until=0  WHERE id=?",
+                    params![chat_id as i32],
+                ).is_ok() {
+                    let stock_str = context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
+                    chat::add_device_msg(context, chat_id, stock_str);
+                    context.call_cb(
+                        Event::CHAT_MODIFIED,
+                        chat_id as usize,
+                        0,
+                    );
+                }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::test_utils::dummy_context;
+
+    #[test]
+    fn test_dc_kml_parse() {
+        unsafe {
+            let context = dummy_context();
+
+            let xml =
+                b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>\x00"
+                as *const u8 as *const libc::c_char;
+
+            let mut kml = dc_kml_parse(&context.ctx, xml, strlen(xml));
+
+            assert!(!kml.addr.is_null());
+            assert_eq!(as_str(kml.addr as *const libc::c_char), "user@example.org",);
+
+            let locations_ref = &kml.locations.as_ref().unwrap();
+            assert_eq!(locations_ref.len(), 2);
+
+            assert!(locations_ref[0].latitude > 53.6f64);
+            assert!(locations_ref[0].latitude < 53.8f64);
+            assert!(locations_ref[0].longitude > 9.3f64);
+            assert!(locations_ref[0].longitude < 9.5f64);
+            assert!(locations_ref[0].accuracy > 31.9f64);
+            assert!(locations_ref[0].accuracy < 32.1f64);
+            assert_eq!(locations_ref[0].timestamp, 1551906597);
+
+            assert!(locations_ref[1].latitude > 63.6f64);
+            assert!(locations_ref[1].latitude < 63.8f64);
+            assert!(locations_ref[1].longitude > 19.3f64);
+            assert!(locations_ref[1].longitude < 19.5f64);
+            assert!(locations_ref[1].accuracy > 2.4f64);
+            assert!(locations_ref[1].accuracy < 2.6f64);
+            assert_eq!(locations_ref[1].timestamp, 1544739072);
+
+            dc_kml_unref(&mut kml);
+        }
+    }
+}
--- a/src/dc_mimefactory.rs
+++ b/src/dc_mimefactory.rs
--- a/src/dc_mimeparser.rs
+++ b/src/dc_mimeparser.rs
--- a/src/dc_move.rs
+++ b/src/dc_move.rs
@@ -0,0 +1,46 @@
+use crate::constants::*;
+use crate::context::*;
+use crate::dc_msg::*;
+use crate::job::*;
+use crate::param::Params;
+
+pub unsafe fn dc_do_heuristics_moves(context: &Context, folder: &str, msg_id: u32) {
+    if context
+        .sql
+        .get_config_int(context, "mvbox_move")
+        .unwrap_or_else(|| 1)
+        == 0
+    {
+        return;
+    }
+
+    if !dc_is_inbox(context, folder) && !dc_is_sentbox(context, folder) {
+        return;
+    }
+
+    let msg = dc_msg_new_load(context, msg_id);
+    if dc_msg_is_setupmessage(msg) {
+        // do not move setup messages;
+        // there may be a non-delta device that wants to handle it
+        dc_msg_unref(msg);
+        return;
+    }
+
+    if dc_is_mvbox(context, folder) {
+        dc_update_msg_move_state(context, (*msg).rfc724_mid, MoveState::Stay);
+    }
+
+    // 1 = dc message, 2 = reply to dc message
+    if 0 != (*msg).is_dc_message {
+        job_add(
+            context,
+            Action::MoveMsg,
+            (*msg).id as libc::c_int,
+            Params::new(),
+            0,
+        );
+        dc_update_msg_move_state(context, (*msg).rfc724_mid, MoveState::Moving);
+    }
+
+    dc_msg_unref(msg);
+}
--- a/src/message.rs
+++ b/src/message.rs
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -13,17 +13,18 @@ use sha2::{Digest, Sha256};
 use crate::chat::{self, Chat};
 use crate::constants::*;
 use crate::contact::*;
-use crate::context::{do_heuristics_moves, Context};
+use crate::context::Context;
+use crate::dc_location::*;
 use crate::dc_mimeparser::*;
+use crate::dc_move::*;
+use crate::dc_msg::*;
+use crate::dc_securejoin::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::error::Result;
 use crate::job::*;
-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::*;
@@ -55,8 +56,8 @@ pub unsafe fn dc_receive_imf(
    // we use mailmime_parse() through dc_mimeparser (both call mailimf_struct_multiple_parse()
    // somewhen, I did not found out anything that speaks against this approach yet)

-    let body = std::slice::from_raw_parts(imf_raw_not_terminated as *const u8, imf_raw_bytes);
-    let mut mime_parser = dc_mimeparser_parse(context, body);
+    let mut mime_parser = dc_mimeparser_new(context);
+    dc_mimeparser_parse(&mut mime_parser, imf_raw_not_terminated, imf_raw_bytes);

    if mime_parser.header.is_empty() {
        // Error - even adding an empty record won't help as we do not know the message ID
@@ -130,7 +131,7 @@ pub unsafe fn dc_receive_imf(
            if 0 != check_self {
                incoming = 0;
                if 0 != dc_mimeparser_sender_equals_recipient(&mime_parser) {
-                    from_id = DC_CONTACT_ID_SELF;
+                    from_id = DC_CONTACT_ID_SELF as u32;
                }
            } else if from_list.len() >= 1 {
                // if there is no from given, from_id stays 0 which is just fine. These messages
@@ -219,7 +220,7 @@ pub unsafe fn dc_receive_imf(
        );
    }

-    if !mime_parser.message_kml.is_none() && chat_id > DC_CHAT_ID_LAST_SPECIAL {
+    if !mime_parser.message_kml.is_none() && chat_id > DC_CHAT_ID_LAST_SPECIAL as u32 {
        save_locations(
            context,
            &mime_parser,
@@ -361,7 +362,7 @@ unsafe fn add_parts(
    }

    // 1 or 0 for yes/no
-    msgrmsg = mime_parser.is_send_by_messenger as _;
+    msgrmsg = mime_parser.is_send_by_messenger;
    if msgrmsg == 0 && 0 != dc_is_reply_to_messenger_message(context, mime_parser) {
        // 2=no, but is reply to messenger message
        msgrmsg = 2;
@@ -400,7 +401,7 @@ unsafe fn add_parts(
            msgrmsg = 1;
            *chat_id = 0;
            allow_creation = 1;
-            let handshake = handle_securejoin_handshake(context, mime_parser, *from_id);
+            let handshake = dc_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;
@@ -444,7 +445,7 @@ unsafe fn add_parts(

        if *chat_id == 0 {
            // check if the message belongs to a mailing list
-            if dc_mimeparser_is_mailinglist_message(mime_parser) {
+            if 0 != dc_mimeparser_is_mailinglist_message(mime_parser) {
                *chat_id = 3;
                info!(
                    context,
@@ -491,7 +492,7 @@ unsafe fn add_parts(
        }
        if *chat_id == 0 {
            // maybe from_id is null or sth. else is suspicious, move message to trash
-            *chat_id = DC_CHAT_ID_TRASH;
+            *chat_id = DC_CHAT_ID_TRASH as u32;
        }

        // if the chat_id is blocked,
@@ -508,7 +509,7 @@ unsafe fn add_parts(
        // the mail is on the IMAP server, probably it is also delivered.
        // We cannot recreate other states (read, error).
        state = MessageState::OutDelivered;
-        *from_id = DC_CONTACT_ID_SELF;
+        *from_id = DC_CONTACT_ID_SELF as u32;
        if !to_ids.is_empty() {
            *to_id = to_ids[0];
            if *chat_id == 0 {
@@ -564,7 +565,7 @@ unsafe fn add_parts(
            }
        }
        if *chat_id == 0 {
-            *chat_id = DC_CHAT_ID_TRASH;
+            *chat_id = DC_CHAT_ID_TRASH as u32;
        }
    }
    // correct message_timestamp, it should not be used before,
@@ -629,18 +630,21 @@ unsafe fn add_parts(
                        continue;
                    }

-                    if let Some(ref msg) = part.msg {
-                        if !mime_parser.location_kml.is_none()
-                            && icnt == 1
-                            && (msg == "-location-" || msg.is_empty())
-                        {
-                            *hidden = 1;
-                            if state == MessageState::InFresh {
-                                state = MessageState::InNoticed;
-                            }
+                    if !mime_parser.location_kml.is_none()
+                        && icnt == 1
+                        && !part.msg.is_null()
+                        && (strcmp(
+                            part.msg,
+                            b"-location-\x00" as *const u8 as *const libc::c_char,
+                        ) == 0
+                            || *part.msg.offset(0) as libc::c_int == 0)
+                    {
+                        *hidden = 1;
+                        if state == MessageState::InFresh {
+                            state = MessageState::InNoticed;
                        }
                    }
-                    if part.type_0 == Viewtype::Text {
+                    if part.type_0 == Viewtype::Text as i32 {
                        txt_raw = dc_mprintf(
                            b"%s\n\n%s\x00" as *const u8 as *const libc::c_char,
                            if !mime_parser.subject.is_null() {
@@ -669,7 +673,11 @@ unsafe fn add_parts(
                        part.type_0,
                        state,
                        msgrmsg,
-                        part.msg.as_ref().map_or("", String::as_str),
+                        if !part.msg.is_null() {
+                            as_str(part.msg)
+                        } else {
+                            ""
+                        },
                        // txt_raw might contain invalid utf8
                        if !txt_raw.is_null() {
                            to_string_lossy(txt_raw)
@@ -695,7 +703,7 @@ unsafe fn add_parts(
                    ])?;

                    free(txt_raw as *mut libc::c_void);
-                    txt_raw = ptr::null_mut();
+                    txt_raw = 0 as *mut libc::c_char;
                    *insert_msg_id = sql::get_rowid_with_conn(
                        context,
                        conn,
@@ -722,7 +730,7 @@ unsafe fn add_parts(
    );

    // check event to send
-    if *chat_id == DC_CHAT_ID_TRASH {
+    if *chat_id == DC_CHAT_ID_TRASH as u32 {
        *create_event_to_send = None;
    } else if 0 != incoming && state == MessageState::InFresh {
        if 0 != from_id_blocked {
@@ -734,7 +742,7 @@ unsafe fn add_parts(
        }
    }

-    do_heuristics_moves(context, server_folder.as_ref(), *insert_msg_id);
+    dc_do_heuristics_moves(context, server_folder.as_ref(), *insert_msg_id);
    cleanup(mime_in_reply_to, mime_references, txt_raw);

    Ok(())
@@ -796,7 +804,7 @@ unsafe fn handle_reports(
                {
                    (*(*(*report_root).mm_data.mm_multipart.mm_mp_list).first).next
                } else {
-                    ptr::null_mut()
+                    0 as *mut clistcell
                }
                .is_null()
                {
@@ -806,11 +814,11 @@ unsafe fn handle_reports(
                    {
                        (*(*(*report_root).mm_data.mm_multipart.mm_mp_list).first).next
                    } else {
-                        ptr::null_mut()
+                        0 as *mut clistcell
                    })
                    .data
                } else {
-                    ptr::null_mut()
+                    0 as *mut libc::c_void
                }) as *mut mailmime;

                if !report_data.is_null()
@@ -900,11 +908,11 @@ unsafe fn handle_reports(
                }
            }

-            if mime_parser.is_send_by_messenger || 0 != mdn_consumed {
+            if 0 != mime_parser.is_send_by_messenger || 0 != mdn_consumed {
                let mut param = Params::new();
                param.set(Param::ServerFolder, server_folder.as_ref());
                param.set_int(Param::ServerUid, server_uid as i32);
-                if mime_parser.is_send_by_messenger
+                if 0 != mime_parser.is_send_by_messenger
                    && 0 != context
                        .sql
                        .get_config_int(context, "mvbox_move")
@@ -930,34 +938,36 @@ unsafe fn save_locations(
    let mut send_event = false;

    if !mime_parser.message_kml.is_none() && chat_id > DC_CHAT_ID_LAST_SPECIAL as libc::c_uint {
-        let locations = &mime_parser.message_kml.as_ref().unwrap().locations;
-        let newest_location_id =
-            location::save(context, chat_id, from_id, locations, 1).unwrap_or_default();
+        let newest_location_id: uint32_t = dc_save_locations(
+            context,
+            chat_id,
+            from_id,
+            &mime_parser.message_kml.as_ref().unwrap().locations,
+            1,
+        );
        if 0 != newest_location_id && 0 == hidden {
-            if location::set_msg_location_id(context, insert_msg_id, newest_location_id).is_ok() {
-                location_id_written = true;
-                send_event = true;
-            }
+            dc_set_msg_location_id(context, insert_msg_id, newest_location_id);
+            location_id_written = true;
+            send_event = true;
        }
    }

    if !mime_parser.location_kml.is_none() && chat_id > DC_CHAT_ID_LAST_SPECIAL as libc::c_uint {
-        if let Some(ref addr) = mime_parser.location_kml.as_ref().unwrap().addr {
+        if !mime_parser.location_kml.as_ref().unwrap().addr.is_null() {
            if let Ok(contact) = Contact::get_by_id(context, from_id) {
                if !contact.get_addr().is_empty()
-                    && contact.get_addr().to_lowercase() == addr.to_lowercase()
+                    && contact.get_addr().to_lowercase()
+                        == as_str(mime_parser.location_kml.as_ref().unwrap().addr).to_lowercase()
                {
-                    let locations = &mime_parser.location_kml.as_ref().unwrap().locations;
-                    let newest_location_id =
-                        location::save(context, chat_id, from_id, locations, 0).unwrap_or_default();
+                    let newest_location_id = dc_save_locations(
+                        context,
+                        chat_id,
+                        from_id,
+                        &mime_parser.location_kml.as_ref().unwrap().locations,
+                        0,
+                    );
                    if newest_location_id != 0 && hidden == 0 && !location_id_written {
-                        if let Err(err) = location::set_msg_location_id(
-                            context,
-                            insert_msg_id,
-                            newest_location_id,
-                        ) {
-                            error!(context, 0, "Failed to set msg_location_id: {:?}", err);
-                        }
+                        dc_set_msg_location_id(context, insert_msg_id, newest_location_id);
                    }
                    send_event = true;
                }
@@ -1034,6 +1044,7 @@ 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();
@@ -1215,9 +1226,14 @@ unsafe fn create_or_lookup_group(
    set_better_msg(mime_parser, &better_msg);

    // check, if we have a chat with this group ID
-    let (mut chat_id, chat_id_verified, _blocked) = chat::get_chat_id_by_grpid(context, &grpid);
+    chat_id = chat::get_chat_id_by_grpid(
+        context,
+        &grpid,
+        Some(&mut chat_id_blocked),
+        &mut chat_id_verified,
+    );
    if chat_id != 0 {
-        if chat_id_verified
+        if 0 != chat_id_verified
            && 0 == check_verified_properties(
                context,
                mime_parser,
@@ -1244,7 +1260,7 @@ unsafe fn create_or_lookup_group(
        .get_config(context, "configured_addr")
        .unwrap_or_default();
    if chat_id == 0
-            && !dc_mimeparser_is_mailinglist_message(mime_parser)
+            && 0 == dc_mimeparser_is_mailinglist_message(mime_parser)
            && !grpid.is_empty()
            && !grpname.is_null()
            // otherwise, a pending "quit" message may pop up
@@ -1283,10 +1299,10 @@ unsafe fn create_or_lookup_group(
    }

    // again, check chat_id
-    if chat_id <= DC_CHAT_ID_LAST_SPECIAL {
+    if chat_id <= DC_CHAT_ID_LAST_SPECIAL as u32 {
        chat_id = 0;
        if group_explicitly_left {
-            chat_id = DC_CHAT_ID_TRASH;
+            chat_id = DC_CHAT_ID_TRASH as u32;
        } else {
            create_or_lookup_adhoc_group(
                context,
@@ -1327,7 +1343,7 @@ unsafe fn create_or_lookup_group(
    }
    if !X_MrGrpImageChanged.is_null() {
        let mut ok = 0;
-        let mut grpimage = ptr::null_mut();
+        let mut grpimage = 0 as *mut libc::c_char;
        if strcmp(
            X_MrGrpImageChanged,
            b"0\x00" as *const u8 as *const libc::c_char,
@@ -1336,7 +1352,7 @@ unsafe fn create_or_lookup_group(
            ok = 1
        } else {
            for part in &mut mime_parser.parts {
-                if part.type_0 == Viewtype::Image {
+                if part.type_0 == 20 {
                    grpimage = part
                        .param
                        .get(Param::File)
@@ -1381,7 +1397,7 @@ unsafe fn create_or_lookup_group(
        let skip = if !X_MrRemoveFromGrp.is_null() {
            X_MrRemoveFromGrp
        } else {
-            ptr::null_mut()
+            0 as *mut libc::c_char
        };
        sql::execute(
            context,
@@ -1391,9 +1407,9 @@ unsafe fn create_or_lookup_group(
        )
        .ok();
        if skip.is_null() || !addr_cmp(&self_addr, as_str(skip)) {
-            chat::add_to_chat_contacts_table(context, chat_id, DC_CONTACT_ID_SELF);
+            chat::add_to_chat_contacts_table(context, chat_id, DC_CONTACT_ID_SELF as u32);
        }
-        if from_id > DC_CHAT_ID_LAST_SPECIAL {
+        if from_id > DC_CHAT_ID_LAST_SPECIAL as u32 {
            if !Contact::addr_equals_contact(context, &self_addr, from_id as u32)
                && (skip.is_null()
                    || !Contact::addr_equals_contact(context, to_string(skip), from_id as u32))
@@ -1419,7 +1435,7 @@ unsafe fn create_or_lookup_group(

    // check the number of receivers -
    // the only critical situation is if the user hits "Reply" instead of "Reply all" in a non-messenger-client */
-    if to_ids_cnt == 1 && !mime_parser.is_send_by_messenger {
+    if to_ids_cnt == 1 && mime_parser.is_send_by_messenger == 0 {
        let is_contact_cnt = chat::get_chat_contact_cnt(context, chat_id);
        if is_contact_cnt > 3 {
            // to_ids_cnt==1 may be "From: A, To: B, SELF" as SELF is not counted in to_ids_cnt.
@@ -1463,7 +1479,7 @@ unsafe fn create_or_lookup_adhoc_group(
    // group matching the to-list or if we can create one
    let mut chat_id = 0;
    let mut chat_id_blocked = Blocked::Not;
-    let mut grpname = ptr::null_mut();
+    let mut grpname = 0 as *mut libc::c_char;

    let cleanup = |grpname: *mut libc::c_char,
                   ret_chat_id: *mut uint32_t,
@@ -1479,7 +1495,7 @@ unsafe fn create_or_lookup_adhoc_group(
    };

    // build member list from the given ids
-    if to_ids.is_empty() || dc_mimeparser_is_mailinglist_message(mime_parser) {
+    if to_ids.is_empty() || 0 != dc_mimeparser_is_mailinglist_message(mime_parser) {
        // too few contacts or a mailinglist
        cleanup(
            grpname,
@@ -1755,7 +1771,7 @@ unsafe fn check_verified_properties(
        }
    };

-    if mimeparser.e2ee_helper.encrypted {
+    if 0 == mimeparser.e2ee_helper.encrypted {
        verify_fail("This message is not encrypted".into());
        return 0;
    }
@@ -1846,8 +1862,9 @@ unsafe fn set_better_msg<T: AsRef<str>>(mime_parser: &mut dc_mimeparser_t, bette
    let msg = better_msg.as_ref();
    if msg.len() > 0 && !mime_parser.parts.is_empty() {
        let part = &mut mime_parser.parts[0];
-        if (*part).type_0 == Viewtype::Text {
-            part.msg = Some(msg.to_string());
+        if (*part).type_0 == 10 {
+            free(part.msg as *mut libc::c_void);
+            part.msg = msg.strdup();
        }
    };
 }
@@ -1868,7 +1885,10 @@ unsafe fn dc_is_reply_to_known_message(
    if !field.is_null() && (*field).fld_type == MAILIMF_FIELD_IN_REPLY_TO as libc::c_int {
        let fld_in_reply_to: *mut mailimf_in_reply_to = (*field).fld_data.fld_in_reply_to;
        if !fld_in_reply_to.is_null() {
-            if is_known_rfc724_mid_in_list(context, (*(*field).fld_data.fld_in_reply_to).mid_list) {
+            if 0 != is_known_rfc724_mid_in_list(
+                context,
+                (*(*field).fld_data.fld_in_reply_to).mid_list,
+            ) {
                return 1;
            }
        }
@@ -1877,7 +1897,10 @@ unsafe fn dc_is_reply_to_known_message(
    if !field.is_null() && (*field).fld_type == MAILIMF_FIELD_REFERENCES as libc::c_int {
        let fld_references: *mut mailimf_references = (*field).fld_data.fld_references;
        if !fld_references.is_null() {
-            if is_known_rfc724_mid_in_list(context, (*(*field).fld_data.fld_references).mid_list) {
+            if 0 != is_known_rfc724_mid_in_list(
+                context,
+                (*(*field).fld_data.fld_references).mid_list,
+            ) {
                return 1;
            }
        }
@@ -1885,18 +1908,29 @@ unsafe fn dc_is_reply_to_known_message(
    0
 }

-unsafe fn is_known_rfc724_mid_in_list(context: &Context, mid_list: *const clist) -> bool {
-    if mid_list.is_null() {
-        return false;
-    }
-
-    for data in &*mid_list {
-        if 0 != is_known_rfc724_mid(context, data.cast()) {
-            return true;
+unsafe fn is_known_rfc724_mid_in_list(context: &Context, mid_list: *const clist) -> libc::c_int {
+    if !mid_list.is_null() {
+        let mut cur: *mut clistiter;
+        cur = (*mid_list).first;
+        while !cur.is_null() {
+            if 0 != is_known_rfc724_mid(
+                context,
+                (if !cur.is_null() {
+                    (*cur).data
+                } else {
+                    0 as *mut libc::c_void
+                }) as *const libc::c_char,
+            ) {
+                return 1;
+            }
+            cur = if !cur.is_null() {
+                (*cur).next
+            } else {
+                ptr::null_mut()
+            }
        }
    }
-
-    return false;
+    0
 }

 /// Check if a message is a reply to a known message (messenger or non-messenger).
@@ -1961,7 +1995,7 @@ unsafe fn is_msgrmsg_rfc724_mid_in_list(context: &Context, mid_list: *const clis
                (if !cur.is_null() {
                    (*cur).data
                } else {
-                    ptr::null_mut()
+                    0 as *mut libc::c_void
                }) as *const libc::c_char,
            ) {
                return 1;
@@ -2005,7 +2039,7 @@ unsafe fn dc_add_or_lookup_contacts_by_address_list(
        let adr: *mut mailimf_address = (if !cur.is_null() {
            (*cur).data
        } else {
-            ptr::null_mut()
+            0 as *mut libc::c_void
        }) as *mut mailimf_address;
        if !adr.is_null() {
            if (*adr).ad_type == MAILIMF_ADDRESS_MAILBOX as libc::c_int {
@@ -2036,7 +2070,7 @@ unsafe fn dc_add_or_lookup_contacts_by_address_list(
        cur = if !cur.is_null() {
            (*cur).next
        } else {
-            ptr::null_mut()
+            0 as *mut clistcell
        }
    }
 }
@@ -2056,7 +2090,7 @@ unsafe fn dc_add_or_lookup_contacts_by_mailbox_list(
        let mb: *mut mailimf_mailbox = (if !cur.is_null() {
            (*cur).data
        } else {
-            ptr::null_mut()
+            0 as *mut libc::c_void
        }) as *mut mailimf_mailbox;
        if !mb.is_null() {
            add_or_lookup_contact_by_addr(
@@ -2071,7 +2105,7 @@ unsafe fn dc_add_or_lookup_contacts_by_mailbox_list(
        cur = if !cur.is_null() {
            (*cur).next
        } else {
-            ptr::null_mut()
+            0 as *mut clistcell
        }
    }
 }
--- a/src/dc_securejoin.rs
+++ b/src/dc_securejoin.rs
--- a/src/dc_simplify.rs
+++ b/src/dc_simplify.rs
@@ -1,49 +1,64 @@
 use crate::dc_dehtml::*;
+use crate::dc_tools::*;
+use crate::x::*;

 #[derive(Copy, Clone)]
 pub struct Simplify {
    pub is_forwarded: bool,
-}
-
-/// Return index of footer line in vector of message lines, or vector length if
-/// no footer is found.
-///
-/// Also return whether not-standard (rfc3676, §4.3) footer is found.
-fn find_message_footer(lines: &[&str]) -> (usize, bool) {
-    for ix in 0..lines.len() {
-        let line = lines[ix];
-
-        // quoted-printable may encode `-- ` to `-- =20` which is converted
-        // back to `--  `
-        match line.as_ref() {
-            "-- " | "--  " => return (ix, false),
-            "--" | "---" | "----" => return (ix, true),
-            _ => (),
-        }
-    }
-    return (lines.len(), false);
+    pub is_cut_at_begin: bool,
+    pub is_cut_at_end: bool,
 }

 impl Simplify {
    pub fn new() -> Self {
        Simplify {
            is_forwarded: false,
+            is_cut_at_begin: false,
+            is_cut_at_end: false,
        }
    }

    /// Simplify and normalise text: Remove quotes, signatures, unnecessary
    /// lineends etc.
    /// The data returned from simplify() must be free()'d when no longer used.
-    pub fn simplify(&mut self, input: &str, is_html: bool, is_msgrmsg: bool) -> String {
-        let mut out = if is_html {
-            dc_dehtml(input)
-        } else {
-            input.to_string()
-        };
+    pub unsafe fn simplify(
+        &mut self,
+        in_unterminated: *const libc::c_char,
+        in_bytes: libc::c_int,
+        is_html: bool,
+        is_msgrmsg: libc::c_int,
+    ) -> *mut libc::c_char {
+        if in_bytes <= 0 {
+            return "".strdup();
+        }

-        out.retain(|c| c != '\r');
-        out = self.simplify_plain_text(&out, is_msgrmsg);
-        out.retain(|c| c != '\r');
+        /* create a copy of the given buffer */
+        let mut out: *mut libc::c_char;
+        let mut temp: *mut libc::c_char;
+        self.is_forwarded = false;
+        self.is_cut_at_begin = false;
+        self.is_cut_at_end = false;
+        out = strndup(
+            in_unterminated as *mut libc::c_char,
+            in_bytes as libc::c_ulong,
+        );
+        if out.is_null() {
+            return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+        }
+        if is_html {
+            temp = dc_dehtml(out);
+            if !temp.is_null() {
+                free(out as *mut libc::c_void);
+                out = temp
+            }
+        }
+        dc_remove_cr_chars(out);
+        temp = self.simplify_plain_text(out, is_msgrmsg);
+        if !temp.is_null() {
+            free(out as *mut libc::c_void);
+            out = temp
+        }
+        dc_remove_cr_chars(out);

        out
    }
@@ -52,75 +67,102 @@ impl Simplify {
     * Simplify Plain Text
     */
    #[allow(non_snake_case)]
-    fn simplify_plain_text(&mut self, buf_terminated: &str, is_msgrmsg: bool) -> String {
+    unsafe fn simplify_plain_text(
+        &mut self,
+        buf_terminated: *const libc::c_char,
+        is_msgrmsg: libc::c_int,
+    ) -> *mut libc::c_char {
        /* This function ...
        ... removes all text after the line `-- ` (footer mark)
        ... removes full quotes at the beginning and at the end of the text -
            these are all lines starting with the character `>`
        ... remove a non-empty line before the removed quote (contains sth. like "On 2.9.2016, Bjoern wrote:" in different formats and lanugages) */
        /* split the given buffer into lines */
-        let lines: Vec<_> = buf_terminated.split('\n').collect();
+        let lines = dc_split_into_lines(buf_terminated);
        let mut l_first: usize = 0;
-        let mut is_cut_at_begin = false;
-        let (mut l_last, mut is_cut_at_end) = find_message_footer(&lines);
-
+        let mut l_last = lines.len();
+        let mut line: *mut libc::c_char;
+        let mut footer_mark: libc::c_int = 0i32;
+        for l in l_first..l_last {
+            line = lines[l];
+            if strcmp(line, b"-- \x00" as *const u8 as *const libc::c_char) == 0i32
+                || strcmp(line, b"--  \x00" as *const u8 as *const libc::c_char) == 0i32
+            {
+                footer_mark = 1i32
+            }
+            if strcmp(line, b"--\x00" as *const u8 as *const libc::c_char) == 0i32
+                || strcmp(line, b"---\x00" as *const u8 as *const libc::c_char) == 0i32
+                || strcmp(line, b"----\x00" as *const u8 as *const libc::c_char) == 0i32
+            {
+                footer_mark = 1i32;
+                self.is_cut_at_end = true
+            }
+            if 0 != footer_mark {
+                l_last = l;
+                /* done */
+                break;
+            }
+        }
        if l_last > l_first + 2 {
-            let line0 = lines[l_first];
-            let line1 = lines[l_first + 1];
-            let line2 = lines[l_first + 2];
-            if line0 == "---------- Forwarded message ----------"
-                && line1.starts_with("From: ")
-                && line2.is_empty()
+            let line0: *mut libc::c_char = lines[l_first];
+            let line1: *mut libc::c_char = lines[l_first + 1];
+            let line2: *mut libc::c_char = lines[l_first + 2];
+            if strcmp(
+                line0,
+                b"---------- Forwarded message ----------\x00" as *const u8 as *const libc::c_char,
+            ) == 0i32
+                && strncmp(line1, b"From: \x00" as *const u8 as *const libc::c_char, 6) == 0i32
+                && *line2.offset(0isize) as libc::c_int == 0i32
            {
                self.is_forwarded = true;
                l_first += 3
            }
        }
        for l in l_first..l_last {
-            let line = lines[l];
-            if line == "-----"
-                || line == "_____"
-                || line == "====="
-                || line == "*****"
-                || line == "~~~~~"
+            line = lines[l];
+            if strncmp(line, b"-----\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"_____\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"=====\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"*****\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"~~~~~\x00" as *const u8 as *const libc::c_char, 5) == 0i32
            {
                l_last = l;
-                is_cut_at_end = true;
+                self.is_cut_at_end = true;
                /* done */
                break;
            }
        }
-        if !is_msgrmsg {
+        if 0 == is_msgrmsg {
            let mut l_lastQuotedLine = None;
            for l in (l_first..l_last).rev() {
-                let line = lines[l];
+                line = lines[l];
                if is_plain_quote(line) {
                    l_lastQuotedLine = Some(l)
                } else if !is_empty_line(line) {
                    break;
                }
            }
-            if let Some(last_quoted_line) = l_lastQuotedLine {
-                l_last = last_quoted_line;
-                is_cut_at_end = true;
+            if l_lastQuotedLine.is_some() {
+                l_last = l_lastQuotedLine.unwrap();
+                self.is_cut_at_end = true;
                if l_last > 1 {
                    if is_empty_line(lines[l_last - 1]) {
                        l_last -= 1
                    }
                }
                if l_last > 1 {
-                    let line = lines[l_last - 1];
+                    line = lines[l_last - 1];
                    if is_quoted_headline(line) {
                        l_last -= 1
                    }
                }
            }
        }
-        if !is_msgrmsg {
+        if 0 == is_msgrmsg {
            let mut l_lastQuotedLine_0 = None;
            let mut hasQuotedHeadline = 0;
            for l in l_first..l_last {
-                let line = lines[l];
+                line = lines[l];
                if is_plain_quote(line) {
                    l_lastQuotedLine_0 = Some(l)
                } else if !is_empty_line(line) {
@@ -135,21 +177,21 @@ impl Simplify {
                    }
                }
            }
-            if let Some(last_quoted_line) = l_lastQuotedLine_0 {
-                l_first = last_quoted_line + 1;
-                is_cut_at_begin = true
+            if l_lastQuotedLine_0.is_some() {
+                l_first = l_lastQuotedLine_0.unwrap() + 1;
+                self.is_cut_at_begin = true
            }
        }
        /* re-create buffer from the remaining lines */
        let mut ret = String::new();
-        if is_cut_at_begin {
+        if self.is_cut_at_begin {
            ret += "[...]";
        }
        /* we write empty lines only in case and non-empty line follows */
        let mut pending_linebreaks: libc::c_int = 0i32;
        let mut content_lines_added: libc::c_int = 0i32;
        for l in l_first..l_last {
-            let line = lines[l];
+            line = lines[l];
            if is_empty_line(line) {
                pending_linebreaks += 1
            } else {
@@ -163,105 +205,142 @@ impl Simplify {
                    }
                }
                // the incoming message might contain invalid UTF8
-                ret += line;
+                ret += &to_string_lossy(line);
                content_lines_added += 1;
                pending_linebreaks = 1i32
            }
        }
-        if is_cut_at_end && (!is_cut_at_begin || 0 != content_lines_added) {
+        if self.is_cut_at_end && (!self.is_cut_at_begin || 0 != content_lines_added) {
            ret += " [...]";
        }
+        dc_free_splitted_lines(lines);

-        ret
+        ret.strdup()
    }
 }

 /**
 * Tools
 */
-fn is_empty_line(buf: &str) -> bool {
-    // XXX: can it be simplified to buf.chars().all(|c| c.is_whitespace())?
-    //
-    // Strictly speaking, it is not equivalent (^A is not whitespace, but less than ' '),
-    // but having control sequences in email body?!
-    //
-    // See discussion at: https://github.com/deltachat/deltachat-core-rust/pull/402#discussion_r317062392
-    for c in buf.chars() {
-        if c > ' ' {
+unsafe fn is_empty_line(buf: *const libc::c_char) -> bool {
+    /* force unsigned - otherwise the `> ' '` comparison will fail */
+    let mut p1: *const libc::c_uchar = buf as *const libc::c_uchar;
+    while 0 != *p1 {
+        if *p1 as libc::c_int > ' ' as i32 {
            return false;
        }
+        p1 = p1.offset(1isize)
    }

    true
 }

-fn is_quoted_headline(buf: &str) -> bool {
+unsafe fn is_quoted_headline(buf: *const libc::c_char) -> bool {
    /* This function may be called for the line _directly_ before a quote.
    The function checks if the line contains sth. like "On 01.02.2016, xy@z wrote:" in various languages.
    - Currently, we simply check if the last character is a ':'.
    - Checking for the existence of an email address may fail (headlines may show the user's name instead of the address) */
+    let buf_len: libc::c_int = strlen(buf) as libc::c_int;
+    if buf_len > 80i32 {
+        return false;
+    }
+    if buf_len > 0i32 && *buf.offset((buf_len - 1i32) as isize) as libc::c_int == ':' as i32 {
+        return true;
+    }

-    buf.len() <= 80 && buf.ends_with(':')
+    false
 }

-fn is_plain_quote(buf: &str) -> bool {
-    buf.starts_with(">")
+unsafe fn is_plain_quote(buf: *const libc::c_char) -> bool {
+    if *buf.offset(0isize) as libc::c_int == '>' as i32 {
+        return true;
+    }
+
+    false
 }

 #[cfg(test)]
 mod tests {
    use super::*;
+    use std::ffi::CStr;

    #[test]
    fn test_simplify_trim() {
-        let mut simplify = Simplify::new();
-        let html = "\r\r\nline1<br>\r\n\r\n\r\rline2\n\r";
-        let plain = simplify.simplify(html, true, false);
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html: *const libc::c_char =
+                b"\r\r\nline1<br>\r\n\r\n\r\rline2\n\r\x00" as *const u8 as *const libc::c_char;
+            let plain: *mut libc::c_char =
+                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);

-        assert_eq!(plain, "line1\nline2");
+            assert_eq!(
+                CStr::from_ptr(plain as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "line1\nline2",
+            );
+
+            free(plain as *mut libc::c_void);
+        }
    }

    #[test]
    fn test_simplify_parse_href() {
-        let mut simplify = Simplify::new();
-        let html = "<a href=url>text</a";
-        let plain = simplify.simplify(html, true, false);
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html: *const libc::c_char =
+                b"<a href=url>text</a\x00" as *const u8 as *const libc::c_char;
+            let plain: *mut libc::c_char =
+                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);

-        assert_eq!(plain, "[text](url)");
+            assert_eq!(
+                CStr::from_ptr(plain as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "[text](url)",
+            );
+
+            free(plain as *mut libc::c_void);
+        }
    }

    #[test]
    fn test_simplify_bold_text() {
-        let mut simplify = Simplify::new();
-        let html = "<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>";
-        let plain = simplify.simplify(html, true, false);
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html: *const libc::c_char =
+                b"<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>\x00"
+                as *const u8 as *const libc::c_char;
+            let plain = simplify.simplify(html, strlen(html) as libc::c_int, true, 0);

-        assert_eq!(plain, "text *bold*<>");
+            assert_eq!(
+                CStr::from_ptr(plain as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "text *bold*<>",
+            );
+
+            free(plain as *mut libc::c_void);
+        }
    }

    #[test]
    fn test_simplify_html_encoded() {
-        let mut simplify = Simplify::new();
-        let html =
-                "&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;";
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html =
+                b"&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;\x00"
+                as *const u8 as *const libc::c_char;
+            let plain = simplify.simplify(html, strlen(html) as libc::c_int, true, 0);

-        let plain = simplify.simplify(html, true, false);
+            assert_eq!(
+                CStr::from_ptr(plain as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "<>\"\'& äÄöÖüÜß fooÆçÇ \u{2666}\u{200e}\u{200f}\u{200c}&noent;\u{200d}"
+            );

-        assert_eq!(
-            plain,
-            "<>\"\'& äÄöÖüÜß fooÆçÇ \u{2666}\u{200e}\u{200f}\u{200c}&noent;\u{200d}"
-        );
-    }
-
-    #[test]
-    fn test_simplify_utilities() {
-        assert!(is_empty_line(" \t"));
-        assert!(is_empty_line(""));
-        assert!(is_empty_line(" \r"));
-        assert!(!is_empty_line(" x"));
-        assert!(is_plain_quote("> hello world"));
-        assert!(is_plain_quote(">>"));
-        assert!(!is_plain_quote("Life is pain"));
-        assert!(!is_plain_quote(""));
+            free(plain as *mut libc::c_void);
+        }
    }
 }
--- a/src/dc_strencode.rs
+++ b/src/dc_strencode.rs
@@ -1,5 +1,4 @@
 use std::ffi::{CStr, CString};
-use std::ptr;

 use charset::Charset;
 use mmime::mailmime_decode::*;
@@ -80,7 +79,7 @@ fn hex_2_int(ch: libc::c_char) -> libc::c_char {

 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();
+    let mut ret_str: *mut libc::c_char = 0 as *mut libc::c_char;
    let mut cur: *const libc::c_char = to_encode;
    let mmapstr: *mut MMAPString = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char);
    if to_encode.is_null() || mmapstr.is_null() {
@@ -271,9 +270,9 @@ unsafe fn to_be_quoted(word: *const libc::c_char, size: size_t) -> bool {

 pub unsafe fn dc_decode_header_words(in_0: *const libc::c_char) -> *mut libc::c_char {
    if in_0.is_null() {
-        return ptr::null_mut();
+        return 0 as *mut libc::c_char;
    }
-    let mut out: *mut libc::c_char = ptr::null_mut();
+    let mut out: *mut libc::c_char = 0 as *mut libc::c_char;
    let mut cur_token: size_t = 0i32 as size_t;
    let r: libc::c_int = mailmime_encoded_phrase_parse(
        b"iso-8859-1\x00" as *const u8 as *const libc::c_char,
@@ -617,8 +616,8 @@ pub unsafe fn dc_encode_ext_header(to_encode: *const libc::c_char) -> *mut libc:
 }

 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 decoded: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut charset: *mut libc::c_char = 0 as *mut libc::c_char;
    let mut p2: *const libc::c_char;
    if !to_decode.is_null() {
        // get char set
--- a/src/dc_token.rs
+++ b/src/dc_token.rs
@@ -10,47 +10,56 @@ 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) -> String {
+pub fn dc_token_save(
+    context: &Context,
+    namespc: dc_tokennamespc_t,
+    foreign_id: u32,
+    token: *const libc::c_char,
+) -> bool {
+    if token.is_null() {
+        return false;
+    }
    // 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![namespc as i32, foreign_id as i32, &token, time()],
+        params![namespc as i32, foreign_id as i32, as_str(token), time()],
    )
-    .ok();
-    token
+    .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,
-    )
+) -> *mut libc::c_char {
+    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,
+        )
+        .map(|s| unsafe { s.strdup() })
+        .unwrap_or_else(|| std::ptr::null_mut())
 }

-pub fn dc_token_lookup_or_new(
+pub fn dc_token_exists(
    context: &Context,
    namespc: dc_tokennamespc_t,
-    foreign_id: u32,
-) -> String {
-    dc_token_lookup(context, namespc, foreign_id)
-        .unwrap_or_else(|| dc_token_save(context, namespc, foreign_id))
-}
+    token: *const libc::c_char,
+) -> bool {
+    if token.is_null() {
+        return false;
+    }

-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],
+            params![namespc as i32, as_str(token)],
        )
        .unwrap_or_default()
 }
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -83,6 +83,14 @@ 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,
@@ -97,6 +105,21 @@ 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;
@@ -332,6 +355,33 @@ unsafe fn dc_utf8_strnlen(s: *const libc::c_char, n: size_t) -> size_t {
    j
 }

+/* split string into lines*/
+pub unsafe fn dc_split_into_lines(buf_terminated: *const libc::c_char) -> Vec<*mut libc::c_char> {
+    let mut lines = Vec::new();
+    let mut line_chars = 0;
+    let mut p1: *const libc::c_char = buf_terminated;
+    let mut line_start: *const libc::c_char = p1;
+    while 0 != *p1 {
+        if *p1 as libc::c_int == '\n' as i32 {
+            lines.push(strndup(line_start, line_chars));
+            p1 = p1.offset(1isize);
+            line_start = p1;
+            line_chars = 0;
+        } else {
+            p1 = p1.offset(1isize);
+            line_chars += 1;
+        }
+    }
+    lines.push(strndup(line_start, line_chars));
+    lines
+}
+
+pub unsafe fn dc_free_splitted_lines(lines: Vec<*mut libc::c_char>) {
+    for s in lines {
+        free(s as *mut libc::c_void);
+    }
+}
+
 pub unsafe fn dc_str_from_clist(
    list: *const clist,
    delimiter: *const libc::c_char,
@@ -494,7 +544,7 @@ pub fn dc_gm2local_offset() -> i64 {
 }

 /* timesmearing */
-pub fn dc_smeared_time(context: &Context) -> i64 {
+pub unsafe 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();
@@ -1360,32 +1410,6 @@ 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::*;
@@ -1427,7 +1451,7 @@ mod tests {
            );
            assert_ne!(str_a, str_a_copy);

-            let str_a = ptr::null();
+            let str_a = 0 as *const u8 as *const libc::c_char;
            let str_a_copy = dc_strdup_keep_null(str_a);
            assert_eq!(str_a.is_null(), true);
            assert_eq!(str_a_copy.is_null(), true);
@@ -1482,6 +1506,23 @@ 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));
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -479,19 +479,25 @@ impl Imap {
            0, "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) {
-                eprintln!("failed to shutdown connection: {:?}", err);
+        if stream.is_some() {
+            match stream.unwrap().shutdown(net::Shutdown::Both) {
+                Ok(_) => {}
+                Err(err) => {
+                    eprintln!("failed to shutdown connection: {:?}", err);
+                }
            }
        }
-
        info!(
            context,
            0, "IMAP unsetup_handle step 2 (acquiring session.lock)"
        );
-        if let Some(mut session) = self.session.lock().unwrap().take() {
-            if let Err(err) = session.close() {
-                eprintln!("failed to close connection: {:?}", err);
+        let session = self.session.lock().unwrap().take();
+        if session.is_some() {
+            match session.unwrap().close() {
+                Ok(_) => {}
+                Err(err) => {
+                    eprintln!("failed to close connection: {:?}", err);
+                }
            }
        }

@@ -548,17 +554,19 @@ impl Imap {
        }

        let (teardown, can_idle, has_xlist) = match &mut *self.session.lock().unwrap() {
-            Some(ref mut session) => match session.capabilities() {
-                Ok(caps) => {
+            Some(ref mut session) => {
+                if let Ok(caps) = session.capabilities() {
                    if !context.sql.is_open() {
                        warn!(context, 0, "IMAP-LOGIN as {} ok but ABORTING", lp.mail_user,);
                        (true, false, false)
                    } else {
-                        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));
+                        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
+                        });
                        log_event!(
                            context,
                            Event::IMAP_CONNECTED,
@@ -569,12 +577,10 @@ impl Imap {
                        );
                        (false, can_idle, has_xlist)
                    }
-                }
-                Err(err) => {
-                    info!(context, 0, "CAPABILITY command error: {}", err);
+                } else {
                    (true, false, false)
                }
-            },
+            }
            None => (true, false, false),
        };

--- a/src/job.rs
+++ b/src/job.rs
@@ -6,16 +6,16 @@ use deltachat_derive::{FromSql, ToSql};
 use rand::{thread_rng, Rng};

 use crate::chat;
-use crate::configure::*;
 use crate::constants::*;
 use crate::context::Context;
+use crate::dc_configure::*;
 use crate::dc_imex::*;
+use crate::dc_location::*;
 use crate::dc_loginparam::*;
 use crate::dc_mimefactory::*;
+use crate::dc_msg::*;
 use crate::dc_tools::*;
 use crate::imap::*;
-use crate::location;
-use crate::message::*;
 use crate::param::*;
 use crate::sql;
 use crate::types::*;
@@ -82,7 +82,7 @@ pub struct Job {
    pub added_timestamp: i64,
    pub tries: i32,
    pub param: Params,
-    pub try_again: i32,
+    pub try_again: Delay,
    pub pending_error: Option<String>,
 }

@@ -117,86 +117,94 @@ impl Job {
            let connected = context.smtp.lock().unwrap().connect(context, &loginparam);

            if !connected {
-                self.try_again_later(3i32, None);
+                self.try_again_later(Delay::Standard, None);
+                return;
+            } 
+        }
+        let filename = self.param.get(Param::File).unwrap_or_default();
+        let body = match dc_read_file_safe(context, filename) {
+            Some(bytes) => bytes,
+            None => {
+                warn!(context, 0, "job {} error", self.job_id);
+                return;
+            }
+        };
+
+        let recipients = self.param.get(Param::Recipients);
+        if recipients.is_none() {
+            error!(context, 0, "Missing recipients for job {}", self.job_id,);
+            return;
+        } 
+        let recipients_list = recipients
+            .unwrap()
+            .split("\x1e")
+            .filter_map(|addr| match lettre::EmailAddress::new(addr.to_string()) {
+                Ok(addr) => Some(addr),
+                Err(err) => {
+                    eprintln!("WARNING: invalid recipient: {} {:?}", addr, err);
+                    None
+                }
+            })
+            .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 */
+        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,
+                );
                return;
            }
        }
-
-        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")
-                        .filter_map(|addr| match lettre::EmailAddress::new(addr.to_string()) {
-                            Ok(addr) => Some(addr),
-                            Err(err) => {
-                                eprintln!("WARNING: invalid recipient: {} {:?}", addr, err);
-                                None
-                            }
-                        })
-                        .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 */
-                    if 0 != self.foreign_id
-                        && 0 == unsafe { dc_msg_exists(context, self.foreign_id) }
-                    {
-                        warn!(
-                            context,
-                            0, "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, 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,
-                                    "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,);
-                }
-            }
+        /* send message while holding the smtp lock long enough 
+           to also mark success in the database, to reduce chances
+           of a message getting sent twice.
+        */
+        let mut sock = context.smtp.lock().unwrap();
+        if 0 == sock.send(context, recipients_list, body) {
+            sock.disconnect();
+            self.try_again_later(Delay::At_once, Some(as_str(sock.error)));
+            return;
+        } 
+        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,
+                    "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,
+            );
        }
    }

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

    #[allow(non_snake_case)]
    fn do_DC_JOB_MOVE_MSG(&mut self, context: &Context) {
        let ok_to_continue;
+        let msg = unsafe { dc_msg_new_untyped(context) };
        let mut dest_uid = 0;

        let inbox = context.inbox.read().unwrap();
@@ -204,7 +212,7 @@ impl Job {
        if !inbox.is_connected() {
            connect_to_inbox(context, &inbox);
            if !inbox.is_connected() {
-                self.try_again_later(3, None);
+                self.try_again_later(Delay::Standard, None);
                ok_to_continue = false;
            } else {
                ok_to_continue = true;
@@ -213,7 +221,7 @@ impl Job {
            ok_to_continue = true;
        }
        if ok_to_continue {
-            if let Ok(msg) = dc_msg_load_from_db(context, self.foreign_id) {
+            if dc_msg_load_from_db(msg, context, self.foreign_id) {
                if context
                    .sql
                    .get_config_int(context, "folders_configured")
@@ -224,6 +232,8 @@ impl Job {
                }
                let dest_folder = context.sql.get_config(context, "configured_mvbox_folder");

+                let msg = unsafe { &mut *msg };
+
                if let Some(dest_folder) = dest_folder {
                    let server_folder = msg.server_folder.as_ref().unwrap();

@@ -235,82 +245,88 @@ impl Job {
                        &mut dest_uid,
                    ) as libc::c_uint
                    {
-                        1 => {
-                            self.try_again_later(3i32, None);
+                        DC_RETRY_LATER => {
+                            self.try_again_later(Delay::Standard, None);
                        }
-                        3 => {
+                        DC_SUCCESS => {
                            dc_update_server_uid(context, msg.rfc724_mid, &dest_folder, dest_uid);
                        }
-                        0 | 2 | _ => {}
+                        _ => {}
                    }
                }
            }
        }
+
+        unsafe { dc_msg_unref(msg) };
    }

    #[allow(non_snake_case)]
    fn do_DC_JOB_DELETE_MSG_ON_IMAP(&mut self, context: &Context) {
        let mut delete_from_server = 1;
+        let msg = unsafe { dc_msg_new_untyped(context) };
        let inbox = context.inbox.read().unwrap();

-        if let Ok(mut msg) = dc_msg_load_from_db(context, self.foreign_id) {
-            if !(msg.rfc724_mid.is_null()
-                || unsafe { *msg.rfc724_mid.offset(0isize) as libc::c_int == 0 })
-            {
-                let ok_to_continue1;
-                /* eg. device messages have no Message-ID */
-                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.",
-                    );
-                    delete_from_server = 0i32
-                }
-                /* if this is the last existing part of the message, we delete the message from the server */
-                if 0 != delete_from_server {
-                    let ok_to_continue;
+        if !(!dc_msg_load_from_db(msg, context, self.foreign_id)
+            || unsafe { (*msg).rfc724_mid.is_null() }
+            || unsafe { *(*msg).rfc724_mid.offset(0isize) as libc::c_int == 0 })
+        {
+            let ok_to_continue1;
+            /* eg. device messages have no Message-ID */
+            if dc_rfc724_mid_cnt(context, unsafe { (*msg).rfc724_mid }) != 1 {
+                info!(
+                    context,
+                    0, "The message is deleted from the server when all parts are deleted.",
+                );
+                delete_from_server = 0i32
+            }
+            /* if this is the last existing part of the message, we delete the message from the server */
+            if 0 != delete_from_server {
+                let ok_to_continue;
+                if !inbox.is_connected() {
+                    connect_to_inbox(context, &inbox);
                    if !inbox.is_connected() {
-                        connect_to_inbox(context, &inbox);
-                        if !inbox.is_connected() {
-                            self.try_again_later(3i32, None);
-                            ok_to_continue = false;
-                        } else {
-                            ok_to_continue = true;
-                        }
+                        self.try_again_later(Delay::Standard, None);
+                        ok_to_continue = false;
                    } else {
                        ok_to_continue = true;
                    }
-                    if ok_to_continue {
-                        let mid = unsafe { CStr::from_ptr(msg.rfc724_mid).to_str().unwrap() };
-                        let server_folder = msg.server_folder.as_ref().unwrap();
-                        if 0 == inbox.delete_msg(context, mid, server_folder, &mut msg.server_uid) {
-                            self.try_again_later(-1i32, None);
-                            ok_to_continue1 = false;
-                        } else {
-                            ok_to_continue1 = true;
-                        }
-                    } else {
+                } else {
+                    ok_to_continue = true;
+                }
+                if ok_to_continue {
+                    let mid = unsafe { CStr::from_ptr((*msg).rfc724_mid).to_str().unwrap() };
+                    let server_folder = unsafe { (*msg).server_folder.as_ref().unwrap() };
+                    if 0 == inbox.delete_msg(context, mid, server_folder, unsafe {
+                        &mut (*msg).server_uid
+                    }) {
+                        self.try_again_later(Delay::At_once, None);
                        ok_to_continue1 = false;
+                    } else {
+                        ok_to_continue1 = true;
                    }
                } else {
-                    ok_to_continue1 = true;
-                }
-                if ok_to_continue1 {
-                    dc_delete_msg_from_db(context, msg.id);
+                    ok_to_continue1 = false;
                }
+            } else {
+                ok_to_continue1 = true;
+            }
+            if ok_to_continue1 {
+                unsafe { dc_delete_msg_from_db(context, (*msg).id) };
            }
        }
+        unsafe { dc_msg_unref(msg) }
    }

    #[allow(non_snake_case)]
    fn do_DC_JOB_MARKSEEN_MSG_ON_IMAP(&mut self, context: &Context) {
        let ok_to_continue;
+        let msg = unsafe { dc_msg_new_untyped(context) };
        let inbox = context.inbox.read().unwrap();

        if !inbox.is_connected() {
            connect_to_inbox(context, &inbox);
            if !inbox.is_connected() {
-                self.try_again_later(3i32, None);
+                self.try_again_later(Delay::Standard, None);
                ok_to_continue = false;
            } else {
                ok_to_continue = true;
@@ -319,29 +335,32 @@ impl Job {
            ok_to_continue = true;
        }
        if ok_to_continue {
-            if let Ok(msg) = dc_msg_load_from_db(context, self.foreign_id) {
-                let server_folder = msg.server_folder.as_ref().unwrap();
-                match inbox.set_seen(context, server_folder, msg.server_uid) as libc::c_uint {
+            if dc_msg_load_from_db(msg, context, self.foreign_id) {
+                let server_folder = unsafe { (*msg).server_folder.as_ref().unwrap() };
+                match inbox.set_seen(context, server_folder, unsafe { (*msg).server_uid })
+                    as libc::c_uint
+                {
                    0 => {}
                    1 => {
-                        self.try_again_later(3i32, None);
+                        self.try_again_later(Delay::Standard, None);
                    }
                    _ => {
-                        if 0 != msg.param.get_int(Param::WantsMdn).unwrap_or_default()
+                        if 0 != unsafe { (*msg).param.get_int(Param::WantsMdn).unwrap_or_default() }
                            && 0 != context
                                .sql
                                .get_config_int(context, "mdns_enabled")
                                .unwrap_or_else(|| 1)
                        {
-                            let folder = msg.server_folder.as_ref().unwrap();
+                            let folder = unsafe { (*msg).server_folder.as_ref().unwrap() };

-                            match inbox.set_mdnsent(context, folder, msg.server_uid) as libc::c_uint
+                            match inbox.set_mdnsent(context, folder, unsafe { (*msg).server_uid })
+                                as libc::c_uint
                            {
                                1 => {
-                                    self.try_again_later(3i32, None);
+                                    self.try_again_later(Delay::Standard, None);
                                }
                                3 => {
-                                    send_mdn(context, msg.id);
+                                    send_mdn(context, unsafe { (*msg).id });
                                }
                                0 | 2 | _ => {}
                            }
@@ -350,6 +369,7 @@ impl Job {
                }
            }
        }
+        unsafe { dc_msg_unref(msg) };
    }

    #[allow(non_snake_case)]
@@ -367,7 +387,7 @@ impl Job {
        if !inbox.is_connected() {
            connect_to_inbox(context, &inbox);
            if !inbox.is_connected() {
-                self.try_again_later(3, None);
+                self.try_again_later(Delay::Standard, None);
                ok_to_continue = false;
            } else {
                ok_to_continue = true;
@@ -377,7 +397,7 @@ impl Job {
        }
        if ok_to_continue {
            if inbox.set_seen(context, &folder, uid) == 0 {
-                self.try_again_later(3i32, None);
+                self.try_again_later(Delay::Standard, None);
            }
            if 0 != self.param.get_int(Param::AlsoMove).unwrap_or_default() {
                if context
@@ -393,7 +413,7 @@ impl Job {
                    if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid)
                        as libc::c_uint
                    {
-                        self.try_again_later(3, None);
+                        self.try_again_later(Delay::Standard, None);
                    }
                }
            }
@@ -438,7 +458,7 @@ pub fn perform_imap_fetch(context: &Context) {
        context,
        0,
        "INBOX-fetch done in {:.4} ms.",
-        start.elapsed().as_nanos() as f64 / 1000.0,
+        start.elapsed().as_millis(),
    );
 }

@@ -632,38 +652,55 @@ pub fn job_action_exists(context: &Context, action: Action) -> bool {
 #[allow(non_snake_case)]
 pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
    let mut success = 0;
+    let mut mimefactory = dc_mimefactory_t {
+        from_addr: ptr::null_mut(),
+        from_displayname: ptr::null_mut(),
+        selfstatus: ptr::null_mut(),
+        recipients_names: ptr::null_mut(),
+        recipients_addr: ptr::null_mut(),
+        timestamp: 0,
+        rfc724_mid: ptr::null_mut(),
+        loaded: DC_MF_NOTHING_LOADED,
+        msg: ptr::null_mut(),
+        chat: None,
+        increation: 0,
+        in_reply_to: ptr::null_mut(),
+        references: ptr::null_mut(),
+        req_mdn: 0,
+        out: ptr::null_mut(),
+        out_encrypted: 0,
+        out_gossiped: 0,
+        out_last_added_location_id: 0,
+        error: ptr::null_mut(),
+        context,
+    };

    /* load message data */
-    let mimefactory = dc_mimefactory_load_msg(context, msg_id);
-    if mimefactory.is_err() || mimefactory.as_ref().unwrap().from_addr.is_null() {
+    if 0 == dc_mimefactory_load_msg(&mut mimefactory, msg_id) || mimefactory.from_addr.is_null() {
        warn!(
            context,
            0, "Cannot load data to send, maybe the message is deleted in between.",
        );
    } else {
-        let mut mimefactory = mimefactory.unwrap();
        // no redo, no IMAP. moreover, as the data does not exist, there is no need in calling dc_set_msg_failed()
-        if chat::msgtype_has_file(mimefactory.msg.type_0) {
-            let file_param = mimefactory
-                .msg
-                .param
-                .get(Param::File)
-                .map(|s| s.to_string());
-            if let Some(pathNfilename) = file_param {
-                if (mimefactory.msg.type_0 == Viewtype::Image
-                    || mimefactory.msg.type_0 == Viewtype::Gif)
-                    && !mimefactory.msg.param.exists(Param::Width)
+        if chat::msgtype_has_file((*mimefactory.msg).type_0) {
+            if let Some(pathNfilename) = (*mimefactory.msg).param.get(Param::File) {
+                if ((*mimefactory.msg).type_0 == Viewtype::Image
+                    || (*mimefactory.msg).type_0 == Viewtype::Gif)
+                    && !(*mimefactory.msg).param.exists(Param::Width)
                {
-                    mimefactory.msg.param.set_int(Param::Width, 0);
-                    mimefactory.msg.param.set_int(Param::Height, 0);
+                    (*mimefactory.msg).param.set_int(Param::Width, 0);
+                    (*mimefactory.msg).param.set_int(Param::Height, 0);

                    if let Some(buf) = dc_read_file_safe(context, pathNfilename) {
                        if let Ok((width, height)) = dc_get_filemeta(&buf) {
-                            mimefactory.msg.param.set_int(Param::Width, width as i32);
-                            mimefactory.msg.param.set_int(Param::Height, height as i32);
+                            (*mimefactory.msg).param.set_int(Param::Width, width as i32);
+                            (*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(mimefactory.msg);
                }
            }
        }
@@ -671,8 +708,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
        if 0 == dc_mimefactory_render(&mut mimefactory) {
            dc_set_msg_failed(context, msg_id, as_opt_str(mimefactory.error));
        } else if 0
-            != mimefactory
-                .msg
+            != (*mimefactory.msg)
                .param
                .get_int(Param::GuranteeE2ee)
                .unwrap_or_default()
@@ -683,7 +719,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
                0,
                "e2e encryption unavailable {} - {:?}",
                msg_id,
-                mimefactory.msg.param.get_int(Param::GuranteeE2ee),
+                (*mimefactory.msg).param.get_int(Param::GuranteeE2ee),
            );
            dc_set_msg_failed(
                context,
@@ -698,7 +734,7 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
                clist_insert_after(
                    mimefactory.recipients_names,
                    (*mimefactory.recipients_names).last,
-                    ptr::null_mut(),
+                    0 as *mut libc::c_void,
                );
                clist_insert_after(
                    mimefactory.recipients_addr,
@@ -707,38 +743,32 @@ pub unsafe fn job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_int {
                );
            }
            if 0 != mimefactory.out_gossiped {
-                chat::set_gossiped_timestamp(context, mimefactory.msg.chat_id, time());
+                chat::set_gossiped_timestamp(context, (*mimefactory.msg).chat_id, time());
            }
            if 0 != mimefactory.out_last_added_location_id {
-                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);
-                }
-                if !mimefactory.msg.hidden {
-                    if let Err(err) = location::set_msg_location_id(
+                dc_set_kml_sent_timestamp(context, (*mimefactory.msg).chat_id, time());
+                if 0 == (*mimefactory.msg).hidden {
+                    dc_set_msg_location_id(
                        context,
-                        mimefactory.msg.id,
+                        (*mimefactory.msg).id,
                        mimefactory.out_last_added_location_id,
-                    ) {
-                        error!(context, 0, "Failed to set msg_location_id: {:?}", err);
-                    }
+                    );
                }
            }
            if 0 != mimefactory.out_encrypted
-                && mimefactory
-                    .msg
+                && (*mimefactory.msg)
                    .param
                    .get_int(Param::GuranteeE2ee)
                    .unwrap_or_default()
                    == 0
            {
-                mimefactory.msg.param.set_int(Param::GuranteeE2ee, 1);
-                dc_msg_save_param_to_disk(&mut mimefactory.msg);
+                (*mimefactory.msg).param.set_int(Param::GuranteeE2ee, 1);
+                dc_msg_save_param_to_disk(mimefactory.msg);
            }
            success = add_smtp_job(context, Action::SendMsgToSmtp, &mut mimefactory);
        }
    }
+    dc_mimefactory_empty(&mut mimefactory);

    success
 }
@@ -788,7 +818,7 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                added_timestamp: row.get(4)?,
                tries: row.get(6)?,
                param: row.get::<_, String>(3)?.parse().unwrap_or_default(),
-                try_again: 0,
+                try_again: Delay::Do_not_try_again,
                pending_error: None,
            };

@@ -841,7 +871,7 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
        let mut tries = 0;
        while tries <= 1 {
            // this can be modified by a job using dc_job_try_again_later()
-            job.try_again = 0;
+            job.try_again = Delay::Do_not_try_again;

            match job.action {
                Action::SendMsgToSmtp => job.do_DC_JOB_SEND(context),
@@ -852,17 +882,17 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                Action::SendMdn => job.do_DC_JOB_SEND(context),
                Action::ConfigureImap => unsafe { dc_job_do_DC_JOB_CONFIGURE_IMAP(context, &job) },
                Action::ImexImap => unsafe { dc_job_do_DC_JOB_IMEX_IMAP(context, &job) },
-                Action::MaybeSendLocations => {
-                    location::job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context, &job)
-                }
-                Action::MaybeSendLocationsEnded => {
-                    location::job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context, &mut job)
-                }
+                Action::MaybeSendLocations => unsafe {
+                    dc_job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context, &job)
+                },
+                Action::MaybeSendLocationsEnded => unsafe {
+                    dc_job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context, &mut job)
+                },
                Action::Housekeeping => sql::housekeeping(context),
                Action::SendMdnOld => {}
                Action::SendMsgToSmtpOld => {}
            }
-            if job.try_again != -1 {
+            if job.try_again != Delay::At_once {
                break;
            }
            tries += 1
@@ -882,7 +912,7 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                .unsuspend(context);
            suspend_smtp_thread(context, false);
            break;
-        } else if job.try_again == 2 {
+        } else if job.try_again == Delay::Increation_poll {
            // just try over next loop unconditionally, the ui typically interrupts idle when the file (video) is ready
            info!(
                context,
@@ -895,7 +925,7 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                },
                job.job_id
            );
-        } else if job.try_again == -1 || job.try_again == 3 {
+        } else if job.try_again == Delay::At_once || job.try_again == Delay::Standard {
            let tries = job.tries + 1;
            if tries < 17 {
                job.tries = tries;
@@ -927,7 +957,9 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                }
            } else {
                if job.action == Action::SendMsgToSmtp {
-                    dc_set_msg_failed(context, job.foreign_id, job.pending_error.as_ref());
+                    unsafe {
+                        dc_set_msg_failed(context, job.foreign_id, job.pending_error.as_ref())
+                    };
                }
                job.delete(context);
            }
@@ -980,10 +1012,33 @@ 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) } {
-            add_smtp_job(context, Action::SendMdn, &mut mimefactory);
-        }
+    let mut mimefactory = dc_mimefactory_t {
+        from_addr: ptr::null_mut(),
+        from_displayname: ptr::null_mut(),
+        selfstatus: ptr::null_mut(),
+        recipients_names: ptr::null_mut(),
+        recipients_addr: ptr::null_mut(),
+        timestamp: 0,
+        rfc724_mid: ptr::null_mut(),
+        loaded: DC_MF_NOTHING_LOADED,
+        msg: ptr::null_mut(),
+        chat: None,
+        increation: 0,
+        in_reply_to: ptr::null_mut(),
+        references: ptr::null_mut(),
+        req_mdn: 0,
+        out: ptr::null_mut(),
+        out_encrypted: 0,
+        out_gossiped: 0,
+        out_last_added_location_id: 0,
+        error: ptr::null_mut(),
+        context,
+    };
+
+    if !(0 == unsafe { dc_mimefactory_load_mdn(&mut mimefactory, msg_id) }
+        || 0 == unsafe { dc_mimefactory_render(&mut mimefactory) })
+    {
+        add_smtp_job(context, Action::SendMdn, &mut mimefactory);
    }
 }

@@ -991,7 +1046,7 @@ fn send_mdn(context: &Context, msg_id: uint32_t) {
 fn add_smtp_job(context: &Context, action: Action, mimefactory: &dc_mimefactory_t) -> libc::c_int {
    let pathNfilename: *mut libc::c_char;
    let mut success: libc::c_int = 0i32;
-    let mut recipients: *mut libc::c_char = ptr::null_mut();
+    let mut recipients: *mut libc::c_char = 0 as *mut libc::c_char;
    let mut param = Params::new();
    pathNfilename = unsafe {
        dc_get_fine_pathNfilename(
@@ -1039,7 +1094,7 @@ fn add_smtp_job(context: &Context, action: Action, mimefactory: &dc_mimefactory_
            (if mimefactory.loaded as libc::c_uint
                == DC_MF_MSG_LOADED as libc::c_int as libc::c_uint
            {
-                mimefactory.msg.id
+                unsafe { (*mimefactory.msg).id }
            } else {
                0
            }) as libc::c_int,
--- a/src/job_thread.rs
+++ b/src/job_thread.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, Condvar, Mutex};

-use crate::configure::*;
 use crate::context::Context;
+use crate::dc_configure::*;
 use crate::imap::Imap;

 pub struct JobThread {
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,25 +20,21 @@ extern crate strum_macros;
 #[macro_use]
 mod log;
 #[macro_use]
-pub mod error;
+mod error;

 mod aheader;
 pub mod chat;
 pub mod chatlist;
 pub mod config;
-pub mod configure;
 pub mod constants;
 pub mod contact;
 pub mod context;
-mod e2ee;
 mod imap;
 pub mod job;
 mod job_thread;
 pub mod key;
 pub mod keyring;
-pub mod location;
 pub mod lot;
-pub mod message;
 pub mod oauth2;
 mod param;
 pub mod peerstate;
@@ -51,17 +47,22 @@ pub mod types;
 pub mod x;

 pub mod dc_array;
+pub mod dc_configure;
 mod dc_dehtml;
+mod dc_e2ee;
 pub mod dc_imex;
+pub mod dc_location;
 mod dc_loginparam;
 mod dc_mimefactory;
 pub mod dc_mimeparser;
+mod dc_move;
+pub mod dc_msg;
 pub mod dc_receive_imf;
+pub mod dc_securejoin;
 mod dc_simplify;
 mod dc_strencode;
 mod dc_token;
 pub mod dc_tools;
-pub mod securejoin;

 #[cfg(test)]
 mod test_utils;
--- a/src/location.rs
+++ b/src/location.rs
@@ -1,696 +0,0 @@
-use bitflags::bitflags;
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
-
-use crate::chat;
-use crate::constants::Event;
-use crate::constants::*;
-use crate::context::*;
-use crate::dc_tools::*;
-use crate::error::Error;
-use crate::job::*;
-use crate::message::*;
-use crate::param::*;
-use crate::sql;
-use crate::stock::StockMessage;
-use crate::types::*;
-
-// location handling
-#[derive(Debug, Clone, Default)]
-pub struct Location {
-    pub location_id: u32,
-    pub latitude: f64,
-    pub longitude: f64,
-    pub accuracy: f64,
-    pub timestamp: i64,
-    pub contact_id: u32,
-    pub msg_id: u32,
-    pub chat_id: u32,
-    pub marker: Option<String>,
-    pub independent: u32,
-}
-
-impl Location {
-    pub fn new() -> Self {
-        Default::default()
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct Kml {
-    pub addr: Option<String>,
-    pub locations: Vec<Location>,
-    tag: KmlTag,
-    pub curr: Location,
-}
-
-bitflags! {
-    #[derive(Default)]
-    struct KmlTag: i32 {
-        const UNDEFINED = 0x00;
-        const PLACEMARK = 0x01;
-        const TIMESTAMP = 0x02;
-        const WHEN = 0x04;
-        const POINT = 0x08;
-        const COORDINATES = 0x10;
-    }
-}
-
-impl Kml {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn parse(context: &Context, content: impl AsRef<str>) -> Result<Self, Error> {
-        ensure!(
-            content.as_ref().len() <= (1 * 1024 * 1024),
-            "A kml-files with {} bytes is larger than reasonably expected.",
-            content.as_ref().len()
-        );
-
-        let mut reader = quick_xml::Reader::from_str(content.as_ref());
-        reader.trim_text(true);
-
-        let mut kml = Kml::new();
-        kml.locations = Vec::with_capacity(100);
-
-        let mut buf = Vec::new();
-
-        loop {
-            match reader.read_event(&mut buf) {
-                Ok(quick_xml::events::Event::Start(ref e)) => kml.starttag_cb(e, &reader),
-                Ok(quick_xml::events::Event::End(ref e)) => kml.endtag_cb(e),
-                Ok(quick_xml::events::Event::Text(ref e)) => kml.text_cb(e, &reader),
-                Err(e) => {
-                    error!(
-                        context,
-                        0,
-                        "Location parsing: Error at position {}: {:?}",
-                        reader.buffer_position(),
-                        e
-                    );
-                }
-                Ok(quick_xml::events::Event::Eof) => break,
-                _ => (),
-            }
-            buf.clear();
-        }
-
-        Ok(kml)
-    }
-
-    fn text_cb<B: std::io::BufRead>(&mut self, event: &BytesText, reader: &quick_xml::Reader<B>) {
-        if self.tag.contains(KmlTag::WHEN) || self.tag.contains(KmlTag::COORDINATES) {
-            let val = event.unescape_and_decode(reader).unwrap_or_default();
-
-            let val = val
-                .replace("\n", "")
-                .replace("\r", "")
-                .replace("\t", "")
-                .replace(" ", "");
-
-            if self.tag.contains(KmlTag::WHEN) && val.len() >= 19 {
-                // YYYY-MM-DDTHH:MM:SSZ
-                // 0   4  7  10 13 16 19
-                match chrono::NaiveDateTime::parse_from_str(&val, "%Y-%m-%dT%H:%M:%SZ") {
-                    Ok(res) => {
-                        self.curr.timestamp = res.timestamp();
-                        if self.curr.timestamp > time() {
-                            self.curr.timestamp = time();
-                        }
-                    }
-                    Err(_err) => {
-                        self.curr.timestamp = time();
-                    }
-                }
-            } else if self.tag.contains(KmlTag::COORDINATES) {
-                let parts = val.splitn(2, ',').collect::<Vec<_>>();
-                if parts.len() == 2 {
-                    self.curr.longitude = parts[0].parse().unwrap_or_default();
-                    self.curr.latitude = parts[1].parse().unwrap_or_default();
-                }
-            }
-        }
-    }
-
-    fn endtag_cb(&mut self, event: &BytesEnd) {
-        let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-        if tag == "placemark" {
-            if self.tag.contains(KmlTag::PLACEMARK)
-                && 0 != self.curr.timestamp
-                && 0. != self.curr.latitude
-                && 0. != self.curr.longitude
-            {
-                self.locations
-                    .push(std::mem::replace(&mut self.curr, Location::new()));
-            }
-            self.tag = KmlTag::UNDEFINED;
-        };
-    }
-
-    fn starttag_cb<B: std::io::BufRead>(
-        &mut self,
-        event: &BytesStart,
-        reader: &quick_xml::Reader<B>,
-    ) {
-        let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-        if tag == "document" {
-            if let Some(addr) = event.attributes().find(|attr| {
-                attr.as_ref()
-                    .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "addr")
-                    .unwrap_or_default()
-            }) {
-                self.addr = addr.unwrap().unescape_and_decode_value(reader).ok();
-            }
-        } else if tag == "placemark" {
-            self.tag = KmlTag::PLACEMARK;
-            self.curr.timestamp = 0;
-            self.curr.latitude = 0.0;
-            self.curr.longitude = 0.0;
-            self.curr.accuracy = 0.0
-        } else if tag == "timestamp" && self.tag.contains(KmlTag::PLACEMARK) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::TIMESTAMP
-        } else if tag == "when" && self.tag.contains(KmlTag::TIMESTAMP) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::TIMESTAMP | KmlTag::WHEN
-        } else if tag == "point" && self.tag.contains(KmlTag::PLACEMARK) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::POINT
-        } else if tag == "coordinates" && self.tag.contains(KmlTag::POINT) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::POINT | KmlTag::COORDINATES;
-            if let Some(acc) = event.attributes().find(|attr| {
-                attr.as_ref()
-                    .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "accuracy")
-                    .unwrap_or_default()
-            }) {
-                let v = acc
-                    .unwrap()
-                    .unescape_and_decode_value(reader)
-                    .unwrap_or_default();
-
-                self.curr.accuracy = v.trim().parse().unwrap_or_default();
-            }
-        }
-    }
-}
-
-// location streaming
-pub fn send_locations_to_chat(context: &Context, chat_id: u32, seconds: i64) {
-    let now = time();
-    let mut msg: Message;
-    let is_sending_locations_before: bool;
-    if !(seconds < 0 || chat_id <= 9i32 as libc::c_uint) {
-        is_sending_locations_before = is_sending_locations_to_chat(context, chat_id);
-        if sql::execute(
-            context,
-            &context.sql,
-            "UPDATE chats    \
-             SET locations_send_begin=?,        \
-             locations_send_until=?  \
-             WHERE id=?",
-            params![
-                if 0 != seconds { now } else { 0 },
-                if 0 != seconds { now + seconds } else { 0 },
-                chat_id as i32,
-            ],
-        )
-        .is_ok()
-        {
-            if 0 != seconds && !is_sending_locations_before {
-                msg = dc_msg_new(context, Viewtype::Text);
-                msg.text =
-                    Some(context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0));
-                msg.param.set_int(Param::Cmd, 8);
-                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);
-                chat::add_device_msg(context, chat_id, stock_str);
-            }
-            context.call_cb(
-                Event::CHAT_MODIFIED,
-                chat_id as uintptr_t,
-                0i32 as uintptr_t,
-            );
-            if 0 != seconds {
-                schedule_MAYBE_SEND_LOCATIONS(context, 0i32);
-                job_add(
-                    context,
-                    Action::MaybeSendLocationsEnded,
-                    chat_id as libc::c_int,
-                    Params::new(),
-                    seconds + 1,
-                );
-            }
-        }
-    }
-}
-
-#[allow(non_snake_case)]
-fn schedule_MAYBE_SEND_LOCATIONS(context: &Context, flags: i32) {
-    if 0 != flags & 0x1 || !job_action_exists(context, Action::MaybeSendLocations) {
-        job_add(context, Action::MaybeSendLocations, 0, Params::new(), 60);
-    };
-}
-
-pub fn is_sending_locations_to_chat(context: &Context, chat_id: u32) -> bool {
-    context
-        .sql
-        .exists(
-            "SELECT id  FROM chats  WHERE (? OR id=?)   AND locations_send_until>?;",
-            params![if chat_id == 0 { 1 } else { 0 }, chat_id as i32, time()],
-        )
-        .unwrap_or_default()
-}
-
-pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> libc::c_int {
-    if latitude == 0.0 && longitude == 0.0 {
-        return 1;
-    }
-
-    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(
-                    "INSERT INTO locations  \
-                     (latitude, longitude, accuracy, timestamp, chat_id, from_id) VALUES (?,?,?,?,?,?);",
-                    params![
-                        latitude,
-                        longitude,
-                        accuracy,
-                        time(),
-                        chat_id,
-                        1,
-                    ]
-                )?;
-                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()
-}
-
-pub fn get_range(
-    context: &Context,
-    chat_id: u32,
-    contact_id: u32,
-    timestamp_from: i64,
-    mut timestamp_to: i64,
-) -> Vec<Location> {
-    if timestamp_to == 0 {
-        timestamp_to = time() + 10;
-    }
-
-    context
-        .sql
-        .query_map(
-            "SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \
-             m.id, l.from_id, l.chat_id, m.txt \
-             FROM locations l  LEFT JOIN msgs m ON l.id=m.location_id  WHERE (? OR l.chat_id=?) \
-             AND (? OR l.from_id=?) \
-             AND (l.independent=1 OR (l.timestamp>=? AND l.timestamp<=?)) \
-             ORDER BY l.timestamp DESC, l.id DESC, m.id DESC;",
-            params![
-                if chat_id == 0 { 1 } else { 0 },
-                chat_id as i32,
-                if contact_id == 0 { 1 } else { 0 },
-                contact_id as i32,
-                timestamp_from,
-                timestamp_to,
-            ],
-            |row| {
-                let msg_id = row.get(6)?;
-                let txt: String = row.get(9)?;
-                let marker = if msg_id != 0 && is_marker(&txt) {
-                    Some(txt)
-                } else {
-                    None
-                };
-
-                let loc = Location {
-                    location_id: row.get(0)?,
-                    latitude: row.get(1)?,
-                    longitude: row.get(2)?,
-                    accuracy: row.get(3)?,
-                    timestamp: row.get(4)?,
-                    independent: row.get(5)?,
-                    msg_id,
-                    contact_id: row.get(7)?,
-                    chat_id: row.get(8)?,
-                    marker,
-                };
-                Ok(loc)
-            },
-            |locations| {
-                let mut ret = Vec::new();
-
-                for location in locations {
-                    ret.push(location?);
-                }
-                Ok(ret)
-            },
-        )
-        .unwrap_or_default()
-}
-
-fn is_marker(txt: &str) -> bool {
-    txt.len() == 1 && txt.chars().next().unwrap() != ' '
-}
-
-pub fn delete_all(context: &Context) -> Result<(), Error> {
-    sql::execute(context, &context.sql, "DELETE FROM locations;", params![])?;
-    context.call_cb(Event::LOCATION_CHANGED, 0, 0);
-    Ok(())
-}
-
-pub fn get_kml(context: &Context, chat_id: u32) -> Result<(String, u32), Error> {
-    let now = time();
-    let mut location_count = 0;
-    let mut ret = String::new();
-    let mut last_added_location_id = 0;
-
-    let self_addr = context
-        .sql
-        .get_config(context, "configured_addr")
-        .unwrap_or_default();
-
-    let (locations_send_begin, locations_send_until, locations_last_sent) = context.sql.query_row(
-        "SELECT locations_send_begin, locations_send_until, locations_last_sent  FROM chats  WHERE id=?;",
-        params![chat_id as i32], |row| {
-            let send_begin: i64 = row.get(0)?;
-            let send_until: i64 = row.get(1)?;
-            let last_sent: i64 = row.get(2)?;
-
-            Ok((send_begin, send_until, last_sent))
-        })?;
-
-    if !(locations_send_begin == 0 || now > locations_send_until) {
-        ret += &format!(
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
-            self_addr,
-        );
-
-        context.sql.query_map(
-            "SELECT id, latitude, longitude, accuracy, timestamp\
-             FROM locations  WHERE from_id=? \
-             AND timestamp>=? \
-             AND (timestamp>=? OR timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
-             AND independent=0 \
-             GROUP BY timestamp \
-             ORDER BY timestamp;",
-            params![1, locations_send_begin, locations_last_sent, 1],
-            |row| {
-                let location_id: i32 = row.get(0)?;
-                let latitude: f64 = row.get(1)?;
-                let longitude: f64 = row.get(2)?;
-                let accuracy: f64 = row.get(3)?;
-                let timestamp = get_kml_timestamp(row.get(4)?);
-
-                Ok((location_id, latitude, longitude, accuracy, timestamp))
-            },
-            |rows| {
-                for row in rows {
-                    let (location_id, latitude, longitude, accuracy, timestamp) = row?;
-                    ret += &format!(
-                        "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n\x00",
-                        timestamp,
-                        accuracy,
-                        longitude,
-                        latitude
-                    );
-                    location_count += 1;
-                    last_added_location_id = location_id as u32;
-                }
-                Ok(())
-            }
-        )?;
-    }
-
-    ensure!(location_count > 0, "No locations processed");
-    ret += "</Document>\n</kml>";
-
-    Ok((ret, last_added_location_id))
-}
-
-fn get_kml_timestamp(utc: i64) -> String {
-    // Returns a string formatted as YYYY-MM-DDTHH:MM:SSZ. The trailing `Z` indicates UTC.
-    chrono::NaiveDateTime::from_timestamp(utc, 0)
-        .format("%Y-%m-%dT%H:%M:%SZ")
-        .to_string()
-}
-
-pub fn get_message_kml(timestamp: i64, latitude: f64, longitude: f64) -> String {
-    format!(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
-         <kml xmlns=\"http://www.opengis.net/kml/2.2\">\n\
-         <Document>\n\
-         <Placemark>\
-         <Timestamp><when>{}</when></Timestamp>\
-         <Point><coordinates>{:.2},{:.2}</coordinates></Point>\
-         </Placemark>\n\
-         </Document>\n\
-         </kml>",
-        get_kml_timestamp(timestamp),
-        longitude,
-        latitude,
-    )
-}
-
-pub fn set_kml_sent_timestamp(
-    context: &Context,
-    chat_id: u32,
-    timestamp: i64,
-) -> Result<(), Error> {
-    sql::execute(
-        context,
-        &context.sql,
-        "UPDATE chats SET locations_last_sent=? WHERE id=?;",
-        params![timestamp, chat_id as i32],
-    )?;
-
-    Ok(())
-}
-
-pub fn set_msg_location_id(context: &Context, msg_id: u32, location_id: u32) -> Result<(), Error> {
-    sql::execute(
-        context,
-        &context.sql,
-        "UPDATE msgs SET location_id=? WHERE id=?;",
-        params![location_id, msg_id as i32],
-    )?;
-
-    Ok(())
-}
-
-pub fn save(
-    context: &Context,
-    chat_id: u32,
-    contact_id: u32,
-    locations: &[Location],
-    independent: i32,
-) -> Result<u32, Error> {
-    ensure!(chat_id > 9, "Invalid chat id");
-    context.sql.prepare2(
-        "SELECT id FROM locations WHERE timestamp=? AND from_id=?",
-        "INSERT INTO locations\
-         (timestamp, from_id, chat_id, latitude, longitude, accuracy, independent) \
-         VALUES (?,?,?,?,?,?,?);",
-        |mut stmt_test, mut stmt_insert, conn| {
-            let mut newest_timestamp = 0;
-            let mut newest_location_id = 0;
-
-            for location in locations {
-                let exists = stmt_test.exists(params![location.timestamp, contact_id as i32])?;
-
-                if 0 != independent || !exists {
-                    stmt_insert.execute(params![
-                        location.timestamp,
-                        contact_id as i32,
-                        chat_id as i32,
-                        location.latitude,
-                        location.longitude,
-                        location.accuracy,
-                        independent,
-                    ])?;
-
-                    if location.timestamp > newest_timestamp {
-                        newest_timestamp = location.timestamp;
-                        newest_location_id = sql::get_rowid2_with_conn(
-                            context,
-                            conn,
-                            "locations",
-                            "timestamp",
-                            location.timestamp,
-                            "from_id",
-                            contact_id as i32,
-                        );
-                    }
-                }
-            }
-            Ok(newest_location_id)
-        },
-    )
-}
-
-#[allow(non_snake_case)]
-pub fn job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context: &Context, _job: &Job) {
-    let now = time();
-    let mut continue_streaming: libc::c_int = 1;
-    info!(
-        context,
-        0, " ----------------- 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;
-
-                // 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?
-                            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;
-                            }
-                            // 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
-                            chat::send_msg(context, chat_id as u32, &mut msg).unwrap();
-                        }
-                        Ok(())
-                    },
-                )
-            },
-        )
-        .unwrap(); // TODO: Better error handling
-
-    if 0 != continue_streaming {
-        schedule_MAYBE_SEND_LOCATIONS(context, 0x1);
-    }
-}
-
-#[allow(non_snake_case)]
-pub fn job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context: &Context, job: &mut Job) {
-    // this function is called when location-streaming _might_ have ended for a chat.
-    // the function checks, if location-streaming is really ended;
-    // if so, a device-message is added if not yet done.
-
-    let chat_id = job.foreign_id;
-
-    if let Ok((send_begin, send_until)) = context.sql.query_row(
-        "SELECT locations_send_begin, locations_send_until  FROM chats  WHERE id=?",
-        params![chat_id as i32],
-        |row| Ok((row.get::<_, i64>(0)?, row.get::<_, i64>(1)?)),
-    ) {
-        if !(send_begin != 0 && time() <= send_until) {
-            // still streaming -
-            // may happen as several calls to dc_send_locations_to_chat()
-            // do not un-schedule pending DC_MAYBE_SEND_LOC_ENDED jobs
-            if !(send_begin == 0 && send_until == 0) {
-                // not streaming, device-message already sent
-                if context.sql.execute(
-                    "UPDATE chats    SET locations_send_begin=0, locations_send_until=0  WHERE id=?",
-                    params![chat_id as i32],
-                ).is_ok() {
-                    let stock_str = context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
-                    chat::add_device_msg(context, chat_id, stock_str);
-                    context.call_cb(
-                        Event::CHAT_MODIFIED,
-                        chat_id as usize,
-                        0,
-                    );
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::dummy_context;
-
-    #[test]
-    fn test_kml_parse() {
-        let context = dummy_context();
-
-        let xml =
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>";
-
-        let kml = Kml::parse(&context.ctx, &xml).expect("parsing failed");
-
-        assert!(kml.addr.is_some());
-        assert_eq!(kml.addr.as_ref().unwrap(), "user@example.org",);
-
-        let locations_ref = &kml.locations;
-        assert_eq!(locations_ref.len(), 2);
-
-        assert!(locations_ref[0].latitude > 53.6f64);
-        assert!(locations_ref[0].latitude < 53.8f64);
-        assert!(locations_ref[0].longitude > 9.3f64);
-        assert!(locations_ref[0].longitude < 9.5f64);
-        assert!(locations_ref[0].accuracy > 31.9f64);
-        assert!(locations_ref[0].accuracy < 32.1f64);
-        assert_eq!(locations_ref[0].timestamp, 1551906597);
-
-        assert!(locations_ref[1].latitude > 63.6f64);
-        assert!(locations_ref[1].latitude < 63.8f64);
-        assert!(locations_ref[1].longitude > 19.3f64);
-        assert!(locations_ref[1].longitude < 19.5f64);
-        assert!(locations_ref[1].accuracy > 2.4f64);
-        assert!(locations_ref[1].accuracy < 2.6f64);
-        assert_eq!(locations_ref[1].timestamp, 1544739072);
-    }
-}
--- a/src/log.rs
+++ b/src/log.rs
@@ -57,10 +57,3 @@ macro_rules! log_event {
                         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/peerstate.rs
+++ b/src/peerstate.rs
@@ -178,11 +178,8 @@ impl<'a> Peerstate<'a> {
                     OR gossip_key_fingerprint=? COLLATE NOCASE  \
                     ORDER BY public_key_fingerprint=? DESC;";

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

    fn from_stmt<P>(context: &'a Context, query: &str, params: P) -> Option<Self>
@@ -526,10 +523,6 @@ 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
@@ -33,7 +33,7 @@ pub unsafe fn dc_split_armored_data(
    let mut headerline: *mut libc::c_char = ptr::null_mut();
    let mut base64: *mut libc::c_char = ptr::null_mut();
    if !ret_headerline.is_null() {
-        *ret_headerline = ptr::null()
+        *ret_headerline = 0 as *const libc::c_char
    }
    if !ret_setupcodebegin.is_null() {
        *ret_setupcodebegin = ptr::null_mut();
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -1,782 +0,0 @@
-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_token::*;
-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::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 = dc_token_lookup_or_new(context, DC_TOKEN_INVITENUMBER, group_chat_id);
-    let auth = dc_token_lookup_or_new(context, DC_TOKEN_AUTH, group_chat_id);
-    let self_addr = match context.sql.get_config(context, "configured_addr") {
-        Some(addr) => addr,
-        None => {
-            error!(context, 0, "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,
-                0, "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, 0, "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, 0, "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, 0, "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, 0, "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, 0, "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 = unsafe { dc_msg_new_untyped(context) };
-    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,
-        0, ">>>>>>>>>>>>>>>>>>>>>>>>> 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, 0, "Secure-join denied (invitenumber missing).",);
-                    return ret;
-                }
-            };
-            if !dc_token_exists(context, DC_TOKEN_INVITENUMBER, &invitenumber) {
-                warn!(context, 0, "Secure-join denied (bad invitenumber).",);
-                return ret;
-            }
-            info!(context, 0, "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, 0, "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, 0, "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, 0, "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 !dc_token_exists(context, DC_TOKEN_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, 0, "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, 0, "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, 0, "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,
-                    0, "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, 0, "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() == VerifiedStatus::Unverified {
-                    warn!(context, 0, "vg-member-added-received invalid.",);
-                    return ret;
-                }
-                inviter_progress!(context, contact_id, 800);
-                inviter_progress!(context, contact_id, 1000);
-            } else {
-                warn!(context, 0, "vg-member-added-received invalid.",);
-                return ret;
-            }
-        }
-        _ => {
-            warn!(context, 0, "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, 0, "{} ({})", &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, 0, "Message not encrypted.",);
-        false
-    } else if mimeparser.e2ee_helper.signatures.len() <= 0 {
-        warn!(mimeparser.context, 0, "Message not signed.",);
-        false
-    } else if expected_fingerprint.as_ref().is_empty() {
-        warn!(mimeparser.context, 0, "Fingerprint for comparison missing.",);
-        false
-    } else if !mimeparser
-        .e2ee_helper
-        .signatures
-        .contains(expected_fingerprint.as_ref())
-    {
-        warn!(
-            mimeparser.context,
-            0,
-            "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
@@ -12,7 +12,7 @@ pub struct Smtp {
    transport_connected: bool,
    /// Email address we are sending from.
    from: Option<EmailAddress>,
-    pub error: Option<String>,
+    pub error: *mut libc::c_char,
 }

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

@@ -152,7 +152,6 @@ impl Smtp {
                }
                Err(err) => {
                    warn!(context, 0, "SMTP failed to send message: {}", err);
-                    self.error = Some(format!("{}", err));
                    0
                }
            }
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -323,7 +323,7 @@ mod tests {
                StockMessage::MsgAddMember,
                "alice@example.com",
                "",
-                DC_CONTACT_ID_SELF
+                DC_CONTACT_ID_SELF as u32
            ),
            "Member alice@example.com added by me."
        )
@@ -338,7 +338,7 @@ mod tests {
                StockMessage::MsgAddMember,
                "alice@example.com",
                "",
-                DC_CONTACT_ID_SELF
+                DC_CONTACT_ID_SELF as u32
            ),
            "Member Alice (alice@example.com) added by me."
        );
@@ -373,7 +373,7 @@ mod tests {
                StockMessage::MsgGrpName,
                "Some chat",
                "Other chat",
-                DC_CONTACT_ID_SELF
+                DC_CONTACT_ID_SELF as u32
            ),
            "Group name changed from \"Some chat\" to \"Other chat\" by me."
        )
--- a/src/top_evil_rs.py
+++ b/src/top_evil_rs.py
@@ -1,24 +1,24 @@
 #!/usr/bin/env python3


-from pathlib import Path
 import os
 import re

 if __name__ == "__main__":
    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("ok_to_continue")
-        filestats.append((fn, unsafe, free, gotoblocks))
+    for fn in os.listdir():
+        if fn.endswith(".rs"):
+            s = open(fn).read()
+            s = re.sub(r'(?m)///.*$', '', s) # remove comments
+            unsafe = s.count("unsafe")
+            free = s.count("free(")
+            gotoblocks = s.count("current_block =")
+            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} ok_to_continue: {3: >3}".format(str(fn), unsafe, free, gotoblocks))
+        print("{0: <30} unsafe: {1: >3} free: {2: >3} goto-blocks: {3: >3}".format(fn, unsafe, free, gotoblocks))
        sum_unsafe += unsafe
        sum_free += free
        sum_gotoblocks += gotoblocks
@@ -27,5 +27,5 @@ if __name__ == "__main__":
    print()
    print("total unsafe:", sum_unsafe)
    print("total free:", sum_free)
-    print("total ok_to_continue:", sum_gotoblocks)
+    print("total gotoblocks:", sum_gotoblocks)

--- a/tests/stress.rs
+++ b/tests/stress.rs
@@ -2,8 +2,8 @@

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

+use mmime::mailimf_types::*;
 use tempfile::{tempdir, TempDir};

 use deltachat::chat::{self, Chat};
@@ -12,6 +12,7 @@ use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::dc_imex::*;
+use deltachat::dc_mimeparser::*;
 use deltachat::dc_tools::*;
 use deltachat::key::*;
 use deltachat::keyring::*;
@@ -69,7 +70,7 @@ unsafe fn stress_functions(context: &Context) {
        assert!(dc_copy_file(context, "$BLOBDIR/foobar", "$BLOBDIR/dada",));
        assert_eq!(dc_get_filebytes(context, "$BLOBDIR/dada",), 7);

-        let mut buf: *mut libc::c_void = ptr::null_mut();
+        let mut buf: *mut libc::c_void = 0 as *mut libc::c_void;
        let mut buf_bytes: size_t = 0;

        assert_eq!(
@@ -162,10 +163,10 @@ unsafe fn stress_functions(context: &Context) {
    assert!(res.contains(" configured_server_flags "));

    let mut buf_0: *mut libc::c_char;
-    let mut headerline: *const libc::c_char = ptr::null();
-    let mut setupcodebegin: *const libc::c_char = ptr::null();
-    let mut preferencrypt: *const libc::c_char = ptr::null();
-    let mut base64: *const libc::c_char = ptr::null();
+    let mut headerline: *const libc::c_char = 0 as *const libc::c_char;
+    let mut setupcodebegin: *const libc::c_char = 0 as *const libc::c_char;
+    let mut preferencrypt: *const libc::c_char = 0 as *const libc::c_char;
+    let mut base64: *const libc::c_char = 0 as *const libc::c_char;
    buf_0 = strdup(
        b"-----BEGIN PGP MESSAGE-----\nNoVal:\n\ndata\n-----END PGP MESSAGE-----\x00" as *const u8
            as *const libc::c_char,
@@ -174,7 +175,7 @@ unsafe fn stress_functions(context: &Context) {
        buf_0,
        &mut headerline,
        &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
        &mut base64,
    );
    assert!(ok);
@@ -199,7 +200,7 @@ unsafe fn stress_functions(context: &Context) {
        buf_0,
        &mut headerline,
        &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
        &mut base64,
    );

@@ -226,7 +227,7 @@ unsafe fn stress_functions(context: &Context) {
        buf_0,
        &mut headerline,
        &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
        &mut base64,
    );

@@ -251,7 +252,7 @@ unsafe fn stress_functions(context: &Context) {
        buf_0,
        &mut headerline,
        &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
        &mut base64,
    );

@@ -264,7 +265,7 @@ unsafe fn stress_functions(context: &Context) {
        buf_0,
        &mut headerline,
        &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
        &mut base64,
    );
    assert!(ok);
@@ -297,7 +298,7 @@ unsafe fn stress_functions(context: &Context) {
    let ok = dc_split_armored_data(
        buf_0,
        &mut headerline,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
        &mut preferencrypt,
        &mut base64,
    );
@@ -353,16 +354,16 @@ unsafe fn stress_functions(context: &Context) {
    );
    free(norm as *mut libc::c_void);
    let mut buf_1: *mut libc::c_char;
-    let mut headerline_0: *const libc::c_char = ptr::null();
-    let mut setupcodebegin_0: *const libc::c_char = ptr::null();
-    let mut preferencrypt_0: *const libc::c_char = ptr::null();
+    let mut headerline_0: *const libc::c_char = 0 as *const libc::c_char;
+    let mut setupcodebegin_0: *const libc::c_char = 0 as *const libc::c_char;
+    let mut preferencrypt_0: *const libc::c_char = 0 as *const libc::c_char;
    buf_1 = strdup(S_EM_SETUPFILE);
    assert!(dc_split_armored_data(
        buf_1,
        &mut headerline_0,
        &mut setupcodebegin_0,
        &mut preferencrypt_0,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
    ));
    assert!(!headerline_0.is_null());
    assert_eq!(
@@ -388,7 +389,7 @@ unsafe fn stress_functions(context: &Context) {
        &mut headerline_0,
        &mut setupcodebegin_0,
        &mut preferencrypt_0,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
    ));
    assert!(!headerline_0.is_null());
    assert_eq!(
@@ -416,16 +417,16 @@ unsafe fn stress_functions(context: &Context) {
    // let setupcode_c = CString::yolo(setupcode.clone());
    // let setupfile = dc_render_setup_file(context, &setupcode).unwrap();
    // let setupfile_c = CString::yolo(setupfile);
-    // let mut headerline_2: *const libc::c_char = ptr::null();
+    // let mut headerline_2: *const libc::c_char = 0 as *const libc::c_char;
    // let payload = dc_decrypt_setup_file(context, setupcode_c.as_ptr(), setupfile_c.as_ptr());

    // assert!(payload.is_null());
    // assert!(!dc_split_armored_data(
    //     payload,
    //     &mut headerline_2,
-    //     ptr::null_mut(),
-    //     ptr::null_mut(),
-    //     ptr::null_mut(),
+    //     0 as *mut *const libc::c_char,
+    //     0 as *mut *const libc::c_char,
+    //     0 as *mut *const libc::c_char,
    // ));
    // assert!(!headerline_2.is_null());
    // assert_eq!(
@@ -652,6 +653,37 @@ unsafe fn create_test_context() -> TestContext {
    TestContext { ctx: ctx, dir: dir }
 }

+#[test]
+fn test_dc_mimeparser_with_context() {
+    unsafe {
+        let context = create_test_context();
+
+        let mut mimeparser = dc_mimeparser_new(&context.ctx);
+        let raw: *const libc::c_char =
+        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"
+            as *const u8 as *const libc::c_char;
+
+        dc_mimeparser_parse(&mut mimeparser, raw, strlen(raw));
+        assert_eq!(
+            as_str(mimeparser.subject as *const libc::c_char),
+            "inner-subject",
+        );
+
+        let mut of: *mut mailimf_optional_field =
+            dc_mimeparser_lookup_optional_field(&mimeparser, "X-Special-A");
+        assert_eq!(as_str((*of).fld_value as *const libc::c_char), "special-a",);
+
+        of = dc_mimeparser_lookup_optional_field(&mimeparser, "Foo");
+        assert_eq!(as_str((*of).fld_value as *const libc::c_char), "Bar",);
+
+        of = dc_mimeparser_lookup_optional_field(&mimeparser, "Chat-Version");
+        assert_eq!(as_str((*of).fld_value as *const libc::c_char), "1.0",);
+        assert_eq!(mimeparser.parts.len(), 1);
+
+        dc_mimeparser_unref(&mut mimeparser);
+    }
+}
+
 #[test]
 fn test_dc_get_oauth2_url() {
    let ctx = unsafe { create_test_context() };
Author	SHA1	Message	Date
holger krekel	ddd07b1702	use defined constants	2019-08-19 18:34:07 +02:00
holger krekel	34f37ccd9c	rustify dc_job_send and use a Delay enum for try_again later logic	2019-08-19 11:34:08 +02:00
holger krekel	8294b5eb28	Merge branch 'master' into refactor-jobs	2019-08-19 09:30:53 +02:00
holger krekel	bf99c0f2ba	Merge branch 'master' into refactor-jobs and fix conflicts	2019-08-19 08:40:02 +02:00
dignifiedquire	c06cf4eba2	refactor(job): rusty and safe	2019-08-18 13:58:52 +02:00
dignifiedquire	fb7c095dad	refactor(jobthread): safe and rusty	2019-08-18 13:58:25 +02:00
dignifiedquire	d55f6ee7c7	refactor: rename dc_qr -> qr	2019-08-18 13:58:07 +02:00
dignifiedquire	8a49ae2361	refactor: save lot implementation and follow up refactors rewrote qr code to match the now safe lot	2019-08-18 13:58:07 +02:00
dignifiedquire	05ec266d9b	refactor(lot): rename dc_lot to lot	2019-08-18 13:58:06 +02:00
dignifiedquire	9ec7833a50	refactor(lot): rust memory management	2019-08-18 13:58:06 +02:00