Use the first subkey for encryption instead of the primary key

2026-04-02 05:22:14 +03:00 · 2019-11-10 07:16:50 +03:00
68 changed files with 1795 additions and 3655 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ restore-workspace: &restore-workspace
 restore-cache: &restore-cache
  restore_cache:
    keys:
-      - cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+      - cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
      - repo-source-{{ .Branch }}-{{ .Revision }}

 commands:
@@ -44,7 +44,7 @@ jobs:
          command: cargo generate-lockfile
      - restore_cache:
          keys:
-            - cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+            - cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
      - run: rustup install $(cat rust-toolchain)
      - run: rustup default $(cat rust-toolchain)
      - run: rustup component add --toolchain $(cat rust-toolchain) rustfmt
@@ -60,7 +60,7 @@ jobs:
          paths:
            - crate
      - save_cache:
-          key: cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+          key: cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
          paths:
            - "~/.cargo"
            - "~/.rustup"
@@ -121,54 +121,39 @@ jobs:
    steps:
      - checkout
      - run: bash ci_scripts/run-doxygen.sh
-      - run: mkdir -p workspace/c-docs
+      - run: mkdir -p workspace/c-docs 
      - run: cp -av deltachat-ffi/{html,xml} workspace/c-docs/
      - persist_to_workspace:
          root: workspace
          paths:
            - c-docs

-  # build_test_docs_wheel:
-  #   docker:
-  #     - image: deltachat/coredeps
-  #       environment:
-  #           TESTS: 1
-  #           DOCS: 1
-  #   working_directory: /mnt/crate
-  #   steps:
-  #     - *restore-workspace
-  #     - *restore-cache
-  #     - run:
-  #         name: build docs, run tests and build wheels
-  #         command: ci_scripts/run-python.sh
-  #     - run:
-  #          name: copying docs and wheels to workspace
-  #          command: |
-  #            mkdir -p workspace/python
-  #            # cp -av docs workspace/c-docs
-  #            cp -av python/.docker-tox/wheelhouse workspace/
-  #            cp -av python/doc/_build/ workspace/py-docs
-  #     - persist_to_workspace:
-  #         root: workspace
-  #         paths:
-  #           # - c-docs
-  #           - py-docs
-  #           - wheelhouse
-
-  remote_tests_rust:
-    machine: true
+  build_test_docs_wheel:
+    docker:
+      - image: deltachat/coredeps
+        environment:
+            TESTS: 1
+            DOCS: 1
+    working_directory: /mnt/crate
    steps:
-      - checkout
-      - run: ci_scripts/remote_tests_rust.sh
-    
-  remote_tests_python:
-    machine: true
-    steps:
-      - checkout
-      #- attach_workspace:
-      #    at: workspace
-      - run: ci_scripts/remote_tests_python.sh
-    # workspace/py-docs workspace/wheelhouse workspace/c-docs
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: build docs, run tests and build wheels
+          command: ci_scripts/run-python.sh
+      - run:
+           name: copying docs and wheels to workspace
+           command: |
+             mkdir -p workspace/python
+             # cp -av docs workspace/c-docs
+             cp -av python/.docker-tox/wheelhouse workspace/
+             cp -av python/doc/_build/ workspace/py-docs
+      - persist_to_workspace:
+          root: workspace
+          paths:
+            # - c-docs
+            - py-docs
+            - wheelhouse

  upload_docs_wheels:
    machine: true
@@ -196,15 +181,15 @@ workflows:
  test:
    jobs:
      - cargo_fetch
+      - build_doxygen

-      - remote_tests_rust
-
-      - remote_tests_python
-
-      # - upload_docs_wheels:
-      #     requires:
-      #       - build_test_docs_wheel
-      #       - build_doxygen
+      - build_test_docs_wheel:
+          requires:
+            - cargo_fetch
+      - upload_docs_wheels:
+          requires:
+            - build_test_docs_wheel
+            - build_doxygen 
      - rustfmt:
          requires:
            - cargo_fetch
@@ -212,12 +197,10 @@ workflows:
          requires:
           - cargo_fetch

-      - build_doxygen
-
      # Linux Desktop 64bit
-      # - test_x86_64-unknown-linux-gnu:
-      #     requires:
-      #       - cargo_fetch
+      - test_x86_64-unknown-linux-gnu:
+          requires:
+            - cargo_fetch

      # Linux Desktop 32bit
      # - test_i686-unknown-linux-gnu:
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,18 +10,17 @@ deltachat_derive = { path = "./deltachat_derive" }
 mmime = { version = "0.1.2", path = "./mmime" }

 libc = "0.2.51"
-pgp = { git = "https://github.com/rpgp/rpgp", branch = "master", default-features = false }
-hex = "0.4.0"
+pgp = { version = "0.2.3", default-features = false }
+hex = "0.3.2"
 sha2 = "0.8.0"
 rand = "0.6.5"
 smallvec = "0.6.9"
-reqwest = { version = "0.9.15", default-features = false, features = ["rustls-tls"] }
+reqwest = "0.9.15"
 num-derive = "0.2.5"
 num-traits = "0.2.6"
-lettre = { git = "https://github.com/deltachat/lettre", branch = "feat/rustls" }
-async-imap = "0.1.1"
-async-tls = "0.6"
-async-std = { version = "1.0", features = ["unstable"] }
+native-tls = "0.2.3"
+lettre = { git = "https://github.com/deltachat/lettre", branch = "master" }
+imap = { git = "https://github.com/deltachat/rust-imap", branch = "master" }
 base64 = "0.10"
 charset = "0.1"
 percent-encoding = "2.0"
@@ -50,10 +49,6 @@ bitflags = "1.1.0"
 jetscii = "0.4.4"
 debug_stub_derive = "0.3.0"
 sanitize-filename = "0.2.1"
-stop-token = { version = "0.1.1", features = ["unstable"] }
-rustls = "0.16.0"
-webpki-roots = "0.18.0"
-webpki = "0.21.0"

 [dev-dependencies]
 tempfile = "3.0"
@@ -79,6 +74,6 @@ path = "examples/repl/main.rs"

 [features]
 default = ["nightly", "ringbuf"]
-vendored = []
+vendored = ["native-tls/vendored", "reqwest/default-tls-vendored"]
 nightly = ["pgp/nightly"]
 ringbuf = ["pgp/ringbuf"]
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 # Delta Chat Rust

-> Deltachat-core written in Rust 
+> Project porting deltachat-core to rust

 [![CircleCI build status][circle-shield]][circle] [![Appveyor build status][appveyor-shield]][appveyor]

+Current commit on deltachat/deltachat-core: `12ef73c8e76185f9b78e844ea673025f56a959ab`.
+
 ## Installing Rust and Cargo

 To download and install the official compiler for the Rust programming language, and the Cargo package manager, run the command in your user environment:
--- a/assets/icon-device.png
+++ b/assets/icon-device.png
--- a/assets/icon-device.svg
+++ b/assets/icon-device.svg
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0beta1 (32d4812, 2019-09-19)"
-   sodipodi:docname="icon-device.svg"
-   id="svg4344"
-   preserveAspectRatio="xMidYMid meet"
-   viewBox="0 0 45 45"
-   height="60"
-   width="60"
-   version="1.0"
-   inkscape:export-filename="/Users/bpetersen/Documents/deltachat/icons/device4.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <defs
-     id="defs4348">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient865">
-      <stop
-         style="stop-color:#364e59;stop-opacity:1;"
-         offset="0"
-         id="stop861" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop863" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient865"
-       id="linearGradient867"
-       x1="10.227795"
-       y1="43.5238"
-       x2="-25.458139"
-       y2="-7.4257693"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="svg4344"
-     inkscape:window-maximized="0"
-     inkscape:window-y="23"
-     inkscape:window-x="45"
-     inkscape:cy="28.471578"
-     inkscape:cx="41.455164"
-     inkscape:zoom="5.6"
-     units="px"
-     showgrid="false"
-     id="namedview4346"
-     inkscape:window-height="1035"
-     inkscape:window-width="1600"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     inkscape:document-rotation="0"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <metadata
-     id="metadata4336">
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-<rdf:RDF>
-  <cc:Work
-     rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title />
-  </cc:Work>
-</rdf:RDF>
-</metadata>
-  <circle
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071"
-     id="path859"
-     cx="22.5"
-     cy="22.5"
-     r="22.5" />
-  <circle
-     r="22.5"
-     cy="22.5"
-     cx="22.5"
-     id="path4917"
-     style="fill:url(#linearGradient867);fill-opacity:1;stroke-width:0.588554" />
-  <g
-     id="g4342"
-     stroke="none"
-     fill="#000000"
-     transform="matrix(0.00255113,0,0,-0.00255113,5.586152,38.200477)"
-     style="fill:#ffffff;fill-opacity:1">
-    <path
-       inkscape:connector-curvature="0"
-       id="path4338"
-       d="m 8175,12765 c -703,-114 -1248,-608 -1387,-1258 -17,-82 -21,-136 -22,-277 0,-202 15,-307 70,-470 149,-446 499,-733 1009,-828 142,-26 465,-23 619,6 691,131 1201,609 1328,1244 31,158 31,417 0,565 -114,533 -482,889 -1038,1004 -133,27 -448,35 -579,14 z"
-       style="fill:#ffffff;fill-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4340"
-       d="m 7070,9203 c -212,-20 -275,-27 -397,-48 -691,-117 -1400,-444 -2038,-940 -182,-142 -328,-270 -585,-517 -595,-571 -911,-974 -927,-1181 -6,-76 11,-120 69,-184 75,-80 159,-108 245,-79 109,37 263,181 632,595 539,606 774,826 1035,969 135,75 231,105 341,106 82,1 94,-2 138,-27 116,-68 161,-209 122,-376 -9,-36 -349,-868 -757,-1850 -407,-982 -785,-1892 -838,-2021 -287,-694 -513,-1389 -615,-1889 -70,-342 -90,-683 -52,-874 88,-440 381,-703 882,-792 124,-23 401,-30 562,-16 783,69 1674,461 2561,1125 796,596 1492,1354 1607,1751 43,146 -33,308 -168,360 -61,23 -100,15 -173,-36 -105,-74 -202,-170 -539,-529 -515,-551 -762,-783 -982,-927 -251,-164 -437,-186 -543,-65 -56,64 -74,131 -67,247 13,179 91,434 249,815 135,324 1588,4102 1646,4280 106,325 151,561 159,826 9,281 -22,463 -112,652 -58,122 -114,199 -211,292 -245,233 -582,343 -1044,338 -91,-1 -181,-3 -200,-5 z"
-       style="fill:#ffffff;fill-opacity:1" />
-  </g>
-</svg>
--- a/assets/icon-saved-messages.png
+++ b/assets/icon-saved-messages.png
--- a/assets/icon-saved-messages.svg
+++ b/assets/icon-saved-messages.svg
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="204.8"
-   inkscape:export-xdpi="204.8"
-   inkscape:export-filename="/Users/bpetersen/Documents/deltachat/icons/saved-messages.png"
-   version="1.0"
-   width="60"
-   height="60"
-   viewBox="0 0 45 45"
-   preserveAspectRatio="xMidYMid meet"
-   id="svg4344"
-   sodipodi:docname="saved-messages.svg"
-   inkscape:version="1.0beta1 (32d4812, 2019-09-19)">
-  <defs
-     id="defs4348">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient906">
-      <stop
-         style="stop-color:#046cdb;stop-opacity:1"
-         offset="0"
-         id="stop902" />
-      <stop
-         id="stop845"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="-11.049108"
-       x2="-3.1473193"
-       y1="31.473215"
-       x1="36.160713"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient847"
-       xlink:href="#linearGradient906"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     inkscape:document-rotation="0"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="1035"
-     id="namedview4346"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="2.8"
-     inkscape:cx="48.214285"
-     inkscape:cy="55"
-     inkscape:window-x="45"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4344"
-     inkscape:lockguides="false" />
-  <metadata
-     id="metadata4336">
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-<rdf:RDF>
-  <cc:Work
-     rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title />
-  </cc:Work>
-</rdf:RDF>
-</metadata>
-  <circle
-     r="22.5"
-     cy="22.5"
-     cx="22.5"
-     id="path859"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071" />
-  <circle
-     style="fill:url(#linearGradient847);fill-opacity:1;stroke-width:0.588554"
-     id="path4917"
-     cx="22.5"
-     cy="22.5"
-     r="22.5" />
-  <path
-     id="rect846"
-     style="fill:#ffffff;stroke-width:0.84832"
-     d="M 17 9 L 17 55 L 17.125 55 L 30.048828 40.9375 L 42.974609 55 L 43 55 L 43 9 L 17 9 z M 30.005859 15 L 32.720703 22.121094 L 40 22.646484 L 34.396484 27.558594 L 36.169922 35 L 29.992188 30.916016 L 23.808594 34.988281 L 25.595703 27.550781 L 20 22.626953 L 27.28125 22.115234 L 30.005859 15 z "
-     transform="scale(0.75)" />
-</svg>
--- a/ci_scripts/README.md
+++ b/ci_scripts/README.md
@@ -1,46 +1,52 @@
+
 # Continuous Integration Scripts for Delta Chat

-Continuous Integration, run through CircleCI and an own build machine.
-
-## Description of scripts 
-
- `../.circleci/config.yml` describing the build jobs that are run
-  by Circle-CI
-
- `remote_tests_python.sh` rsyncs to a build machine and runs
-  `run-python-test.sh` remotely on the build machine. 
-
- `remote_tests_rust.sh` rsyncs to the build machine and runs
-  `run-rust-test.sh` remotely on the build machine. 
-
- `doxygen/Dockerfile` specifies an image that contains
-  the doxygen tool which is used by `run-doxygen.sh` 
-  to generate C-docs which are then uploaded 
-  via `ci_upload.sh` to `https://c.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
-  (and the master branch is linked to https://c.delta.chat proper). 
+Continuous Integration is run through CircleCI
+but is largely independent of it. 


-## Triggering runs on the build machine locally (fast!)
+## Generating docker containers for performing build step work 

-There is experimental support for triggering a remote Python or Rust test run 
-from your local checkout/branch. You will need to be authorized to login to 
-the build machine (ask your friendly sysadmin on #deltachat freenode) to type::
+All tests, docs and wheel building is run in docker containers:

-    ci_scripts/manual_remote_tests.sh rust
-    ci_scripts/manual_remote_tests.sh python
+- **coredeps/Dockerfile** specifies an image that contains all 
+  of Delta Chat's core dependencies as linkable libraries. 
+  It also serves to run python tests and build wheels 
+  (binary packages for Python). 

-This will **rsync** your current checkout to the remote build machine 
-(no need to commit before) and then run either rust or python tests. 
+- **doxygen/Dockerfile** specifies an image that contains
+  the doxygen tool which is used to generate C-docs. 

-# Outdated files (for later re-use)
+To run tests locally you can pull existing images from "docker.io",
+the hub for sharing Docker images::

-`coredeps/Dockerfile` specifies an image that contains all 
-of Delta Chat's core dependencies. It used to run 
-python tests and build wheels (binary packages for Python)
+    docker pull deltachat/coredeps
+    docker pull deltachat/doxygen 

-You can build the docker images yourself locally
+or you can build the docker images yourself locally
 to avoid the relatively large download:: 
 
    cd ci_scripts  # where all CI things are 
    docker build -t deltachat/coredeps docker-coredeps
    docker build -t deltachat/doxygen docker-doxygen 
+
+## ci_run.sh (main entrypoint called by circle-ci)
+
+Once you have the docker images available 
+you can run python testing, documentation generation 
+and building binary wheels:: 
+
+    sh DOCS=1 TESTS=1 ci_scripts/ci_run.sh 
+    
+## ci_upload.sh (uploading artifacts on success) 
+
+- python docs to `https://py.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
+
+- doxygen docs to `https://c.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
+
+- python wheels to `https://m.devpi.net/dc/<BRANCH>`
+  so that you install fully self-contained wheels like this:
+  `pip install -U -i https://m.devpi.net/dc/<BRANCH> deltachat`
+
+
+
--- a/ci_scripts/ci_upload.sh
+++ b/ci_scripts/ci_upload.sh
@@ -14,12 +14,12 @@ DOXYDOCDIR=${3:?directory where doxygen docs to be found}
 export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}


-# DISABLED: python docs to py.delta.chat
-#ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
-#rsync -avz \
-#  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
-#  "$PYDOCDIR/html/" \
-#  delta@py.delta.chat:build/${BRANCH}
+# python docs to py.delta.chat
+ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
+rsync -avz \
+  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
+  "$PYDOCDIR/html/" \
+  delta@py.delta.chat:build/${BRANCH}

 # C docs to c.delta.chat
 ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@c.delta.chat mkdir -p build-c/${BRANCH}
@@ -28,10 +28,6 @@ rsync -avz \
  "$DOXYDOCDIR/html/" \
  delta@c.delta.chat:build-c/${BRANCH}

-exit 0
-
-# OUTDATED -- for re-use from python release-scripts 
-
 echo -----------------------
 echo upload wheels 
 echo -----------------------
--- a/ci_scripts/docker-coredeps/Dockerfile
+++ b/ci_scripts/docker-coredeps/Dockerfile
@@ -5,6 +5,16 @@ RUN echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \
    echo /usr/local/lib >> /etc/ld.so.conf.d/local.conf
 ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig

+ENV PIP_DISABLE_PIP_VERSION_CHECK 1
+
+# Install python tools (auditwheels,tox, ...)
+ADD deps/build_python.sh /builder/build_python.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1
+
+# Install Rust nightly 
+ADD deps/build_rust.sh /builder/build_rust.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1
+
 # Install a recent Perl, needed to install OpenSSL
 ADD deps/build_perl.sh /builder/build_perl.sh
 RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
@@ -13,12 +23,3 @@ RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
 ADD deps/build_openssl.sh /builder/build_openssl.sh
 RUN mkdir tmp1 && cd tmp1 && bash /builder/build_openssl.sh && cd .. && rm -r tmp1

-ENV PIP_DISABLE_PIP_VERSION_CHECK 1
-
-# Install python tools (auditwheels,tox, ...)
-ADD deps/build_python.sh /builder/build_python.sh
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1
-
-# Install Rust nightly
-ADD deps/build_rust.sh /builder/build_rust.sh
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1
--- a/ci_scripts/docker-coredeps/deps/build_perl.sh
+++ b/ci_scripts/docker-coredeps/deps/build_perl.sh
@@ -1,11 +1,11 @@
 #!/bin/bash

-PERL_VERSION=5.30.0
-# PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
+PERL_VERSION=5.28.0
+PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
 curl -O https://www.cpan.org/src/5.0/perl-${PERL_VERSION}.tar.gz
-# echo "${PERL_SHA256}  perl-${PERL_VERSION}.tar.gz" | sha256sum -c -
-tar -xzf perl-${PERL_VERSION}.tar.gz
-cd perl-${PERL_VERSION}
+echo "${PERL_SHA256}  perl-${PERL_VERSION}.tar.gz" | sha256sum -c -
+tar xzf perl-${PERL_VERSION}.tar.gz
+cd perl-${PERL_VERSION} 

 ./Configure -de
 make
--- a/ci_scripts/docker-coredeps/deps/build_rust.sh
+++ b/ci_scripts/docker-coredeps/deps/build_rust.sh
@@ -1,8 +1,11 @@
 #!/bin/bash

-set -e -x
+set -e -x 

-# Install Rust
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-09-12 -y
+# Install Rust 
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-07-10 -y
 export PATH=/root/.cargo/bin:$PATH
 rustc --version
+
+# remove some 300-400 MB that we don't need for automated builds
+rm -rf /root/.rustup/toolchains/nightly-2019-07-10-x86_64-unknown-linux-gnu/share/
--- a/ci_scripts/manual_remote_tests.sh
+++ b/ci_scripts/manual_remote_tests.sh
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -xe
-export CIRCLE_JOB=remote_tests_${1:?need to specify 'rust' or 'python'} 
-export CIRCLE_BUILD_NUM=$USER
-export CIRCLE_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
-export CIRCLE_PROJECT_REPONAME=$(basename `git rev-parse --show-toplevel`)
-
-time bash ci_scripts/$CIRCLE_JOB.sh 
--- a/ci_scripts/old/gh-actions-rust.yml
+++ b/ci_scripts/old/gh-actions-rust.yml
@@ -1,77 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-
-env:
-  RUSTFLAGS: -Dwarnings
-
-jobs:
-  build_and_test:
-    name: Build and test
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [nightly]
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Install ${{ matrix.rust }}
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ matrix.rust }}
-        override: true
-
-    - name: check
-      uses: actions-rs/cargo@v1
-      if: matrix.rust == 'nightly'
-      with:
-        command:  check
-        args: --all --bins --examples --tests
-
-    - name: tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all
-
-    - name: tests ignored
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all --release -- --ignored
-
-  check_fmt:
-    name: Checking fmt and docs
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-
-    - uses: actions-rs/toolchain@v1
-      with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-    - name: fmt
-      run: cargo fmt --all -- --check
-
-#  clippy_check:
-#    name: Clippy check
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions-rs/toolchain@v1
-#      with:
-#          profile: minimal
-#          toolchain: nightly
-#          override: true
-#          components: clippy
-#
-#    - name: clippy
-#      run: cargo clippy --all
--- a/ci_scripts/remote_tests_python.sh
+++ b/ci_scripts/remote_tests_python.sh
@@ -1,48 +0,0 @@
-#!/bin/bash 
-
-export BRANCH=${CIRCLE_BRANCH:?branch to build}
-export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
-export SSHTARGET=ci@b1.delta.chat
-
-# we construct the BUILDDIR such that we can easily share the
-# CARGO_TARGET_DIR between runs ("..")
-export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
-
-echo "--- Copying files to $SSHTARGET:$BUILDDIR"
-
-set -xe
-
-ssh -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
-git ls-files >.rsynclist 
-# we seem to need .git for setuptools_scm versioning 
-find .git >>.rsynclist
-rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
-
-set +x
-
-echo "--- Running $CIRCLE_JOB remotely"
-
-ssh $SSHTARGET <<_HERE
-    set +x -e
-    cd $BUILDDIR
-    # make sure git checkouts are clean (no dangling revspcs)
-    cargo cache --gc
-    # let's share the target dir with our last run on this branch/job-type
-    # cargo will make sure to block/unblock us properly 
-    export CARGO_TARGET_DIR=\`pwd\`/../target
-    export TARGET=release
-    export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
-
-    #we rely on tox/virtualenv being available in the host
-    #rm -rf virtualenv venv
-    #virtualenv -q -p python3.7 venv 
-    #source venv/bin/activate
-    #pip install -q tox virtualenv
-
-    set -x
-    which python
-    source \$HOME/venv/bin/activate
-    which python
-
-    bash ci_scripts/run-python-test.sh 
-_HERE
--- a/ci_scripts/remote_tests_rust.sh
+++ b/ci_scripts/remote_tests_rust.sh
@@ -1,34 +0,0 @@
-#!/bin/bash 
-
-export BRANCH=${CIRCLE_BRANCH:?branch to build}
-export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
-export SSHTARGET=ci@b1.delta.chat
-
-# we construct the BUILDDIR such that we can easily share the
-# CARGO_TARGET_DIR between runs ("..")
-export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
-
-set -e
-
-echo "--- Copying files to $SSHTARGET:$BUILDDIR"
-
-ssh -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
-git ls-files >.rsynclist 
-rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
-
-echo "--- Running $CIRCLE_JOB remotely"
-
-ssh $SSHTARGET <<_HERE
-    set +x -e
-    cd $BUILDDIR
-    # make sure git checkouts are clean (no dangling revspecs)
-    cargo cache --gc
-    # let's share the target dir with our last run on this branch/job-type
-    # cargo will make sure to block/unblock us properly 
-    export CARGO_TARGET_DIR=\`pwd\`/../target
-    export TARGET=x86_64-unknown-linux-gnu
-    export RUSTC_WRAPPER=sccache
-
-    bash ci_scripts/run-rust-test.sh
-_HERE
-
--- a/ci_scripts/run-python-test.sh
+++ b/ci_scripts/run-python-test.sh
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# Run functional tests for Delta Chat core using the python bindings 
-# and tox/pytest. 
-
-set -e -x
-
-# for core-building and python install step
-export DCC_RS_TARGET=release
-export DCC_RS_DEV=`pwd`
-
-cd python
-
-python install_python_bindings.py onlybuild
-
-# remove and inhibit writing PYC files 
-rm -rf tests/__pycache__
-rm -rf src/deltachat/__pycache__
-export PYTHONDONTWRITEBYTECODE=1
-
-# run python tests (tox invokes pytest to run tests in python/tests)
-#TOX_PARALLEL_NO_SPINNER=1 tox -e lint,doc
-tox -e lint
-tox -e doc,py37
--- a/ci_scripts/old/run-python.sh
+++ b/ci_scripts/old/run-python.sh
--- a/ci_scripts/run-rust-test.sh
+++ b/ci_scripts/run-rust-test.sh
@@ -2,7 +2,7 @@

 set -ex

-#export RUST_TEST_THREADS=1
+export RUST_TEST_THREADS=1
 export RUST_BACKTRACE=1
 export RUSTFLAGS='--deny warnings'
 export OPT="--target=$TARGET"
@@ -37,9 +37,7 @@ else
    export OPT_RELEASE_IGNORED="${OPT_RELEASE} -- --ignored"
 fi

-# Run all the test configurations 
-# RUSTC_WRAPPER=SCCACHE seems to destroy parallelism / prolong the test
-unset RUSTC_WRAPPER
+# Run all the test configurations:
 $CARGO_CMD $CARGO_SUBCMD $OPT
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE_IGNORED
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -1096,9 +1096,9 @@ void            dc_set_draft                 (dc_context_t* context, uint32_t ch
 * Add a message to the device-chat.
 * Device-messages usually contain update information
 * and some hints that are added during the program runs, multi-device etc.
- * The device-message may be defined by a label;
- * if a message with the same label was added or skipped before,
- * the message is not added again, even if the message was deleted in between.
+ *
+ * Device-messages may be added from the core,
+ * however, with this function, this can be done from the ui as well.
 * If needed, the device-chat is created before.
 *
 * Sends the event #DC_EVENT_MSGS_CHANGED on success.
@@ -1106,50 +1106,11 @@ void            dc_set_draft                 (dc_context_t* context, uint32_t ch
 *
 * @memberof dc_context_t
 * @param context The context as created by dc_context_new().
- * @param label A unique name for the message to add.
- *     The label is typically not displayed to the user and
- *     must be created from the characters `A-Z`, `a-z`, `0-9`, `_` or `-`.
- *     If you pass NULL here, the message is added unconditionally.
 * @param msg Message to be added to the device-chat.
 *     The message appears to the user as an incoming message.
- *     If you pass NULL here, only the given label will be added
- *     and block adding messages with that label in the future.
- * @return The ID of the just added message,
- *     if the message was already added or no message to add is given, 0 is returned.
- *
- * Example:
- * ~~~
- * dc_msg_t* welcome_msg = dc_msg_new(DC_MSG_TEXT);
- * dc_msg_set_text(welcome_msg, "great that you give this app a try!");
- *
- * dc_msg_t* changelog_msg = dc_msg_new(DC_MSG_TEXT);
- * dc_msg_set_text(changelog_msg, "we have added 3 new emojis :)");
- *
- * if (dc_add_device_msg(context, "welcome", welcome_msg)) {
- *     // do not add the changelog on a new installations -
- *     // not now and not when this code is executed again
- *     dc_add_device_msg(context, "update-123", NULL);
- * } else {
- *     // welcome message was not added now, this is an oder installation,
- *     // add a changelog
- *     dc_add_device_msg(context, "update-123", changelog_msg);
- * }
- * ~~~
+ * @return The ID of the added message.
 */
-uint32_t        dc_add_device_msg            (dc_context_t* context, const char* label, dc_msg_t* msg);
-
-
-/**
- * Check if a device-message with a given label was ever added.
- * Device-messages can be added dc_add_device_msg().
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param label Label of the message to check.
- * @return 1=A message with this label was added at some point,
- *     0=A message with this label was never added.
- */
-int             dc_was_device_msg_ever_added (dc_context_t* context, const char* label);
+uint32_t        dc_add_device_msg            (dc_context_t* context, dc_msg_t* msg);


 /**
@@ -2777,7 +2738,9 @@ int             dc_chat_is_self_talk         (const dc_chat_t* chat);
 * From the ui view, device-talks are not very special,
 * the user can delete and forward messages, archive the chat, set notifications etc.
 *
- * Messages can be added to the device-talk using dc_add_device_msg()
+ * Messages may be added from the core to the device chat,
+ * so the chat just pops up as usual.
+ * However, if needed the ui can also add messages using dc_add_device_msg()
 *
 * @memberof dc_chat_t
 * @param chat The chat object.
@@ -4504,8 +4467,7 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
 #define DC_STR_MSGLOCATIONDISABLED        65
 #define DC_STR_LOCATION                   66
 #define DC_STR_STICKER                    67
-#define DC_STR_DEVICE_MESSAGES            68
-#define DC_STR_COUNT                      68
+#define DC_STR_COUNT                      67

 /*
 * @}
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -461,7 +461,7 @@ pub unsafe extern "C" fn dc_perform_imap_jobs(context: *mut dc_context_t) {
    }
    let ffi_context = &*context;
    ffi_context
-        .with_inner(|ctx| job::perform_inbox_jobs(ctx))
+        .with_inner(|ctx| job::perform_imap_jobs(ctx))
        .unwrap_or(())
 }

@@ -473,20 +473,19 @@ pub unsafe extern "C" fn dc_perform_imap_fetch(context: *mut dc_context_t) {
    }
    let ffi_context = &*context;
    ffi_context
-        .with_inner(|ctx| job::perform_inbox_fetch(ctx))
+        .with_inner(|ctx| job::perform_imap_fetch(ctx))
        .unwrap_or(())
 }

 #[no_mangle]
 pub unsafe extern "C" fn dc_perform_imap_idle(context: *mut dc_context_t) {
-    // TODO rename function in co-ordination with UIs
    if context.is_null() {
        eprintln!("ignoring careless call to dc_perform_imap_idle()");
        return;
    }
    let ffi_context = &*context;
    ffi_context
-        .with_inner(|ctx| job::perform_inbox_idle(ctx))
+        .with_inner(|ctx| job::perform_imap_idle(ctx))
        .unwrap_or(())
 }

@@ -498,7 +497,7 @@ pub unsafe extern "C" fn dc_interrupt_imap_idle(context: *mut dc_context_t) {
    }
    let ffi_context = &*context;
    ffi_context
-        .with_inner(|ctx| job::interrupt_inbox_idle(ctx, true))
+        .with_inner(|ctx| job::interrupt_imap_idle(ctx))
        .unwrap_or(())
 }

@@ -813,53 +812,22 @@ pub unsafe extern "C" fn dc_set_draft(
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_add_device_msg(
-    context: *mut dc_context_t,
-    label: *const libc::c_char,
-    msg: *mut dc_msg_t,
-) -> u32 {
-    if context.is_null() || (label.is_null() && msg.is_null()) {
+pub unsafe extern "C" fn dc_add_device_msg(context: *mut dc_context_t, msg: *mut dc_msg_t) -> u32 {
+    if context.is_null() || msg.is_null() {
        eprintln!("ignoring careless call to dc_add_device_msg()");
        return 0;
    }
    let ffi_context = &mut *context;
-    let msg = if msg.is_null() {
-        None
-    } else {
-        let ffi_msg: &mut MessageWrapper = &mut *msg;
-        Some(&mut ffi_msg.message)
-    };
+    let ffi_msg = &mut *msg;
    ffi_context
        .with_inner(|ctx| {
-            chat::add_device_msg(
-                ctx,
-                to_opt_string_lossy(label).as_ref().map(|x| x.as_str()),
-                msg,
-            )
-            .unwrap_or_log_default(ctx, "Failed to add device message")
+            chat::add_device_msg(ctx, &mut ffi_msg.message)
+                .unwrap_or_log_default(ctx, "Failed to add device message")
        })
        .map(|msg_id| msg_id.to_u32())
        .unwrap_or(0)
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_was_device_msg_ever_added(
-    context: *mut dc_context_t,
-    label: *const libc::c_char,
-) -> libc::c_int {
-    if context.is_null() || label.is_null() {
-        eprintln!("ignoring careless call to dc_was_device_msg_ever_added()");
-        return 0;
-    }
-    let ffi_context = &mut *context;
-    ffi_context
-        .with_inner(|ctx| {
-            chat::was_device_msg_ever_added(ctx, &to_string_lossy(label)).unwrap_or(false)
-                as libc::c_int
-        })
-        .unwrap_or(0)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32) -> *mut dc_msg_t {
    if context.is_null() {
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -496,7 +496,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            println!("{:#?}", context.get_info());
        }
        "interrupt" => {
-            interrupt_inbox_idle(context, true);
+            interrupt_imap_idle(context);
        }
        "maybenetwork" => {
            maybe_network(context);
@@ -837,7 +837,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
            );
            let mut msg = Message::new(Viewtype::Text);
            msg.set_text(Some(arg1.to_string()));
-            chat::add_device_msg(context, None, Some(&mut msg))?;
+            chat::add_device_msg(context, &mut msg)?;
        }
        "listmedia" => {
            ensure!(sel_chat.is_some(), "No chat selected.");
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -150,11 +150,11 @@ fn start_threads(c: Arc<RwLock<Context>>) {
    let ctx = c.clone();
    let handle_imap = std::thread::spawn(move || loop {
        while_running!({
-            perform_inbox_jobs(&ctx.read().unwrap());
-            perform_inbox_fetch(&ctx.read().unwrap());
+            perform_imap_jobs(&ctx.read().unwrap());
+            perform_imap_fetch(&ctx.read().unwrap());
            while_running!({
                let context = ctx.read().unwrap();
-                perform_inbox_idle(&context);
+                perform_imap_idle(&context);
            });
        });
    });
@@ -202,7 +202,7 @@ fn stop_threads(context: &Context) {
        println!("Stopping threads");
        IS_RUNNING.store(false, Ordering::Relaxed);

-        interrupt_inbox_idle(context, true);
+        interrupt_imap_idle(context);
        interrupt_mvbox_idle(context);
        interrupt_sentbox_idle(context);
        interrupt_smtp_idle(context);
@@ -455,9 +455,9 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
        }
        "imap-jobs" => {
            if HANDLE.clone().lock().unwrap().is_some() {
-                println!("inbox-jobs are already running in a thread.");
+                println!("imap-jobs are already running in a thread.");
            } else {
-                perform_inbox_jobs(&ctx.read().unwrap());
+                perform_imap_jobs(&ctx.read().unwrap());
            }
        }
        "configure" => {
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -11,8 +11,7 @@ use deltachat::configure::*;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::job::{
-    perform_inbox_fetch, perform_inbox_idle, perform_inbox_jobs, perform_smtp_idle,
-    perform_smtp_jobs,
+    perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
 };
 use deltachat::Event;

@@ -51,12 +50,12 @@ fn main() {
    let r1 = running.clone();
    let t1 = thread::spawn(move || {
        while *r1.read().unwrap() {
-            perform_inbox_jobs(&ctx1);
+            perform_imap_jobs(&ctx1);
            if *r1.read().unwrap() {
-                perform_inbox_fetch(&ctx1);
+                perform_imap_fetch(&ctx1);

                if *r1.read().unwrap() {
-                    perform_inbox_idle(&ctx1);
+                    perform_imap_idle(&ctx1);
                }
            }
        }
@@ -114,7 +113,7 @@ fn main() {
    println!("stopping threads");

    *running.clone().write().unwrap() = false;
-    deltachat::job::interrupt_inbox_idle(&ctx, true);
+    deltachat::job::interrupt_imap_idle(&ctx);
    deltachat::job::interrupt_smtp_idle(&ctx);

    println!("joining");
--- a/mmime/Cargo.toml
+++ b/mmime/Cargo.toml
@@ -20,4 +20,4 @@ memmap = "0.7.0"
 lazy_static = "1.3.0"
 rand = "0.6.5"
 chrono = "0.4.6"
-hex = "0.4.0"
+hex = "0.3.2"
--- a/python/install_python_bindings.py
+++ b/python/install_python_bindings.py
@@ -9,23 +9,17 @@ import subprocess
 import sys

 if __name__ == "__main__":
-    target = os.environ.get("DCC_RS_TARGET")
-    if target is None:
-        os.environ["DCC_RS_TARGET"] = target = "release"
+    os.environ["DCC_RS_TARGET"] = target = "release"
    if "DCC_RS_DEV" not in os.environ:
        dn = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
        os.environ["DCC_RS_DEV"] = dn

-    # build the core library  in release + debug mode because
-    # as of Nov 2019 rPGP generates RSA keys which take
-    # prohibitively long for non-release installs
    os.environ["RUSTFLAGS"] = "-g"
    subprocess.check_call([
        "cargo", "build", "-p", "deltachat_ffi", "--" + target
    ])
    subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)

-    if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
-        subprocess.check_call([
-            sys.executable, "-m", "pip", "install", "-e", "."
-        ])
+    subprocess.check_call([
+        sys.executable, "-m", "pip", "install", "-e", "."
+    ])
--- a/python/src/deltachat/_build.py
+++ b/python/src/deltachat/_build.py
@@ -29,10 +29,7 @@ def ffibuilder():
            extra_link_args = []
        else:
            raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
-        target_dir = os.environ.get("CARGO_TARGET_DIR")
-        if target_dir is None:
-            target_dir = os.path.join(projdir, 'target')
-        objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
+        objs = [os.path.join(projdir, 'target', target, 'libdeltachat.a')]
        assert os.path.exists(objs[0]), objs
        incs = [os.path.join(projdir, 'deltachat-ffi')]
    else:
--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -573,10 +573,8 @@ class IOThreads:
        self._log_event("py-bindings-info", 0, "INBOX THREAD START")
        while not self._thread_quitflag:
            lib.dc_perform_imap_jobs(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_imap_fetch(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_imap_idle(self._dc_context)
+            lib.dc_perform_imap_fetch(self._dc_context)
+            lib.dc_perform_imap_idle(self._dc_context)
        self._log_event("py-bindings-info", 0, "INBOX THREAD FINISHED")

    def mvbox_thread_run(self):
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -21,7 +21,7 @@ class TestOfflineAccountBasic:
        d = ac1.get_info()
        assert d["arch"]
        assert d["number_of_chats"] == "0"
-        assert d["bcc_self"] == "0"
+        assert d["bcc_self"] == "1"

    def test_is_not_configured(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
@@ -43,7 +43,7 @@ class TestOfflineAccountBasic:
    def test_has_bccself(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
        assert "bcc_self" in ac1.get_config("sys.config_keys").split()
-        assert ac1.get_config("bcc_self") == "0"
+        assert ac1.get_config("bcc_self") == "1"

    def test_selfcontact_if_unconfigured(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
@@ -405,9 +405,6 @@ class TestOnlineAccount:
        wait_successful_IMAP_SMTP_connection(ac1)
        wait_configuration_progress(ac1, 1000)

-        lp.sec("ac1: setting bcc_self=1")
-        ac1.set_config("bcc_self", "1")
-
        lp.sec("send out message with bcc to ourselves")
        msg_out = chat.send_text("message2")
        ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -430,25 +427,15 @@ class TestOnlineAccount:
        assert self_addr not in ev[2]
        ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")

-    def test_mvbox_sentbox_threads(self, acfactory, lp):
-        lp.sec("ac1: start with mvbox thread")
+    def test_mvbox_sentbox_threads(self, acfactory):
        ac1 = acfactory.get_online_configuring_account(mvbox=True, sentbox=True)
-
-        lp.sec("ac2: start without mvbox/sentbox threads")
        ac2 = acfactory.get_online_configuring_account()
-
-        lp.sec("ac2: waiting for configuration")
        wait_configuration_progress(ac2, 1000)
-
-        lp.sec("ac1: waiting for configuration")
        wait_configuration_progress(ac1, 1000)
-
-        lp.sec("ac1: send message and wait for ac2 to receive it")
        chat = self.get_chat(ac1, ac2)
        chat.send_text("message1")
        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
-        lp.sec("test finished")

    def test_move_works(self, acfactory):
        ac1 = acfactory.get_online_configuring_account()
@@ -688,6 +675,7 @@ class TestOnlineAccount:
        assert len(messages) == 1
        assert messages[0].text == "msg1"

+        pytest.xfail("cannot export twice yet, probably due to interrupt_idle failing")
        # wait until a second passed since last backup
        # because get_latest_backupfile() shall return the latest backup
        # from a UI it's unlikely anyone manages to export two
@@ -730,7 +718,6 @@ class TestOnlineAccount:
        ac2._evlogger.set_timeout(30)
        wait_configuration_progress(ac2, 1000)
        wait_configuration_progress(ac1, 1000)
-
        lp.sec("trigger ac setup message but ignore")
        assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
        ac1.initiate_key_transfer()
@@ -742,7 +729,6 @@ class TestOnlineAccount:
        msg = ac2.get_message_by_id(ev[2])
        assert msg.is_setup_message()
        assert msg.get_setupcodebegin() == setup_code2[:2]
-
        lp.sec("process second setup message")
        msg.continue_key_transfer(setup_code2)
        assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
@@ -910,7 +896,7 @@ class TestOnlineConfigureFails:
        ac1.start_threads()
        wait_configuration_progress(ac1, 500)
        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
-        assert "cannot login" in ev1[2].lower()
+        assert "authentication failed" in ev1[2].lower()
        wait_configuration_progress(ac1, 0, 0)

    def test_invalid_user(self, acfactory):
@@ -919,7 +905,7 @@ class TestOnlineConfigureFails:
        ac1.start_threads()
        wait_configuration_progress(ac1, 500)
        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
-        assert "cannot login" in ev1[2].lower()
+        assert "authentication failed" in ev1[2].lower()
        wait_configuration_progress(ac1, 0, 0)

    def test_invalid_domain(self, acfactory):
--- a/python/tests/test_lowlevel.py
+++ b/python/tests/test_lowlevel.py
@@ -41,7 +41,7 @@ def test_dc_close_events(tmpdir):
            else:
                print("skipping event", *ev)

-    find("disconnecting inbox-thread")
+    find("disconnecting INBOX-watch")
    find("disconnecting sentbox-thread")
    find("disconnecting mvbox-thread")
    find("disconnecting SMTP")
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -1,25 +1,19 @@
 [tox]
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
-    py37
+    py35
    lint
    auditwheels

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

+
 [testenv:lint]
 skipsdist = True
 usedevelop = True
@@ -48,28 +43,18 @@ commands =
    rst-lint --encoding 'utf-8' README.rst

 [testenv:doc]
-changedir=doc
+basepython = python3.5
 deps =
    sphinx==2.2.0
    breathe
+
+changedir = doc
 commands =
-    sphinx-build -w toxdoc-warnings.log -b html . _build/html
-
-
-[testenv:lintdoc]
-skipsdist = True
-usedevelop = True
-deps =
-    {[testenv:lint]deps}
-    {[testenv:doc]deps}
-commands =
-    {[testenv:lint]commands}
-    {[testenv:doc]commands}
-
+    sphinx-build -w docker-toxdoc-warnings.log -b html . _build/html


 [pytest]
-addopts = -v -rs 
+addopts = -v -rs --reruns 3 --reruns-delay 2
 python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true
--- a/2
+++ b/2
@@ -1 +1 @@
-nightly-2019-11-06
+nightly-2019-08-13
--- a/src/aheader.rs
+++ b/src/aheader.rs
@@ -1,7 +1,3 @@
-//! # Autocrypt header module
-//!
-//! Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
-
 use std::collections::BTreeMap;
 use std::ffi::CStr;
 use std::str::FromStr;
@@ -50,7 +46,7 @@ impl str::FromStr for EncryptPreference {
    }
 }

-/// Autocrypt header
+/// Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
 #[derive(Debug)]
 pub struct Aheader {
    pub addr: String,
@@ -59,7 +55,6 @@ pub struct Aheader {
 }

 impl Aheader {
-    /// Creates new autocrypt header
    pub fn new(addr: String, public_key: Key, prefer_encrypt: EncryptPreference) -> Self {
        Aheader {
            addr,
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -1,5 +1,3 @@
-//! # Blob directory management
-
 use std::ffi::OsStr;
 use std::fmt;
 use std::fs;
@@ -140,10 +138,9 @@ impl<'a> BlobObject<'a> {
        context: &Context,
        src: impl AsRef<Path>,
    ) -> std::result::Result<BlobObject, BlobError> {
-        if src.as_ref().starts_with(context.get_blobdir()) {
-            BlobObject::from_path(context, src)
-        } else {
-            BlobObject::create_and_copy(context, src)
+        match src.as_ref().starts_with(context.get_blobdir()) {
+            true => BlobObject::from_path(context, src),
+            false => BlobObject::create_and_copy(context, src),
        }
    }

@@ -265,13 +262,13 @@ impl<'a> BlobObject<'a> {
    fn sanitise_name(name: &str) -> (String, String) {
        let mut name = name.to_string();
        for part in name.rsplit('/') {
-            if !part.is_empty() {
+            if part.len() > 0 {
                name = part.to_string();
                break;
            }
        }
        for part in name.rsplit('\\') {
-            if !part.is_empty() {
+            if part.len() > 0 {
                name = part.to_string();
                break;
            }
@@ -283,13 +280,13 @@ impl<'a> BlobObject<'a> {
        };

        let clean = sanitize_filename::sanitize_with_options(name, opts);
-        let mut iter = clean.splitn(2, '.');
-        let mut stem = iter.next().unwrap_or_default().to_string();
+        let mut iter = clean.rsplitn(2, '.');
        let mut ext = iter.next().unwrap_or_default().to_string();
-        stem.truncate(64);
+        let mut stem = iter.next().unwrap_or_default().to_string();
        ext.truncate(32);
-        match ext.len() {
-            0 => (stem, "".to_string()),
+        stem.truncate(64);
+        match stem.len() {
+            0 => (ext, "".to_string()),
            _ => (stem, format!(".{}", ext).to_lowercase()),
        }
    }
@@ -610,26 +607,6 @@ mod tests {
        }
    }

-    #[test]
-    fn test_double_ext_preserved() {
-        let t = dummy_context();
-        BlobObject::create(&t.ctx, "foo.tar.gz", b"hello").unwrap();
-        let foo = t.ctx.get_blobdir().join("foo.tar.gz");
-        assert!(foo.exists());
-        BlobObject::create(&t.ctx, "foo.tar.gz", b"world").unwrap();
-        for dirent in fs::read_dir(t.ctx.get_blobdir()).unwrap() {
-            let fname = dirent.unwrap().file_name();
-            if fname == foo.file_name().unwrap() {
-                assert_eq!(fs::read(&foo).unwrap(), b"hello");
-            } else {
-                let name = fname.to_str().unwrap();
-                println!("{}", name);
-                assert!(name.starts_with("foo"));
-                assert!(name.ends_with(".tar.gz"));
-            }
-        }
-    }
-
    #[test]
    fn test_create_long_names() {
        let t = dummy_context();
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -1,9 +1,6 @@
-//! # Chat module
-
 use std::path::{Path, PathBuf};

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

 use crate::blob::{BlobErrorKind, BlobObject};
 use crate::chatlist::*;
@@ -39,7 +36,6 @@ pub struct Chat {
 }

 impl Chat {
-    /// Loads chat from the database by its ID.
    pub fn load_from_db(context: &Context, chat_id: u32) -> Result<Self, Error> {
        let res = context.sql.query_row(
            "SELECT c.id,c.type,c.name, c.grpid,c.param,c.archived, \
@@ -100,7 +96,7 @@ impl Chat {
                        }

                        if chat.param.exists(Param::Selftalk) {
-                            chat.name = context.stock_str(StockMessage::SavedMessages).into();
+                            chat.name = context.stock_str(StockMessage::SelfMsg).into();
                        } else if chat.param.exists(Param::Devicetalk) {
                            chat.name = context.stock_str(StockMessage::DeviceMessages).into();
                        }
@@ -229,7 +225,6 @@ impl Chat {
        color
    }

-    /// Returns true if the chat is archived.
    pub fn is_archived(&self) -> bool {
        self.archived
    }
@@ -603,20 +598,6 @@ fn copy_device_icon_to_blobs(context: &Context) -> Result<String, Error> {
    Ok(blob.as_name().to_string())
 }

-pub fn update_saved_messages_icon(context: &Context) -> Result<(), Error> {
-    // if there is no saved-messages chat, there is nothing to update. this is no error.
-    if let Ok((chat_id, _)) = lookup_by_contact_id(context, DC_CONTACT_ID_SELF) {
-        let icon = include_bytes!("../assets/icon-saved-messages.png");
-        let blob = BlobObject::create(context, "icon-saved-messages.png".to_string(), icon)?;
-        let icon = blob.as_name().to_string();
-
-        let mut chat = Chat::load_from_db(context, chat_id)?;
-        chat.param.set(Param::ProfileImage, icon);
-        chat.update_param(context)?;
-    }
-    Ok(())
-}
-
 pub fn create_or_lookup_by_contact_id(
    context: &Context,
    contact_id: u32,
@@ -666,10 +647,6 @@ pub fn create_or_lookup_by_contact_id(
        params![],
    )?;

-    if contact_id == DC_CONTACT_ID_SELF {
-        update_saved_messages_icon(context)?;
-    }
-
    Ok((chat_id, create_blocked))
 }

@@ -712,8 +689,6 @@ pub fn prepare_msg<'a>(

 pub fn msgtype_has_file(msgtype: Viewtype) -> bool {
    match msgtype {
-        Viewtype::Unknown => false,
-        Viewtype::Text => false,
        Viewtype::Image => true,
        Viewtype::Gif => true,
        Viewtype::Sticker => true,
@@ -721,6 +696,7 @@ pub fn msgtype_has_file(msgtype: Viewtype) -> bool {
        Viewtype::Voice => true,
        Viewtype::Video => true,
        Viewtype::File => true,
+        _ => false,
    }
 }

@@ -820,8 +796,7 @@ pub fn is_contact_in_chat(context: &Context, chat_id: u32, contact_id: u32) -> b
        .unwrap_or_default()
 }

-// note that unarchive() is not the same as archive(false) -
-// eg. unarchive() does not send events as done for archive(false).
+// Should return Result
 pub fn unarchive(context: &Context, chat_id: u32) -> Result<(), Error> {
    sql::execute(
        context,
@@ -897,7 +872,7 @@ pub fn send_text_msg(
 ) -> Result<MsgId, Error> {
    ensure!(
        chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
        chat_id
    );

@@ -1037,8 +1012,7 @@ pub fn get_chat_msgs(
        Ok(ret)
    };
    let success = if chat_id == DC_CHAT_ID_DEADDROP {
-        let show_emails =
-            ShowEmails::from_i32(context.get_config_int(Config::ShowEmails)).unwrap_or_default();
+        let show_emails = context.get_config_int(Config::ShowEmails);
        context.sql.query_map(
            concat!(
                "SELECT m.id AS id, m.timestamp AS timestamp",
@@ -1055,7 +1029,7 @@ pub fn get_chat_msgs(
                "   AND m.msgrmsg>=?",
                " ORDER BY m.timestamp,m.id;"
            ),
-            params![if show_emails == ShowEmails::All { 0 } else { 1 }],
+            params![if show_emails == 2 { 0 } else { 1 }],
            process_row,
            process_rows,
        )
@@ -1207,8 +1181,9 @@ pub fn get_chat_media(
            |ids| {
                let mut ret = Vec::new();
                for id in ids {
-                    if let Ok(msg_id) = id {
-                        ret.push(msg_id)
+                    match id {
+                        Ok(msg_id) => ret.push(msg_id),
+                        Err(_) => (),
                    }
                }
                Ok(ret)
@@ -1271,7 +1246,7 @@ pub fn get_next_media(
 pub fn archive(context: &Context, chat_id: u32, archive: bool) -> Result<(), Error> {
    ensure!(
        chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
        chat_id
    );

@@ -1306,7 +1281,7 @@ pub fn archive(context: &Context, chat_id: u32, archive: bool) -> Result<(), Err
 pub fn delete(context: &Context, chat_id: u32) -> Result<(), Error> {
    ensure!(
        chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
        chat_id
    );
    /* Up to 2017-11-02 deleting a group also implied leaving it, see above why we have changed this. */
@@ -1529,7 +1504,7 @@ pub(crate) fn add_contact_to_chat_ex(
        msg.id = send_msg(context, chat_id, &mut msg)?;
        context.call_cb(Event::MsgsChanged {
            chat_id,
-            msg_id: msg.id,
+            msg_id: MsgId::from(msg.id),
        });
    }
    context.call_cb(Event::MsgsChanged {
@@ -1595,7 +1570,7 @@ pub fn remove_contact_from_chat(
 ) -> Result<(), Error> {
    ensure!(
        chat_id > DC_CHAT_ID_LAST_SPECIAL,
-        "bad chat_id = {} <= DC_CHAT_ID_LAST_SPECIAL",
+        "bad chat_id = {} <= 9",
        chat_id
    );
    ensure!(
@@ -1951,78 +1926,37 @@ pub fn get_chat_id_by_grpid(context: &Context, grpid: impl AsRef<str>) -> (u32,
        .unwrap_or((0, false, Blocked::Not))
 }

-pub fn add_device_msg(
-    context: &Context,
-    label: Option<&str>,
-    msg: Option<&mut Message>,
-) -> Result<MsgId, Error> {
-    ensure!(
-        label.is_some() || msg.is_some(),
-        "device-messages need label, msg or both"
-    );
+pub fn add_device_msg(context: &Context, msg: &mut Message) -> Result<MsgId, Error> {
    let (chat_id, _blocked) =
        create_or_lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE, Blocked::Not)?;
-    let mut msg_id = MsgId::new_unset();
+    let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");

-    if let Some(label) = label {
-        if was_device_msg_ever_added(context, label)? {
-            info!(context, "device-message {} already added", label);
-            return Ok(msg_id);
-        }
-    }
+    prepare_msg_blob(context, msg)?;
+    unarchive(context, chat_id)?;

-    if let Some(msg) = msg {
-        let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
-        prepare_msg_blob(context, msg)?;
-        unarchive(context, chat_id)?;
+    context.sql.execute(
+        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,param,rfc724_mid) \
+         VALUES (?,?,?, ?,?,?, ?,?,?);",
+        params![
+            chat_id,
+            DC_CONTACT_ID_DEVICE,
+            DC_CONTACT_ID_SELF,
+            dc_create_smeared_timestamp(context),
+            msg.type_0,
+            MessageState::InFresh,
+            msg.text.as_ref().map_or("", String::as_str),
+            msg.param.to_string(),
+            rfc724_mid,
+        ],
+    )?;

-        context.sql.execute(
-            "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,param,rfc724_mid) \
-             VALUES (?,?,?, ?,?,?, ?,?,?);",
-            params![
-                chat_id,
-                DC_CONTACT_ID_DEVICE,
-                DC_CONTACT_ID_SELF,
-                dc_create_smeared_timestamp(context),
-                msg.type_0,
-                MessageState::InFresh,
-                msg.text.as_ref().map_or("", String::as_str),
-                msg.param.to_string(),
-                rfc724_mid,
-            ],
-        )?;
-
-        let row_id = sql::get_rowid(context, &context.sql, "msgs", "rfc724_mid", &rfc724_mid);
-        msg_id = MsgId::new(row_id);
-    }
-
-    if let Some(label) = label {
-        context.sql.execute(
-            "INSERT INTO devmsglabels (label) VALUES (?);",
-            params![label],
-        )?;
-    }
-
-    if !msg_id.is_unset() {
-        context.call_cb(Event::IncomingMsg { chat_id, msg_id });
-    }
+    let row_id = sql::get_rowid(context, &context.sql, "msgs", "rfc724_mid", &rfc724_mid);
+    let msg_id = MsgId::new(row_id);
+    context.call_cb(Event::IncomingMsg { chat_id, msg_id });

    Ok(msg_id)
 }

-pub fn was_device_msg_ever_added(context: &Context, label: &str) -> Result<bool, Error> {
-    ensure!(!label.is_empty(), "empty label");
-    if let Ok(()) = context.sql.query_row(
-        "SELECT label FROM devmsglabels WHERE label=?",
-        params![label],
-        |_| Ok(()),
-    ) {
-        return Ok(true);
-    }
-
-    Ok(false)
-}
-
 pub fn add_info_msg(context: &Context, chat_id: u32, text: impl AsRef<str>) {
    let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");

@@ -2100,210 +2034,4 @@ mod tests {
        let added = add_contact_to_chat_ex(&t.ctx, chat_id, DC_CONTACT_ID_SELF, false).unwrap();
        assert_eq!(added, false);
    }
-
-    #[test]
-    fn test_self_talk() {
-        let t = dummy_context();
-        let chat_id = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
-        assert_eq!(DC_CONTACT_ID_SELF, 1);
-        assert!(chat_id > DC_CHAT_ID_LAST_SPECIAL);
-        let chat = Chat::load_from_db(&t.ctx, chat_id).unwrap();
-        assert_eq!(chat.id, chat_id);
-        assert!(chat.is_self_talk());
-        assert!(!chat.archived);
-        assert!(!chat.is_device_talk());
-        assert!(chat.can_send());
-        assert_eq!(chat.name, t.ctx.stock_str(StockMessage::SavedMessages));
-        assert!(chat.get_profile_image(&t.ctx).is_some());
-    }
-
-    #[test]
-    fn test_deaddrop_chat() {
-        let t = dummy_context();
-        let chat = Chat::load_from_db(&t.ctx, DC_CHAT_ID_DEADDROP).unwrap();
-        assert_eq!(DC_CHAT_ID_DEADDROP, 1);
-        assert_eq!(chat.id, DC_CHAT_ID_DEADDROP);
-        assert!(!chat.is_self_talk());
-        assert!(!chat.archived);
-        assert!(!chat.is_device_talk());
-        assert!(!chat.can_send());
-        assert_eq!(chat.name, t.ctx.stock_str(StockMessage::DeadDrop));
-    }
-
-    #[test]
-    fn test_add_device_msg_unlabelled() {
-        let t = test_context(Some(Box::new(logging_cb)));
-
-        // add two device-messages
-        let mut msg1 = Message::new(Viewtype::Text);
-        msg1.text = Some("first message".to_string());
-        let msg1_id = add_device_msg(&t.ctx, None, Some(&mut msg1));
-        assert!(msg1_id.is_ok());
-
-        let mut msg2 = Message::new(Viewtype::Text);
-        msg2.text = Some("second message".to_string());
-        let msg2_id = add_device_msg(&t.ctx, None, Some(&mut msg2));
-        assert!(msg2_id.is_ok());
-        assert_ne!(msg1_id.as_ref().unwrap(), msg2_id.as_ref().unwrap());
-
-        // check added messages
-        let msg1 = message::Message::load_from_db(&t.ctx, msg1_id.unwrap());
-        assert!(msg1.is_ok());
-        let msg1 = msg1.unwrap();
-        assert_eq!(msg1.text.as_ref().unwrap(), "first message");
-        assert_eq!(msg1.from_id, DC_CONTACT_ID_DEVICE);
-        assert_eq!(msg1.to_id, DC_CONTACT_ID_SELF);
-        assert!(!msg1.is_info());
-        assert!(!msg1.is_setupmessage());
-
-        let msg2 = message::Message::load_from_db(&t.ctx, msg2_id.unwrap());
-        assert!(msg2.is_ok());
-        let msg2 = msg2.unwrap();
-        assert_eq!(msg2.text.as_ref().unwrap(), "second message");
-
-        // check device chat
-        assert_eq!(get_msg_cnt(&t.ctx, msg2.chat_id), 2);
-    }
-
-    #[test]
-    fn test_add_device_msg_labelled() {
-        let t = test_context(Some(Box::new(logging_cb)));
-
-        // add two device-messages with the same label (second attempt is not added)
-        let mut msg1 = Message::new(Viewtype::Text);
-        msg1.text = Some("first message".to_string());
-        let msg1_id = add_device_msg(&t.ctx, Some("any-label"), Some(&mut msg1));
-        assert!(msg1_id.is_ok());
-        assert!(!msg1_id.as_ref().unwrap().is_unset());
-
-        let mut msg2 = Message::new(Viewtype::Text);
-        msg2.text = Some("second message".to_string());
-        let msg2_id = add_device_msg(&t.ctx, Some("any-label"), Some(&mut msg2));
-        assert!(msg2_id.is_ok());
-        assert!(msg2_id.as_ref().unwrap().is_unset());
-
-        // check added message
-        let msg1 = message::Message::load_from_db(&t.ctx, *msg1_id.as_ref().unwrap());
-        assert!(msg1.is_ok());
-        let msg1 = msg1.unwrap();
-        assert_eq!(msg1_id.as_ref().unwrap(), &msg1.id);
-        assert_eq!(msg1.text.as_ref().unwrap(), "first message");
-        assert_eq!(msg1.from_id, DC_CONTACT_ID_DEVICE);
-        assert_eq!(msg1.to_id, DC_CONTACT_ID_SELF);
-        assert!(!msg1.is_info());
-        assert!(!msg1.is_setupmessage());
-
-        // check device chat
-        let chat_id = msg1.chat_id;
-        assert_eq!(get_msg_cnt(&t.ctx, chat_id), 1);
-        assert!(chat_id > DC_CHAT_ID_LAST_SPECIAL);
-        let chat = Chat::load_from_db(&t.ctx, chat_id);
-        assert!(chat.is_ok());
-        let chat = chat.unwrap();
-        assert!(chat.is_device_talk());
-        assert!(!chat.is_self_talk());
-        assert!(!chat.can_send());
-        assert_eq!(chat.name, t.ctx.stock_str(StockMessage::DeviceMessages));
-        assert!(chat.get_profile_image(&t.ctx).is_some());
-
-        // delete device message, make sure it is not added again
-        message::delete_msgs(&t.ctx, &[*msg1_id.as_ref().unwrap()]);
-        let msg1 = message::Message::load_from_db(&t.ctx, *msg1_id.as_ref().unwrap());
-        assert!(msg1.is_err() || msg1.unwrap().chat_id == DC_CHAT_ID_TRASH);
-        let msg3_id = add_device_msg(&t.ctx, Some("any-label"), Some(&mut msg2));
-        assert!(msg3_id.is_ok());
-        assert!(msg2_id.as_ref().unwrap().is_unset());
-    }
-
-    #[test]
-    fn test_add_device_msg_label_only() {
-        let t = test_context(Some(Box::new(logging_cb)));
-        let res = add_device_msg(&t.ctx, Some(""), None);
-        assert!(res.is_err());
-        let res = add_device_msg(&t.ctx, Some("some-label"), None);
-        assert!(res.is_ok());
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some("message text".to_string());
-
-        let msg_id = add_device_msg(&t.ctx, Some("some-label"), Some(&mut msg));
-        assert!(msg_id.is_ok());
-        assert!(msg_id.as_ref().unwrap().is_unset());
-
-        let msg_id = add_device_msg(&t.ctx, Some("unused-label"), Some(&mut msg));
-        assert!(msg_id.is_ok());
-        assert!(!msg_id.as_ref().unwrap().is_unset());
-    }
-
-    #[test]
-    fn test_was_device_msg_ever_added() {
-        let t = test_context(Some(Box::new(logging_cb)));
-        add_device_msg(&t.ctx, Some("some-label"), None).ok();
-        assert!(was_device_msg_ever_added(&t.ctx, "some-label").unwrap());
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some("message text".to_string());
-        add_device_msg(&t.ctx, Some("another-label"), Some(&mut msg)).ok();
-        assert!(was_device_msg_ever_added(&t.ctx, "another-label").unwrap());
-
-        assert!(!was_device_msg_ever_added(&t.ctx, "unused-label").unwrap());
-
-        assert!(was_device_msg_ever_added(&t.ctx, "").is_err());
-    }
-
-    fn chatlist_len(ctx: &Context, listflags: usize) -> usize {
-        Chatlist::try_load(ctx, listflags, None, None)
-            .unwrap()
-            .len()
-    }
-
-    #[test]
-    fn test_archive() {
-        // create two chats
-        let t = dummy_context();
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some("foo".to_string());
-        let msg_id = add_device_msg(&t.ctx, None, Some(&mut msg)).unwrap();
-        let chat_id1 = message::Message::load_from_db(&t.ctx, msg_id)
-            .unwrap()
-            .chat_id;
-        let chat_id2 = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
-        assert!(chat_id1 > DC_CHAT_ID_LAST_SPECIAL);
-        assert!(chat_id2 > DC_CHAT_ID_LAST_SPECIAL);
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 2);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 2);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 0);
-        assert_eq!(DC_GCL_ARCHIVED_ONLY, 0x01);
-        assert_eq!(DC_GCL_NO_SPECIALS, 0x02);
-
-        // archive first chat
-        assert!(archive(&t.ctx, chat_id1, true).is_ok());
-        assert!(Chat::load_from_db(&t.ctx, chat_id1).unwrap().is_archived());
-        assert!(!Chat::load_from_db(&t.ctx, chat_id2).unwrap().is_archived());
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 2); // including DC_CHAT_ID_ARCHIVED_LINK now
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 1);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 1);
-
-        // archive second chat
-        assert!(archive(&t.ctx, chat_id2, true).is_ok());
-        assert!(Chat::load_from_db(&t.ctx, chat_id1).unwrap().is_archived());
-        assert!(Chat::load_from_db(&t.ctx, chat_id2).unwrap().is_archived());
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 1); // only DC_CHAT_ID_ARCHIVED_LINK now
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 0);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 2);
-
-        // archive already archived first chat, unarchive second chat two times
-        assert!(archive(&t.ctx, chat_id1, true).is_ok());
-        assert!(archive(&t.ctx, chat_id2, false).is_ok());
-        assert!(archive(&t.ctx, chat_id2, false).is_ok());
-        assert!(Chat::load_from_db(&t.ctx, chat_id1).unwrap().is_archived());
-        assert!(!Chat::load_from_db(&t.ctx, chat_id2).unwrap().is_archived());
-        assert_eq!(get_chat_cnt(&t.ctx), 2);
-        assert_eq!(chatlist_len(&t.ctx, 0), 2);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 1);
-        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 1);
-    }
 }
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -1,5 +1,3 @@
-//! # Chat list module
-
 use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
@@ -235,7 +233,6 @@ impl Chatlist {
        self.ids.len()
    }

-    /// Returns true if chatlist is empty.
    pub fn is_empty(&self) -> bool {
        self.ids.is_empty()
    }
@@ -332,7 +329,6 @@ impl Chatlist {
    }
 }

-/// Get the number of archived chats
 pub fn dc_get_archived_cnt(context: &Context) -> u32 {
    context
        .sql
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,5 +1,3 @@
-//! # Key-value configuration management
-
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};

@@ -33,7 +31,7 @@ pub enum Config {
    Displayname,
    Selfstatus,
    Selfavatar,
-    #[strum(props(default = "0"))]
+    #[strum(props(default = "1"))]
    BccSelf,
    #[strum(props(default = "1"))]
    E2eeEnabled,
@@ -121,7 +119,7 @@ impl Context {
            }
            Config::InboxWatch => {
                let ret = self.sql.set_raw_config(self, key, value);
-                interrupt_inbox_idle(self, true);
+                interrupt_imap_idle(self);
                ret
            }
            Config::SentboxWatch => {
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -1,4 +1,3 @@
-//! Thunderbird's Autoconfiguration implementation
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};

--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -1,5 +1,3 @@
-//! Email accounts autoconfiguration process module
-
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};

 use crate::config::Config;
@@ -7,6 +5,7 @@ use crate::constants::*;
 use crate::context::Context;
 use crate::dc_tools::*;
 use crate::e2ee;
+use crate::imap::*;
 use crate::job::*;
 use crate::login_param::LoginParam;
 use crate::oauth2::*;
@@ -63,12 +62,7 @@ pub fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {

    let mut param_autoconfig: Option<LoginParam> = None;

-    context
-        .inbox_thread
-        .read()
-        .unwrap()
-        .imap
-        .disconnect(context);
+    context.inbox.read().unwrap().disconnect(context);
    context
        .sentbox_thread
        .read()
@@ -96,7 +90,7 @@ pub fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
    const STEP_3_INDEX: u8 = 13;
    let mut step_counter: u8 = 0;
    while !context.shall_stop_ongoing() {
-        step_counter += 1;
+        step_counter = step_counter + 1;

        let success = match step_counter {
            // Read login parameters from the database
@@ -362,10 +356,9 @@ pub fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
                    0
                };
                context
-                    .inbox_thread
+                    .inbox
                    .read()
                    .unwrap()
-                    .imap
                    .configure_folders(context, flags);
                true
            }
@@ -405,12 +398,7 @@ pub fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
        }
    }
    if imap_connected_here {
-        context
-            .inbox_thread
-            .read()
-            .unwrap()
-            .imap
-            .disconnect(context);
+        context.inbox.read().unwrap().disconnect(context);
    }
    if smtp_connected_here {
        context.smtp.clone().lock().unwrap().disconnect();
@@ -506,13 +494,7 @@ fn try_imap_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
        param.mail_user, param.mail_server, param.mail_port, param.server_flags
    );
    info!(context, "Trying: {}", inf);
-    if context
-        .inbox_thread
-        .read()
-        .unwrap()
-        .imap
-        .connect(context, &param)
-    {
+    if context.inbox.read().unwrap().connect(context, &param) {
        info!(context, "success: {}", inf);
        return Some(true);
    }
@@ -581,6 +563,28 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
    }
 }

+/*******************************************************************************
+ * 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_raw_config_bool(context, "configured") {
+        warn!(context, "Not configured, cannot connect.",);
+    } else {
+        let param = LoginParam::from_database(context, "configured_");
+        // the trailing underscore is correct
+
+        if imap.connect(context, &param) {
+            ret_connected = 2;
+        }
+    }
+
+    ret_connected
+}
+
 /*******************************************************************************
 * Configure a Context
 ******************************************************************************/
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -1,4 +1,4 @@
-//! # Constants
+//! Constants
 #![allow(non_camel_case_types, dead_code)]

 use deltachat_derive::*;
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -47,8 +47,8 @@ pub struct Contact {
    /// May be empty, initially set to `authname`.
    name: String,
    /// Name authorized by the contact himself. Only this name may be spread to others,
-    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_authname`,
-    /// to access this field.
+    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_name`,
+    /// `Contact::get_display_name` or `Contact::get_name_n_addr` to access this field.
    authname: String,
    /// E-Mail-Address of the contact. It is recommended to use `Contact::get_addr`` to access this field.
    addr: String,
@@ -717,7 +717,6 @@ impl Contact {
        &self.addr
    }

-    /// Get name authorized by the contact.
    pub fn get_authname(&self) -> &str {
        &self.authname
    }
@@ -876,7 +875,7 @@ impl Contact {
    }

    pub fn real_exists_by_id(context: &Context, contact_id: u32) -> bool {
-        if !context.sql.is_open() || contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
+        if !context.sql.is_open() || contact_id <= 9 {
            return false;
        }

@@ -900,7 +899,6 @@ impl Contact {
    }
 }

-/// Extracts first name from full name.
 fn get_first_name<'a>(full_name: &'a str) -> &'a str {
    full_name.splitn(2, ' ').next().unwrap_or_default()
 }
@@ -911,7 +909,6 @@ pub fn may_be_valid_addr(addr: &str) -> bool {
    res.is_ok()
 }

-/// Returns address with whitespace trimmed and `mailto:` prefix removed.
 pub fn addr_normalize(addr: &str) -> &str {
    let norm = addr.trim();

@@ -923,7 +920,7 @@ pub fn addr_normalize(addr: &str) -> &str {
 }

 fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
-    if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
+    if contact_id <= 9 {
        return;
    }

@@ -1056,8 +1053,6 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
 mod tests {
    use super::*;

-    use crate::test_utils::*;
-
    #[test]
    fn test_may_be_valid_addr() {
        assert_eq!(may_be_valid_addr(""), false);
@@ -1099,109 +1094,4 @@ mod tests {
            vec![("Name one", "Address one"), ("Name two", "Address two")]
        )
    }
-
-    #[test]
-    fn test_get_contacts() {
-        let context = dummy_context();
-        let contacts = Contact::get_all(&context.ctx, 0, Some("some2")).unwrap();
-        assert_eq!(contacts.len(), 0);
-
-        let id = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
-        assert_ne!(id, 0);
-
-        let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).unwrap();
-        assert_eq!(contacts.len(), 1);
-
-        let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).unwrap();
-        assert_eq!(contacts.len(), 0);
-    }
-
-    #[test]
-    fn test_add_or_lookup() {
-        // add some contacts, this also tests add_address_book()
-        let t = dummy_context();
-        let book = concat!(
-            "  Name one  \n one@eins.org \n",
-            "Name two\ntwo@deux.net\n",
-            "\nthree@drei.sam\n",
-            "Name two\ntwo@deux.net\n" // should not be added again
-        );
-        assert_eq!(Contact::add_address_book(&t.ctx, book).unwrap(), 3);
-
-        // check first added contact, this does not modify because of lower origin
-        let (contact_id, sth_modified) =
-            Contact::add_or_lookup(&t.ctx, "bla foo", "one@eins.org", Origin::IncomingUnknownTo)
-                .unwrap();
-        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
-        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_id(), contact_id);
-        assert_eq!(contact.get_name(), "Name one");
-        assert_eq!(contact.get_display_name(), "Name one");
-        assert_eq!(contact.get_addr(), "one@eins.org");
-        assert_eq!(contact.get_name_n_addr(), "Name one (one@eins.org)");
-
-        // modify first added contact
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "Real one",
-            " one@eins.org  ",
-            Origin::ManuallyCreated,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name(), "Real one");
-        assert_eq!(contact.get_addr(), "one@eins.org");
-        assert!(!contact.is_blocked());
-
-        // check third added contact (contact without name)
-        let (contact_id, sth_modified) =
-            Contact::add_or_lookup(&t.ctx, "", "three@drei.sam", Origin::IncomingUnknownTo)
-                .unwrap();
-        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
-        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "three@drei.sam");
-        assert_eq!(contact.get_addr(), "three@drei.sam");
-        assert_eq!(contact.get_name_n_addr(), "three@drei.sam");
-
-        // add name to third contact from incoming message (this becomes authorized name)
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "m. serious",
-            "three@drei.sam",
-            Origin::IncomingUnknownFrom,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name_n_addr(), "m. serious (three@drei.sam)");
-        assert!(!contact.is_blocked());
-
-        // manually edit name of third contact (does not changed authorized name)
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "schnucki",
-            "three@drei.sam",
-            Origin::ManuallyCreated,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_authname(), "m. serious");
-        assert_eq!(contact.get_name_n_addr(), "schnucki (three@drei.sam)");
-        assert!(!contact.is_blocked());
-
-        // check SELF
-        let contact = Contact::load_from_db(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
-        assert_eq!(DC_CONTACT_ID_SELF, 1);
-        assert_eq!(contact.get_name(), t.ctx.stock_str(StockMessage::SelfMsg));
-        assert_eq!(contact.get_addr(), ""); // we're not configured
-        assert!(!contact.is_blocked());
-    }
 }
--- a/src/context.rs
+++ b/src/context.rs
@@ -39,14 +39,12 @@ pub type ContextCallback = dyn Fn(&Context, Event) -> uintptr_t + Send + Sync;

 #[derive(DebugStub)]
 pub struct Context {
-    /// Database file path
    dbfile: PathBuf,
-    /// Blob directory path
    blobdir: PathBuf,
    pub sql: Sql,
+    pub inbox: Arc<RwLock<Imap>>,
    pub perform_inbox_jobs_needed: Arc<RwLock<bool>>,
    pub probe_imap_network: Arc<RwLock<bool>>,
-    pub inbox_thread: Arc<RwLock<JobThread>>,
    pub sentbox_thread: Arc<RwLock<JobThread>>,
    pub mvbox_thread: Arc<RwLock<JobThread>>,
    pub smtp: Arc<Mutex<Smtp>>,
@@ -57,7 +55,7 @@ pub struct Context {
    pub os_name: Option<String>,
    pub cmdline_sel_chat_id: Arc<RwLock<u32>>,
    pub bob: Arc<RwLock<BobStatus>>,
-    pub last_smeared_timestamp: RwLock<i64>,
+    pub last_smeared_timestamp: Arc<RwLock<i64>>,
    pub running_state: Arc<RwLock<RunningState>>,
    /// Mutex to avoid generating the key for the user more than once.
    pub generating_key_mutex: Mutex<()>,
@@ -95,7 +93,6 @@ pub fn get_info() -> HashMap<&'static str, String> {
 }

 impl Context {
-    /// Creates new context.
    pub fn new(cb: Box<ContextCallback>, os_name: String, dbfile: PathBuf) -> Result<Context> {
        let mut blob_fname = OsString::new();
        blob_fname.push(dbfile.file_name().unwrap_or_default());
@@ -121,6 +118,7 @@ impl Context {
        let ctx = Context {
            blobdir,
            dbfile,
+            inbox: Arc::new(RwLock::new(Imap::new())),
            cb,
            os_name: Some(os_name),
            running_state: Arc::new(RwLock::new(Default::default())),
@@ -129,13 +127,8 @@ impl Context {
            smtp_state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
            oauth2_critical: Arc::new(Mutex::new(())),
            bob: Arc::new(RwLock::new(Default::default())),
-            last_smeared_timestamp: RwLock::new(0),
+            last_smeared_timestamp: Arc::new(RwLock::new(0)),
            cmdline_sel_chat_id: Arc::new(RwLock::new(0)),
-            inbox_thread: Arc::new(RwLock::new(JobThread::new(
-                "INBOX",
-                "configured_inbox_folder",
-                Imap::new(),
-            ))),
            sentbox_thread: Arc::new(RwLock::new(JobThread::new(
                "SENTBOX",
                "configured_sentbox_folder",
@@ -160,12 +153,10 @@ impl Context {
        Ok(ctx)
    }

-    /// Returns database file path.
    pub fn get_dbfile(&self) -> &Path {
        self.dbfile.as_path()
    }

-    /// Returns blob directory path.
    pub fn get_blobdir(&self) -> &Path {
        self.blobdir.as_path()
    }
@@ -467,8 +458,8 @@ impl Context {

 impl Drop for Context {
    fn drop(&mut self) {
-        info!(self, "disconnecting inbox-thread",);
-        self.inbox_thread.read().unwrap().imap.disconnect(self);
+        info!(self, "disconnecting INBOX-watch",);
+        self.inbox.read().unwrap().disconnect(self);
        info!(self, "disconnecting sentbox-thread",);
        self.sentbox_thread.read().unwrap().imap.disconnect(self);
        info!(self, "disconnecting mvbox-thread",);
--- a/src/dc_strencode.rs
+++ b/src/dc_strencode.rs
@@ -38,7 +38,7 @@ pub fn dc_encode_header_words(input: impl AsRef<str>) -> String {
 fn must_encode(byte: u8) -> bool {
    static SPECIALS: &[u8] = b",:!\"#$@[\\]^`{|}~=?_";

-    SPECIALS.iter().any(|b| *b == byte)
+    SPECIALS.into_iter().any(|b| *b == byte)
 }

 fn quote_word(word: &[u8]) -> String {
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -1,7 +1,7 @@
 //! Some tools and enhancements to the used libraries, there should be
 //! no references to Context and other "larger" entities here.

-use core::cmp::{max, min};
+use core::cmp::max;
 use std::borrow::Cow;
 use std::ffi::{CStr, CString};
 use std::path::{Path, PathBuf};
@@ -165,26 +165,11 @@ pub(crate) fn dc_gm2local_offset() -> i64 {
    lt.offset().local_minus_utc() as i64
 }

-// timesmearing
-// - as e-mails typically only use a second-based-resolution for timestamps,
-//   the order of two mails sent withing one second is unclear.
-//   this is bad eg. when forwarding some messages from a chat -
-//   these messages will appear at the recipient easily out of order.
-// - we work around this issue by not sending out two mails with the same timestamp.
-// - for this purpose, in short, we track the last timestamp used in `last_smeared_timestamp`
-//   when another timestamp is needed in the same second, we use `last_smeared_timestamp+1`
-// - after some moments without messages sent out,
-//   `last_smeared_timestamp` is again in sync with the normal time.
-// - however, we do not do all this for the far future,
-//   but at max `MAX_SECONDS_TO_LEND_FROM_FUTURE`
-const MAX_SECONDS_TO_LEND_FROM_FUTURE: i64 = 5;
-
-// returns the currently smeared timestamp,
-// may be used to check if call to dc_create_smeared_timestamp() is needed or not.
-// the returned timestamp MUST NOT be used to be sent out or saved in the database!
+/* timesmearing */
 pub(crate) fn dc_smeared_time(context: &Context) -> i64 {
+    /* function returns a corrected time(NULL) */
    let mut now = time();
-    let ts = *context.last_smeared_timestamp.read().unwrap();
+    let ts = *context.last_smeared_timestamp.clone().read().unwrap();
    if ts >= now {
        now = ts + 1;
    }
@@ -192,36 +177,32 @@ pub(crate) fn dc_smeared_time(context: &Context) -> i64 {
    now
 }

-// returns a timestamp that is guaranteed to be unique.
 pub(crate) fn dc_create_smeared_timestamp(context: &Context) -> i64 {
    let now = time();
    let mut ret = now;

-    let mut last_smeared_timestamp = context.last_smeared_timestamp.write().unwrap();
-    if ret <= *last_smeared_timestamp {
-        ret = *last_smeared_timestamp + 1;
-        if ret - now > MAX_SECONDS_TO_LEND_FROM_FUTURE {
-            ret = now + MAX_SECONDS_TO_LEND_FROM_FUTURE
+    let ts = *context.last_smeared_timestamp.clone().write().unwrap();
+    if ret <= ts {
+        ret = ts + 1;
+        if ret - now > 5 {
+            ret = now + 5
        }
    }

-    *last_smeared_timestamp = ret;
    ret
 }

-// creates `count` timestamps that are guaranteed to be unique.
-// the frist created timestamps is returned directly,
-// get the other timestamps just by adding 1..count-1
 pub(crate) fn dc_create_smeared_timestamps(context: &Context, count: usize) -> i64 {
+    /* get a range to timestamps that can be used uniquely */
    let now = time();
-    let count = count as i64;
-    let mut start = now + min(count, MAX_SECONDS_TO_LEND_FROM_FUTURE) - count;
+    let start = now + (if count < 5 { count } else { 5 }) as i64 - count as i64;

-    let mut last_smeared_timestamp = context.last_smeared_timestamp.write().unwrap();
-    start = max(*last_smeared_timestamp + 1, start);
-
-    *last_smeared_timestamp = start + count - 1;
-    start
+    let ts = *context.last_smeared_timestamp.clone().write().unwrap();
+    if ts + 1 > start {
+        ts + 1
+    } else {
+        start
+    }
 }

 /* Message-ID tools */
@@ -1374,34 +1355,4 @@ mod tests {
        let listflags: u32 = DC_GCL_VERIFIED_ONLY.try_into().unwrap();
        assert!(listflags_has(listflags, DC_GCL_ADD_SELF) == false);
    }
-
-    #[test]
-    fn test_create_smeared_timestamp() {
-        let t = dummy_context();
-        assert_ne!(
-            dc_create_smeared_timestamp(&t.ctx),
-            dc_create_smeared_timestamp(&t.ctx)
-        );
-        assert!(
-            dc_create_smeared_timestamp(&t.ctx)
-                >= SystemTime::now()
-                    .duration_since(SystemTime::UNIX_EPOCH)
-                    .unwrap()
-                    .as_secs() as i64
-        );
-    }
-
-    #[test]
-    fn test_create_smeared_timestamps() {
-        let t = dummy_context();
-        let count = MAX_SECONDS_TO_LEND_FROM_FUTURE - 1;
-        let start = dc_create_smeared_timestamps(&t.ctx, count as usize);
-        let next = dc_smeared_time(&t.ctx);
-        assert!((start + count - 1) < next);
-
-        let count = MAX_SECONDS_TO_LEND_FROM_FUTURE + 30;
-        let start = dc_create_smeared_timestamps(&t.ctx, count as usize);
-        let next = dc_smeared_time(&t.ctx);
-        assert!((start + count - 1) < next);
-    }
 }
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -498,7 +498,7 @@ fn decrypt_if_autocrypt_message(
    public_keyring_for_validate: &Keyring,
    ret_valid_signatures: &mut HashSet<String>,
    ret_gossip_headers: *mut *mut mailimf_fields,
-) -> Result<bool> {
+) -> Result<(bool)> {
    /* The returned bool is true if we detected an Autocrypt-encrypted
    message and successfully decrypted it. Decryption then modifies the
    passed in mime structure in place. The returned bool is false
--- a/src/error.rs
+++ b/src/error.rs
@@ -34,26 +34,6 @@ pub enum Error {
    BlobError(#[cause] crate::blob::BlobError),
    #[fail(display = "Invalid Message ID.")]
    InvalidMsgId,
-    #[fail(display = "Watch folder not found {:?}", _0)]
-    WatchFolderNotFound(String),
-    #[fail(display = "Connection Failed params: {}", _0)]
-    ImapConnectionFailed(String),
-    #[fail(display = "Could not get OAUTH token")]
-    ImapOauthError,
-    #[fail(display = "Could not login as {}", _0)]
-    ImapLoginFailed(String),
-    #[fail(display = "Cannot idle")]
-    ImapMissesIdle,
-    #[fail(display = "Imap IDLE protocol failed to init/complete")]
-    ImapIdleProtocolFailed(String),
-    #[fail(display = "Imap IDLE failed to select folder {:?}", _0)]
-    ImapSelectFailed(String),
-    #[fail(display = "Connect without configured params")]
-    ConnectWithoutConfigure,
-    #[fail(display = "imap operation attempted while imap is torn down")]
-    ImapInTeardown,
-    #[fail(display = "No IMAP Connection established")]
-    ImapNoConnection,
 }

 pub type Result<T> = std::result::Result<T, Error>;
--- a/src/imap.rs
+++ b/src/imap.rs
--- a/src/imap_client.rs
+++ b/src/imap_client.rs
@@ -1,294 +0,0 @@
-use async_imap::{
-    error::{Error as ImapError, Result as ImapResult},
-    extensions::idle::Handle as ImapIdleHandle,
-    types::{Capabilities, Fetch, Mailbox, Name},
-    Client as ImapClient, Session as ImapSession,
-};
-use async_std::net::{self, TcpStream};
-use async_std::prelude::*;
-use async_std::sync::Arc;
-use async_tls::client::TlsStream;
-
-use crate::login_param::{dc_build_tls_config, CertificateChecks};
-
-const DCC_IMAP_DEBUG: &str = "DCC_IMAP_DEBUG";
-
-#[derive(Debug)]
-pub(crate) enum Client {
-    Secure(ImapClient<TlsStream<TcpStream>>),
-    Insecure(ImapClient<TcpStream>),
-}
-
-#[derive(Debug)]
-pub(crate) enum Session {
-    Secure(ImapSession<TlsStream<TcpStream>>),
-    Insecure(ImapSession<TcpStream>),
-}
-
-#[derive(Debug)]
-pub(crate) enum IdleHandle {
-    Secure(ImapIdleHandle<TlsStream<TcpStream>>),
-    Insecure(ImapIdleHandle<TcpStream>),
-}
-
-impl Client {
-    pub async fn connect_secure<A: net::ToSocketAddrs, S: AsRef<str>>(
-        addr: A,
-        domain: S,
-        certificate_checks: CertificateChecks,
-    ) -> ImapResult<Self> {
-        let stream = TcpStream::connect(addr).await?;
-        let tls_config = dc_build_tls_config(certificate_checks);
-        let tls_connector: async_tls::TlsConnector = Arc::new(tls_config).into();
-        let tls_stream = tls_connector.connect(domain.as_ref(), stream)?.await?;
-        let mut client = ImapClient::new(tls_stream);
-        if std::env::var(DCC_IMAP_DEBUG).is_ok() {
-            client.debug = true;
-        }
-
-        let _greeting = client
-            .read_response()
-            .await
-            .expect("failed to read greeting");
-
-        Ok(Client::Secure(client))
-    }
-
-    pub async fn connect_insecure<A: net::ToSocketAddrs>(addr: A) -> ImapResult<Self> {
-        let stream = TcpStream::connect(addr).await?;
-
-        let mut client = ImapClient::new(stream);
-        if std::env::var(DCC_IMAP_DEBUG).is_ok() {
-            client.debug = true;
-        }
-        let _greeting = client
-            .read_response()
-            .await
-            .expect("failed to read greeting");
-
-        Ok(Client::Insecure(client))
-    }
-
-    pub async fn secure<S: AsRef<str>>(
-        self,
-        domain: S,
-        _certificate_checks: CertificateChecks,
-    ) -> ImapResult<Client> {
-        match self {
-            Client::Insecure(client) => {
-                let tls = async_tls::TlsConnector::new();
-
-                let client_sec = client.secure(domain, &tls).await?;
-
-                Ok(Client::Secure(client_sec))
-            }
-            // Nothing to do
-            Client::Secure(_) => Ok(self),
-        }
-    }
-
-    pub async fn authenticate<A: async_imap::Authenticator, S: AsRef<str>>(
-        self,
-        auth_type: S,
-        authenticator: &A,
-    ) -> Result<Session, (ImapError, Client)> {
-        match self {
-            Client::Secure(i) => match i.authenticate(auth_type, authenticator).await {
-                Ok(session) => Ok(Session::Secure(session)),
-                Err((err, c)) => Err((err, Client::Secure(c))),
-            },
-            Client::Insecure(i) => match i.authenticate(auth_type, authenticator).await {
-                Ok(session) => Ok(Session::Insecure(session)),
-                Err((err, c)) => Err((err, Client::Insecure(c))),
-            },
-        }
-    }
-
-    pub async fn login<U: AsRef<str>, P: AsRef<str>>(
-        self,
-        username: U,
-        password: P,
-    ) -> Result<Session, (ImapError, Client)> {
-        match self {
-            Client::Secure(i) => match i.login(username, password).await {
-                Ok(session) => Ok(Session::Secure(session)),
-                Err((err, c)) => Err((err, Client::Secure(c))),
-            },
-            Client::Insecure(i) => match i.login(username, password).await {
-                Ok(session) => Ok(Session::Insecure(session)),
-                Err((err, c)) => Err((err, Client::Insecure(c))),
-            },
-        }
-    }
-}
-
-impl Session {
-    pub async fn capabilities(&mut self) -> ImapResult<Capabilities> {
-        let res = match self {
-            Session::Secure(i) => i.capabilities().await?,
-            Session::Insecure(i) => i.capabilities().await?,
-        };
-
-        Ok(res)
-    }
-
-    pub async fn list(
-        &mut self,
-        reference_name: Option<&str>,
-        mailbox_pattern: Option<&str>,
-    ) -> ImapResult<Vec<Name>> {
-        let res = match self {
-            Session::Secure(i) => {
-                i.list(reference_name, mailbox_pattern)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.list(reference_name, mailbox_pattern)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-        Ok(res)
-    }
-
-    pub async fn create<S: AsRef<str>>(&mut self, mailbox_name: S) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.create(mailbox_name).await?,
-            Session::Insecure(i) => i.create(mailbox_name).await?,
-        }
-        Ok(())
-    }
-
-    pub async fn subscribe<S: AsRef<str>>(&mut self, mailbox: S) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.subscribe(mailbox).await?,
-            Session::Insecure(i) => i.subscribe(mailbox).await?,
-        }
-        Ok(())
-    }
-
-    pub async fn close(&mut self) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.close().await?,
-            Session::Insecure(i) => i.close().await?,
-        }
-        Ok(())
-    }
-
-    pub async fn select<S: AsRef<str>>(&mut self, mailbox_name: S) -> ImapResult<Mailbox> {
-        let mbox = match self {
-            Session::Secure(i) => i.select(mailbox_name).await?,
-            Session::Insecure(i) => i.select(mailbox_name).await?,
-        };
-
-        Ok(mbox)
-    }
-
-    pub async fn fetch<S1, S2>(&mut self, sequence_set: S1, query: S2) -> ImapResult<Vec<Fetch>>
-    where
-        S1: AsRef<str>,
-        S2: AsRef<str>,
-    {
-        let res = match self {
-            Session::Secure(i) => {
-                i.fetch(sequence_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.fetch(sequence_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-        Ok(res)
-    }
-
-    pub async fn uid_fetch<S1, S2>(&mut self, uid_set: S1, query: S2) -> ImapResult<Vec<Fetch>>
-    where
-        S1: AsRef<str>,
-        S2: AsRef<str>,
-    {
-        let res = match self {
-            Session::Secure(i) => {
-                i.uid_fetch(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.uid_fetch(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-
-        Ok(res)
-    }
-
-    pub fn idle(self) -> IdleHandle {
-        match self {
-            Session::Secure(i) => {
-                let h = i.idle();
-                IdleHandle::Secure(h)
-            }
-            Session::Insecure(i) => {
-                let h = i.idle();
-                IdleHandle::Insecure(h)
-            }
-        }
-    }
-
-    pub async fn uid_store<S1, S2>(&mut self, uid_set: S1, query: S2) -> ImapResult<Vec<Fetch>>
-    where
-        S1: AsRef<str>,
-        S2: AsRef<str>,
-    {
-        let res = match self {
-            Session::Secure(i) => {
-                i.uid_store(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.uid_store(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-        Ok(res)
-    }
-
-    pub async fn uid_mv<S1: AsRef<str>, S2: AsRef<str>>(
-        &mut self,
-        uid_set: S1,
-        mailbox_name: S2,
-    ) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.uid_mv(uid_set, mailbox_name).await?,
-            Session::Insecure(i) => i.uid_mv(uid_set, mailbox_name).await?,
-        }
-        Ok(())
-    }
-
-    pub async fn uid_copy<S1: AsRef<str>, S2: AsRef<str>>(
-        &mut self,
-        uid_set: S1,
-        mailbox_name: S2,
-    ) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.uid_copy(uid_set, mailbox_name).await?,
-            Session::Insecure(i) => i.uid_copy(uid_set, mailbox_name).await?,
-        }
-
-        Ok(())
-    }
-}
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -1,5 +1,3 @@
-//! # Import/export module
-
 use core::cmp::{max, min};
 use std::path::Path;

@@ -51,7 +49,7 @@ pub enum ImexMode {

 /// Import/export things.
 /// For this purpose, the function creates a job that is executed in the IMAP-thread then;
-/// this requires to call dc_perform_inbox_jobs() regularly.
+/// this requires to call dc_perform_imap_jobs() regularly.
 ///
 /// What to do is defined by the _what_ parameter.
 ///
@@ -157,11 +155,6 @@ fn do_initiate_key_transfer(context: &Context) -> Result<String> {
            }
        }
    }
-    // no maybe_add_bcc_self_device_msg() here.
-    // the ui shows the dialog with the setup code on this device,
-    // it would be too much noise to have two things popping up at the same time.
-    // maybe_add_bcc_self_device_msg() is called on the other device
-    // once the transfer is completed.
    Ok(setup_code)
 }

@@ -237,21 +230,6 @@ pub fn create_setup_code(_context: &Context) -> String {
    ret
 }

-fn maybe_add_bcc_self_device_msg(context: &Context) -> Result<()> {
-    if !context.sql.get_raw_config_bool(context, "bcc_self") {
-        let mut msg = Message::new(Viewtype::Text);
-        // TODO: define this as a stockstring once the wording is settled.
-        msg.text = Some(
-            "It seems you are using multiple devices with Delta Chat. Great!\n\n\
-             If you also want to synchronize outgoing messages accross all devices, \
-             go to the settings and enable \"Send copy to self\"."
-                .to_string(),
-        );
-        chat::add_device_msg(context, Some("bcc-self-hint"), Some(&mut msg))?;
-    }
-    Ok(())
-}
-
 pub fn continue_key_transfer(context: &Context, msg_id: MsgId, setup_code: &str) -> Result<()> {
    ensure!(!msg_id.is_special(), "wrong id");

@@ -266,7 +244,6 @@ pub fn continue_key_transfer(context: &Context, msg_id: MsgId, setup_code: &str)
        let sc = normalize_setup_code(setup_code);
        let armored_key = decrypt_setup_file(context, &sc, file)?;
        set_self_key(context, &armored_key, true, true)?;
-        maybe_add_bcc_self_device_msg(context)?;

        Ok(())
    } else {
--- a/src/job.rs
+++ b/src/job.rs
@@ -182,7 +182,23 @@ impl Job {
                        Ok(()) => {
                            // smtp success, update db ASAP, then delete smtp file
                            if 0 != self.foreign_id {
-                                set_delivered(context, MsgId::new(self.foreign_id));
+                                message::update_msg_state(
+                                    context,
+                                    MsgId::new(self.foreign_id),
+                                    MessageState::OutDelivered,
+                                );
+                                let chat_id: i32 = context
+                                    .sql
+                                    .query_get_value(
+                                        context,
+                                        "SELECT chat_id FROM msgs WHERE id=?",
+                                        params![self.foreign_id as i32],
+                                    )
+                                    .unwrap_or_default();
+                                context.call_cb(Event::MsgDelivered {
+                                    chat_id: chat_id as u32,
+                                    msg_id: MsgId::new(self.foreign_id),
+                                });
                            }
                            // now also delete the generated file
                            dc_delete_file(context, filename);
@@ -203,7 +219,7 @@ impl Job {

    #[allow(non_snake_case)]
    fn do_DC_JOB_MOVE_MSG(&mut self, context: &Context) {
-        let imap_inbox = &context.inbox_thread.read().unwrap().imap;
+        let inbox = context.inbox.read().unwrap();

        if let Ok(msg) = Message::load_from_db(context, MsgId::new(self.foreign_id)) {
            if context
@@ -212,7 +228,7 @@ impl Job {
                .unwrap_or_default()
                < 3
            {
-                imap_inbox.configure_folders(context, 0x1i32);
+                inbox.configure_folders(context, 0x1i32);
            }
            let dest_folder = context
                .sql
@@ -222,17 +238,17 @@ impl Job {
                let server_folder = msg.server_folder.as_ref().unwrap();
                let mut dest_uid = 0;

-                match imap_inbox.mv(
+                match inbox.mv(
                    context,
                    server_folder,
                    msg.server_uid,
                    &dest_folder,
                    &mut dest_uid,
                ) {
-                    ImapActionResult::RetryLater => {
+                    ImapResult::RetryLater => {
                        self.try_again_later(3i32, None);
                    }
-                    ImapActionResult::Success => {
+                    ImapResult::Success => {
                        message::update_server_uid(
                            context,
                            &msg.rfc724_mid,
@@ -240,7 +256,7 @@ impl Job {
                            dest_uid,
                        );
                    }
-                    ImapActionResult::Failed | ImapActionResult::AlreadyDone => {}
+                    ImapResult::Failed | ImapResult::AlreadyDone => {}
                }
            }
        }
@@ -248,7 +264,7 @@ impl Job {

    #[allow(non_snake_case)]
    fn do_DC_JOB_DELETE_MSG_ON_IMAP(&mut self, context: &Context) {
-        let imap_inbox = &context.inbox_thread.read().unwrap().imap;
+        let inbox = context.inbox.read().unwrap();

        if let Ok(mut msg) = Message::load_from_db(context, MsgId::new(self.foreign_id)) {
            if !msg.rfc724_mid.is_empty() {
@@ -263,9 +279,8 @@ impl Job {
                    we delete the message from the server */
                    let mid = msg.rfc724_mid;
                    let server_folder = msg.server_folder.as_ref().unwrap();
-                    let res =
-                        imap_inbox.delete_msg(context, &mid, server_folder, &mut msg.server_uid);
-                    if res == ImapActionResult::RetryLater {
+                    let res = inbox.delete_msg(context, &mid, server_folder, &mut msg.server_uid);
+                    if res == ImapResult::RetryLater {
                        self.try_again_later(-1i32, None);
                        return;
                    }
@@ -277,32 +292,32 @@ impl Job {

    #[allow(non_snake_case)]
    fn do_DC_JOB_EMPTY_SERVER(&mut self, context: &Context) {
-        let imap_inbox = &context.inbox_thread.read().unwrap().imap;
+        let inbox = context.inbox.read().unwrap();
        if self.foreign_id & DC_EMPTY_MVBOX > 0 {
            if let Some(mvbox_folder) = context
                .sql
                .get_raw_config(context, "configured_mvbox_folder")
            {
-                imap_inbox.empty_folder(context, &mvbox_folder);
+                inbox.empty_folder(context, &mvbox_folder);
            }
        }
        if self.foreign_id & DC_EMPTY_INBOX > 0 {
-            imap_inbox.empty_folder(context, "INBOX");
+            inbox.empty_folder(context, "INBOX");
        }
    }

    #[allow(non_snake_case)]
    fn do_DC_JOB_MARKSEEN_MSG_ON_IMAP(&mut self, context: &Context) {
-        let imap_inbox = &context.inbox_thread.read().unwrap().imap;
+        let inbox = context.inbox.read().unwrap();

        if let Ok(msg) = Message::load_from_db(context, MsgId::new(self.foreign_id)) {
            let folder = msg.server_folder.as_ref().unwrap();
-            match imap_inbox.set_seen(context, folder, msg.server_uid) {
-                ImapActionResult::RetryLater => {
+            match inbox.set_seen(context, folder, msg.server_uid) {
+                ImapResult::RetryLater => {
                    self.try_again_later(3i32, None);
                }
-                ImapActionResult::AlreadyDone => {}
-                ImapActionResult::Success | ImapActionResult::Failed => {
+                ImapResult::AlreadyDone => {}
+                ImapResult::Success | ImapResult::Failed => {
                    // XXX the message might just have been moved
                    // we want to send out an MDN anyway
                    // The job will not be retried so locally
@@ -327,8 +342,8 @@ impl Job {
            .unwrap_or_default()
            .to_string();
        let uid = self.param.get_int(Param::ServerUid).unwrap_or_default() as u32;
-        let imap_inbox = &context.inbox_thread.read().unwrap().imap;
-        if imap_inbox.set_seen(context, &folder, uid) == ImapActionResult::RetryLater {
+        let inbox = context.inbox.read().unwrap();
+        if inbox.set_seen(context, &folder, uid) == ImapResult::RetryLater {
            self.try_again_later(3i32, None);
            return;
        }
@@ -339,15 +354,15 @@ impl Job {
                .unwrap_or_default()
                < 3
            {
-                imap_inbox.configure_folders(context, 0x1i32);
+                inbox.configure_folders(context, 0x1i32);
            }
            let dest_folder = context
                .sql
                .get_raw_config(context, "configured_mvbox_folder");
            if let Some(dest_folder) = dest_folder {
                let mut dest_uid = 0;
-                if ImapActionResult::RetryLater
-                    == imap_inbox.mv(context, &folder, uid, &dest_folder, &mut dest_uid)
+                if ImapResult::RetryLater
+                    == inbox.mv(context, &folder, uid, &dest_folder, &mut dest_uid)
                {
                    self.try_again_later(3, None);
                }
@@ -367,14 +382,45 @@ pub fn job_kill_action(context: &Context, action: Action) -> bool {
    .is_ok()
 }

-pub fn perform_inbox_fetch(context: &Context) {
-    let use_network = context.get_config_bool(Config::InboxWatch);
+pub fn perform_imap_fetch(context: &Context) {
+    let inbox = context.inbox.read().unwrap();
+    let start = std::time::Instant::now();

-    context
-        .inbox_thread
-        .write()
-        .unwrap()
-        .fetch(context, use_network);
+    if 0 == connect_to_inbox(context, &inbox) {
+        return;
+    }
+    if !context.get_config_bool(Config::InboxWatch) {
+        info!(context, "INBOX-watch disabled.",);
+        return;
+    }
+    info!(context, "INBOX-fetch started...",);
+    inbox.fetch(context);
+    if inbox.should_reconnect() {
+        info!(context, "INBOX-fetch aborted, starting over...",);
+        inbox.fetch(context);
+    }
+    info!(
+        context,
+        "INBOX-fetch done in {:.4} ms.",
+        start.elapsed().as_nanos() as f64 / 1_000_000.0,
+    );
+}
+
+pub fn perform_imap_idle(context: &Context) {
+    let inbox = context.inbox.read().unwrap();
+
+    connect_to_inbox(context, &inbox);
+
+    if *context.perform_inbox_jobs_needed.clone().read().unwrap() {
+        info!(
+            context,
+            "INBOX-IDLE will not be started because of waiting jobs."
+        );
+        return;
+    }
+    info!(context, "INBOX-IDLE started...");
+    inbox.idle(context);
+    info!(context, "INBOX-IDLE ended.");
 }

 pub fn perform_mvbox_fetch(context: &Context) {
@@ -387,33 +433,6 @@ pub fn perform_mvbox_fetch(context: &Context) {
        .fetch(context, use_network);
 }

-pub fn perform_sentbox_fetch(context: &Context) {
-    let use_network = context.get_config_bool(Config::SentboxWatch);
-
-    context
-        .sentbox_thread
-        .write()
-        .unwrap()
-        .fetch(context, use_network);
-}
-
-pub fn perform_inbox_idle(context: &Context) {
-    if *context.perform_inbox_jobs_needed.clone().read().unwrap() {
-        info!(
-            context,
-            "INBOX-IDLE will not be started because of waiting jobs."
-        );
-        return;
-    }
-    let use_network = context.get_config_bool(Config::InboxWatch);
-
-    context
-        .inbox_thread
-        .read()
-        .unwrap()
-        .idle(context, use_network);
-}
-
 pub fn perform_mvbox_idle(context: &Context) {
    let use_network = context.get_config_bool(Config::MvboxWatch);

@@ -424,6 +443,20 @@ pub fn perform_mvbox_idle(context: &Context) {
        .idle(context, use_network);
 }

+pub fn interrupt_mvbox_idle(context: &Context) {
+    context.mvbox_thread.read().unwrap().interrupt_idle(context);
+}
+
+pub fn perform_sentbox_fetch(context: &Context) {
+    let use_network = context.get_config_bool(Config::SentboxWatch);
+
+    context
+        .sentbox_thread
+        .write()
+        .unwrap()
+        .fetch(context, use_network);
+}
+
 pub fn perform_sentbox_idle(context: &Context) {
    let use_network = context.get_config_bool(Config::SentboxWatch);

@@ -434,27 +467,6 @@ pub fn perform_sentbox_idle(context: &Context) {
        .idle(context, use_network);
 }

-pub fn interrupt_inbox_idle(context: &Context, block: bool) {
-    info!(context, "interrupt_inbox_idle called blocking={}", block);
-    if block {
-        context.inbox_thread.read().unwrap().interrupt_idle(context);
-    } else {
-        match context.inbox_thread.try_read() {
-            Ok(inbox_thread) => {
-                inbox_thread.interrupt_idle(context);
-            }
-            Err(err) => {
-                *context.perform_inbox_jobs_needed.write().unwrap() = true;
-                warn!(context, "could not interrupt idle: {}", err);
-            }
-        }
-    }
-}
-
-pub fn interrupt_mvbox_idle(context: &Context) {
-    context.mvbox_thread.read().unwrap().interrupt_idle(context);
-}
-
 pub fn interrupt_sentbox_idle(context: &Context) {
    context
        .sentbox_thread
@@ -510,7 +522,7 @@ pub fn perform_smtp_idle(context: &Context) {
                let res = cvar.wait_timeout(state, dur).unwrap();
                state = res.0;

-                if state.idle || res.1.timed_out() {
+                if state.idle == true || res.1.timed_out() {
                    // We received the notification and the value has been updated, we can leave.
                    break;
                }
@@ -555,7 +567,7 @@ pub fn maybe_network(context: &Context) {
    }

    interrupt_smtp_idle(context);
-    interrupt_inbox_idle(context, true);
+    interrupt_imap_idle(context);
    interrupt_mvbox_idle(context);
    interrupt_sentbox_idle(context);
 }
@@ -567,22 +579,6 @@ pub fn job_action_exists(context: &Context, action: Action) -> bool {
        .unwrap_or_default()
 }

-fn set_delivered(context: &Context, msg_id: MsgId) {
-    message::update_msg_state(context, msg_id, MessageState::OutDelivered);
-    let chat_id: i32 = context
-        .sql
-        .query_get_value(
-            context,
-            "SELECT chat_id FROM msgs WHERE id=?",
-            params![msg_id],
-        )
-        .unwrap_or_default();
-    context.call_cb(Event::MsgDelivered {
-        chat_id: chat_id as u32,
-        msg_id: msg_id,
-    });
-}
-
 /* special case for DC_JOB_SEND_MSG_TO_SMTP */
 #[allow(non_snake_case)]
 pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
@@ -644,12 +640,10 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
    }

    if mimefactory.recipients_addr.is_empty() {
-        // may happen eg. for groups with only SELF and bcc_self disabled
-        info!(
+        warn!(
            context,
            "message {} has no recipient, skipping smtp-send", msg_id
        );
-        set_delivered(context, msg_id);
        return Ok(());
    }

@@ -687,15 +681,15 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
    Ok(())
 }

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

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

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

 pub fn perform_mvbox_jobs(context: &Context) {
@@ -728,31 +722,32 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
        params_probe
    };

-    let jobs: Result<Vec<Job>, _> = context
-        .sql
-        .query_map(
-            query,
-            params,
-            |row| {
-                let job = Job {
-                    job_id: row.get(0)?,
-                    action: row.get(1)?,
-                    foreign_id: row.get(2)?,
-                    desired_timestamp: row.get(5)?,
-                    added_timestamp: row.get(4)?,
-                    tries: row.get(6)?,
-                    param: row.get::<_, String>(3)?.parse().unwrap_or_default(),
-                    try_again: 0,
-                    pending_error: None,
-                };
+    let jobs: Result<Vec<Job>, _> = context.sql.query_map(
+        query,
+        params,
+        |row| {
+            let job = Job {
+                job_id: row.get(0)?,
+                action: row.get(1)?,
+                foreign_id: row.get(2)?,
+                desired_timestamp: row.get(5)?,
+                added_timestamp: row.get(4)?,
+                tries: row.get(6)?,
+                param: row.get::<_, String>(3)?.parse().unwrap_or_default(),
+                try_again: 0,
+                pending_error: None,
+            };

-                Ok(job)
-            },
-            |jobs| jobs.collect::<Result<Vec<Job>, _>>().map_err(Into::into),
-        )
-        .map_err(|err| {
-            warn!(context, "query failed: {:?}", err);
-        });
+            Ok(job)
+        },
+        |jobs| jobs.collect::<Result<Vec<Job>, _>>().map_err(Into::into),
+    );
+    match jobs {
+        Ok(ref _res) => {}
+        Err(ref err) => {
+            info!(context, "query failed: {:?}", err);
+        }
+    }

    for mut job in jobs.unwrap_or_default() {
        info!(
@@ -931,6 +926,14 @@ fn suspend_smtp_thread(context: &Context, suspend: bool) {
    }
 }

+pub fn connect_to_inbox(context: &Context, inbox: &Imap) -> libc::c_int {
+    let ret_connected = dc_connect_to_configured_imap(context, inbox);
+    if 0 != ret_connected {
+        inbox.set_watch_folder("INBOX".into());
+    }
+    ret_connected
+}
+
 fn send_mdn(context: &Context, msg_id: MsgId) -> Result<(), Error> {
    let mut mimefactory = MimeFactory::load_mdn(context, msg_id)?;
    unsafe { mimefactory.render()? };
@@ -1001,7 +1004,7 @@ pub fn job_add(
    ).ok();

    match thread {
-        Thread::Imap => interrupt_inbox_idle(context, false),
+        Thread::Imap => interrupt_imap_idle(context),
        Thread::Smtp => interrupt_smtp_idle(context),
        Thread::Unknown => {}
    }
@@ -1017,3 +1020,11 @@ pub fn interrupt_smtp_idle(context: &Context) {
    state.idle = true;
    cvar.notify_one();
 }
+
+pub fn interrupt_imap_idle(context: &Context) {
+    info!(context, "Interrupting INBOX-IDLE...",);
+
+    *context.perform_inbox_jobs_needed.write().unwrap() = true;
+
+    context.inbox.read().unwrap().interrupt_idle();
+}
--- a/src/job_thread.rs
+++ b/src/job_thread.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, Condvar, Mutex};

+use crate::configure::*;
 use crate::context::Context;
-use crate::error::{Error, Result};
 use crate::imap::Imap;

 #[derive(Debug)]
@@ -85,49 +85,53 @@ impl JobThread {
        }

        if use_network {
-            if let Err(err) = self.connect_and_fetch(context) {
-                warn!(context, "connect+fetch failed: {}, reconnect & retry", err);
-                self.imap.trigger_reconnect();
-                if let Err(err) = self.connect_and_fetch(context) {
-                    warn!(context, "connect+fetch failed: {}", err);
+            let start = std::time::Instant::now();
+            if self.connect_to_imap(context) {
+                info!(context, "{}-fetch started...", self.name);
+                self.imap.fetch(context);
+
+                if self.imap.should_reconnect() {
+                    info!(context, "{}-fetch aborted, starting over...", self.name,);
+                    self.imap.fetch(context);
                }
+                info!(
+                    context,
+                    "{}-fetch done in {:.3} ms.",
+                    self.name,
+                    start.elapsed().as_millis(),
+                );
            }
        }
+
        self.state.0.lock().unwrap().using_handle = false;
    }

-    fn connect_and_fetch(&mut self, context: &Context) -> Result<()> {
-        let prefix = format!("{}-fetch", self.name);
-        match self.imap.connect_configured(context) {
-            Ok(()) => {
-                if let Some(watch_folder) = self.get_watch_folder(context) {
-                    let start = std::time::Instant::now();
-                    info!(context, "{} started...", prefix);
-                    let res = self.imap.fetch(context, &watch_folder);
-                    let elapsed = start.elapsed().as_millis();
-                    info!(context, "{} done in {:.3} ms.", prefix, elapsed);
-
-                    res
-                } else {
-                    Err(Error::WatchFolderNotFound("not-set".to_string()))
-                }
-            }
-            Err(err) => Err(err),
+    fn connect_to_imap(&self, context: &Context) -> bool {
+        if self.imap.is_connected() {
+            return true;
        }
-    }

-    fn get_watch_folder(&self, context: &Context) -> Option<String> {
-        match context.sql.get_raw_config(context, self.folder_config_name) {
-            Some(name) => Some(name),
-            None => {
-                if self.folder_config_name == "configured_inbox_folder" {
-                    // initialized with old version, so has not set configured_inbox_folder
-                    Some("INBOX".to_string())
-                } else {
-                    None
-                }
+        let mut ret_connected = dc_connect_to_configured_imap(context, &self.imap) != 0;
+
+        if ret_connected {
+            if context
+                .sql
+                .get_raw_config_int(context, "folders_configured")
+                .unwrap_or_default()
+                < 3
+            {
+                self.imap.configure_folders(context, 0x1);
+            }
+
+            if let Some(mvbox_name) = context.sql.get_raw_config(context, self.folder_config_name) {
+                self.imap.set_watch_folder(mvbox_name);
+            } else {
+                self.imap.disconnect(context);
+                ret_connected = false;
            }
        }
+
+        ret_connected
    }

    pub fn idle(&self, context: &Context, use_network: bool) {
@@ -166,37 +170,10 @@ impl JobThread {
            }
        }

-        let prefix = format!("{}-IDLE", self.name);
-        let do_fake_idle = match self.imap.connect_configured(context) {
-            Ok(()) => {
-                info!(context, "{} started...", prefix);
-                let watch_folder = self.get_watch_folder(context);
-                let res = self.imap.idle(context, watch_folder);
-                info!(context, "{} ended...", prefix);
-                match res {
-                    Ok(()) => false,
-                    Err(Error::ImapMissesIdle) => true, // we have to do fake_idle
-                    Err(err) => {
-                        warn!(context, "{} failed: {} -> reconnecting", prefix, err);
-                        // something is borked, let's start afresh on the next occassion
-                        self.imap.disconnect(context);
-
-                        false
-                    }
-                }
-            }
-            Err(err) => {
-                info!(context, "{}-IDLE connection fail: {:?}", self.name, err);
-                // if the connection fails, use fake_idle to retry periodically
-                // fake_idle() will be woken up by interrupt_idle() as
-                // well so will act on maybe_network events
-                true
-            }
-        };
-        if do_fake_idle {
-            let watch_folder = self.get_watch_folder(context);
-            self.imap.fake_idle(context, watch_folder);
-        }
+        self.connect_to_imap(context);
+        info!(context, "{}-IDLE started...", self.name,);
+        self.imap.idle(context);
+        info!(context, "{}-IDLE ended.", self.name);

        self.state.0.lock().unwrap().using_handle = false;
    }
--- a/src/key.rs
+++ b/src/key.rs
@@ -1,5 +1,3 @@
-//! Cryptographic key module
-
 use std::collections::BTreeMap;
 use std::io::Cursor;
 use std::path::Path;
@@ -13,7 +11,6 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::sql::{self, Sql};

-/// Cryptographic key
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Key {
    Public(SignedPublicKey),
@@ -32,44 +29,44 @@ impl From<SignedSecretKey> for Key {
    }
 }

-impl std::convert::TryFrom<Key> for SignedSecretKey {
+impl std::convert::TryInto<SignedSecretKey> for Key {
    type Error = ();

-    fn try_from(value: Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<SignedSecretKey, Self::Error> {
+        match self {
            Key::Public(_) => Err(()),
            Key::Secret(key) => Ok(key),
        }
    }
 }

-impl<'a> std::convert::TryFrom<&'a Key> for &'a SignedSecretKey {
+impl<'a> std::convert::TryInto<&'a SignedSecretKey> for &'a Key {
    type Error = ();

-    fn try_from(value: &'a Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<&'a SignedSecretKey, Self::Error> {
+        match self {
            Key::Public(_) => Err(()),
            Key::Secret(key) => Ok(key),
        }
    }
 }

-impl std::convert::TryFrom<Key> for SignedPublicKey {
+impl std::convert::TryInto<SignedPublicKey> for Key {
    type Error = ();

-    fn try_from(value: Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<SignedPublicKey, Self::Error> {
+        match self {
            Key::Public(key) => Ok(key),
            Key::Secret(_) => Err(()),
        }
    }
 }

-impl<'a> std::convert::TryFrom<&'a Key> for &'a SignedPublicKey {
+impl<'a> std::convert::TryInto<&'a SignedPublicKey> for &'a Key {
    type Error = ();

-    fn try_from(value: &'a Key) -> Result<Self, Self::Error> {
-        match value {
+    fn try_into(self) -> Result<&'a SignedPublicKey, Self::Error> {
+        match self {
            Key::Public(key) => Ok(key),
            Key::Secret(_) => Err(()),
        }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,7 +40,6 @@ pub mod contact;
 pub mod context;
 mod e2ee;
 mod imap;
-mod imap_client;
 pub mod imex;
 pub mod job;
 mod job_thread;
--- a/src/location.rs
+++ b/src/location.rs
@@ -1,5 +1,3 @@
-//! Location handling
-
 use bitflags::bitflags;
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
@@ -18,7 +16,7 @@ use crate::param::*;
 use crate::sql;
 use crate::stock::StockMessage;

-/// Location record
+// location handling
 #[derive(Debug, Clone, Default)]
 pub struct Location {
    pub location_id: u32,
@@ -304,15 +302,16 @@ pub fn get_range(
    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, \
-             COALESCE(m.id, 0) AS msg_id, l.from_id, l.chat_id, COALESCE(m.txt, '') AS txt \
+             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, msg_id DESC;",
+             ORDER BY l.timestamp DESC, l.id DESC, m.id DESC;",
            params![
                if chat_id == 0 { 1 } else { 0 },
                chat_id as i32,
@@ -329,6 +328,7 @@ pub fn get_range(
                } else {
                    None
                };
+
                let loc = Location {
                    location_id: row.get(0)?,
                    latitude: row.get(1)?,
--- a/src/log.rs
+++ b/src/log.rs
@@ -1,5 +1,3 @@
-//! # Logging macros
-
 #[macro_export]
 macro_rules! info {
    ($ctx:expr,  $msg:expr) => {
--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -3,10 +3,6 @@ use std::fmt;

 use crate::context::Context;
 use crate::error::Error;
-use async_std::sync::Arc;
-use rustls;
-use webpki;
-use webpki_roots;

 #[derive(Copy, Clone, Debug, Display, FromPrimitive)]
 #[repr(i32)]
@@ -255,49 +251,27 @@ fn get_readable_flags(flags: i32) -> String {
    res
 }

-pub struct NoCertificateVerification {}
-
-impl rustls::ServerCertVerifier for NoCertificateVerification {
-    fn verify_server_cert(
-        &self,
-        _roots: &rustls::RootCertStore,
-        _presented_certs: &[rustls::Certificate],
-        _dns_name: webpki::DNSNameRef<'_>,
-        _ocsp: &[u8],
-    ) -> Result<rustls::ServerCertVerified, rustls::TLSError> {
-        Ok(rustls::ServerCertVerified::assertion())
-    }
-}
-
-pub fn dc_build_tls_config(certificate_checks: CertificateChecks) -> rustls::ClientConfig {
-    let mut config = rustls::ClientConfig::new();
-    config
-        .root_store
-        .add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
-
+pub fn dc_build_tls(
+    certificate_checks: CertificateChecks,
+) -> Result<native_tls::TlsConnector, native_tls::Error> {
+    let mut tls_builder = native_tls::TlsConnector::builder();
    match certificate_checks {
-        CertificateChecks::Strict => {}
        CertificateChecks::Automatic => {
            // Same as AcceptInvalidCertificates for now.
            // TODO: use provider database when it becomes available
-            config
-                .dangerous()
-                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
-        }
-        CertificateChecks::AcceptInvalidCertificates => {
-            // TODO: only accept invalid certs
-            config
-                .dangerous()
-                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
+            tls_builder
+                .danger_accept_invalid_hostnames(true)
+                .danger_accept_invalid_certs(true)
        }
+        CertificateChecks::Strict => &mut tls_builder,
        CertificateChecks::AcceptInvalidHostnames => {
-            // TODO: only accept invalid hostnames
-            config
-                .dangerous()
-                .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
+            tls_builder.danger_accept_invalid_hostnames(true)
        }
+        CertificateChecks::AcceptInvalidCertificates => tls_builder
+            .danger_accept_invalid_hostnames(true)
+            .danger_accept_invalid_certs(true),
    }
-    config
+    .build()
 }

 #[cfg(test)]
--- a/src/message.rs
+++ b/src/message.rs
@@ -841,11 +841,6 @@ pub fn get_mime_headers(context: &Context, msg_id: MsgId) -> Option<String> {

 pub fn delete_msgs(context: &Context, msg_ids: &[MsgId]) {
    for msg_id in msg_ids.iter() {
-        if let Ok(msg) = Message::load_from_db(context, *msg_id) {
-            if msg.location_id > 0 {
-                delete_poi_location(context, msg.location_id);
-            }
-        }
        update_msg_chat_id(context, *msg_id, DC_CHAT_ID_TRASH);
        job_add(
            context,
@@ -876,16 +871,6 @@ fn update_msg_chat_id(context: &Context, msg_id: MsgId, chat_id: u32) -> bool {
    .is_ok()
 }

-fn delete_poi_location(context: &Context, location_id: u32) -> bool {
-    sql::execute(
-        context,
-        &context.sql,
-        "DELETE FROM locations WHERE independent = 1 AND id=?;",
-        params![location_id as i32],
-    )
-    .is_ok()
-}
-
 pub fn markseen_msgs(context: &Context, msg_ids: &[MsgId]) -> bool {
    if msg_ids.is_empty() {
        return false;
@@ -1119,7 +1104,7 @@ pub fn mdn_from_ext(
    rfc724_mid: &str,
    timestamp_sent: i64,
 ) -> Option<(u32, MsgId)> {
-    if from_id <= DC_MSG_ID_LAST_SPECIAL || rfc724_mid.is_empty() {
+    if from_id <= 9 || rfc724_mid.is_empty() {
        return None;
    }

--- a/src/oauth2.rs
+++ b/src/oauth2.rs
@@ -1,5 +1,3 @@
-//! OAuth 2 module
-
 use std::collections::HashMap;

 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
@@ -35,14 +33,12 @@ struct Oauth2 {
    get_userinfo: Option<&'static str>,
 }

-/// OAuth 2 Access Token Response
 #[derive(Debug, Deserialize)]
 struct Response {
    // Should always be there according to: https://www.oauth.com/oauth2-servers/access-tokens/access-token-response/
    // but previous code handled its abscense.
    access_token: Option<String>,
    token_type: String,
-    /// Duration of time the token is granted for, in seconds
    expires_in: Option<u64>,
    refresh_token: Option<String>,
    scope: Option<String>,
@@ -209,7 +205,7 @@ pub fn dc_get_oauth2_access_token(
                .ok();
            let expires_in = response
                .expires_in
-                // refresh a bit before
+                // refresh a bet before
                .map(|t| time() + t as i64 - 5)
                .unwrap_or_else(|| 0);
            context
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -1,4 +1,3 @@
-//! # [Autocrypt Peer State](https://autocrypt.org/level1.html#peer-state-management) module
 use std::collections::HashSet;
 use std::fmt;

@@ -383,11 +382,11 @@ impl<'a> Peerstate<'a> {
            sql::execute(
                self.context,
                sql,
-                "UPDATE acpeerstates \
-                 SET last_seen=?, last_seen_autocrypt=?, prefer_encrypted=?, \
-                 public_key=?, gossip_timestamp=?, gossip_key=?, public_key_fingerprint=?, gossip_key_fingerprint=?, \
+		"UPDATE acpeerstates \
+		 SET last_seen=?, last_seen_autocrypt=?, prefer_encrypted=?, \
+		 public_key=?, gossip_timestamp=?, gossip_key=?, public_key_fingerprint=?, gossip_key_fingerprint=?, \
                 verified_key=?, verified_key_fingerprint=? \
-                 WHERE addr=?;",
+		 WHERE addr=?;",
                params![
                    self.last_seen,
                    self.last_seen_autocrypt,
--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -1,8 +1,5 @@
-//! OpenPGP helper module using [rPGP facilities](https://github.com/rpgp/rpgp)
-
 use std::collections::{BTreeMap, HashSet};
 use std::convert::TryInto;
-use std::io;
 use std::io::Cursor;

 use pgp::armor::BlockType;
@@ -11,10 +8,8 @@ use pgp::composed::{
    SignedPublicSubKey, SignedSecretKey, SubkeyParamsBuilder,
 };
 use pgp::crypto::{HashAlgorithm, SymmetricKeyAlgorithm};
-use pgp::types::{
-    CompressionAlgorithm, KeyTrait, Mpi, PublicKeyTrait, SecretKeyTrait, StringToKey,
-};
-use rand::{thread_rng, CryptoRng, Rng};
+use pgp::types::{CompressionAlgorithm, KeyTrait, SecretKeyTrait, StringToKey};
+use rand::thread_rng;

 use crate::error::Error;
 use crate::key::*;
@@ -23,68 +18,6 @@ use crate::keyring::*;
 pub const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt";
 pub const HEADER_SETUPCODE: &str = "passphrase-begin";

-/// A wrapper for rPGP public key types
-#[derive(Debug)]
-enum SignedPublicKeyOrSubkey<'a> {
-    Key(&'a SignedPublicKey),
-    Subkey(&'a SignedPublicSubKey),
-}
-
-impl<'a> KeyTrait for SignedPublicKeyOrSubkey<'a> {
-    fn fingerprint(&self) -> Vec<u8> {
-        match self {
-            Self::Key(k) => k.fingerprint(),
-            Self::Subkey(k) => k.fingerprint(),
-        }
-    }
-
-    fn key_id(&self) -> pgp::types::KeyId {
-        match self {
-            Self::Key(k) => k.key_id(),
-            Self::Subkey(k) => k.key_id(),
-        }
-    }
-
-    fn algorithm(&self) -> pgp::crypto::PublicKeyAlgorithm {
-        match self {
-            Self::Key(k) => k.algorithm(),
-            Self::Subkey(k) => k.algorithm(),
-        }
-    }
-}
-
-impl<'a> PublicKeyTrait for SignedPublicKeyOrSubkey<'a> {
-    fn verify_signature(
-        &self,
-        hash: HashAlgorithm,
-        data: &[u8],
-        sig: &[Mpi],
-    ) -> pgp::errors::Result<()> {
-        match self {
-            Self::Key(k) => k.verify_signature(hash, data, sig),
-            Self::Subkey(k) => k.verify_signature(hash, data, sig),
-        }
-    }
-
-    fn encrypt<R: Rng + CryptoRng>(
-        &self,
-        rng: &mut R,
-        plain: &[u8],
-    ) -> pgp::errors::Result<Vec<Mpi>> {
-        match self {
-            Self::Key(k) => k.encrypt(rng, plain),
-            Self::Subkey(k) => k.encrypt(rng, plain),
-        }
-    }
-
-    fn to_writer_old(&self, writer: &mut impl io::Write) -> pgp::errors::Result<()> {
-        match self {
-            Self::Key(k) => k.to_writer_old(writer),
-            Self::Subkey(k) => k.to_writer_old(writer),
-        }
-    }
-}
-
 /// Split data from PGP Armored Data as defined in https://tools.ietf.org/html/rfc4880#section-6.2.
 ///
 /// Returns (type, headers, base64 encoded body).
@@ -164,39 +97,22 @@ pub fn create_keypair(addr: impl AsRef<str>) -> Option<(Key, Key)> {
    Some((Key::Public(public_key), Key::Secret(private_key)))
 }

-/// Select public key or subkey to use for encryption.
+/// Select subkey of the public key to use for encryption.
 ///
-/// First, tries to use subkeys. If none of the subkeys are suitable
-/// for encryption, tries to use primary key. Returns `None` if the public
-/// key cannot be used for encryption.
-///
-/// TODO: take key flags and expiration dates into account
-fn select_pk_for_encryption(key: &SignedPublicKey) -> Option<SignedPublicKeyOrSubkey> {
-    key.public_subkeys
-        .iter()
-        .find(|subkey| subkey.is_encryption_key())
-        .map_or_else(
-            || {
-                // No usable subkey found, try primary key
-                if key.is_encryption_key() {
-                    Some(SignedPublicKeyOrSubkey::Key(key))
-                } else {
-                    None
-                }
-            },
-            |subkey| Some(SignedPublicKeyOrSubkey::Subkey(subkey)),
-        )
+/// Currently the first subkey is selected.
+fn select_pk_for_encryption(key: &SignedPublicKey) -> Option<&SignedPublicSubKey> {
+    key.public_subkeys.iter().find(|_k|
+        // TODO: check if it is an encryption subkey
+        true)
 }

-/// Encrypts `plain` text using `public_keys_for_encryption`
-/// and signs it using `private_key_for_signing`.
 pub fn pk_encrypt(
    plain: &[u8],
    public_keys_for_encryption: &Keyring,
    private_key_for_signing: Option<&Key>,
 ) -> Result<String, Error> {
    let lit_msg = Message::new_literal_bytes("", plain);
-    let pkeys: Vec<SignedPublicKeyOrSubkey> = public_keys_for_encryption
+    let pkeys: Vec<&SignedPublicSubKey> = public_keys_for_encryption
        .keys()
        .iter()
        .filter_map(|key| {
@@ -206,7 +122,6 @@ pub fn pk_encrypt(
                .and_then(select_pk_for_encryption)
        })
        .collect();
-    let pkeys_refs: Vec<&SignedPublicKeyOrSubkey> = pkeys.iter().collect();

    let mut rng = thread_rng();

@@ -219,9 +134,9 @@ pub fn pk_encrypt(
        lit_msg
            .sign(skey, || "".into(), Default::default())
            .and_then(|msg| msg.compress(CompressionAlgorithm::ZLIB))
-            .and_then(|msg| msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs))
+            .and_then(|msg| msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys))
    } else {
-        lit_msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs)
+        lit_msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys)
    };

    let msg = encrypted_msg?;
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -1,5 +1,3 @@
-//! # QR code module
-
 use lazy_static::lazy_static;
 use percent_encoding::percent_decode_str;

--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -1,5 +1,3 @@
-//! Verified contact protocol implementation as [specified by countermitm project](https://countermitm.readthedocs.io/en/stable/new.html#setup-contact-protocol)
-
 use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};

 use crate::aheader::EncryptPreference;
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -5,7 +5,7 @@ use crate::constants::*;
 use crate::context::Context;
 use crate::error::Error;
 use crate::events::Event;
-use crate::login_param::{dc_build_tls_config, LoginParam};
+use crate::login_param::{dc_build_tls, LoginParam};
 use crate::oauth2::*;

 #[derive(DebugStub)]
@@ -65,8 +65,8 @@ impl Smtp {
        let domain = &lp.send_server;
        let port = lp.send_port as u16;

-        let tls_config = dc_build_tls_config(lp.smtp_certificate_checks);
-        let tls_parameters = ClientTlsParameters::new(domain.to_string(), tls_config);
+        let tls = dc_build_tls(lp.smtp_certificate_checks).unwrap();
+        let tls_parameters = ClientTlsParameters::new(domain.to_string(), tls);

        let (creds, mechanism) = if 0 != lp.server_flags & (DC_LP_AUTH_OAUTH2 as i32) {
            // oauth2
@@ -138,7 +138,7 @@ impl Smtp {

    /// SMTP-Send a prepared mail to recipients.
    /// on successful send out Ok() is returned.
-    pub fn send(
+    pub fn send<'a>(
        &mut self,
        context: &Context,
        recipients: Vec<EmailAddress>,
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -1,5 +1,3 @@
-//! # SQLite wrapper
-
 use std::collections::HashSet;
 use std::sync::{Arc, RwLock};
 use std::time::Duration;
@@ -7,8 +5,6 @@ use std::time::Duration;
 use rusqlite::{Connection, OpenFlags, Statement, NO_PARAMS};
 use thread_local_object::ThreadLocal;

-use crate::chat::update_saved_messages_icon;
-use crate::constants::ShowEmails;
 use crate::context::Context;
 use crate::dc_tools::*;
 use crate::error::{Error, Result};
@@ -352,7 +348,7 @@ fn open(
    }

    if !readonly {
-        let mut exists_before_update = false;
+        let mut exists_before_update = 0;
        let mut dbversion_before_update = 0;
        /* Init tables to dbversion=0 */
        if !sql.table_exists("config") {
@@ -482,7 +478,7 @@ fn open(
                sql.set_raw_config_int(context, "dbversion", 0)?;
            }
        } else {
-            exists_before_update = true;
+            exists_before_update = 1;
            dbversion_before_update = sql
                .get_raw_config_int(context, "dbversion")
                .unwrap_or_default();
@@ -492,11 +488,9 @@ fn open(
        // this should be done before updates that use high-level objects that
        // rely themselves on the low-level structure.
        // --------------------------------------------------------------------
-
        let mut dbversion = dbversion_before_update;
        let mut recalc_fingerprints = 0;
        let mut update_file_paths = 0;
-        let mut update_icons = false;

        if dbversion < 1 {
            info!(context, "[migration] v1");
@@ -594,8 +588,6 @@ fn open(
        }
        if dbversion < 27 {
            info!(context, "[migration] v27");
-            // chat.id=1 and chat.id=2 are the old deaddrops,
-            // the current ones are defined by chats.blocked=2
            sql.execute("DELETE FROM msgs WHERE chat_id=1 OR chat_id=2;", params![])?;
            sql.execute(
                "CREATE INDEX chats_contacts_index2 ON chats_contacts (contact_id);",
@@ -661,9 +653,6 @@ fn open(
                params![],
            )?;
            if dbversion_before_update == 34 {
-                // migrate database from the use of verified-flags to verified_key,
-                // _only_ version 34 (0.17.0) has the fields public_key_verified and gossip_key_verified
-                // this block can be deleted in half a year or so (created 5/2018)
                sql.execute(
                    "UPDATE acpeerstates SET verified_key=gossip_key, verified_key_fingerprint=gossip_key_fingerprint WHERE gossip_key_verified=2;",
                    params![]
@@ -693,8 +682,6 @@ fn open(
        }
        if dbversion < 42 {
            info!(context, "[migration] v42");
-            // older versions set the txt-field to the filenames, for debugging and fulltext search.
-            // to allow text+attachment compound messages, we need to reset these fields.
            sql.execute("UPDATE msgs SET txt='' WHERE type!=10", params![])?;
            dbversion = 42;
            sql.set_raw_config_int(context, "dbversion", 42)?;
@@ -748,19 +735,14 @@ fn open(
        }
        if dbversion < 50 {
            info!(context, "[migration] v50");
-            // installations <= 0.100.1 used DC_SHOW_EMAILS_ALL implicitly;
-            // keep this default and use DC_SHOW_EMAILS_NO
-            // only for new installations
-            if exists_before_update {
-                sql.set_raw_config_int(context, "show_emails", ShowEmails::All as i32)?;
+            if 0 != exists_before_update {
+                sql.set_raw_config_int(context, "show_emails", 2)?;
            }
            dbversion = 50;
            sql.set_raw_config_int(context, "dbversion", 50)?;
        }
        if dbversion < 53 {
            info!(context, "[migration] v53");
-            // the messages containing _only_ locations
-            // are also added to the database as _hidden_.
            sql.execute(
                "CREATE TABLE locations ( id INTEGER PRIMARY KEY AUTOINCREMENT, latitude REAL DEFAULT 0.0, longitude REAL DEFAULT 0.0, accuracy REAL DEFAULT 0.0, timestamp INTEGER DEFAULT 0, chat_id INTEGER DEFAULT 0, from_id INTEGER DEFAULT 0);",
                params![]
@@ -808,30 +790,9 @@ fn open(
                "ALTER TABLE locations ADD COLUMN independent INTEGER DEFAULT 0;",
                params![],
            )?;
+
            sql.set_raw_config_int(context, "dbversion", 55)?;
        }
-        if dbversion < 59 {
-            info!(context, "[migration] v59");
-            // records in the devmsglabels are kept when the message is deleted.
-            // so, msg_id may or may not exist.
-            sql.execute(
-                "CREATE TABLE devmsglabels (id INTEGER PRIMARY KEY AUTOINCREMENT, label TEXT, msg_id INTEGER DEFAULT 0);",
-                NO_PARAMS,
-            )?;
-            sql.execute(
-                "CREATE INDEX devmsglabels_index1 ON devmsglabels (label);",
-                NO_PARAMS,
-            )?;
-            if exists_before_update && sql.get_raw_config_int(context, "bcc_self").is_none() {
-                sql.set_raw_config_int(context, "bcc_self", 1)?;
-            }
-            update_icons = true;
-            sql.set_raw_config_int(context, "dbversion", 59)?;
-        }
-
-        // (2) updates that require high-level objects
-        // (the structure is complete now and all objects are usable)
-        // --------------------------------------------------------------------

        if 0 != recalc_fingerprints {
            info!(context, "[migration] recalc fingerprints");
@@ -879,9 +840,6 @@ fn open(

            sql.set_raw_config(context, "backup_for", None)?;
        }
-        if update_icons {
-            update_saved_messages_icon(context)?;
-        }
    }

    info!(context, "Opened {:?}.", dbfile.as_ref(),);
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -1,5 +1,3 @@
-//! Module to work with translatable stock strings
-
 use std::borrow::Cow;

 use strum::EnumProperty;
@@ -112,10 +110,8 @@ pub enum StockMessage {
    Location = 66,
    #[strum(props(fallback = "Sticker"))]
    Sticker = 67,
-    #[strum(props(fallback = "Device messages"))]
+    #[strum(props(fallback = "Device Messages"))]
    DeviceMessages = 68,
-    #[strum(props(fallback = "Saved messages"))]
-    SavedMessages = 69,
 }

 impl StockMessage {
--- a/src/token.rs
+++ b/src/token.rs
@@ -1,8 +1,4 @@
-//! # Token module
-//!
 //! Functions to read/write token from/to the database. A token is any string associated with a key.
-//!
-//! Tokens are used in countermitm verification protocols.

 use deltachat_derive::*;

@@ -10,7 +6,7 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::sql;

-/// Token namespace
+// Token namespaces
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
 #[repr(i32)]
 pub enum Namespace {
@@ -25,8 +21,6 @@ impl Default for Namespace {
    }
 }

-/// Creates a new token and saves it into the database.
-/// Returns created token.
 pub fn save(context: &Context, namespace: Namespace, foreign_id: u32) -> String {
    // foreign_id may be 0
    let token = dc_create_id();
--- a/tests/stress.rs
+++ b/tests/stress.rs
@@ -261,6 +261,22 @@ fn test_stress_tests() {
    }
 }

+#[test]
+fn test_get_contacts() {
+    let context = create_test_context();
+    let contacts = Contact::get_all(&context.ctx, 0, Some("some2")).unwrap();
+    assert_eq!(contacts.len(), 0);
+
+    let id = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
+    assert_ne!(id, 0);
+
+    let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).unwrap();
+    assert_eq!(contacts.len(), 1);
+
+    let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).unwrap();
+    assert_eq!(contacts.len(), 0);
+}
+
 #[test]
 fn test_chat() {
    let context = create_test_context();