Update group test

Never reset gossip timestamp for all chats at the same time
Do not reset gossip timestamp when members are removed
2026-07-14 15:03:09 +03:00 · 2020-01-10 12:08:12 +03:00 · 2020-01-10 09:34:17 +03:00 · 2020-01-09 21:05:04 +03:00 · 2020-01-09 18:42:59 +03:00
23 changed files with 684 additions and 1022 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -528,6 +528,14 @@ dependencies = [
 "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "crossbeam-queue"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.6.6"
@@ -640,7 +648,7 @@ dependencies = [
 "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)",
 "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.22.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -658,11 +666,11 @@ dependencies = [
 "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "quick-xml 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "r2d2_sqlite 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "r2d2_sqlite 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "reqwest 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rusqlite 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "sanitize-filename 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1321,7 +1329,7 @@ dependencies = [

 [[package]]
 name = "image"
-version = "0.22.4"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1331,6 +1339,8 @@ dependencies = [
 "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "png 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1394,6 +1404,7 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1482,7 +1493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "libsqlite3-sys"
-version = "0.17.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1717,6 +1728,16 @@ dependencies = [
 "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "num-derive"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num-derive"
 version = "0.3.0"
@@ -2123,11 +2144,11 @@ dependencies = [

 [[package]]
 name = "r2d2_sqlite"
-version = "0.13.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rusqlite 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -2276,6 +2297,28 @@ dependencies = [
 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "rayon"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rdrand"
 version = "0.4.0"
@@ -2407,13 +2450,13 @@ dependencies = [

 [[package]]
 name = "rusqlite"
-version = "0.21.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fallible-streaming-iterator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libsqlite3-sys 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libsqlite3-sys 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2513,6 +2556,11 @@ dependencies = [
 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "scoped_threadpool"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "1.0.0"
@@ -2769,6 +2817,16 @@ dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "syn"
+version = "0.15.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.11"
@@ -2870,6 +2928,17 @@ dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "tiff"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "time"
 version = "0.1.42"
@@ -3382,6 +3451,7 @@ dependencies = [
 "checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
 "checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
 "checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
+"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
 "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc"
@@ -3463,7 +3533,7 @@ dependencies = [
 "checksum hyper-tls 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab58a31960b2f78c5c24cf255216789863754438a1e48849a956846f899e762e"
 "checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-"checksum image 0.22.4 (registry+https://github.com/rust-lang/crates.io-index)" = "53cb19c4e35102e5c6fb9ade5e0e236c5588424dc171a849af3141bf0b47768a"
+"checksum image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4be8aaefbe7545dc42ae925afb55a0098f226a3fe5ef721872806f44f57826"
 "checksum image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b00861cbbb254a627d8acc0cec786b484297d896ab8f20fdc8e28536a3e918ef"
 "checksum imap-proto 0.9.1 (git+https://github.com/djc/tokio-imap)" = "<none>"
 "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
@@ -3482,7 +3552,7 @@ dependencies = [
 "checksum lexical-core 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2304bccb228c4b020f3a4835d247df0a02a7c4686098d4167762cfbbe4c5cb14"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-"checksum libsqlite3-sys 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "266eb8c361198e8d1f682bc974e5d9e2ae90049fb1943890904d11dad7d4a77d"
+"checksum libsqlite3-sys 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5b95e89c330291768dc840238db7f9e204fd208511ab6319b56193a7f2ae25"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
@@ -3508,6 +3578,7 @@ dependencies = [
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 "checksum nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c618b63422da4401283884e6668d39f819a106ef51f5f59b81add00075da35ca"
 "checksum num-bigint-dig 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3d03c330f9f7a2c19e3c0b42698e48141d0809c78cd9b6219f85bd7d7e892aa"
+"checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
 "checksum num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746"
 "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
 "checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
@@ -3551,7 +3622,7 @@ dependencies = [
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum quoted_printable 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86cedf331228892e747bb85beb130b6bb23fc628c40dde9ea01eb6becea3c798"
 "checksum r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "22b5c5fc5fba064373f03887337b412e0e1562d63023393db77251146cb75553"
-"checksum r2d2_sqlite 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b061f5b16692bbe81eeb260f92e6fc7d13aea455c4cbe67f5c4aa20aa92d1d9e"
+"checksum r2d2_sqlite 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "806e268035ce9e5a604bf617ac8a073ef28b59ef2e48e8338db0baf530caef33"
 "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
@@ -3567,6 +3638,8 @@ dependencies = [
 "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+"checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd"
+"checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 "checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
@@ -3578,7 +3651,7 @@ dependencies = [
 "checksum reqwest 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03c6cbd2bc1c1cb7052dbe30f4a70cf65811967c800f2dfbb2e6036dc9ee2553"
 "checksum ripemd160 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a"
 "checksum rsa 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ed8692d8e0ea3baae03f0f32ecfc13a6c6f1f85fcd6d9fdefcdf364e70f4df9"
-"checksum rusqlite 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "64a656821bb6317a84b257737b7934f79c0dbb7eb694710475908280ebad3e64"
+"checksum rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a194373ef527035645a1bc21b10dc2125f73497e6e155771233eb187aedd051"
 "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
@@ -3590,6 +3663,7 @@ dependencies = [
 "checksum sanitize-filename 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23fd0fec94ec480abfd86bb8f4f6c57e0efb36dac5c852add176ea7b04c74801"
 "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
 "checksum scheduled-thread-pool 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f5de7bc31f28f8e6c28df5e1bf3d10610f5fdc14cc95f272853512c70a2bd779"
+"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
 "checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
@@ -3621,6 +3695,7 @@ dependencies = [
 "checksum subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 "checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
@@ -3632,6 +3707,7 @@ dependencies = [
 "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 tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tokio 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "a9d5acfe1b1130d50ac2286a2f1f8cf49309680366ceb7609ce369b75c9058d4"
 "checksum tokio-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bde02a3a5291395f59b06ec6945a3077602fac2b07eeeaf0dee2122f3619828"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "deltachat"
 version = "1.0.0-beta.22"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
-license = "MPL-2.0"
+license = "MPL"

 [profile.release]
 lto = true
@@ -17,7 +17,7 @@ hex = "0.4.0"
 sha2 = "0.8.0"
 rand = "0.7.0"
 smallvec = "1.0.0"
-reqwest = { version = "0.10.0", features = ["blocking", "json"] }
+reqwest = "0.10.0"
 num-derive = "0.3.0"
 num-traits = "0.2.6"
 async-smtp = { git = "https://github.com/async-email/async-smtp" }
@@ -42,8 +42,8 @@ indexmap = "1.3.0"
 rustyline = "4.1.0"
 lazy_static = "1.4.0"
 regex = "1.1.6"
-rusqlite = { version = "0.21", features = ["bundled"] }
-r2d2_sqlite = "0.13.0"
+rusqlite = { version = "0.20", features = ["bundled"] }
+r2d2_sqlite = "0.12.0"
 r2d2 = "0.8.5"
 strum = "0.16.0"
 strum_macros = "0.16.0"
@@ -61,7 +61,7 @@ stop-token = { version = "0.1.1", features = ["unstable"] }
 mailparse = "0.10.2"
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 native-tls = "0.2.3"
-image = { version = "0.22.4", default-features=false, features = ["gif_codec", "jpeg", "ico", "png_codec", "pnm", "webp", "bmp"] }
+image = "0.22.3"

 [dev-dependencies]
 tempfile = "3.0"
@@ -85,7 +85,7 @@ path = "examples/repl/main.rs"


 [features]
-default = ["nightly", "ringbuf"]
+default = ["nightly", "ringbuf", "reqwest/blocking", "reqwest/json"]
 vendored = ["native-tls/vendored", "reqwest/native-tls-vendored"]
 nightly = ["pgp/nightly"]
 ringbuf = ["pgp/ringbuf"]
--- a/3
+++ b/3
@@ -2,6 +2,9 @@ The files in this directory and under its subdirectories
 are (c) 2019 by Bjoern Petersen and contributors and released under the
 Mozilla Public License Version 2.0, see below for a copy.

+NOTE that the files in the "libs" directory are copyrighted by third parties
+and come with their own respective licenses.
+
 Mozilla Public License Version 2.0
 ==================================

--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -5,7 +5,7 @@ description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 readme = "README.md"
-license = "MPL-2.0"
+license = "MIT OR Apache-2.0"

 keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -2989,15 +2989,15 @@ int             dc_msg_get_viewtype           (const dc_msg_t* msg);
 * Get the state of a message.
 *
 * Incoming message states:
- * - DC_STATE_IN_FRESH (10) - Incoming _fresh_ message. Fresh messages are neither noticed nor seen and are typically shown in notifications. Use dc_get_fresh_msgs() to get all fresh messages.
- * - DC_STATE_IN_NOTICED (13) - Incoming _noticed_ message. E.g. chat opened but message not yet read - noticed messages are not counted as unread but did not marked as read nor resulted in MDNs. Use dc_marknoticed_chat() or dc_marknoticed_contact() to mark messages as being noticed.
- * - DC_STATE_IN_SEEN (16) - Incoming message, really _seen_ by the user. Marked as read on IMAP and MDN may be sent. Use dc_markseen_msgs() to mark messages as being seen.
+ * - DC_STATE_IN_FRESH (10) - Incoming _fresh_ message. Fresh messages are not noticed nor seen and are typically shown in notifications. Use dc_get_fresh_msgs() to get all fresh messages.
+ * - DC_STATE_IN_NOTICED (13) - Incoming _noticed_ message. Eg. chat opened but message not yet read - noticed messages are not counted as unread but did not marked as read nor resulted in MDNs. Use dc_marknoticed_chat() or dc_marknoticed_contact() to mark messages as being noticed.
+ * - DC_STATE_IN_SEEN (16) - Incoming message, really _seen_ by the user. Marked as read on IMAP and MDN may be send. Use dc_markseen_msgs() to mark messages as being seen.
 *
 * Outgoing message states:
 * - DC_STATE_OUT_PREPARING (18) - For files which need time to be prepared before they can be sent,
 *   the message enters this state before DC_STATE_OUT_PENDING.
 * - DC_STATE_OUT_DRAFT (19) - Message saved as draft using dc_set_draft()
- * - DC_STATE_OUT_PENDING (20) - The user has pressed the "send" button but the
+ * - DC_STATE_OUT_PENDING (20) - The user has send the "send" button but the
 *   message is not yet sent and is pending in some way. Maybe we're offline (no checkmark).
 * - DC_STATE_OUT_FAILED (24) - _Unrecoverable_ error (_recoverable_ errors result in pending messages), you'll receive the event #DC_EVENT_MSG_FAILED.
 * - DC_STATE_OUT_DELIVERED (26) - Outgoing message successfully delivered to server (one checkmark). Note, that already delivered messages may get into the state DC_STATE_OUT_FAILED if we get such a hint from the server.
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -678,26 +678,14 @@ class TestOnlineAccount:
        chat2b.mark_noticed()
        assert chat2b.count_fresh_messages() == 0

-        ac2._evlogger.consume_events()
-
-        lp.sec("sending a second message from ac1 to ac2")
-        msg_out2 = chat.send_text("message2")
-
-        lp.sec("wait for ac2 to receive second message")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        assert ev[2] == msg_out2.id
-        msg_in2 = ac2.get_message_by_id(msg_out2.id)
-
-        lp.sec("mark messages as seen on ac2, wait for changes on ac1")
-        ac2.mark_seen_messages([msg_in, msg_in2])
+        lp.sec("mark message as seen on ac2, wait for changes on ac1")
+        ac2.mark_seen_messages([msg_in])
        lp.step("1")
-        for i in range(2):
-            ev = ac1._evlogger.get_matching("DC_EVENT_MSG_READ")
-            assert ev[1] > const.DC_CHAT_ID_LAST_SPECIAL
-            assert ev[2] > const.DC_MSG_ID_LAST_SPECIAL
+        ev = ac1._evlogger.get_matching("DC_EVENT_MSG_READ")
+        assert ev[1] > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev[2] > const.DC_MSG_ID_LAST_SPECIAL
        lp.step("2")
        assert msg_out.is_out_mdn_received()
-        assert msg_out2.is_out_mdn_received()

        lp.sec("check that a second call to mark_seen does not create change or smtp job")
        ac2._evlogger.consume_events()
@@ -841,21 +829,7 @@ class TestOnlineAccount:
        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")
-
-        # Set unprepared and unencrypted draft to test that it is not
-        # taken into account when determining whether last message is
-        # encrypted.
-        msg_draft = Message.new_empty(ac1, "text")
-        msg_draft.set_text("message2 -- should be encrypted")
-        chat.set_draft(msg_draft)
-
-        # Get the draft, prepare and send it.
-        msg_draft = chat.get_draft()
-        msg_out = chat.prepare_message(msg_draft)
-        chat.send_prepared(msg_out)
-
-        chat.set_draft(None)
-        assert chat.get_draft() is None
+        chat.send_text("message2 -- should be encrypted")

        lp.sec("wait for ac2 to receive message")
        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
--- a/spec.md
+++ b/spec.md
@@ -153,8 +153,8 @@ The message-id MUST have the format `Gr.<group-id>.<unique data>`.
    Hello group - this group contains three members

 Messengers adding the member list in the form `Name <email-address>`
-MUST take care only to distribute the names authorized by the contacts themselves.
-Otherwise, names as _Daddy_ or _Honey_ may be distributed
+MUST take care only to spread the names authorized by the contacts themselves.
+Otherwise, names as _Daddy_ or _Honey_ may be spread
 (this issue is also true for normal MUAs, however,
 for more contact- and chat-centralized apps
 such situations happen more frequently).
@@ -288,7 +288,7 @@ to add a `Chat-Group-Avatar` only on image changes.

 # Set profile image

-A user MAY have a profile-image that MAY be distributed to their contacts.
+A user MAY have a profile-image that MAY be spread to their contacts.
 To change or set the profile-image,
 the messenger MUST attach an image file to a message
 and MUST add the header `Chat-User-Avatar`
@@ -297,7 +297,7 @@ with the value set to the image name.
 To remove the profile-image,
 the messenger MUST add the header `Chat-User-Avatar: 0`.

-To distribute the image,
+To spread the image,
 the messenger MAY send the profile image
 together with the next mail to a given contact
 (to do this only once,
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -19,7 +19,7 @@ use crate::job::*;
 use crate::message::{self, InvalidMsgId, Message, MessageState, MsgId};
 use crate::mimeparser::SystemMessage;
 use crate::param::*;
-use crate::sql;
+use crate::sql::{self, Sql};
 use crate::stock::StockMessage;

 /// An object representing a single chat in memory.
@@ -91,8 +91,8 @@ impl Chat {
                            let contacts = get_chat_contacts(context, chat.id);
                            let mut chat_name = "Err [Name not found]".to_owned();

-                            if let Some(contact_id) = contacts.first() {
-                                if let Ok(contact) = Contact::get_by_id(context, *contact_id) {
+                            if !(*contacts).is_empty() {
+                                if let Ok(contact) = Contact::get_by_id(context, contacts[0]) {
                                    chat_name = contact.get_display_name().to_owned();
                                }
                            }
@@ -182,46 +182,24 @@ impl Chat {
        "Err".to_string()
    }

-    fn parent_query(fields: &str) -> String {
-        // Check for server_uid guarantees that we don't
-        // select a draft or undelivered message.
-        format!(
-            "SELECT {} \
-             FROM msgs WHERE chat_id=?1 AND server_uid!=0 \
-             ORDER BY timestamp DESC, id DESC \
-             LIMIT 1;",
-            fields
-        )
-    }
-
-    fn get_parent_mime_headers(&self, context: &Context) -> Option<(String, String, String)> {
+    pub fn get_parent_mime_headers(&self, context: &Context) -> Option<(String, String, String)> {
        let collect = |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?, row.get(2)?));
-        let params = params![self.id as i32];
+        let params = params![self.id as i32, DC_CONTACT_ID_SELF as i32];
        let sql = &context.sql;

-        let query = Self::parent_query("rfc724_mid, mime_in_reply_to, mime_references");
+        // use the last messsage of another user in the group as the parent
+        let main_query = "SELECT rfc724_mid, mime_in_reply_to, mime_references \
+                          FROM msgs WHERE chat_id=?1 AND timestamp=(SELECT max(timestamp) \
+                          FROM msgs WHERE chat_id=?1 AND from_id!=?2);";

-        sql.query_row(&query, params, collect).ok()
-    }
+        // there are no messages of other users - use the first message if SELF as parent
+        let fallback_query = "SELECT rfc724_mid, mime_in_reply_to, mime_references \
+                              FROM msgs WHERE chat_id=?1 AND timestamp=(SELECT min(timestamp) \
+                              FROM msgs WHERE chat_id=?1 AND from_id==?2);";

-    fn parent_is_encrypted(&self, context: &Context) -> bool {
-        let sql = &context.sql;
-        let params = params![self.id as i32];
-        let query = Self::parent_query("param");
-
-        let packed: Option<String> = sql.query_get_value(context, &query, params);
-
-        if let Some(ref packed) = packed {
-            match packed.parse::<Params>() {
-                Ok(param) => param.exists(Param::GuaranteeE2ee),
-                Err(err) => {
-                    error!(context, "invalid params stored: '{}', {:?}", packed, err);
-                    false
-                }
-            }
-        } else {
-            false
-        }
+        sql.query_row(main_query, params, collect)
+            .or_else(|_| sql.query_row(fallback_query, params, collect))
+            .ok()
    }

    pub fn get_profile_image(&self, context: &Context) -> Option<PathBuf> {
@@ -231,8 +209,8 @@ impl Chat {
            }
        } else if self.typ == Chattype::Single {
            let contacts = get_chat_contacts(context, self.id);
-            if let Some(contact_id) = contacts.first() {
-                if let Ok(contact) = Contact::get_by_id(context, *contact_id) {
+            if !contacts.is_empty() {
+                if let Ok(contact) = Contact::get_by_id(context, contacts[0]) {
                    return contact.get_profile_image(context);
                }
            }
@@ -250,8 +228,8 @@ impl Chat {

        if self.typ == Chattype::Single {
            let contacts = get_chat_contacts(context, self.id);
-            if let Some(contact_id) = contacts.first() {
-                if let Ok(contact) = Contact::get_by_id(context, *contact_id) {
+            if !contacts.is_empty() {
+                if let Ok(contact) = Contact::get_by_id(context, contacts[0]) {
                    color = contact.get_color();
                }
            }
@@ -425,7 +403,9 @@ impl Chat {
                    }
                }

-                if can_encrypt && (all_mutual || self.parent_is_encrypted(context)) {
+                if can_encrypt
+                    && (all_mutual || last_msg_in_chat_encrypted(context, &context.sql, self.id))
+                {
                    msg.param.set_int(Param::GuaranteeE2ee, 1);
                }
            }
@@ -924,6 +904,28 @@ fn prepare_msg_common(context: &Context, chat_id: u32, msg: &mut Message) -> Res
    Ok(msg.id)
 }

+fn last_msg_in_chat_encrypted(context: &Context, sql: &Sql, chat_id: u32) -> bool {
+    let packed: Option<String> = sql.query_get_value(
+        context,
+        "SELECT param  \
+         FROM msgs  WHERE timestamp=(SELECT MAX(timestamp) FROM msgs WHERE chat_id=?)  \
+         ORDER BY id DESC;",
+        params![chat_id as i32],
+    );
+
+    if let Some(ref packed) = packed {
+        match packed.parse::<Params>() {
+            Ok(param) => param.exists(Param::GuaranteeE2ee),
+            Err(err) => {
+                error!(context, "invalid params stored: '{}', {:?}", packed, err);
+                false
+            }
+        }
+    } else {
+        false
+    }
+}
+
 /// Returns whether a contact is in a chat or not.
 pub fn is_contact_in_chat(context: &Context, chat_id: u32, contact_id: u32) -> bool {
    /* this function works for group and for normal chats, however, it is more useful for group chats.
@@ -2111,21 +2113,21 @@ pub fn get_chat_cnt(context: &Context) -> usize {
    }
 }

-pub(crate) fn get_chat_id_by_grpid(
-    context: &Context,
-    grpid: impl AsRef<str>,
-) -> Result<(u32, bool, Blocked), sql::Error> {
-    context.sql.query_row(
-        "SELECT id, blocked, type FROM chats WHERE grpid=?;",
-        params![grpid.as_ref()],
-        |row| {
-            let chat_id = row.get(0)?;
+pub fn get_chat_id_by_grpid(context: &Context, grpid: impl AsRef<str>) -> (u32, bool, Blocked) {
+    context
+        .sql
+        .query_row(
+            "SELECT id, blocked, type FROM chats WHERE grpid=?;",
+            params![grpid.as_ref()],
+            |row| {
+                let chat_id = row.get(0)?;

-            let b = row.get::<_, Option<Blocked>>(1)?.unwrap_or_default();
-            let v = row.get::<_, Option<Chattype>>(2)?.unwrap_or_default();
-            Ok((chat_id, v == Chattype::VerifiedGroup, b))
-        },
-    )
+                let b = row.get::<_, Option<Blocked>>(1)?.unwrap_or_default();
+                let v = row.get::<_, Option<Chattype>>(2)?.unwrap_or_default();
+                Ok((chat_id, v == Chattype::VerifiedGroup, b))
+            },
+        )
+        .unwrap_or((0, false, Blocked::Not))
 }

 /// Adds a message to device chat.
--- a/src/config.rs
+++ b/src/config.rs
@@ -190,9 +190,7 @@ mod tests {
    use std::str::FromStr;
    use std::string::ToString;

-    use crate::constants::AVATAR_SIZE;
    use crate::test_utils::*;
-    use image::GenericImageView;
    use std::fs::File;
    use std::io::Write;

@@ -214,55 +212,32 @@ mod tests {
    }

    #[test]
-    fn test_selfavatar_outside_blobdir() {
+    fn test_selfavatar_outside_blobdir() -> failure::Fallible<()> {
        let t = dummy_context();
        let avatar_src = t.dir.path().join("avatar.jpg");
        let avatar_bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
-        File::create(&avatar_src)
-            .unwrap()
-            .write_all(avatar_bytes)
-            .unwrap();
+        File::create(&avatar_src)?.write_all(avatar_bytes)?;
        let avatar_blob = t.ctx.get_blobdir().join("avatar.jpg");
        assert!(!avatar_blob.exists());
        t.ctx
-            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))
-            .unwrap();
+            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?;
        assert!(avatar_blob.exists());
        assert!(std::fs::metadata(&avatar_blob).unwrap().len() < avatar_bytes.len() as u64);
        let avatar_cfg = t.ctx.get_config(Config::Selfavatar);
        assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string()));
-
-        let img = image::open(avatar_src).unwrap();
-        assert_eq!(img.width(), 1000);
-        assert_eq!(img.height(), 1000);
-
-        let img = image::open(avatar_blob).unwrap();
-        assert_eq!(img.width(), AVATAR_SIZE);
-        assert_eq!(img.height(), AVATAR_SIZE);
+        Ok(())
    }

    #[test]
-    fn test_selfavatar_in_blobdir() {
+    fn test_selfavatar_in_blobdir() -> failure::Fallible<()> {
        let t = dummy_context();
-        let avatar_src = t.ctx.get_blobdir().join("avatar.png");
-        let avatar_bytes = include_bytes!("../test-data/image/avatar900x900.png");
-        File::create(&avatar_src)
-            .unwrap()
-            .write_all(avatar_bytes)
-            .unwrap();
-
-        let img = image::open(&avatar_src).unwrap();
-        assert_eq!(img.width(), 900);
-        assert_eq!(img.height(), 900);
-
+        let avatar_src = t.ctx.get_blobdir().join("avatar.jpg");
+        let avatar_bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
+        File::create(&avatar_src)?.write_all(avatar_bytes)?;
        t.ctx
-            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))
-            .unwrap();
+            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?;
        let avatar_cfg = t.ctx.get_config(Config::Selfavatar);
        assert_eq!(avatar_cfg, avatar_src.to_str().map(|s| s.to_string()));
-
-        let img = image::open(avatar_src).unwrap();
-        assert_eq!(img.width(), AVATAR_SIZE);
-        assert_eq!(img.height(), AVATAR_SIZE);
+        Ok(())
    }
 }
--- a/src/context.rs
+++ b/src/context.rs
@@ -75,6 +75,10 @@ pub fn get_info() -> HashMap<&'static str, String> {
    let mut res = HashMap::new();
    res.insert("deltachat_core_version", format!("v{}", &*DC_VERSION_STR));
    res.insert("sqlite_version", rusqlite::version().to_string());
+    res.insert(
+        "sqlite_thread_safe",
+        unsafe { rusqlite::ffi::sqlite3_threadsafe() }.to_string(),
+    );
    res.insert("arch", (std::mem::size_of::<usize>() * 8).to_string());
    res.insert("level", "awesome".into());
    res
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -17,7 +17,7 @@ use crate::message::{self, MessageState, MessengerMessage, MsgId};
 use crate::mimeparser::*;
 use crate::param::*;
 use crate::peerstate::*;
-use crate::securejoin::{self, handle_securejoin_handshake};
+use crate::securejoin::handle_securejoin_handshake;
 use crate::sql;
 use crate::stock::StockMessage;
 use crate::{contact, location};
@@ -328,6 +328,7 @@ fn add_parts(
            MessageState::InFresh
        };
        to_id = DC_CONTACT_ID_SELF;
+        let mut needs_stop_ongoing_process = false;

        // handshake messages must be processed _before_ chats are created
        // (eg. contacs may be marked as verified)
@@ -337,24 +338,26 @@ fn add_parts(
            *chat_id = 0;
            allow_creation = true;
            match handle_securejoin_handshake(context, mime_parser, from_id) {
-                Ok(securejoin::HandshakeMessage::Done) => {
-                    *hidden = true;
-                    *needs_delete_job = true;
-                    state = MessageState::InSeen;
-                }
-                Ok(securejoin::HandshakeMessage::Ignore) => {
-                    *hidden = true;
-                    state = MessageState::InSeen;
-                }
-                Ok(securejoin::HandshakeMessage::Propagate) => {
-                    // Message will still be processed as "member
-                    // added" or similar system message.
+                Ok(ret) => {
+                    if ret.hide_this_msg {
+                        *hidden = true;
+                        *needs_delete_job = ret.delete_this_msg;
+                        state = MessageState::InSeen;
+                    }
+                    if let Some(status) = ret.bob_securejoin_success {
+                        context.bob.write().unwrap().status = status as i32;
+                    }
+                    needs_stop_ongoing_process = ret.stop_ongoing_process;
                }
                Err(err) => {
+                    // maybe this message belongs to an aborted scan,
+                    // however, by the explicit header check we really know
+                    // that it is a Secure-Join message that should be hidden in the chat view.
                    *hidden = true;
-                    context.bob.write().unwrap().status = 0; // secure-join failed
-                    context.stop_ongoing();
-                    error!(context, "Error in Secure-Join message handling: {}", err);
+                    warn!(
+                        context,
+                        "Unexpected messaged passed to Secure-Join handshake protocol: {}", err
+                    );
                }
            }
        }
@@ -451,6 +454,13 @@ fn add_parts(
        {
            state = MessageState::InNoticed;
        }
+
+        if needs_stop_ongoing_process {
+            // The Secure-Join protocol finished and the group
+            // creation handling is done.  Stopping the ongoing
+            // process will let dc_join_securejoin() return.
+            context.stop_ongoing();
+        }
    } else {
        // Outgoing

@@ -777,10 +787,10 @@ fn create_or_lookup_group(
        }
        if grpid.is_empty() {
            if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::InReplyTo) {
-                grpid = extracted_grpid.to_string();
+                grpid = extracted_grpid;
            } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::References)
            {
-                grpid = extracted_grpid.to_string();
+                grpid = extracted_grpid;
            } else {
                return create_or_lookup_adhoc_group(
                    context,
@@ -820,14 +830,14 @@ fn create_or_lookup_group(
    } else {
        let field = mime_parser.get(HeaderDef::ChatGroupMemberAdded).cloned();
        if let Some(optional_field) = field {
+            X_MrAddToGrp = Some(optional_field);
            mime_parser.is_system_message = SystemMessage::MemberAddedToGroup;
            better_msg = context.stock_system_msg(
                StockMessage::MsgAddMember,
-                &optional_field,
+                X_MrAddToGrp.as_ref().unwrap(),
                "",
                from_id as u32,
-            );
-            X_MrAddToGrp = Some(optional_field);
+            )
        } else {
            let field = mime_parser.get(HeaderDef::ChatGroupNameChanged);
            if let Some(field) = field {
@@ -867,8 +877,7 @@ fn create_or_lookup_group(
    set_better_msg(mime_parser, &better_msg);

    // check, if we have a chat with this group ID
-    let (mut chat_id, chat_id_verified, _blocked) =
-        chat::get_chat_id_by_grpid(context, &grpid).unwrap_or((0, false, Blocked::Not));
+    let (mut chat_id, chat_id_verified, _blocked) = chat::get_chat_id_by_grpid(context, &grpid);
    if chat_id != 0 {
        if chat_id_verified {
            if let Err(err) =
@@ -970,9 +979,14 @@ fn create_or_lookup_group(
    // XXX insert code in a different PR :)

    // execute group commands
-    if X_MrAddToGrp.is_some() || X_MrRemoveFromGrp.is_some() {
+    if X_MrAddToGrp.is_some() {
+        chat::reset_gossiped_timestamp(context, chat_id)?;
        recreate_member_list = true;
-    } else if X_MrGrpNameChanged {
+    }
+    if X_MrRemoveFromGrp.is_some() {
+        recreate_member_list = true;
+    }
+    if X_MrGrpNameChanged {
        if let Some(ref grpname) = grpname {
            if grpname.len() < 200 {
                info!(context, "updating grpname for chat {}", chat_id);
@@ -1049,13 +1063,17 @@ fn create_or_lookup_group(
 }

 /// try extract a grpid from a message-id list header value
-fn extract_grpid<'a>(mime_parser: &'a MimeMessage, headerdef: HeaderDef) -> Option<&'a str> {
-    let header = mime_parser.get(headerdef)?;
-    let parts = header
-        .split(',')
-        .map(str::trim)
-        .filter(|part| !part.is_empty());
-    parts.filter_map(dc_extract_grpid_from_rfc724_mid).next()
+fn extract_grpid(mime_parser: &MimeMessage, headerdef: HeaderDef) -> Option<String> {
+    if let Some(value) = mime_parser.get(headerdef) {
+        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
@@ -1180,23 +1198,10 @@ fn create_group_record(
    )
    .is_err()
    {
-        warn!(
-            context,
-            "Failed to create group '{}' for grpid={}",
-            grpname.as_ref(),
-            grpid.as_ref()
-        );
        return 0;
    }
-    let chat_id = sql::get_rowid(context, &context.sql, "chats", "grpid", grpid.as_ref());
-    info!(
-        context,
-        "Created group '{}' grpid={} as chat #{}",
-        grpname.as_ref(),
-        grpid.as_ref(),
-        chat_id
-    );
-    chat_id
+
+    sql::get_rowid(context, &context.sql, "chats", "grpid", grpid.as_ref())
 }

 fn create_adhoc_grp_id(context: &Context, member_ids: &[u32]) -> String {
@@ -1374,31 +1379,31 @@ fn check_verified_properties(
            context.is_self_addr(&to_addr)
        );
        let mut is_verified = _is_verified != 0;
-        let peerstate = Peerstate::from_addr(context, &context.sql, &to_addr);
+        let mut peerstate = Peerstate::from_addr(context, &context.sql, &to_addr);

        // mark gossiped keys (if any) as verified
-        if mimeparser.gossipped_addr.contains(&to_addr) {
-            if let Some(mut peerstate) = peerstate {
-                // if we're here, we know the gossip key is verified:
-                // - use the gossip-key as verified-key if there is no verified-key
-                // - OR if the verified-key does not match public-key or gossip-key
-                //   (otherwise a verified key can _only_ be updated through QR scan which might be annoying,
-                //   see https://github.com/nextleap-project/countermitm/issues/46 for a discussion about this point)
-                if !is_verified
-                    || peerstate.verified_key_fingerprint != peerstate.public_key_fingerprint
-                        && peerstate.verified_key_fingerprint != peerstate.gossip_key_fingerprint
-                {
-                    info!(context, "{} has verified {}.", contact.get_addr(), to_addr,);
-                    let fp = peerstate.gossip_key_fingerprint.clone();
-                    if let Some(fp) = fp {
-                        peerstate.set_verified(
-                            PeerstateKeyType::GossipKey,
-                            &fp,
-                            PeerstateVerifiedStatus::BidirectVerified,
-                        );
-                        peerstate.save_to_db(&context.sql, false)?;
-                        is_verified = true;
-                    }
+        if mimeparser.gossipped_addr.contains(&to_addr) && peerstate.is_some() {
+            let peerstate = peerstate.as_mut().unwrap();
+
+            // if we're here, we know the gossip key is verified:
+            // - use the gossip-key as verified-key if there is no verified-key
+            // - OR if the verified-key does not match public-key or gossip-key
+            //   (otherwise a verified key can _only_ be updated through QR scan which might be annoying,
+            //   see https://github.com/nextleap-project/countermitm/issues/46 for a discussion about this point)
+            if !is_verified
+                || peerstate.verified_key_fingerprint != peerstate.public_key_fingerprint
+                    && peerstate.verified_key_fingerprint != peerstate.gossip_key_fingerprint
+            {
+                info!(context, "{} has verified {}.", contact.get_addr(), to_addr,);
+                let fp = peerstate.gossip_key_fingerprint.clone();
+                if let Some(fp) = fp {
+                    peerstate.set_verified(
+                        PeerstateKeyType::GossipKey,
+                        &fp,
+                        PeerstateVerifiedStatus::BidirectVerified,
+                    );
+                    peerstate.save_to_db(&context.sql, false)?;
+                    is_verified = true;
                }
            }
        }
@@ -1624,7 +1629,7 @@ mod tests {
                    hello\x00";
        let mimeparser = MimeMessage::from_bytes(&context.ctx, &raw[..]).unwrap();
        assert_eq!(extract_grpid(&mimeparser, HeaderDef::InReplyTo), None);
-        let grpid = Some("HcxyMARjyJy");
+        let grpid = Some("HcxyMARjyJy".to_string());
        assert_eq!(extract_grpid(&mimeparser, HeaderDef::References), grpid);
    }

@@ -1638,7 +1643,7 @@ mod tests {
                    \n\
                    hello\x00";
        let mimeparser = MimeMessage::from_bytes(&context.ctx, &raw[..]).unwrap();
-        let grpid = Some("HcxyMARjyJy");
+        let grpid = Some("HcxyMARjyJy".to_string());
        assert_eq!(extract_grpid(&mimeparser, HeaderDef::InReplyTo), grpid);
        assert_eq!(extract_grpid(&mimeparser, HeaderDef::References), grpid);
    }
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -653,6 +653,7 @@ mod tests {
        );
    }

+    #[test]
    #[test]
    fn test_dc_extract_grpid_from_rfc724_mid() {
        // Should return None if we pass invalid mid
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -10,10 +10,6 @@ pub enum HeaderDef {
    Cc,
    Disposition,
    OriginalMessageId,
-
-    /// Delta Chat extension for message IDs in combined MDNs
-    XAdditionalMessageIds,
-
    ListId,
    References,
    InReplyTo,
--- a/src/job.rs
+++ b/src/job.rs
@@ -6,7 +6,6 @@
 use std::{fmt, time};

 use deltachat_derive::{FromSql, ToSql};
-use itertools::Itertools;
 use rand::{thread_rng, Rng};

 use async_std::task;
@@ -16,7 +15,6 @@ use crate::chat;
 use crate::config::Config;
 use crate::configure::*;
 use crate::constants::*;
-use crate::contact::Contact;
 use crate::context::{Context, PerformJobsNeeded};
 use crate::dc_tools::*;
 use crate::error::{Error, Result};
@@ -27,7 +25,7 @@ use crate::location;
 use crate::login_param::LoginParam;
 use crate::message::MsgId;
 use crate::message::{self, Message, MessageState};
-use crate::mimefactory::{MimeFactory, RenderedEmail};
+use crate::mimefactory::{vec_contains_lowercase, MimeFactory, RenderedEmail};
 use crate::param::*;
 use crate::sql;

@@ -90,7 +88,9 @@ pub enum Action {
    // Jobs in the SMTP-thread, range from DC_SMTP_THREAD..DC_SMTP_THREAD+999
    MaybeSendLocations = 5005, // low priority ...
    MaybeSendLocationsEnded = 5007,
-    SendMdn = 5010,
+    SendMdnOld = 5010,
+    SendMdn = 5011,
+    SendMsgToSmtpOld = 5900,
    SendMsgToSmtp = 5901, // ... high priority
 }

@@ -118,7 +118,9 @@ impl From<Action> for Thread {

            MaybeSendLocations => Thread::Smtp,
            MaybeSendLocationsEnded => Thread::Smtp,
+            SendMdnOld => Thread::Smtp,
            SendMdn => Thread::Smtp,
+            SendMsgToSmtpOld => Thread::Smtp,
            SendMsgToSmtp => Thread::Smtp,
        }
    }
@@ -255,130 +257,6 @@ impl Job {
        }
    }

-    /// Get `SendMdn` jobs with foreign_id equal to `contact_id` excluding the `job_id` job.
-    fn get_additional_mdn_jobs(
-        &self,
-        context: &Context,
-        contact_id: u32,
-    ) -> sql::Result<(Vec<u32>, Vec<String>)> {
-        // Extract message IDs from job parameters
-        let res: Vec<(u32, MsgId)> = context.sql.query_map(
-            "SELECT id, param FROM jobs WHERE foreign_id=? AND id!=?",
-            params![contact_id, self.job_id],
-            |row| {
-                let job_id: u32 = row.get(0)?;
-                let params_str: String = row.get(1)?;
-                let params: Params = params_str.parse().unwrap_or_default();
-                Ok((job_id, params))
-            },
-            |jobs| {
-                let res = jobs
-                    .filter_map(|row| {
-                        let (job_id, params) = row.ok()?;
-                        let msg_id = params.get_msg_id()?;
-                        Some((job_id, msg_id))
-                    })
-                    .collect();
-                Ok(res)
-            },
-        )?;
-
-        // Load corresponding RFC724 message IDs
-        let mut job_ids = Vec::new();
-        let mut rfc724_mids = Vec::new();
-        for (job_id, msg_id) in res {
-            if let Ok(Message { rfc724_mid, .. }) = Message::load_from_db(context, msg_id) {
-                job_ids.push(job_id);
-                rfc724_mids.push(rfc724_mid);
-            }
-        }
-        Ok((job_ids, rfc724_mids))
-    }
-
-    #[allow(non_snake_case)]
-    fn SendMdn(&mut self, context: &Context) -> Status {
-        if !context.get_config_bool(Config::MdnsEnabled) {
-            // User has disabled MDNs after job scheduling but before
-            // execution.
-            return Status::Finished(Err(format_err!("MDNs are disabled")));
-        }
-
-        let contact_id = self.foreign_id;
-        let contact = job_try!(Contact::load_from_db(context, contact_id));
-        if contact.is_blocked() {
-            return Status::Finished(Err(format_err!("Contact is blocked")));
-        }
-
-        let msg_id = if let Some(msg_id) = self.param.get_msg_id() {
-            msg_id
-        } else {
-            return Status::Finished(Err(format_err!(
-                "SendMdn job has invalid parameters: {}",
-                self.param
-            )));
-        };
-
-        // Try to aggregate other SendMdn jobs and send a combined MDN.
-        let (additional_job_ids, additional_rfc724_mids) = self
-            .get_additional_mdn_jobs(context, contact_id)
-            .unwrap_or_default();
-
-        if !additional_rfc724_mids.is_empty() {
-            info!(
-                context,
-                "SendMdn job: aggregating {} additional MDNs",
-                additional_rfc724_mids.len()
-            )
-        }
-
-        let msg = job_try!(Message::load_from_db(context, msg_id));
-        let mimefactory = job_try!(MimeFactory::from_mdn(context, &msg, additional_rfc724_mids));
-        let rendered_msg = job_try!(mimefactory.render());
-        let body = rendered_msg.message;
-
-        let addr = contact.get_addr();
-        let recipient = job_try!(async_smtp::EmailAddress::new(addr.to_string())
-            .map_err(|err| format_err!("invalid recipient: {} {:?}", addr, err)));
-        let recipients = vec![recipient];
-
-        /* connect to SMTP server, if not yet done */
-        if !context.smtp.lock().unwrap().is_connected() {
-            let loginparam = LoginParam::from_database(context, "configured_");
-            if let Err(err) = context.smtp.lock().unwrap().connect(context, &loginparam) {
-                warn!(context, "SMTP connection failure: {:?}", err);
-                return Status::RetryLater;
-            }
-        }
-
-        let mut smtp = context.smtp.lock().unwrap();
-        match task::block_on(smtp.send(context, recipients, body, self.job_id)) {
-            Err(crate::smtp::send::Error::SendError(err)) => {
-                // Remote error, retry later.
-                warn!(context, "SMTP failed to send: {}", err);
-                smtp.disconnect();
-                self.pending_error = Some(err.to_string());
-                Status::RetryLater
-            }
-            Err(crate::smtp::send::Error::EnvelopeError(err)) => {
-                // Local error, job is invalid, do not retry.
-                smtp.disconnect();
-                warn!(context, "SMTP job is invalid: {}", err);
-                Status::Finished(Err(Error::SmtpError(err)))
-            }
-            Err(crate::smtp::send::Error::NoTransport) => {
-                // Should never happen.
-                // It does not even make sense to disconnect here.
-                error!(context, "SMTP job failed because SMTP has no transport");
-                Status::Finished(Err(format_err!("SMTP has not transport")))
-            }
-            Ok(()) => {
-                // Remove additional SendMdn jobs we have aggretated into this one.
-                job_try!(job_kill_ids(context, &additional_job_ids));
-                Status::Finished(Ok(()))
-            }
-        }
-    }
-
    #[allow(non_snake_case)]
    fn MoveMsg(&mut self, context: &Context) -> Status {
        let imap_inbox = &context.inbox_thread.read().unwrap().imap;
@@ -485,7 +363,7 @@ impl Job {
                if msg.param.get_bool(Param::WantsMdn).unwrap_or_default()
                    && context.get_config_bool(Config::MdnsEnabled)
                {
-                    if let Err(err) = send_mdn(context, &msg) {
+                    if let Err(err) = send_mdn(context, msg.id) {
                        warn!(context, "could not send out mdn for {}: {}", msg.id, err);
                        return Status::Finished(Err(err));
                    }
@@ -544,19 +422,6 @@ pub fn job_kill_action(context: &Context, action: Action) -> bool {
    .is_ok()
 }

-/// Remove jobs with specified IDs.
-pub fn job_kill_ids(context: &Context, job_ids: &[u32]) -> sql::Result<()> {
-    sql::execute(
-        context,
-        &context.sql,
-        format!(
-            "DELETE FROM jobs WHERE id IN({})",
-            job_ids.iter().map(|_| "?").join(",")
-        ),
-        job_ids,
-    )
-}
-
 pub fn perform_inbox_fetch(context: &Context) {
    let use_network = context.get_config_bool(Config::InboxWatch);

@@ -818,12 +683,8 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<()> {
        );
    }

-    let lowercase_from = rendered_msg.from.to_lowercase();
    if context.get_config_bool(Config::BccSelf)
-        && !rendered_msg
-            .recipients
-            .iter()
-            .any(|x| x.to_lowercase() == lowercase_from)
+        && !vec_contains_lowercase(&rendered_msg.recipients, &rendered_msg.from)
    {
        rendered_msg.recipients.push(rendered_msg.from.clone());
    }
@@ -866,7 +727,7 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<()> {
        msg.save_param_to_disk(context);
    }

-    add_smtp_job(context, Action::SendMsgToSmtp, msg.id, &rendered_msg)?;
+    add_smtp_job(context, Action::SendMsgToSmtp, &rendered_msg)?;

    Ok(())
 }
@@ -891,7 +752,9 @@ pub fn perform_sentbox_jobs(context: &Context) {
 }

 fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
-    while let Some(mut job) = load_next_job(context, thread, probe_network) {
+    let jobs: Vec<Job> = load_jobs(context, thread, probe_network);
+
+    for mut job in jobs {
        info!(context, "{}-job {} started...", thread, job);

        // some configuration jobs are "exclusive":
@@ -930,7 +793,7 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                    Action::MarkseenMsgOnImap => job.MarkseenMsgOnImap(context),
                    Action::MarkseenMdnOnImap => job.MarkseenMdnOnImap(context),
                    Action::MoveMsg => job.MoveMsg(context),
-                    Action::SendMdn => job.SendMdn(context),
+                    Action::SendMdn => job.SendMsgToSmtp(context),
                    Action::ConfigureImap => JobConfigureImap(context),
                    Action::ImexImap => match JobImexImap(context, &job) {
                        Ok(()) => Status::Finished(Ok(())),
@@ -947,6 +810,8 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                        sql::housekeeping(context);
                        Status::Finished(Ok(()))
                    }
+                    Action::SendMdnOld => Status::Finished(Ok(())),
+                    Action::SendMsgToSmtpOld => Status::Finished(Ok(())),
                };

                info!(
@@ -1077,21 +942,17 @@ fn suspend_smtp_thread(context: &Context, suspend: bool) {
    }
 }

-fn send_mdn(context: &Context, msg: &Message) -> Result<()> {
-    let mut param = Params::new();
-    param.set(Param::MessageId, msg.id.to_u32().to_string());
+fn send_mdn(context: &Context, msg_id: MsgId) -> Result<()> {
+    let msg = Message::load_from_db(context, msg_id)?;
+    let mimefactory = MimeFactory::from_mdn(context, &msg)?;
+    let rendered_msg = mimefactory.render()?;

-    job_add(context, Action::SendMdn, msg.from_id as i32, param, 0);
+    add_smtp_job(context, Action::SendMdn, &rendered_msg)?;

    Ok(())
 }

-fn add_smtp_job(
-    context: &Context,
-    action: Action,
-    msg_id: MsgId,
-    rendered_msg: &RenderedEmail,
-) -> Result<()> {
+fn add_smtp_job(context: &Context, action: Action, rendered_msg: &RenderedEmail) -> Result<()> {
    ensure!(
        !rendered_msg.recipients.is_empty(),
        "no recipients for smtp job set"
@@ -1104,7 +965,16 @@ fn add_smtp_job(
    param.set(Param::File, blob.as_name());
    param.set(Param::Recipients, &recipients);

-    job_add(context, action, msg_id.to_u32() as i32, param, 0);
+    job_add(
+        context,
+        action,
+        rendered_msg
+            .foreign_id
+            .map(|v| v.to_u32() as i32)
+            .unwrap_or_default(),
+        param,
+        0,
+    );

    Ok(())
 }
@@ -1165,7 +1035,7 @@ pub fn interrupt_smtp_idle(context: &Context) {
 /// IMAP jobs.  The `probe_network` parameter decides how to query
 /// jobs, this is tricky and probably wrong currently.  Look at the
 /// SQL queries for details.
-fn load_next_job(context: &Context, thread: Thread, probe_network: bool) -> Option<Job> {
+fn load_jobs(context: &Context, thread: Thread, probe_network: bool) -> Vec<Job> {
    let query = if !probe_network {
        // processing for first-try and after backoff-timeouts:
        // process jobs in the order they were added.
@@ -1207,13 +1077,14 @@ fn load_next_job(context: &Context, thread: Thread, probe_network: bool) -> Opti
                Ok(job)
            },
            |jobs| {
+                let mut ret: Vec<Job> = Vec::new();
                for job in jobs {
                    match job {
-                        Ok(j) => return Ok(Some(j)),
+                        Ok(j) => ret.push(j),
                        Err(e) => warn!(context, "Bad job from the database: {}", e),
                    }
                }
-                Ok(None)
+                Ok(ret)
            },
        )
        .unwrap_or_default()
@@ -1246,17 +1117,15 @@ mod tests {
    }

    #[test]
-    fn test_load_next_job() {
+    fn test_load_jobs() {
        // We want to ensure that loading jobs skips over jobs which
        // fails to load from the database instead of failing to load
        // all jobs.
        let t = dummy_context();
+        insert_job(&t.ctx, 0);
        insert_job(&t.ctx, -1); // This can not be loaded into Job struct.
-        let jobs = load_next_job(&t.ctx, Thread::from(Action::MoveMsg), false);
-        assert!(jobs.is_none());
-
        insert_job(&t.ctx, 1);
-        let jobs = load_next_job(&t.ctx, Thread::from(Action::MoveMsg), false);
-        assert!(jobs.is_some());
+        let jobs = load_jobs(&t.ctx, Thread::from(Action::MoveMsg), false);
+        assert_eq!(jobs.len(), 2);
    }
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,3 @@
-#![forbid(unsafe_code)]
 #![deny(clippy::correctness, missing_debug_implementations, clippy::all)]
 // for now we hide warnings to not clutter/hide errors during "cargo clippy"
 #![allow(clippy::cognitive_complexity, clippy::too_many_arguments)]
--- a/src/message.rs
+++ b/src/message.rs
@@ -610,48 +610,18 @@ impl Message {
    }
 }

-#[derive(Debug, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
 #[repr(i32)]
 pub enum MessageState {
    Undefined = 0,
-
-    /// Incoming *fresh* message. Fresh messages are neither noticed
-    /// nor seen and are typically shown in notifications.
    InFresh = 10,
-
-    /// Incoming *noticed* message. E.g. chat opened but message not
-    /// yet read - noticed messages are not counted as unread but did
-    /// not marked as read nor resulted in MDNs.
    InNoticed = 13,
-
-    /// Incoming message, really *seen* by the user. Marked as read on
-    /// IMAP and MDN may be sent.
    InSeen = 16,
-
-    /// For files which need time to be prepared before they can be
-    /// sent, the message enters this state before
-    /// OutPending.
    OutPreparing = 18,
-
-    /// Message saved as draft.
    OutDraft = 19,
-
-    /// The user has pressed the "send" button but the message is not
-    /// yet sent and is pending in some way. Maybe we're offline (no
-    /// checkmark).
    OutPending = 20,
-
-    /// *Unrecoverable* error (*recoverable* errors result in pending
-    /// messages).
    OutFailed = 24,
-
-    /// Outgoing message successfully delivered to server (one
-    /// checkmark). Note, that already delivered messages may get into
-    /// the OutFailed state if we get such a hint from the server.
    OutDelivered = 26,
-
-    /// Outgoing message read by the recipient (two checkmarks; this
-    /// requires goodwill on the receiver's side)
    OutMdnRcvd = 28,
 }

@@ -661,27 +631,6 @@ impl Default for MessageState {
    }
 }

-impl std::fmt::Display for MessageState {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::Undefined => "Undefined",
-                Self::InFresh => "Fresh",
-                Self::InNoticed => "Noticed",
-                Self::InSeen => "Seen",
-                Self::OutPreparing => "Preparing",
-                Self::OutDraft => "Draft",
-                Self::OutPending => "Pending",
-                Self::OutFailed => "Failed",
-                Self::OutDelivered => "Delivered",
-                Self::OutMdnRcvd => "Read",
-            }
-        )
-    }
-}
-
 impl From<MessageState> for LotState {
    fn from(s: MessageState) -> Self {
        use MessageState::*;
@@ -836,7 +785,19 @@ pub fn get_msg_info(context: &Context, msg_id: MsgId) -> String {
        }
    }

-    ret += &format!("State: {}", msg.state);
+    ret += "State: ";
+    use MessageState::*;
+    match msg.state {
+        InFresh => ret += "Fresh",
+        InNoticed => ret += "Noticed",
+        InSeen => ret += "Seen",
+        OutDelivered => ret += "Delivered",
+        OutFailed => ret += "Failed",
+        OutMdnRcvd => ret += "Read",
+        OutPending => ret += "Pending",
+        OutPreparing => ret += "Preparing",
+        _ => ret += &format!("{}", msg.state),
+    }

    if msg.has_location() {
        ret += ", Location sent";
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -11,35 +11,36 @@ use crate::dc_tools::*;
 use crate::e2ee::*;
 use crate::error::Error;
 use crate::location;
+use crate::message::MsgId;
 use crate::message::{self, Message};
 use crate::mimeparser::SystemMessage;
 use crate::param::*;
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::stock::StockMessage;

-#[derive(Debug, Clone)]
+#[derive(Clone, Copy, Eq, PartialEq)]
 pub enum Loaded {
-    Message { chat: Chat },
-    MDN { additional_msg_ids: Vec<String> },
+    Message,
+    MDN,
 }

 /// Helper to construct mime messages.
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct MimeFactory<'a, 'b> {
-    from_addr: String,
-    from_displayname: String,
-    selfstatus: String,
-
-    /// Vector of pairs of recipient name and address
-    recipients: Vec<(String, String)>,
-
-    timestamp: i64,
-    loaded: Loaded,
-    msg: &'b Message,
-    in_reply_to: String,
-    references: String,
-    req_mdn: bool,
-    context: &'a Context,
+    pub from_addr: String,
+    pub from_displayname: String,
+    pub selfstatus: String,
+    pub recipients_names: Vec<String>,
+    pub recipients_addr: Vec<String>,
+    pub timestamp: i64,
+    pub loaded: Loaded,
+    pub msg: &'b Message,
+    pub chat: Option<Chat>,
+    pub increation: bool,
+    pub in_reply_to: String,
+    pub references: String,
+    pub req_mdn: bool,
+    pub context: &'a Context,
    last_added_location_id: u32,
    attach_selfavatar: bool,
 }
@@ -52,6 +53,8 @@ pub struct RenderedEmail {
    pub is_encrypted: bool,
    pub is_gossiped: bool,
    pub last_added_location_id: u32,
+    /// None for MDN, the message id otherwise
+    pub foreign_id: Option<MsgId>,

    pub from: String,
    pub recipients: Vec<String>,
@@ -68,22 +71,44 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
    ) -> Result<MimeFactory<'a, 'b>, Error> {
        let chat = Chat::load_from_db(context, msg.chat_id)?;

-        let from_addr = context
-            .get_config(Config::ConfiguredAddr)
-            .unwrap_or_default();
-        let from_displayname = context.get_config(Config::Displayname).unwrap_or_default();
-        let mut recipients = Vec::with_capacity(5);
-        let mut req_mdn = false;
+        let mut factory = MimeFactory {
+            from_addr: context
+                .get_config(Config::ConfiguredAddr)
+                .unwrap_or_default(),
+            from_displayname: context.get_config(Config::Displayname).unwrap_or_default(),
+            selfstatus: context
+                .get_config(Config::Selfstatus)
+                .unwrap_or_else(|| context.stock_str(StockMessage::StatusLine).to_string()),
+            recipients_names: Vec::with_capacity(5),
+            recipients_addr: Vec::with_capacity(5),
+            timestamp: msg.timestamp_sort,
+            loaded: Loaded::Message,
+            msg,
+            chat: Some(chat),
+            increation: msg.is_increation(),
+            in_reply_to: String::default(),
+            references: String::default(),
+            req_mdn: false,
+            last_added_location_id: 0,
+            attach_selfavatar: add_selfavatar,
+            context,
+        };
+
+        // just set the chat above
+        let chat = factory.chat.as_ref().unwrap();

        if chat.is_self_talk() {
-            recipients.push((from_displayname.to_string(), from_addr.to_string()));
+            factory
+                .recipients_names
+                .push(factory.from_displayname.to_string());
+            factory.recipients_addr.push(factory.from_addr.to_string());
        } else {
            context.sql.query_map(
                "SELECT c.authname, c.addr  \
                 FROM chats_contacts cc  \
                 LEFT JOIN contacts c ON cc.contact_id=c.id  \
                 WHERE cc.chat_id=? AND cc.contact_id>9;",
-                params![msg.chat_id as i32],
+                params![factory.msg.chat_id as i32],
                |row| {
                    let authname: String = row.get(0)?;
                    let addr: String = row.get(1)?;
@@ -92,15 +117,17 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                |rows| {
                    for row in rows {
                        let (authname, addr) = row?;
-                        if !recipients_contain_addr(&recipients, &addr) {
-                            recipients.push((authname, addr));
+                        if !vec_contains_lowercase(&factory.recipients_addr, &addr) {
+                            factory.recipients_addr.push(addr);
+                            factory.recipients_names.push(authname);
                        }
                    }
                    Ok(())
                },
            )?;

-            let command = msg.param.get_cmd();
+            let command = factory.msg.param.get_cmd();
+            let msg = &factory.msg;

            /* for added members, the list is just fine */
            if command == SystemMessage::MemberRemovedFromGroup {
@@ -112,19 +139,20 @@ impl<'a, 'b> MimeFactory<'a, 'b> {

                if !email_to_remove.is_empty()
                    && !addr_cmp(email_to_remove, self_addr)
-                    && !recipients_contain_addr(&recipients, &email_to_remove)
+                    && !vec_contains_lowercase(&factory.recipients_addr, &email_to_remove)
                {
-                    recipients.push(("".to_string(), email_to_remove.to_string()));
+                    factory.recipients_names.push("".to_string());
+                    factory.recipients_addr.push(email_to_remove.to_string());
                }
            }
            if command != SystemMessage::AutocryptSetupMessage
                && command != SystemMessage::SecurejoinMessage
                && context.get_config_bool(Config::MdnsEnabled)
            {
-                req_mdn = true;
+                factory.req_mdn = true;
            }
        }
-        let (in_reply_to, references) = context.sql.query_row(
+        let row = context.sql.query_row(
            "SELECT mime_in_reply_to, mime_references FROM msgs WHERE id=?",
            params![msg.id],
            |row| {
@@ -136,37 +164,39 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                    render_rfc724_mid_list(&references),
                ))
            },
-        )?;
+        );
+
+        match row {
+            Ok((in_reply_to, references)) => {
+                factory.in_reply_to = in_reply_to;
+                factory.references = references;
+            }
+            Err(err) => {
+                error!(
+                    context,
+                    "mimefactory: failed to load mime_in_reply_to: {:?}", err
+                );
+            }
+        }

-        let factory = MimeFactory {
-            from_addr,
-            from_displayname,
-            selfstatus: context
-                .get_config(Config::Selfstatus)
-                .unwrap_or_else(|| context.stock_str(StockMessage::StatusLine).to_string()),
-            recipients,
-            timestamp: msg.timestamp_sort,
-            loaded: Loaded::Message { chat },
-            msg,
-            in_reply_to,
-            references,
-            req_mdn,
-            last_added_location_id: 0,
-            attach_selfavatar: add_selfavatar,
-            context,
-        };
        Ok(factory)
    }

-    pub fn from_mdn(
-        context: &'a Context,
-        msg: &'b Message,
-        additional_msg_ids: Vec<String>,
-    ) -> Result<Self, Error> {
-        ensure!(msg.chat_id > DC_CHAT_ID_LAST_SPECIAL, "Invalid chat id");
+    pub fn from_mdn(context: &'a Context, msg: &'b Message) -> Result<Self, Error> {
+        // MDNs not enabled - check this is late, in the job. the
+        // user may have changed its choice while offline ...
+        ensure!(
+            context.get_config_bool(Config::MdnsEnabled),
+            "MDNs meanwhile disabled"
+        );

        let contact = Contact::load_from_db(context, msg.from_id)?;

+        // Do not send MDNs trash etc.; chats.blocked is already checked by the caller
+        // in dc_markseen_msgs()
+        ensure!(!contact.is_blocked(), "Contact blocked");
+        ensure!(msg.chat_id > DC_CHAT_ID_LAST_SPECIAL, "Invalid chat id");
+
        Ok(MimeFactory {
            context,
            from_addr: context
@@ -176,13 +206,13 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            selfstatus: context
                .get_config(Config::Selfstatus)
                .unwrap_or_else(|| context.stock_str(StockMessage::StatusLine).to_string()),
-            recipients: vec![(
-                contact.get_authname().to_string(),
-                contact.get_addr().to_string(),
-            )],
+            recipients_names: vec![contact.get_authname().to_string()],
+            recipients_addr: vec![contact.get_addr().to_string()],
            timestamp: dc_create_smeared_timestamp(context),
-            loaded: Loaded::MDN { additional_msg_ids },
+            loaded: Loaded::MDN,
            msg,
+            chat: None,
+            increation: false,
            in_reply_to: String::default(),
            references: String::default(),
            req_mdn: false,
@@ -198,10 +228,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            .ok_or_else(|| format_err!("Not configured"))?;

        Ok(self
-            .recipients
+            .recipients_addr
            .iter()
-            .filter(|(_, addr)| addr != &self_addr)
-            .map(|(_, addr)| {
+            .filter(|addr| *addr != &self_addr)
+            .map(|addr| {
                (
                    Peerstate::from_addr(self.context, &self.context.sql, addr),
                    addr.as_str(),
@@ -210,10 +240,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            .collect())
    }

-    fn is_e2ee_guaranteed(&self) -> bool {
-        match &self.loaded {
-            Loaded::Message { chat } => {
-                if chat.typ == Chattype::VerifiedGroup {
+    fn is_e2ee_guranteed(&self) -> bool {
+        match self.loaded {
+            Loaded::Message => {
+                if self.chat.as_ref().unwrap().typ == Chattype::VerifiedGroup {
                    return true;
                }

@@ -234,26 +264,28 @@ impl<'a, 'b> MimeFactory<'a, 'b> {

                false
            }
-            Loaded::MDN { .. } => false,
+            Loaded::MDN => false,
        }
    }

    fn min_verified(&self) -> PeerstateVerifiedStatus {
-        match &self.loaded {
-            Loaded::Message { chat } => {
+        match self.loaded {
+            Loaded::Message => {
+                let chat = self.chat.as_ref().unwrap();
                if chat.typ == Chattype::VerifiedGroup {
                    PeerstateVerifiedStatus::BidirectVerified
                } else {
                    PeerstateVerifiedStatus::Unverified
                }
            }
-            Loaded::MDN { .. } => PeerstateVerifiedStatus::Unverified,
+            Loaded::MDN => PeerstateVerifiedStatus::Unverified,
        }
    }

    fn should_force_plaintext(&self) -> i32 {
-        match &self.loaded {
-            Loaded::Message { chat } => {
+        match self.loaded {
+            Loaded::Message => {
+                let chat = self.chat.as_ref().unwrap();
                if chat.typ == Chattype::VerifiedGroup {
                    0
                } else {
@@ -263,13 +295,14 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                        .unwrap_or_default()
                }
            }
-            Loaded::MDN { .. } => ForcePlaintext::NoAutocryptHeader as i32,
+            Loaded::MDN => ForcePlaintext::NoAutocryptHeader as i32,
        }
    }

    fn should_do_gossip(&self) -> bool {
-        match &self.loaded {
-            Loaded::Message { chat } => {
+        match self.loaded {
+            Loaded::Message => {
+                let chat = self.chat.as_ref().unwrap();
                // beside key- and member-changes, force re-gossip every 48 hours
                let gossiped_timestamp = chat.get_gossiped_timestamp(self.context);
                if time() > gossiped_timestamp + (2 * 24 * 60 * 60) {
@@ -278,13 +311,14 @@ impl<'a, 'b> MimeFactory<'a, 'b> {

                self.msg.param.get_cmd() == SystemMessage::MemberAddedToGroup
            }
-            Loaded::MDN { .. } => false,
+            Loaded::MDN => false,
        }
    }

    fn grpimage(&self) -> Option<String> {
-        match &self.loaded {
-            Loaded::Message { chat } => {
+        match self.loaded {
+            Loaded::Message => {
+                let chat = self.chat.as_ref().unwrap();
                let cmd = self.msg.param.get_cmd();

                match cmd {
@@ -308,37 +342,51 @@ impl<'a, 'b> MimeFactory<'a, 'b> {

                None
            }
-            Loaded::MDN { .. } => None,
+            Loaded::MDN => None,
        }
    }

    fn subject_str(&self) -> String {
        match self.loaded {
-            Loaded::Message { ref chat } => {
-                if self.msg.param.get_cmd() == SystemMessage::AutocryptSetupMessage {
-                    self.context
-                        .stock_str(StockMessage::AcSetupMsgSubject)
-                        .into_owned()
-                } else if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
-                    let re = if self.in_reply_to.is_empty() {
-                        ""
-                    } else {
-                        "Re: "
-                    };
-                    format!("{}{}", re, chat.name)
-                } else {
-                    let raw = message::get_summarytext_by_raw(
-                        self.msg.viewtype,
-                        self.msg.text.as_ref(),
-                        &self.msg.param,
-                        32,
-                        self.context,
-                    );
-                    let raw_subject = raw.lines().next().unwrap_or_default();
-                    format!("Chat: {}", raw_subject)
+            Loaded::Message => {
+                match self.chat {
+                    Some(ref chat) => {
+                        let raw = message::get_summarytext_by_raw(
+                            self.msg.viewtype,
+                            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 { "" };
+
+                        if self.msg.param.get_cmd() == SystemMessage::AutocryptSetupMessage {
+                            // do not add the "Chat:" prefix for setup messages
+                            self.context
+                                .stock_str(StockMessage::AcSetupMsgSubject)
+                                .into_owned()
+                        } else if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup
+                        {
+                            format!("Chat: {}: {}{}", chat.name, fwd, raw_subject)
+                        } else {
+                            format!("Chat: {}{}", fwd, raw_subject)
+                        }
+                    }
+                    None => String::new(),
                }
            }
-            Loaded::MDN { .. } => self.context.stock_str(StockMessage::ReadRcpt).into_owned(),
+            Loaded::MDN => {
+                let e = self.context.stock_str(StockMessage::ReadRcpt);
+                format!("Chat: {}", e)
+            }
        }
    }

@@ -357,8 +405,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            self.from_addr.clone(),
        );

-        let mut to = Vec::with_capacity(self.recipients.len());
-        for (name, addr) in self.recipients.iter() {
+        let mut to = Vec::with_capacity(self.recipients_names.len());
+        let name_iter = self.recipients_names.iter();
+        let addr_iter = self.recipients_addr.iter();
+        for (name, addr) in name_iter.zip(addr_iter) {
            if name.is_empty() {
                to.push(Address::new_mailbox(addr.clone()));
            } else {
@@ -415,16 +465,16 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        let grpimage = self.grpimage();
        let force_plaintext = self.should_force_plaintext();
        let subject_str = self.subject_str();
-        let e2ee_guaranteed = self.is_e2ee_guaranteed();
+        let e2ee_guranteed = self.is_e2ee_guranteed();
        let mut encrypt_helper = EncryptHelper::new(self.context)?;

        let subject = encode_words(&subject_str);

        let mut message = match self.loaded {
-            Loaded::Message { .. } => {
+            Loaded::Message => {
                self.render_message(&mut protected_headers, &mut unprotected_headers, &grpimage)?
            }
-            Loaded::MDN { .. } => self.render_mdn()?,
+            Loaded::MDN => self.render_mdn()?,
        };

        if force_plaintext != ForcePlaintext::NoAutocryptHeader as i32 {
@@ -437,12 +487,12 @@ impl<'a, 'b> MimeFactory<'a, 'b> {

        let peerstates = self.peerstates_for_recipients()?;
        let should_encrypt =
-            encrypt_helper.should_encrypt(self.context, e2ee_guaranteed, &peerstates)?;
+            encrypt_helper.should_encrypt(self.context, e2ee_guranteed, &peerstates)?;
        let is_encrypted = should_encrypt && force_plaintext == 0;

        let rfc724_mid = match self.loaded {
-            Loaded::Message { .. } => self.msg.rfc724_mid.clone(),
-            Loaded::MDN { .. } => dc_create_outgoing_rfc724_mid(None, &self.from_addr),
+            Loaded::Message => self.msg.rfc724_mid.clone(),
+            Loaded::MDN => dc_create_outgoing_rfc724_mid(None, &self.from_addr),
        };

        // we could also store the message-id in the protected headers
@@ -551,9 +601,11 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        };

        let MimeFactory {
-            recipients,
+            recipients_addr,
            from_addr,
            last_added_location_id,
+            msg,
+            loaded,
            ..
        } = self;

@@ -563,7 +615,11 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            is_encrypted,
            is_gossiped,
            last_added_location_id,
-            recipients: recipients.into_iter().map(|(_, addr)| addr).collect(),
+            foreign_id: match loaded {
+                Loaded::Message => Some(msg.id),
+                Loaded::MDN => None,
+            },
+            recipients: recipients_addr,
            from: from_addr,
            rfc724_mid,
        })
@@ -576,10 +632,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        grpimage: &Option<String>,
    ) -> Result<PartBuilder, Error> {
        let context = self.context;
-        let chat = match &self.loaded {
-            Loaded::Message { chat } => chat,
-            Loaded::MDN { .. } => bail!("Attempt to render MDN as a message"),
-        };
+        let chat = self.chat.as_ref().unwrap();
        let command = self.msg.param.get_cmd();
        let mut placeholdertext = None;
        let mut meta_part = None;
@@ -897,13 +950,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
        //   are forwarded for any reasons (eg. gmail always forwards to IMAP), we have no chance to decrypt them;
        //   this issue is fixed with 0.9.4

-        let additional_msg_ids = match &self.loaded {
-            Loaded::Message { .. } => bail!("Attempt to render a message as MDN"),
-            Loaded::MDN {
-                additional_msg_ids, ..
-            } => additional_msg_ids,
-        };
-
        let mut message = PartBuilder::new().header((
            "Content-Type".to_string(),
            "multipart/report; report-type=disposition-notification".to_string(),
@@ -945,22 +991,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            version, self.from_addr, self.from_addr, self.msg.rfc724_mid
        );

-        let extension_fields = if additional_msg_ids.is_empty() {
-            "".to_string()
-        } else {
-            "X-Additional-Message-IDs: ".to_string()
-                + &additional_msg_ids
-                    .iter()
-                    .map(|mid| render_rfc724_mid(&mid))
-                    .collect::<Vec<String>>()
-                    .join(" ")
-                + "\r\n"
-        };
-
        message = message.child(
            PartBuilder::new()
                .content_type(&"message/disposition-notification".parse().unwrap())
-                .body(message_text2 + &extension_fields)
+                .body(message_text2)
                .build(),
        );

@@ -1078,11 +1112,14 @@ fn build_selfavatar_file(context: &Context, path: String) -> Result<(PartBuilder
    Ok((part, filename_to_send))
 }

-fn recipients_contain_addr(recipients: &[(String, String)], addr: &str) -> bool {
-    let addr_lc = addr.to_lowercase();
-    recipients
-        .iter()
-        .any(|(_, cur)| cur.to_lowercase() == addr_lc)
+pub(crate) fn vec_contains_lowercase(vec: &[String], part: &str) -> bool {
+    let partlc = part.to_lowercase();
+    for cur in vec.iter() {
+        if cur.to_lowercase() == partlc {
+            return true;
+        }
+    }
+    false
 }

 fn is_file_size_okay(context: &Context, msg: &Message) -> bool {
@@ -1123,8 +1160,14 @@ fn encode_words(word: &str) -> String {
 }

 pub fn needs_encoding(to_check: impl AsRef<str>) -> bool {
-    !to_check.as_ref().chars().all(|c| {
-        c.is_ascii_alphanumeric() || c == '-' || c == '_' || c == '.' || c == '~' || c == '%'
+    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 != '%'
    })
 }

@@ -1183,12 +1226,4 @@ mod tests {
             FBQUFBQUFBQQ==";
        assert_eq!(wrapped_base64_encode(input), output);
    }
-
-    #[test]
-    fn test_needs_encoding() {
-        assert!(!needs_encoding(""));
-        assert!(!needs_encoding("foobar"));
-        assert!(needs_encoding(" "));
-        assert!(needs_encoding("foo bar"));
-    }
 }
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -49,7 +49,7 @@ pub struct MimeMessage<'a> {
    pub message_kml: Option<location::Kml>,
    pub user_avatar: AvatarAction,
    pub group_avatar: AvatarAction,
-    pub(crate) reports: Vec<Report>,
+    reports: Vec<Report>,
 }

 #[derive(Debug, PartialEq)]
@@ -367,9 +367,14 @@ impl<'a> MimeMessage<'a> {
    }

    pub(crate) fn get_subject(&self) -> Option<String> {
-        self.get(HeaderDef::Subject)
-            .filter(|s| !s.is_empty())
-            .map(|s| s.to_string())
+        if let Some(s) = self.get(HeaderDef::Subject) {
+            if s.is_empty() {
+                return None;
+            }
+            Some(s.to_string())
+        } else {
+            None
+        }
    }

    pub fn get(&self, headerdef: HeaderDef) -> Option<&String> {
@@ -708,8 +713,11 @@ impl<'a> MimeMessage<'a> {
    }

    pub fn get_rfc724_mid(&self) -> Option<String> {
-        self.get(HeaderDef::MessageId)
-            .and_then(|msgid| parse_message_id(msgid))
+        if let Some(msgid) = self.get(HeaderDef::MessageId) {
+            parse_message_id(msgid)
+        } else {
+            None
+        }
    }

    fn merge_headers(&mut self, fields: &[mailparse::MailHeader<'_>]) {
@@ -742,17 +750,8 @@ impl<'a> MimeMessage<'a> {
                .flatten()
                .and_then(|v| parse_message_id(&v))
            {
-                let additional_message_ids = report_fields
-                    .get_first_value(&HeaderDef::XAdditionalMessageIds.get_headername())
-                    .ok()
-                    .flatten()
-                    .map_or_else(Vec::new, |v| {
-                        v.split(' ').filter_map(parse_message_id).collect()
-                    });
-
                return Ok(Some(Report {
                    original_message_id,
-                    additional_message_ids,
                }));
            }
        }
@@ -779,18 +778,14 @@ impl<'a> MimeMessage<'a> {

        let mut mdn_recognized = false;
        for report in &self.reports {
-            for original_message_id in
-                std::iter::once(&report.original_message_id).chain(&report.additional_message_ids)
-            {
-                if let Some((chat_id, msg_id)) = message::mdn_from_ext(
-                    self.context,
-                    from_id,
-                    original_message_id,
-                    sent_timestamp,
-                ) {
-                    self.context.call_cb(Event::MsgRead { chat_id, msg_id });
-                    mdn_recognized = true;
-                }
+            if let Some((chat_id, msg_id)) = message::mdn_from_ext(
+                self.context,
+                from_id,
+                &report.original_message_id,
+                sent_timestamp,
+            ) {
+                self.context.call_cb(Event::MsgRead { chat_id, msg_id });
+                mdn_recognized = true;
            }
        }

@@ -865,11 +860,8 @@ fn update_gossip_peerstates(
 }

 #[derive(Debug)]
-pub(crate) struct Report {
-    /// Original-Message-ID header
+struct Report {
    original_message_id: String,
-    /// X-Additional-Message-IDs
-    additional_message_ids: Vec<String>,
 }

 fn parse_message_id(field: &str) -> Option<String> {
@@ -1278,176 +1270,4 @@ Content-Disposition: attachment; filename=\"message.kml\"\n\
        // and only goes into message_kml.
        assert_eq!(mimeparser.parts.len(), 1);
    }
-
-    #[test]
-    fn test_parse_mdn() {
-        let context = dummy_context();
-        let raw = b"Subject: =?utf-8?q?Chat=3A_Message_opened?=\n\
-Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
-Chat-Version: 1.0\n\
-Message-ID: <bar@example.org>\n\
-To: Alice <alice@example.org>\n\
-From: Bob <bob@example.org>\n\
-Content-Type: multipart/report; report-type=disposition-notification;\n\t\
-boundary=\"kJBbU58X1xeWNHgBtTbMk80M5qnV4N\"\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-Content-Type: text/plain; charset=utf-8\n\
-\n\
-The \"Encrypted message\" message you sent was displayed on the screen of the recipient.\n\
-\n\
-This is no guarantee the content was read.\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-Content-Type: message/disposition-notification\n\
-\n\
-Reporting-UA: Delta Chat 1.0.0-beta.22\n\
-Original-Recipient: rfc822;bob@example.org\n\
-Final-Recipient: rfc822;bob@example.org\n\
-Original-Message-ID: <foo@example.org>\n\
-Disposition: manual-action/MDN-sent-automatically; displayed\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N--\n\
-";
-
-        let message = MimeMessage::from_bytes(&context.ctx, &raw[..]).unwrap();
-        assert_eq!(
-            message.get_subject(),
-            Some("Chat: Message opened".to_string())
-        );
-
-        assert_eq!(message.parts.len(), 0);
-        assert_eq!(message.reports.len(), 1);
-    }
-
-    /// Test parsing multiple MDNs combined in a single message.
-    ///
-    /// RFC 6522 specifically allows MDNs to be nested inside
-    /// multipart MIME messages.
-    #[test]
-    fn test_parse_multiple_mdns() {
-        let context = dummy_context();
-        let raw = b"Subject: =?utf-8?q?Chat=3A_Message_opened?=\n\
-Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
-Chat-Version: 1.0\n\
-Message-ID: <foo@example.org>\n\
-To: Alice <alice@example.org>\n\
-From: Bob <bob@example.org>\n\
-Content-Type: multipart/parallel; boundary=outer\n\
-\n\
-This is a multipart MDN.\n\
-\n\
--outer\n\
-Content-Type: multipart/report; report-type=disposition-notification;\n\t\
-boundary=kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-Content-Type: text/plain; charset=utf-8\n\
-\n\
-The \"Encrypted message\" message you sent was displayed on the screen of the recipient.\n\
-\n\
-This is no guarantee the content was read.\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-Content-Type: message/disposition-notification\n\
-\n\
-Reporting-UA: Delta Chat 1.0.0-beta.22\n\
-Original-Recipient: rfc822;bob@example.org\n\
-Final-Recipient: rfc822;bob@example.org\n\
-Original-Message-ID: <bar@example.org>\n\
-Disposition: manual-action/MDN-sent-automatically; displayed\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N--\n\
--outer\n\
-Content-Type: multipart/report; report-type=disposition-notification;\n\t\
-boundary=zuOJlsTfZAukyawEPVdIgqWjaM9w2W\n\
-\n\
-\n\
--zuOJlsTfZAukyawEPVdIgqWjaM9w2W\n\
-Content-Type: text/plain; charset=utf-8\n\
-\n\
-The \"Encrypted message\" message you sent was displayed on the screen of the recipient.\n\
-\n\
-This is no guarantee the content was read.\n\
-\n\
-\n\
--zuOJlsTfZAukyawEPVdIgqWjaM9w2W\n\
-Content-Type: message/disposition-notification\n\
-\n\
-Reporting-UA: Delta Chat 1.0.0-beta.22\n\
-Original-Recipient: rfc822;bob@example.org\n\
-Final-Recipient: rfc822;bob@example.org\n\
-Original-Message-ID: <baz@example.org>\n\
-Disposition: manual-action/MDN-sent-automatically; displayed\n\
-\n\
-\n\
--zuOJlsTfZAukyawEPVdIgqWjaM9w2W--\n\
--outer--\n\
-";
-
-        let message = MimeMessage::from_bytes(&context.ctx, &raw[..]).unwrap();
-        assert_eq!(
-            message.get_subject(),
-            Some("Chat: Message opened".to_string())
-        );
-
-        assert_eq!(message.parts.len(), 0);
-        assert_eq!(message.reports.len(), 2);
-    }
-
-    #[test]
-    fn test_parse_mdn_with_additional_message_ids() {
-        let context = dummy_context();
-        let raw = b"Subject: =?utf-8?q?Chat=3A_Message_opened?=\n\
-Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
-Chat-Version: 1.0\n\
-Message-ID: <bar@example.org>\n\
-To: Alice <alice@example.org>\n\
-From: Bob <bob@example.org>\n\
-Content-Type: multipart/report; report-type=disposition-notification;\n\t\
-boundary=\"kJBbU58X1xeWNHgBtTbMk80M5qnV4N\"\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-Content-Type: text/plain; charset=utf-8\n\
-\n\
-The \"Encrypted message\" message you sent was displayed on the screen of the recipient.\n\
-\n\
-This is no guarantee the content was read.\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-Content-Type: message/disposition-notification\n\
-\n\
-Reporting-UA: Delta Chat 1.0.0-beta.22\n\
-Original-Recipient: rfc822;bob@example.org\n\
-Final-Recipient: rfc822;bob@example.org\n\
-Original-Message-ID: <foo@example.org>\n\
-Disposition: manual-action/MDN-sent-automatically; displayed\n\
-X-Additional-Message-IDs: <foo@example.com> <foo@example.net>\n\
-\n\
-\n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N--\n\
-";
-
-        let message = MimeMessage::from_bytes(&context.ctx, &raw[..]).unwrap();
-        assert_eq!(
-            message.get_subject(),
-            Some("Chat: Message opened".to_string())
-        );
-
-        assert_eq!(message.parts.len(), 0);
-        assert_eq!(message.reports.len(), 1);
-        assert_eq!(message.reports[0].original_message_id, "foo@example.org");
-        assert_eq!(
-            &message.reports[0].additional_message_ids,
-            &["foo@example.com", "foo@example.net"]
-        );
-    }
 }
--- a/src/oauth2.rs
+++ b/src/oauth2.rs
@@ -312,12 +312,13 @@ impl Oauth2 {
        }
        if let Ok(response) = parsed {
            // serde_json::Value.as_str() removes the quotes of json-strings
-            if let Some(addr) = response.get("email") {
-                Some(addr.to_string())
-            } else {
+            let addr = response.get("email");
+            if addr.is_none() {
                warn!(context, "E-mail missing in userinfo.");
-                None
+                return None;
            }
+            let addr = addr.unwrap().as_str();
+            addr.map(|addr| addr.to_string())
        } else {
            warn!(context, "Failed to parse userinfo.");
            None
--- a/src/param.rs
+++ b/src/param.rs
@@ -8,7 +8,6 @@ use num_traits::FromPrimitive;
 use crate::blob::{BlobError, BlobObject};
 use crate::context::Context;
 use crate::error;
-use crate::message::MsgId;
 use crate::mimeparser::SystemMessage;

 /// Available param keys.
@@ -97,29 +96,26 @@ pub enum Param {
    /// For Jobs: space-separated list of message recipients
    Recipients = b'R',

-    /// For Groups
+    // For Groups
    Unpromoted = b'U',

-    /// For Groups and Contacts
+    // For Groups and Contacts
    ProfileImage = b'i',

-    /// For Chats
+    // For Chats
    Selftalk = b'K',

-    /// For Chats
+    // For Chats
    Devicetalk = b'D',

-    /// For QR
+    // For QR
    Auth = b's',

-    /// For QR
+    // For QR
    GroupId = b'x',

-    /// For QR
+    // For QR
    GroupName = b'g',
-
-    /// For MDN-sending job
-    MessageId = b'I',
 }

 /// Possible values for `Param::ForcePlaintext`.
@@ -316,12 +312,6 @@ impl Params {
        Ok(Some(path))
    }

-    pub fn get_msg_id(&self) -> Option<MsgId> {
-        self.get(Param::MessageId)
-            .and_then(|x| x.parse::<u32>().ok())
-            .map(MsgId::new)
-    }
-
    /// Set the given paramter to the passed in `i32`.
    pub fn set_int(&mut self, key: Param, value: i32) -> &mut Self {
        self.set(key, format!("{}", value));
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -66,17 +66,14 @@ macro_rules! get_qr_attr {
 }

 pub fn dc_get_securejoin_qr(context: &Context, group_chat_id: u32) -> Option<String> {
-    /*=======================================================
+    /* =========================================================
    ====             Alice - the inviter side            ====
    ====   Step 1 in "Setup verified contact" protocol   ====
-    =======================================================*/
+    ========================================================= */

    let fingerprint: String;

    ensure_secret_key_exists(context).ok();
-
-    // invitenumber will be used to allow starting the handshake,
-    // auth will be used to verify the fingerprint
    let invitenumber = token::lookup_or_new(context, token::Namespace::InviteNumber, group_chat_id);
    let auth = token::lookup_or_new(context, token::Namespace::Auth, group_chat_id);
    let self_addr = match context.get_config(Config::ConfiguredAddr) {
@@ -102,7 +99,6 @@ pub fn dc_get_securejoin_qr(context: &Context, group_chat_id: u32) -> Option<Str
        utf8_percent_encode(&self_name, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();

    let qr = if 0 != group_chat_id {
-        // parameters used: a=g=x=i=s=
        if let Ok(chat) = Chat::load_from_db(context, group_chat_id) {
            let group_name = chat.get_name();
            let group_name_urlencoded =
@@ -122,7 +118,6 @@ pub fn dc_get_securejoin_qr(context: &Context, group_chat_id: u32) -> Option<Str
            return None;
        }
    } else {
-        // parameters used: a=n=i=s=
        Some(format!(
            "OPENPGP4FPR:{}#a={}&n={}&i={}&s={}",
            fingerprint, self_addr_urlencoded, self_name_urlencoded, &invitenumber, &auth,
@@ -154,7 +149,6 @@ pub fn dc_join_securejoin(context: &Context, qr: &str) -> u32 {
                        context,
                        bob.qr_scan.as_ref().unwrap().text2.as_ref().unwrap(),
                    )
-                    .unwrap_or((0, false, Blocked::Not))
                    .0
                } else {
                    contact_chat_id
@@ -169,12 +163,10 @@ pub fn dc_join_securejoin(context: &Context, qr: &str) -> u32 {
            }
            ret_chat_id as u32
        };
-
-    /*========================================================
+    /* ==========================================================
    ====             Bob - the joiner's side             =====
    ====   Step 2 in "Setup verified contact" protocol   =====
-    ========================================================*/
-
+    ========================================================== */
    let mut contact_chat_id: u32 = 0;
    let mut join_vg: bool = false;

@@ -217,14 +209,10 @@ pub fn dc_join_securejoin(context: &Context, qr: &str) -> u32 {
            .unwrap(),
        contact_chat_id,
    ) {
-        // the scanned fingerprint matches Alice's key,
-        // we can proceed to step 4b) directly and save two mails
        info!(context, "Taking protocol shortcut.");
        context.bob.write().unwrap().expects = DC_VC_CONTACT_CONFIRM;
        joiner_progress!(context, chat_id_2_contact_id(context, contact_chat_id), 400);
        let own_fingerprint = get_self_fingerprint(context).unwrap_or_default();
-
-        // Bob -> Alice
        send_handshake_msg(
            context,
            contact_chat_id,
@@ -243,8 +231,6 @@ pub fn dc_join_securejoin(context: &Context, qr: &str) -> u32 {
        );
    } else {
        context.bob.write().unwrap().expects = DC_VC_AUTH_REQUIRED;
-
-        // Bob -> Alice
        send_handshake_msg(
            context,
            contact_chat_id,
@@ -255,6 +241,7 @@ pub fn dc_join_securejoin(context: &Context, qr: &str) -> u32 {
        );
    }

+    // Bob -> Alice
    while !context.shall_stop_ongoing() {
        // Don't sleep too long, the user is waiting.
        std::thread::sleep(std::time::Duration::from_millis(200));
@@ -332,115 +319,80 @@ fn fingerprint_equals_sender(
    }
    false
 }
-#[derive(Fail, Debug)]
-pub(crate) enum HandshakeError {
-    #[fail(display = "Can not be called with special contact ID")]
-    SpecialContactId,
-    #[fail(display = "Not a Secure-Join message")]
-    NotSecureJoinMsg,
-    #[fail(
-        display = "Failed to look up or create chat for contact #{}",
-        contact_id
-    )]
-    NoChat {
-        contact_id: u32,
-        #[cause]
-        cause: Error,
-    },
-    #[fail(display = "Chat for group {} not found", group)]
-    ChatNotFound { group: String },
-    #[fail(display = "No configured self address found")]
-    NoSelfAddr,
+
+pub(crate) struct HandshakeMessageStatus {
+    pub(crate) hide_this_msg: bool,
+    pub(crate) delete_this_msg: bool,
+    pub(crate) stop_ongoing_process: bool,
+    pub(crate) bob_securejoin_success: Option<bool>,
 }

-/// What to do with a Secure-Join handshake message after it was handled.
-pub(crate) enum HandshakeMessage {
-    /// The message has been fully handled and should be removed/delete.
-    Done,
-    /// The message should be ignored/hidden, but not removed/deleted.
-    Ignore,
-    /// The message should be further processed by incoming message handling.
-    Propagate,
+impl Default for HandshakeMessageStatus {
+    fn default() -> Self {
+        Self {
+            hide_this_msg: true,
+            delete_this_msg: false,
+            stop_ongoing_process: false,
+            bob_securejoin_success: None,
+        }
+    }
 }

 /// Handle incoming secure-join handshake.
-///
-/// This function will update the securejoin state in [Context::bob]
-/// and also terminate the ongoing process using
-/// [Context::stop_ongoing] as required by the protocol.
-///
-/// A message which results in [Err] will be hidden from the user but
-/// not deleted, it may be a valid message for something else we are
-/// not aware off.  E.g. it could be part of a handshake performed by
-/// another DC app on the same account.
-///
-/// When handle_securejoin_handshake() is called,
-/// the message is not yet filed in the database;
-/// this is done by receive_imf() later on as needed.
 pub(crate) fn handle_securejoin_handshake(
    context: &Context,
-    mime_message: &MimeMessage,
+    mimeparser: &MimeMessage,
    contact_id: u32,
-) -> Result<HandshakeMessage, HandshakeError> {
+) -> Result<HandshakeMessageStatus, Error> {
    let own_fingerprint: String;

-    if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
-        return Err(HandshakeError::SpecialContactId);
-    }
-    let step = mime_message
+    ensure!(
+        contact_id > DC_CONTACT_ID_LAST_SPECIAL,
+        "handle_securejoin_handshake(): called with special contact id"
+    );
+    let step = mimeparser
        .get(HeaderDef::SecureJoin)
-        .ok_or(HandshakeError::NotSecureJoinMsg)?;
+        .ok_or_else(|| format_err!("This message is not a Secure-Join message"))?;

    info!(
        context,
        ">>>>>>>>>>>>>>>>>>>>>>>>> secure-join message \'{}\' received", step,
    );

-    let contact_chat_id =
-        match chat::create_or_lookup_by_contact_id(context, contact_id, Blocked::Not) {
-            Ok((chat_id, blocked)) => {
-                if blocked != Blocked::Not {
-                    chat::unblock(context, chat_id);
-                }
-                chat_id
-            }
-            Err(err) => {
-                return Err(HandshakeError::NoChat {
-                    contact_id,
-                    cause: err,
-                });
-            }
-        };
+    let (contact_chat_id, contact_chat_id_blocked) =
+        chat::create_or_lookup_by_contact_id(context, contact_id, Blocked::Not).unwrap_or_default();
+
+    if contact_chat_id_blocked != Blocked::Not {
+        chat::unblock(context, contact_chat_id);
+    }

    let join_vg = step.starts_with("vg-");
+    let mut ret = HandshakeMessageStatus::default();

    match step.as_str() {
        "vg-request" | "vc-request" => {
-            /*=======================================================
+            /* =========================================================
            ====             Alice - the inviter side            ====
            ====   Step 3 in "Setup verified contact" protocol   ====
-            =======================================================*/
-
-            // this message may be unencrypted (Bob, the joiner and the sender, might not have Alice's key yet)
+            ========================================================= */
+            // this message may be unencrypted (Bob, the joinder and the sender, might not have Alice's key yet)
            // it just ensures, we have Bobs key now. If we do _not_ have the key because eg. MitM has removed it,
            // send_message() will fail with the error "End-to-end-encryption unavailable unexpectedly.", so, there is no additional check needed here.
            // verify that the `Secure-Join-Invitenumber:`-header matches invitenumber written to the QR code
-            let invitenumber = match mime_message.get(HeaderDef::SecureJoinInvitenumber) {
+            let invitenumber = match mimeparser.get(HeaderDef::SecureJoinInvitenumber) {
                Some(n) => n,
                None => {
-                    warn!(context, "Secure-join denied (invitenumber missing)");
-                    return Ok(HandshakeMessage::Ignore);
+                    warn!(context, "Secure-join denied (invitenumber missing).",);
+                    return Ok(ret);
                }
            };
            if !token::exists(context, token::Namespace::InviteNumber, &invitenumber) {
-                warn!(context, "Secure-join denied (bad invitenumber).");
-                return Ok(HandshakeMessage::Ignore);
+                warn!(context, "Secure-join denied (bad invitenumber).",);
+                return Ok(ret);
            }
            info!(context, "Secure-join requested.",);

            inviter_progress!(context, contact_id, 300);
-
-            // Alice -> Bob
            send_handshake_msg(
                context,
                contact_chat_id,
@@ -449,15 +401,8 @@ pub(crate) fn handle_securejoin_handshake(
                None,
                "",
            );
-            Ok(HandshakeMessage::Done)
        }
        "vg-auth-required" | "vc-auth-required" => {
-            /*========================================================
-            ====             Bob - the joiner's side             =====
-            ====   Step 4 in "Setup verified contact" protocol   =====
-            ========================================================*/
-
-            // verify that Alice's Autocrypt key and fingerprint matches the QR-code
            let cond = {
                let bob = context.bob.read().unwrap();
                let scan = bob.qr_scan.as_ref();
@@ -467,26 +412,26 @@ pub(crate) fn handle_securejoin_handshake(
            };

            if cond {
-                warn!(context, "auth-required message out of sync.");
+                warn!(context, "auth-required message out of sync.",);
                // no error, just aborted somehow or a mail from another handshake
-                return Ok(HandshakeMessage::Ignore);
+                return Ok(ret);
            }
            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
            let auth = get_qr_attr!(context, auth).to_string();

-            if !encrypted_and_signed(mime_message, &scanned_fingerprint_of_alice) {
+            if !encrypted_and_signed(mimeparser, &scanned_fingerprint_of_alice) {
                could_not_establish_secure_connection(
                    context,
                    contact_chat_id,
-                    if mime_message.was_encrypted() {
+                    if mimeparser.was_encrypted() {
                        "No valid signature."
                    } else {
                        "Not encrypted."
                    },
                );
-                context.bob.write().unwrap().status = 0; // secure-join failed
-                context.stop_ongoing();
-                return Ok(HandshakeMessage::Ignore);
+                ret.stop_ongoing_process = true;
+                ret.bob_securejoin_success = Some(false);
+                return Ok(ret);
            }
            if !fingerprint_equals_sender(context, &scanned_fingerprint_of_alice, contact_chat_id) {
                could_not_establish_secure_connection(
@@ -494,16 +439,15 @@ pub(crate) fn handle_securejoin_handshake(
                    contact_chat_id,
                    "Fingerprint mismatch on joiner-side.",
                );
-                context.bob.write().unwrap().status = 0; // secure-join failed
-                context.stop_ongoing();
-                return Ok(HandshakeMessage::Ignore);
+                ret.stop_ongoing_process = true;
+                ret.bob_securejoin_success = Some(false);
+                return Ok(ret);
            }
            info!(context, "Fingerprint verified.",);
            own_fingerprint = get_self_fingerprint(context).unwrap();
            joiner_progress!(context, contact_id, 400);
            context.bob.write().unwrap().expects = DC_VC_CONTACT_CONFIRM;

-            // Bob -> Alice
            send_handshake_msg(
                context,
                contact_chat_id,
@@ -516,17 +460,15 @@ pub(crate) fn handle_securejoin_handshake(
                    "".to_string()
                },
            );
-            Ok(HandshakeMessage::Done)
        }
        "vg-request-with-auth" | "vc-request-with-auth" => {
-            /*==========================================================
+            /* ============================================================
            ====              Alice - the inviter side              ====
            ====   Steps 5+6 in "Setup verified contact" protocol   ====
            ====  Step 6 in "Out-of-band verified groups" protocol  ====
-            ==========================================================*/
-
+            ============================================================ */
            // verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob
-            let fingerprint = match mime_message.get(HeaderDef::SecureJoinFingerprint) {
+            let fingerprint = match mimeparser.get(HeaderDef::SecureJoinFingerprint) {
                Some(fp) => fp,
                None => {
                    could_not_establish_secure_connection(
@@ -534,16 +476,16 @@ pub(crate) fn handle_securejoin_handshake(
                        contact_chat_id,
                        "Fingerprint not provided.",
                    );
-                    return Ok(HandshakeMessage::Ignore);
+                    return Ok(ret);
                }
            };
-            if !encrypted_and_signed(mime_message, &fingerprint) {
+            if !encrypted_and_signed(mimeparser, &fingerprint) {
                could_not_establish_secure_connection(
                    context,
                    contact_chat_id,
                    "Auth not encrypted.",
                );
-                return Ok(HandshakeMessage::Ignore);
+                return Ok(ret);
            }
            if !fingerprint_equals_sender(context, &fingerprint, contact_chat_id) {
                could_not_establish_secure_connection(
@@ -551,11 +493,11 @@ pub(crate) fn handle_securejoin_handshake(
                    contact_chat_id,
                    "Fingerprint mismatch on inviter-side.",
                );
-                return Ok(HandshakeMessage::Ignore);
+                return Ok(ret);
            }
            info!(context, "Fingerprint verified.",);
            // verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code
-            let auth_0 = match mime_message.get(HeaderDef::SecureJoinAuth) {
+            let auth_0 = match mimeparser.get(HeaderDef::SecureJoinAuth) {
                Some(auth) => auth,
                None => {
                    could_not_establish_secure_connection(
@@ -563,12 +505,12 @@ pub(crate) fn handle_securejoin_handshake(
                        contact_chat_id,
                        "Auth not provided.",
                    );
-                    return Ok(HandshakeMessage::Ignore);
+                    return Ok(ret);
                }
            };
            if !token::exists(context, token::Namespace::Auth, &auth_0) {
                could_not_establish_secure_connection(context, contact_chat_id, "Auth invalid.");
-                return Ok(HandshakeMessage::Ignore);
+                return Ok(ret);
            }
            if mark_peer_as_verified(context, fingerprint).is_err() {
                could_not_establish_secure_connection(
@@ -576,7 +518,7 @@ pub(crate) fn handle_securejoin_handshake(
                    contact_chat_id,
                    "Fingerprint mismatch on inviter-side.",
                );
-                return Ok(HandshakeMessage::Ignore);
+                return Ok(ret);
            }
            Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinInvited);
            info!(context, "Auth verified.",);
@@ -584,47 +526,31 @@ pub(crate) fn handle_securejoin_handshake(
            emit_event!(context, Event::ContactsChanged(Some(contact_id)));
            inviter_progress!(context, contact_id, 600);
            if join_vg {
-                // the vg-member-added message is special:
-                // this is a normal Chat-Group-Member-Added message
-                // with an additional Secure-Join header
-                let field_grpid = match mime_message.get(HeaderDef::SecureJoinGroup) {
-                    Some(s) => s.as_str(),
-                    None => {
-                        warn!(context, "Missing Secure-Join-Group header");
-                        return Ok(HandshakeMessage::Ignore);
-                    }
-                };
-                match chat::get_chat_id_by_grpid(context, field_grpid) {
-                    Ok((group_chat_id, _, _)) => {
-                        if let Err(err) =
-                            chat::add_contact_to_chat_ex(context, group_chat_id, contact_id, true)
-                        {
-                            error!(context, "failed to add contact: {}", err);
-                        }
-                    }
-                    Err(err) => {
-                        error!(context, "Chat {} not found: {}", &field_grpid, err);
-                        return Err(HandshakeError::ChatNotFound {
-                            group: field_grpid.to_string(),
-                        });
-                    }
+                let field_grpid = mimeparser
+                    .get(HeaderDef::SecureJoinGroup)
+                    .map(|s| s.as_str())
+                    .unwrap_or_else(|| "");
+                let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, field_grpid);
+                if group_chat_id == 0 {
+                    error!(context, "Chat {} not found.", &field_grpid);
+                    return 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 {
-                // Alice -> Bob
                send_handshake_msg(context, contact_chat_id, "vc-contact-confirm", "", None, "");
                inviter_progress!(context, contact_id, 1000);
            }
-            Ok(HandshakeMessage::Done)
        }
        "vg-member-added" | "vc-contact-confirm" => {
-            /*=======================================================
-            ====             Bob - the joiner's side             ====
-            ====   Step 7 in "Setup verified contact" protocol   ====
-            =======================================================*/
-
+            if join_vg {
+                ret.hide_this_msg = false;
+            }
            if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM {
                info!(context, "Message belongs to a different handshake.",);
-                return Ok(HandshakeMessage::Propagate);
+                return Ok(ret);
            }
            let cond = {
                let bob = context.bob.read().unwrap();
@@ -636,19 +562,13 @@ pub(crate) fn handle_securejoin_handshake(
                    context,
                    "Message out of sync or belongs to a different handshake.",
                );
-                return Ok(HandshakeMessage::Propagate);
+                return Ok(ret);
            }
            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();

            let vg_expect_encrypted = if join_vg {
                let group_id = get_qr_attr!(context, text2).to_string();
-                // This is buggy, is_verified_group will always be
-                // false since the group is created by receive_imf by
-                // the very handshake message we're handling now.  But
-                // only after we have returned.  It does not impact
-                // the security invariants of secure-join however.
-                let (_, is_verified_group, _) = chat::get_chat_id_by_grpid(context, &group_id)
-                    .unwrap_or((0, false, Blocked::Not));
+                let (_, is_verified_group, _) = chat::get_chat_id_by_grpid(context, group_id);
                // when joining a non-verified group
                // the vg-member-added message may be unencrypted
                // when not all group members have keys or prefer encryption.
@@ -659,15 +579,15 @@ pub(crate) fn handle_securejoin_handshake(
                true
            };
            if vg_expect_encrypted
-                && !encrypted_and_signed(mime_message, &scanned_fingerprint_of_alice)
+                && !encrypted_and_signed(mimeparser, &scanned_fingerprint_of_alice)
            {
                could_not_establish_secure_connection(
                    context,
                    contact_chat_id,
                    "Contact confirm message not encrypted.",
                );
-                context.bob.write().unwrap().status = 0;
-                return Ok(HandshakeMessage::Propagate);
+                ret.bob_securejoin_success = Some(false);
+                return Ok(ret);
            }

            if mark_peer_as_verified(context, &scanned_fingerprint_of_alice).is_err() {
@@ -676,26 +596,21 @@ pub(crate) fn handle_securejoin_handshake(
                    contact_chat_id,
                    "Fingerprint mismatch on joiner-side.",
                );
-                return Ok(HandshakeMessage::Propagate);
+                return Ok(ret);
            }
            Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinJoined);
            emit_event!(context, Event::ContactsChanged(None));
-            let cg_member_added = mime_message
+            let cg_member_added = mimeparser
                .get(HeaderDef::ChatGroupMemberAdded)
                .map(|s| s.as_str())
                .unwrap_or_else(|| "");
-            if join_vg
-                && !context
-                    .is_self_addr(cg_member_added)
-                    .map_err(|_| HandshakeError::NoSelfAddr)?
-            {
+            if join_vg && !context.is_self_addr(cg_member_added)? {
                info!(context, "Message belongs to a different handshake (scaled up contact anyway to allow creation of group).");
-                return Ok(HandshakeMessage::Propagate);
+                return Ok(ret);
            }
            secure_connection_established(context, contact_chat_id);
            context.bob.write().unwrap().expects = 0;
            if join_vg {
-                // Bob -> Alice
                send_handshake_msg(
                    context,
                    contact_chat_id,
@@ -705,49 +620,45 @@ pub(crate) fn handle_securejoin_handshake(
                    "",
                );
            }
-            context.bob.write().unwrap().status = 1;
-            context.stop_ongoing();
-            Ok(HandshakeMessage::Propagate)
+            ret.stop_ongoing_process = true;
+            ret.bob_securejoin_success = Some(true);
        }
        "vg-member-added-received" => {
-            /*==========================================================
+            /* ============================================================
            ====              Alice - the inviter side              ====
            ====  Step 8 in "Out-of-band verified groups" protocol  ====
-            ==========================================================*/
-
+            ============================================================ */
            if let Ok(contact) = Contact::get_by_id(context, contact_id) {
                if contact.is_verified(context) == VerifiedStatus::Unverified {
                    warn!(context, "vg-member-added-received invalid.",);
-                    return Ok(HandshakeMessage::Ignore);
+                    return Ok(ret);
                }
                inviter_progress!(context, contact_id, 800);
                inviter_progress!(context, contact_id, 1000);
-                let field_grpid = mime_message
+                let field_grpid = mimeparser
                    .get(HeaderDef::SecureJoinGroup)
                    .map(|s| s.as_str())
                    .unwrap_or_else(|| "");
-                let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, &field_grpid)
-                    .map_err(|err| {
-                        warn!(context, "Failed to lookup chat_id from grpid: {}", err);
-                        HandshakeError::ChatNotFound {
-                            group: field_grpid.to_string(),
-                        }
-                    })?;
+                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,
                });
-                Ok(HandshakeMessage::Done)
            } else {
                warn!(context, "vg-member-added-received invalid.",);
-                Ok(HandshakeMessage::Ignore)
+                return Ok(ret);
            }
        }
        _ => {
            warn!(context, "invalid step: {}", step);
-            Ok(HandshakeMessage::Ignore)
        }
    }
+
+    if ret.hide_this_msg {
+        ret.delete_this_msg = true;
+    }
+
+    Ok(ret)
 }

 fn secure_connection_established(context: &Context, contact_chat_id: u32) {
--- a/src/top_evil_rs.py
+++ b/src/top_evil_rs.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+
+from pathlib import Path
+import os
+import re
+
+if __name__ == "__main__":
+    if Path('src/top_evil_rs.py').exists():
+        os.chdir('src')
+    filestats = []
+    for fn in Path(".").glob("**/*.rs"):
+        s = fn.read_text()
+        s = re.sub(r"(?m)///.*$", "", s)  # remove comments
+        unsafe = s.count("unsafe")
+        free = s.count("free(")
+        unsafe_fn = s.count("unsafe fn")
+        chars = s.count("c_char") + s.count("CStr")
+        libc = s.count("libc")
+        filestats.append((fn, unsafe, free, unsafe_fn, chars, libc))
+
+    sum_unsafe, sum_free, sum_unsafe_fn, sum_chars, sum_libc = 0, 0, 0, 0, 0
+
+    for fn, unsafe, free, unsafe_fn, chars, libc in reversed(sorted(filestats, key=lambda x: sum(x[1:]))):
+        if unsafe + free + unsafe_fn + chars + libc == 0:
+            continue
+        print("{0: <25} unsafe: {1: >3} free: {2: >3} unsafe-fn: {3: >3} chars: {4: >3} libc: {5: >3}".format(str(fn), unsafe, free, unsafe_fn, chars, libc))
+        sum_unsafe += unsafe
+        sum_free += free
+        sum_unsafe_fn += unsafe_fn
+        sum_chars += chars
+        sum_libc += libc
+
+
+    print()
+    print("total unsafe:", sum_unsafe)
+    print("total free:", sum_free)
+    print("total unsafe-fn:", sum_unsafe_fn)
+    print("total c_chars:", sum_chars)
+    print("total libc:", sum_libc)
--- a/test-data/image/avatar900x900.png
+++ b/test-data/image/avatar900x900.png
Author	SHA1	Message	Date
Alexander Krotov	5615e01e05	Update group test	2020-01-10 12:08:12 +03:00
Alexander Krotov	0c04cb8011	Never reset gossip timestamp for all chats at the same time	2020-01-10 09:34:17 +03:00
Alexander Krotov	e95aecd8df	Do not reset gossip timestamp when members are removed	2020-01-09 21:05:04 +03:00
Alexander Krotov	69960c2cef	Fix inverted should_do_gossip condition	2020-01-09 18:42:59 +03:00