use encoded-words crate, which friedel ported from python

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

+## 1.0.0-beta.10 (pending)
+
+- fix grpid-determination from in-reply-to and references headers. @hpk42
+
+- only send Autocrypt-gossip headers on encrypted messages. @dignifiedquire
+
+- fix reply-to-encrypted message to also be encrypted. @hpk42
+
+- remove last unsafe code from dc_receive_imf :) @hpk42
+
+
 ## 1.0.0-beta.9

 - historic: we now use the mailparse crate and lettre-email to generate mime
@@ -22,7 +33,9 @@
 - fix flakyness/sometimes-failing verified/join-protocols, 
  thanks @flub, @r10s, @hpk42

- new DC_EVENT_SECUREJOIN_SUCCEEDED event 
+- fix reply-to-encrypted message to keep encryption 
+
+- new DC_EVENT_SECUREJOIN_MEMBER_ADDED event 

 - many little fixes and rustifications (@link2xt, @flub, @hpk42)

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -607,7 +607,7 @@ dependencies = [

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

 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.8"
+version = "1.0.0-beta.9"
 dependencies = [
- "deltachat 1.0.0-beta.8",
+ "deltachat 1.0.0-beta.9",
 "deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -796,6 +797,20 @@ dependencies = [
 "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

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

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

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

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

+[[package]]
+name = "thiserror"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thread-local-object"
 version = "0.1.0"
@@ -3069,7 +3102,7 @@ dependencies = [

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

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

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

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

 Some tests are expensive and marked with `#[ignore]`, to run these
--- a/assets/welcome-image.jpg
+++ b/assets/welcome-image.jpg
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.8"
+version = "1.0.0-beta.9"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -879,7 +879,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
        }
        "forward" => {
            ensure!(
-                !arg1.is_empty() && arg2.is_empty(),
+                !arg1.is_empty() && !arg2.is_empty(),
                "Arguments <msg-id> <chat-id> expected"
            );

--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -58,8 +58,6 @@ class Message(object):

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

    @props.with_doc
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -430,6 +430,32 @@ class TestOnlineAccount:
        assert self_addr not in ev[2]
        ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")

+    def test_prepare_file_with_unicode(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = self.get_chat(ac1, ac2)
+
+        lp.sec("ac1: prepare and send attachment + text to ac2")
+        blobdir = ac1.get_blobdir()
+        basename = "somedäüta.txt"
+        p = os.path.join(blobdir, basename)
+        with open(p, "w") as f:
+            f.write("some data")
+        msg = Message.new_empty(ac1, "file")
+        msg.set_text("hello ä world")
+        msg.set_file(p)
+        message = chat.prepare_message(msg)
+        assert message.is_out_preparing()
+        assert message.text == "hello ä world"
+        chat.send_prepared(message)
+
+        lp.sec("ac2: receive message")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
+        msg = ac2.get_message_by_id(ev[1])
+        assert msg.text == "hello ä world"
+        assert open(msg.filename).read() == "some data"
+        assert msg.filename.endswith(basename)
+
    def test_mvbox_sentbox_threads(self, acfactory, lp):
        lp.sec("ac1: start with mvbox thread")
        ac1 = acfactory.get_online_configuring_account(mvbox=True, sentbox=True)
@@ -475,27 +501,32 @@ class TestOnlineAccount:
        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")

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

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

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

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

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

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

        lp.sec("wait1 for original or forwarded messages to arrive")
        ev1 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ev1[1] >= const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev1[1] > const.DC_CHAT_ID_LAST_SPECIAL
        received_original = ac2.get_message_by_id(ev1[2])
        assert cmp(received_original.filename, path, False)

        lp.sec("wait2 for original or forwarded messages to arrive")
        ev2 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ev2[1] >= const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev2[1] > const.DC_CHAT_ID_LAST_SPECIAL
        assert ev2[1] != ev1[1]
        received_copy = ac2.get_message_by_id(ev2[2])
        assert cmp(received_copy.filename, path, False)
--- a/set_core_version.py
+++ b/set_core_version.py
@@ -33,6 +33,8 @@ def replace_toml_version(relpath, newversion):
 if __name__ == "__main__":

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

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

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

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

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

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

            // add independent location to database

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

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

 pub fn set_blocking(context: &Context, chat_id: u32, new_blocking: Blocked) -> bool {
+    if chat_id == 0 {
+        warn!(context, "ignoring setting of Block-status for chat_id=0");
+        return false;
+    }
    sql::execute(
        context,
        &context.sql,
@@ -874,17 +866,14 @@ pub fn send_msg(context: &Context, chat_id: u32, msg: &mut Message) -> Result<Ms
        let forwards = msg.param.get(Param::PrepForwards);
        if let Some(forwards) = forwards {
            for forward in forwards.split(' ') {
-                match forward
+                if let Ok(msg_id) = forward
                    .parse::<u32>()
                    .map_err(|_| InvalidMsgId)
-                    .map(|id| MsgId::new(id))
+                    .map(MsgId::new)
                {
-                    Ok(msg_id) => {
-                        if let Ok(mut msg) = Message::load_from_db(context, msg_id) {
-                            send_msg(context, 0, &mut msg)?;
-                        };
-                    }
-                    Err(_) => (),
+                    if let Ok(mut msg) = Message::load_from_db(context, msg_id) {
+                        send_msg(context, 0, &mut msg)?;
+                    };
                }
            }
            msg.param.remove(Param::PrepForwards);
@@ -1726,12 +1715,8 @@ pub fn set_chat_name(
            if sql::execute(
                context,
                &context.sql,
-                format!(
-                    "UPDATE chats SET name='{}' WHERE id={};",
-                    new_name.as_ref(),
-                    chat_id as i32
-                ),
-                params![],
+                "UPDATE chats SET name=? WHERE id=?;",
+                params![new_name.as_ref(), chat_id as i32],
            )
            .is_ok()
            {
@@ -1849,6 +1834,7 @@ pub fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: u32) -> Resul

    unarchive(context, chat_id)?;
    if let Ok(mut chat) = Chat::load_from_db(context, chat_id) {
+        ensure!(chat.can_send(), "cannot send to chat #{}", chat_id);
        curr_timestamp = dc_create_smeared_timestamps(context, msg_ids.len());
        let ids = context.sql.query_map(
            format!(
@@ -2212,6 +2198,7 @@ mod tests {
        let chat = Chat::load_from_db(&t.ctx, chat_id);
        assert!(chat.is_ok());
        let chat = chat.unwrap();
+        assert_eq!(chat.get_type(), Chattype::Single);
        assert!(chat.is_device_talk());
        assert!(!chat.is_self_talk());
        assert!(!chat.can_send());
@@ -2279,6 +2266,22 @@ mod tests {
        assert_eq!(chatlist_len(&t.ctx, 0), 0)
    }

+    #[test]
+    fn test_device_chat_cannot_sent() {
+        let t = test_context(Some(Box::new(logging_cb)));
+        t.ctx.update_device_chats().unwrap();
+        let (device_chat_id, _) =
+            create_or_lookup_by_contact_id(&t.ctx, DC_CONTACT_ID_DEVICE, Blocked::Not).unwrap();
+
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = Some("message text".to_string());
+        assert!(send_msg(&t.ctx, device_chat_id, &mut msg).is_err());
+        assert!(prepare_msg(&t.ctx, device_chat_id, &mut msg).is_err());
+
+        let msg_id = add_device_msg(&t.ctx, None, Some(&mut msg)).unwrap();
+        assert!(forward_msgs(&t.ctx, &[msg_id], device_chat_id).is_err());
+    }
+
    fn chatlist_len(ctx: &Context, listflags: usize) -> usize {
        Chatlist::try_load(ctx, listflags, None, None)
            .unwrap()
@@ -2334,4 +2337,20 @@ mod tests {
        assert_eq!(chatlist_len(&t.ctx, DC_GCL_NO_SPECIALS), 1);
        assert_eq!(chatlist_len(&t.ctx, DC_GCL_ARCHIVED_ONLY), 1);
    }
+
+    #[test]
+    fn test_set_chat_name() {
+        let t = dummy_context();
+        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo").unwrap();
+        assert_eq!(
+            Chat::load_from_db(&t.ctx, chat_id).unwrap().get_name(),
+            "foo"
+        );
+
+        set_chat_name(&t.ctx, chat_id, "bar").unwrap();
+        assert_eq!(
+            Chat::load_from_db(&t.ctx, chat_id).unwrap().get_name(),
+            "bar"
+        );
+    }
 }
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -60,7 +60,7 @@ impl Chatlist {
    ///   or "Not now".
    ///   The UI can also offer a "Close" button that calls dc_marknoticed_contact() then.
    /// - DC_CHAT_ID_ARCHIVED_LINK (6) - this special chat is present if the user has
-    ///   archived _any_ chat using dc_archive_chat(). The UI should show a link as
+    ///   archived *any* chat using dc_archive_chat(). The UI should show a link as
    ///   "Show archived chats", if the user clicks this item, the UI should show a
    ///   list of all archived chats that can be created by this function hen using
    ///   the DC_GCL_ARCHIVED_ONLY flag.
@@ -71,7 +71,7 @@ impl Chatlist {
    /// The `listflags` is a combination of flags:
    /// - if the flag DC_GCL_ARCHIVED_ONLY is set, only archived chats are returned.
    ///   if DC_GCL_ARCHIVED_ONLY is not set, only unarchived chats are returned and
-    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are _any_ archived
+    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are *any* archived
    ///   chats
    /// - if the flag DC_GCL_NO_SPECIALS is set, deaddrop and archive link are not added
    ///   to the list (may be used eg. for selecting chats on forwarding, the flag is
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -74,7 +74,7 @@ fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {
    // Split address into local part and domain part.
    let p = in_emailaddr
        .find('@')
-        .ok_or(Error::InvalidEmailAddress(in_emailaddr.to_string()))?;
+        .ok_or_else(|| Error::InvalidEmailAddress(in_emailaddr.to_string()))?;
    let (in_emaillocalpart, in_emaildomain) = in_emailaddr.split_at(p);
    let in_emaildomain = &in_emaildomain[1..];

@@ -130,13 +130,14 @@ pub fn moz_autoconfigure(
 ) -> Result<LoginParam> {
    let xml_raw = read_url(context, url)?;

-    parse_xml(&param_in.addr, &xml_raw).map_err(|err| {
+    let res = parse_xml(&param_in.addr, &xml_raw);
+    if let Err(err) = &res {
        warn!(
            context,
            "Failed to parse Thunderbird autoconfiguration XML: {}", err
        );
-        err.into()
-    })
+    }
+    res
 }

 fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -23,15 +23,17 @@ use crate::stock::StockMessage;
 const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;

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

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

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

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

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

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

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

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

            cleanup(
                context,
@@ -407,27 +407,25 @@ fn add_parts(
            // try to create a group
            // (groups appear automatically only if the _sender_ is known, see core issue #54)

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

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

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

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

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

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

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

                mime_parser.is_system_message = SystemMessage::GroupNameChanged;
-            } else {
-                if let Some(optional_field) = mime_parser.lookup_field("Chat-Group-Image").cloned()
-                {
-                    // fld_value is a pointer somewhere into mime_parser, must not be freed
-                    X_MrGrpImageChanged = optional_field;
-                    mime_parser.is_system_message = SystemMessage::GroupImageChanged;
-                    better_msg = context.stock_system_msg(
-                        if X_MrGrpImageChanged == "0" {
-                            StockMessage::MsgGrpImgDeleted
-                        } else {
-                            StockMessage::MsgGrpImgChanged
-                        },
-                        "",
-                        "",
-                        from_id as u32,
-                    )
-                }
+            } else if let Some(optional_field) =
+                mime_parser.lookup_field("Chat-Group-Image").cloned()
+            {
+                // fld_value is a pointer somewhere into mime_parser, must not be freed
+                X_MrGrpImageChanged = optional_field;
+                mime_parser.is_system_message = SystemMessage::GroupImageChanged;
+                better_msg = context.stock_system_msg(
+                    if X_MrGrpImageChanged == "0" {
+                        StockMessage::MsgGrpImgDeleted
+                    } else {
+                        StockMessage::MsgGrpImgChanged
+                    },
+                    "",
+                    "",
+                    from_id as u32,
+                )
            }
        }
    }
@@ -964,20 +934,19 @@ fn create_or_lookup_group(
                mime_parser.repl_msg_by_error(s);
            }
        }
-    }
-
-    // check if the sender is a member of the existing group -
-    // if not, we'll recreate the group list
-    if chat_id != 0 && !chat::is_contact_in_chat(context, chat_id, from_id as u32) {
-        recreate_member_list = 1;
+        // check if the sender is a member of the existing group -
+        // if not, we'll recreate the group list
+        if !chat::is_contact_in_chat(context, chat_id, from_id as u32) {
+            recreate_member_list = 1;
+        }
    }

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

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

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

    // check the number of receivers -
-    // the only critical situation is if the user hits "Reply" instead of "Reply all" in a non-messenger-client */
-    if to_ids_cnt == 1 && !mime_parser.is_send_by_messenger {
-        let is_contact_cnt = chat::get_chat_contact_cnt(context, chat_id);
-        if is_contact_cnt > 3 {
-            // to_ids_cnt==1 may be "From: A, To: B, SELF" as SELF is not counted in to_ids_cnt.
-            // So everything up to 3 is no error.
-            chat_id = 0;
-            create_or_lookup_adhoc_group(
-                context,
-                mime_parser,
-                allow_creation,
-                create_blocked,
-                from_id,
-                to_ids,
-                &mut chat_id,
-                &mut chat_id_blocked,
-            )?;
-        }
+    // the only critical situation is if the user hits "Reply" instead
+    // of "Reply all" in a non-messenger-client */
+    if to_ids_cnt == 1
+        && !mime_parser.is_send_by_messenger
+        && chat::get_chat_contact_cnt(context, chat_id) > 3
+    {
+        // to_ids_cnt==1 may be "From: A, To: B, SELF" as SELF is not counted in to_ids_cnt.
+        // So everything up to 3 is no error.
+        create_or_lookup_adhoc_group(
+            context,
+            mime_parser,
+            allow_creation,
+            create_blocked,
+            from_id,
+            to_ids,
+        )
+        .map_err(|err| {
+            warn!(context, "could not create ad-hoc group: {:?}", err);
+            err
+        })?;
    }
-
-    cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
-    return Ok(());
+    Ok((chat_id, chat_id_blocked))
 }

-/// Handle groups for received messages
+/// try extract a grpid from a message-id list header value
+fn get_grpid_from_list(mime_parser: &MimeParser, header_key: &str) -> Option<String> {
+    if let Some(value) = mime_parser.lookup_field(header_key) {
+        for part in value.split(',').map(str::trim) {
+            if !part.is_empty() {
+                if let Some(extracted_grpid) = dc_extract_grpid_from_rfc724_mid(part) {
+                    return Some(extracted_grpid.to_string());
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Handle groups for received messages, return chat_id/Blocked status on success
 fn create_or_lookup_adhoc_group(
    context: &Context,
    mime_parser: &MimeParser,
    allow_creation: i32,
    create_blocked: Blocked,
    from_id: u32,
-    to_ids: &mut Vec<u32>,
-    ret_chat_id: *mut u32,
-    ret_chat_id_blocked: &mut Blocked,
-) -> Result<()> {
-    // if we're here, no grpid was found, check there is an existing ad-hoc
-    // group matching the to-list or if we can create one
-    let mut chat_id = 0;
-    let mut chat_id_blocked = Blocked::Not;
+    to_ids: &[u32],
+) -> Result<(u32, Blocked)> {
+    // if we're here, no grpid was found, check if there is an existing
+    // ad-hoc group matching the to-list or if we should and can create one
+    // (we do not want to heuristically look at the likely mangled Subject)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/src/events.rs
+++ b/src/events.rs
@@ -1,3 +1,5 @@
+//! # Events specification
+
 use std::path::PathBuf;

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

+pub mod select_folder;
+
 const DC_IMAP_SEEN: usize = 0x0001;

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

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

@@ -61,15 +60,6 @@ pub enum Error {
    #[fail(display = "IMAP server does not have IDLE capability")]
    IdleAbilityMissing,

-    #[fail(display = "IMAP Connection Lost or no connection established")]
-    ConnectionLost,
-
-    #[fail(display = "IMAP close/expunge failed: {}", _0)]
-    CloseExpungeFailed(#[cause] async_imap::error::Error),
-
-    #[fail(display = "IMAP Folder name invalid: {:?}", _0)]
-    BadFolderName(String),
-
    #[fail(display = "IMAP operation attempted while it is torn down")]
    InTeardown,

@@ -79,6 +69,9 @@ pub enum Error {
    #[fail(display = "IMAP got error from elsewhere: {:?}", _0)]
    WrappedError(#[cause] crate::error::Error),

+    #[fail(display = "IMAP select folder error")]
+    SelectFolderError(#[cause] select_folder::Error),
+
    #[fail(display = "IMAP other error: {:?}", _0)]
    Other(String),
 }
@@ -101,6 +94,12 @@ impl From<Error> for crate::error::Error {
    }
 }

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

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

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

    pub async fn is_connected(&self) -> bool {
@@ -233,9 +225,7 @@ impl Imap {
                    match Client::connect_insecure((imap_server, imap_port)).await {
                        Ok(client) => {
                            if (server_flags & DC_LP_IMAP_SOCKET_STARTTLS) != 0 {
-                                let res =
-                                    client.secure(imap_server, config.certificate_checks).await;
-                                res
+                                client.secure(imap_server, config.certificate_checks).await
                            } else {
                                Ok(client)
                            }
@@ -271,14 +261,12 @@ impl Imap {
                                user: imap_user.into(),
                                access_token: token,
                            };
-                            let res = client.authenticate("XOAUTH2", &auth).await;
-                            res
+                            client.authenticate("XOAUTH2", &auth).await
                        } else {
                            return Err(Error::OauthError);
                        }
                    } else {
-                        let res = client.login(imap_user, imap_pw).await;
-                        res
+                        client.login(imap_user, imap_pw).await
                    }
                }
                Err(err) => {
@@ -369,7 +357,7 @@ impl Imap {
        if self.connect(context, &param) {
            self.ensure_configured_folders(context, true)
        } else {
-            Err(Error::ConnectionFailed(format!("{}", param).to_string()))
+            Err(Error::ConnectionFailed(format!("{}", param)))
        }
    }

@@ -471,92 +459,6 @@ impl Imap {
        })
    }

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

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

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

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

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

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

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

 use deltachat_derive::{FromSql, ToSql};
@@ -117,6 +122,7 @@ pub struct Job {
 }

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

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

@@ -893,6 +906,8 @@ fn add_smtp_job(
    Ok(())
 }

+/// Adds a job to the database, scheduling it `delay_seconds`
+/// after the current time.
 pub fn job_add(
    context: &Context,
    action: Action,
--- a/src/key.rs
+++ b/src/key.rs
@@ -192,7 +192,6 @@ impl Key {
                res.push(c);
                res
            })
-            .to_string()
    }

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

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

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

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

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

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

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

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

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

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

@@ -82,7 +84,7 @@ impl MsgId {
    ///
    /// Avoid using this, eventually types should be cleaned up enough
    /// that it is no longer necessary.
-    pub fn to_u32(&self) -> u32 {
+    pub fn to_u32(self) -> u32 {
        self.0
    }
 }
@@ -687,7 +689,7 @@ impl Lot {
        self.text2 = Some(get_summarytext_by_raw(
            msg.type_0,
            msg.text.as_ref(),
-            &mut msg.param,
+            &msg.param,
            SUMMARY_CHARACTERS,
            context,
        ));
@@ -1218,9 +1220,10 @@ pub fn mdn_from_ext(
                } // else wait for more receipts
            }
        }
-        return match read_by_all {
-            true => Some((chat_id, msg_id)),
-            false => None,
+        return if read_by_all {
+            Some((chat_id, msg_id))
+        } else {
+            None
        };
    }
    None
@@ -1368,50 +1371,32 @@ mod tests {
        some_file.set(Param::File, "foo.bar");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

        let outer_message = if is_encrypted {
+            // Add gossip headers
+            if do_gossip {
+                for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) {
+                    if peerstate.peek_key(min_verified).is_some() {
+                        if let Some(header) = peerstate.render_gossip_header(min_verified) {
+                            message =
+                                message.header(Header::new("Autocrypt-Gossip".into(), header));
+                        }
+                    }
+                }
+            }
+
            // Store protected headers in the inner message.
            for header in protected_headers.into_iter() {
                message = message.header(header);
            }
+
            // Set the appropriate Content-Type for the inner message.
            let mut existing_ct = message
                .get_header("Content-Type".to_string())
@@ -609,7 +610,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
            protected_headers.push(Header::new("Chat-Group-ID".into(), chat.grpid.clone()));

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

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

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

    let body = std::fs::read(blob.to_abs_path())?;
@@ -1026,3 +1025,23 @@ fn is_file_size_okay(context: &Context, msg: &Message) -> bool {
        None => false,
    }
 }
+
+/* ******************************************************************************
+ * Encode/decode header words, RFC 2047
+ ******************************************************************************/
+
+fn encode_words(word: &str) -> String {
+    encoded_words::encode(word, None, encoded_words::EncodingFlag::Shortest, None)
+}
+
+pub fn needs_encoding(to_check: impl AsRef<str>) -> bool {
+    let to_check = to_check.as_ref();
+
+    if to_check.is_empty() {
+        return false;
+    }
+
+    to_check.chars().any(|c| {
+        !c.is_ascii_alphanumeric() && c != '-' && c != '_' && c != '.' && c != '~' && c != '%'
+    })
+}
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -148,11 +148,11 @@ impl<'a> MimeParser<'a> {
            self.subject = Some(field.clone());
        }

-        if let Some(_) = self.lookup_field("Chat-Version") {
+        if self.lookup_field("Chat-Version").is_some() {
            self.is_send_by_messenger = true
        }

-        if let Some(_) = self.lookup_field("Autocrypt-Setup-Message") {
+        if self.lookup_field("Autocrypt-Setup-Message").is_some() {
            let has_setup_file = self.parts.iter().any(|p| {
                p.mimetype.is_some() && p.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
            });
@@ -188,14 +188,12 @@ impl<'a> MimeParser<'a> {
                self.is_system_message = SystemMessage::LocationStreamingEnabled;
            }
        }
-        if let Some(_) = self.lookup_field("Chat-Group-Image") {
-            if !self.parts.is_empty() {
-                let textpart = &self.parts[0];
-                if textpart.typ == Viewtype::Text && self.parts.len() >= 2 {
-                    let imgpart = &mut self.parts[1];
-                    if imgpart.typ == Viewtype::Image {
-                        imgpart.is_meta = true;
-                    }
+        if self.lookup_field("Chat-Group-Image").is_some() && !self.parts.is_empty() {
+            let textpart = &self.parts[0];
+            if textpart.typ == Viewtype::Text && self.parts.len() >= 2 {
+                let imgpart = &mut self.parts[1];
+                if imgpart.typ == Viewtype::Image {
+                    imgpart.is_meta = true;
                }
            }
        }
@@ -264,11 +262,11 @@ impl<'a> MimeParser<'a> {
            }
        }
        if self.parts.len() == 1 {
-            if self.parts[0].typ == Viewtype::Audio {
-                if let Some(_) = self.lookup_field("Chat-Voice-Message") {
-                    let part_mut = &mut self.parts[0];
-                    part_mut.typ = Viewtype::Voice;
-                }
+            if self.parts[0].typ == Viewtype::Audio
+                && self.lookup_field("Chat-Voice-Message").is_some()
+            {
+                let part_mut = &mut self.parts[0];
+                part_mut.typ = Viewtype::Voice;
            }
            if self.parts[0].typ == Viewtype::Image {
                if let Some(value) = self.lookup_field("Chat-Content") {
@@ -601,7 +599,7 @@ impl<'a> MimeParser<'a> {

                // if there is still no filename, guess one
                if desired_filename.is_empty() {
-                    if let Some(subtype) = mail.ctype.mimetype.split('/').skip(1).next() {
+                    if let Some(subtype) = mail.ctype.mimetype.split('/').nth(1) {
                        desired_filename = format!("file.{}", subtype,);
                    } else {
                        return Ok(false);
@@ -626,7 +624,7 @@ impl<'a> MimeParser<'a> {
        &mut self,
        msg_type: Viewtype,
        mime_type: Mime,
-        raw_mime: &String,
+        raw_mime: &str,
        decoded_data: &[u8],
        filename: &str,
    ) {
@@ -685,7 +683,7 @@ impl<'a> MimeParser<'a> {

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

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

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

    pub fn sender_equals_recipient(&self) -> bool {
@@ -965,13 +961,12 @@ fn mailmime_is_attachment_disposition(mail: &mailparse::ParsedMail<'_>) -> bool
 }

 // returned addresses are normalized.
-fn get_recipients<'a, S: AsRef<str>, T: Iterator<Item = (S, S)>>(headers: T) -> HashSet<String> {
+fn get_recipients<S: AsRef<str>, T: Iterator<Item = (S, S)>>(headers: T) -> HashSet<String> {
    let mut recipients: HashSet<String> = Default::default();

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

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

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

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

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

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

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

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

    /// Disconnect the SMTP transport and drop it entirely.
--- a/src/smtp/send.rs
+++ b/src/smtp/send.rs
@@ -58,7 +58,7 @@ impl Smtp {
                context,
                "uh? SMTP has no transport, failed to send to {}", recipients_display
            );
-            return Err(Error::NoTransport);
+            Err(Error::NoTransport)
        }
    }
 }
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -68,13 +68,19 @@ pub struct Sql {
    in_use: Arc<ThreadLocal<String>>,
 }

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

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

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

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

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

                unreferenced_count += 1;

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

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

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

 /// Stock strings
@@ -193,7 +195,7 @@ impl StockMessage {
    /// Default untranslated strings for stock messages.
    ///
    /// These could be used in logging calls, so no logging here.
-    fn fallback(&self) -> &'static str {
+    fn fallback(self) -> &'static str {
        self.get_str("fallback").unwrap_or_default()
    }
 }
@@ -238,7 +240,7 @@ impl Context {
            .unwrap()
            .get(&(id as usize))
        {
-            Some(ref x) => Cow::Owned(x.to_string()),
+            Some(ref x) => Cow::Owned((*x).to_string()),
            None => Cow::Borrowed(id.fallback()),
        }
    }
@@ -337,6 +339,13 @@ impl Context {
    }

    pub fn update_device_chats(&self) -> Result<(), Error> {
+        // check for the LAST added device message - if it is present, we can skip message creation.
+        // this is worthwhile as this function is typically called
+        // by the ui on every probram start or even on every opening of the chatlist.
+        if chat::was_device_msg_ever_added(&self, "core-welcome")? {
+            return Ok(());
+        }
+
        // create saved-messages chat;
        // we do this only once, if the user has deleted the chat, he can recreate it manually.
        if !self.sql.get_raw_config_bool(&self, "self-chat-added") {
@@ -351,6 +360,12 @@ impl Context {
        msg.text = Some(self.stock_str(DeviceMessagesHint).to_string());
        chat::add_device_msg(&self, Some("core-about-device-chat"), Some(&mut msg))?;

+        let image = include_bytes!("../assets/welcome-image.jpg");
+        let blob = BlobObject::create(&self, "welcome-image.jpg".to_string(), image)?;
+        let mut msg = Message::new(Viewtype::Image);
+        msg.param.set(Param::File, blob.as_name());
+        chat::add_device_msg(&self, Some("core-welcome-image"), Some(&mut msg))?;
+
        let mut msg = Message::new(Viewtype::Text);
        msg.text = Some(self.stock_str(WelcomeMessage).to_string());
        chat::add_device_msg(&self, Some("core-welcome"), Some(&mut msg))?;
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -34,7 +34,7 @@ pub fn test_context(callback: Option<Box<ContextCallback>>) -> TestContext {
        None => Box::new(|_, _| 0),
    };
    let ctx = Context::new(cb, "FakeOs".into(), dbfile).unwrap();
-    TestContext { ctx: ctx, dir: dir }
+    TestContext { ctx, dir }
 }

 /// Return a dummy [TestContext].
--- a/test-data/message/mail_with_cc.txt
+++ b/test-data/message/mail_with_cc.txt
@@ -0,0 +1,14 @@
+Return-Path: <x@testrun.org>
+Received: from hq5.merlinux.eu
+	by hq5.merlinux.eu (Dovecot) with LMTP id yRKOBakcfV1AewAAPzvFDg
+	; Sat, 14 Sep 2019 19:00:25 +0200
+Received: from localhost (unknown 7.165.105.24])
+	by hq5.merlinux.eu (Postfix) with ESMTPSA id 8D9844E023;
+	Sat, 14 Sep 2019 19:00:22 +0200 (CEST)
+message-id: <2dfdbde7@example.org>
+Date: Sat, 14 Sep 2019 19:00:13 +0200
+From: lmn <x@tux.org>
+To: abc <abc@bcd.com>
+CC: def <def@def.de>
+
+hi
Author	SHA1	Message	Date
holger krekel	944a397ea8	use encoded-words crate, which friedel ported from python	2019-12-05 18:56:34 +01:00
holger krekel	225fdf560a	try fix filename encoding bug -- fails in one test	2019-12-05 14:52:16 +01:00
dignifiedquire	454aa90ed6	switch to quoted-printable, which is already used by mailparse	2019-12-05 13:23:31 +01:00
holger krekel	9b2c04ad34	use rfc2047 crate from @valodim and remove dc_strencode.rs completely	2019-12-05 13:11:51 +01:00
holger krekel	7e907f3f54	fix multi-line subject encoding and introduce MIME debugging env var	2019-12-05 11:06:42 +01:00
holger krekel	7f117574ab	test and fix #956	2019-12-05 02:15:54 +01:00
holger krekel	f91474c2f8	add preliminary changelog for beta10	2019-12-05 01:22:50 +01:00
holger krekel	2a081aac2b	fix grpid extraction from In-Reply-To and References headers	2019-12-05 01:18:53 +01:00
holger krekel	9b10f31fb3	more cleanups	2019-12-05 00:56:09 +01:00
holger krekel	63ad7b8d34	make to_ids const in some places, and simplify returns from create_or_lookup_adhoc_group	2019-12-05 00:56:09 +01:00
holger krekel	86baaab2e9	get rid of unsafe and indirect return values for create_or_lookup.*group	2019-12-05 00:56:09 +01:00
holger krekel	3e66d23367	make set_core_version return the versions if no args are specified	2019-12-04 22:32:56 +01:00
dignifiedquire	609b5588fa	fix(mimefactory): only send Autocrypt-Gossip headers on encrypted messages	2019-12-04 13:58:33 +01:00
pabzm	798072b8ba	Fix new event name in Changelog.	2019-12-04 13:52:02 +01:00
Alexander Krotov	d950a58613	Improve documentation	2019-12-04 10:15:40 +01:00
holger krekel	4c68e6fe41	update deps	2019-12-04 09:11:21 +01:00
holger krekel	914ce77b50	adapt changelog	2019-12-04 08:58:48 +01:00
holger krekel	d09989a4ed	fix implementation of Autocrypt to encrypt if answering to an encrypted message. Previously, if any of a chat's peers set prefer_encrypt to false (i.e. "e2ee_enabled=0" in the config, a misnomer btw) then a previously encrypted chat would drop to cleartext easily.	2019-12-04 08:57:42 +01:00
holger krekel	6999a4e3a9	streamline decrypt/encrypt logging	2019-12-04 08:57:42 +01:00
Alexander Krotov	069541f374	Create select_folder::Error	2019-12-04 06:13:24 +01:00
Alexander Krotov	49b9b28c99	Move select_folder to a separate submodule	2019-12-04 06:13:24 +01:00
B. Petersen	b274482125	add welcome-image created by @Simon-Laux	2019-12-04 06:11:42 +01:00
B. Petersen	b766a55b0a	in set_chat_name(), bind value to sql using ?-operator, add a test to check the name is really changed	2019-12-04 06:11:01 +01:00
B. Petersen	b8057b7ddb	remove >1y old file path migration which is now uneeded and has potential issues	2019-12-04 06:11:01 +01:00
B. Petersen	98266f47d6	bind value to sql using ?-operator	2019-12-04 06:11:01 +01:00
B. Petersen	7b83979e10	test that the device-chat is a one-to-one-chat	2019-12-04 06:01:37 +01:00
B. Petersen	79cdcca2d2	check that sending/preparing/forwarding on a chat that cannot send really fails	2019-12-04 06:01:37 +01:00
B. Petersen	4c0d00640b	fix repl forward command	2019-12-04 06:01:37 +01:00
Alexander Krotov	ad87b7c4a5	Fix clippy warnings	2019-12-03 20:20:52 +03:00
holger krekel	74f36b264b	fix get_recipients with test	2019-12-03 17:51:44 +01:00
holger krekel	2df43b6c5d	avoids double-semicolon problem leading to empty messages in pre-master releases	2019-12-03 16:55:53 +01:00