Use sql migration over direct tables.sql modification

Fix test_encryption_modus()
Add {get, set}_chat_encryption_mods() methdos to jsonrpc
2026-06-26 01:26:36 +03:00 · 2022-12-01 15:15:04 +01:00 · 2022-12-01 13:50:20 +01:00 · 2022-11-29 23:37:30 +01:00 · 2022-11-29 23:34:46 +01:00 · 2022-11-18 03:06:40 +01:00
36 changed files with 964 additions and 479 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,13 +83,13 @@ jobs:
            rust: 1.61.0
            python: false # Python bindings compilation on Windows is not supported.

-          # Minimum Supported Rust Version = 1.56.1
+          # Minimum Supported Rust Version = 1.57.0
          #
          # Minimum Supported Python Version = 3.7
          # This is the minimum version for which manylinux Python wheels are
          # built.
          - os: ubuntu-latest
-            rust: 1.56.1
+            rust: 1.57.0
            python: 3.7
    runs-on: ${{ matrix.os }}
    steps:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,41 @@

 ## Unreleased

-### API-Changes
-
 ### Changes

+### API-Changes
+
 ### Fixes
+- fix detection of "All mail", "Trash", "Junk" etc folders. #3760
+- fetch messages sequentially to fix reactions on partially downloaded messages #3688
+
+
+## 1.101.0
+
+### Changes
+- add `configured_inbox_folder` to account info #3748
+- `dc_delete_contact()` hides contacts if referenced #3751
+- add IMAP UIDs to message info #3755
+
+### Fixes
+- improve IMAP logging, in particular fix incorrect "IMAP IDLE protocol
+  timed out" message on network error during IDLE #3749
+- pop Recently Seen Loop event out of the queue when it is in the past
+  to avoid busy looping #3753
+- fix build failures by going back to standard `async_zip` #3747
+
+
+## 1.100.0
+
+### API-Changes
+- jsonrpc: add `miscSaveSticker` method
+
+### Changes
+- add JSON-RPC stdio server `deltachat-rpc-server` and use it for JSON-RPC tests #3695
+- update rPGP from 0.8 to 0.9 #3737
+- jsonrpc: typescript client: use npm released deltachat fork of the tiny emitter package #3741
+- jsonrpc: show sticker image in quote #3744
+


 ## 1.99.0
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,14 +31,13 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"

 [[package]]
 name = "aes"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
+checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
 dependencies = [
 "cfg-if",
 "cipher",
 "cpufeatures",
- "opaque-debug",
 ]

 [[package]]
@@ -110,9 +109,9 @@ dependencies = [

 [[package]]
 name = "async-compression"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695"
+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
 dependencies = [
 "flate2",
 "futures-core",
@@ -198,16 +197,18 @@ dependencies = [

 [[package]]
 name = "async_io_utilities"
-version = "0.1.3"
-source = "git+https://github.com/Majored/rs-async-io-utilities#6661a0fb914ccc1f97a6acd446bc03e9547d64fc"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b20cffc5590f4bf33f05f97a3ea587feba9c50d20325b401daa096b92ff7da0"
 dependencies = [
 "tokio",
 ]

 [[package]]
 name = "async_zip"
-version = "0.0.8"
-source = "git+https://github.com/dignifiedquire/rs-async-zip?branch=main#5556c5ac5e0bbc89e2d440291a9a6b77c74070aa"
+version = "0.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a36d43bdefc7215b2b3a97edd03b1553b7969ad76551025eedd3b913c645f6e"
 dependencies = [
 "async-compression",
 "async_io_utilities",
@@ -258,7 +259,7 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_urlencoded",
- "sha-1 0.10.0",
+ "sha-1",
 "sync_wrapper",
 "tokio",
 "tokio-tungstenite",
@@ -325,9 +326,9 @@ checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851"

 [[package]]
 name = "bitfield"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
+checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"

 [[package]]
 name = "bitflags"
@@ -341,7 +342,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding",
 "generic-array",
 ]

@@ -355,30 +355,22 @@ dependencies = [
 ]

 [[package]]
-name = "block-modes"
-version = "0.8.1"
+name = "block-padding"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"
+checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78"
 dependencies = [
- "block-padding",
- "cipher",
+ "generic-array",
 ]

-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "blowfish"
-version = "0.8.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab"
+checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
 dependencies = [
 "byteorder",
 "cipher",
- "opaque-debug",
 ]

 [[package]]
@@ -457,13 +449,11 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cast5"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f69790da27038b52ffcf09e7874e1aae353c674d65242549a733ad9372e7281f"
+checksum = "26b07d673db1ccf000e90f54b819db9e75a8348d6eb056e9b8ab53231b7a9911"
 dependencies = [
- "byteorder",
 "cipher",
- "opaque-debug",
 ]

 [[package]]
@@ -474,9 +464,9 @@ checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"

 [[package]]
 name = "cfb-mode"
-version = "0.7.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "750dfbb1b1f84475c1a92fed10fa5e76cb11adc0cda5225f137c5cac84e80860"
+checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330"
 dependencies = [
 "cipher",
 ]
@@ -514,19 +504,14 @@ dependencies = [

 [[package]]
 name = "cipher"
-version = "0.3.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
+checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
 dependencies = [
- "generic-array",
+ "crypto-common",
+ "inout",
 ]

-[[package]]
-name = "circular"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fc239e0f6cb375d2402d48afb92f76f5404fd1df208a41930ec81eda078bea"
-
 [[package]]
 name = "clap"
 version = "2.34.0"
@@ -538,15 +523,6 @@ dependencies = [
 "unicode-width",
 ]

-[[package]]
-name = "clear_on_drop"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38508a63f4979f0048febc9966fadbd48e5dab31fd0ec6a3f151bbf4a74f7423"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "clipboard-win"
 version = "4.4.2"
@@ -575,9 +551,9 @@ dependencies = [

 [[package]]
 name = "const-oid"
-version = "0.7.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
+checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661"

 [[package]]
 name = "convert_case"
@@ -718,16 +694,6 @@ dependencies = [
 "once_cell",
 ]

-[[package]]
-name = "crypto-bigint"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -773,16 +739,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "darling"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
-dependencies = [
- "darling_core 0.10.2",
- "darling_macro 0.10.2",
-]
-
 [[package]]
 name = "darling"
 version = "0.13.4"
@@ -803,20 +759,6 @@ dependencies = [
 "darling_macro 0.14.1",
 ]

-[[package]]
-name = "darling_core"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.9.3",
- "syn",
-]
-
 [[package]]
 name = "darling_core"
 version = "0.13.4"
@@ -827,7 +769,7 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim 0.10.0",
+ "strsim",
 "syn",
 ]

@@ -841,18 +783,7 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim 0.10.0",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
-dependencies = [
- "darling_core 0.10.2",
- "quote",
+ "strsim",
 "syn",
 ]

@@ -895,7 +826,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.99.0"
+version = "1.101.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -947,7 +878,7 @@ dependencies = [
 "sanitize-filename",
 "serde",
 "serde_json",
- "sha-1 0.10.0",
+ "sha-1",
 "sha2 0.10.6",
 "smallvec",
 "strum",
@@ -967,7 +898,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.99.0"
+version = "1.101.0"
 dependencies = [
 "anyhow",
 "async-channel",
@@ -977,6 +908,7 @@ dependencies = [
 "futures",
 "log",
 "num-traits",
+ "sanitize-filename",
 "serde",
 "serde_json",
 "tempfile",
@@ -986,6 +918,21 @@ dependencies = [
 "yerpc",
 ]

+[[package]]
+name = "deltachat-rpc-server"
+version = "1.101.0"
+dependencies = [
+ "anyhow",
+ "deltachat-jsonrpc",
+ "env_logger 0.9.1",
+ "futures-lite",
+ "log",
+ "serde",
+ "serde_json",
+ "tokio",
+ "yerpc",
+]
+
 [[package]]
 name = "deltachat_derive"
 version = "2.0.0"
@@ -996,7 +943,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.99.0"
+version = "1.101.0"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1013,49 +960,53 @@ dependencies = [

 [[package]]
 name = "der"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
+checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f"
 dependencies = [
 "const-oid",
- "crypto-bigint",
 "pem-rfc7468",
+ "zeroize",
 ]

 [[package]]
 name = "derive_builder"
-version = "0.9.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
+checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3"
 dependencies = [
- "darling 0.10.2",
- "derive_builder_core",
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
+dependencies = [
+ "darling 0.14.1",
 "proc-macro2",
 "quote",
 "syn",
 ]

 [[package]]
-name = "derive_builder_core"
-version = "0.9.0"
+name = "derive_builder_macro"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
+checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
- "darling 0.10.2",
- "proc-macro2",
- "quote",
+ "derive_builder_core",
 "syn",
 ]

 [[package]]
 name = "des"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d"
+checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e"
 dependencies = [
- "byteorder",
 "cipher",
- "opaque-debug",
 ]

 [[package]]
@@ -1074,6 +1025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
 dependencies = [
 "block-buffer 0.10.2",
+ "const-oid",
 "crypto-common",
 ]

@@ -1875,6 +1827,15 @@ dependencies = [
 "hashbrown 0.12.3",
 ]

+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -2087,13 +2048,11 @@ checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"

 [[package]]
 name = "md-5"
-version = "0.9.1"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15"
+checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
 dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug",
+ "digest 0.10.5",
 ]

 [[package]]
@@ -2434,9 +2393,9 @@ dependencies = [

 [[package]]
 name = "pem-rfc7468"
-version = "0.3.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30"
+checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac"
 dependencies = [
 "base64ct",
 ]
@@ -2449,14 +2408,13 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"

 [[package]]
 name = "pgp"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c63db779c3f090b540dfa0484f8adc2d380e3aa60cdb0f3a7a97454e22edc5"
+checksum = "991e3f098483f52c454c7cb16720adc010c2966a8845d3c34aad589cb86d3196"
 dependencies = [
 "aes",
 "base64 0.13.1",
 "bitfield",
- "block-modes",
 "block-padding",
 "blowfish",
 "buf_redux",
@@ -2465,17 +2423,14 @@ dependencies = [
 "cfb-mode",
 "chrono",
 "cipher",
- "circular",
- "clear_on_drop",
 "crc24",
 "derive_builder",
 "des",
- "digest 0.9.0",
+ "digest 0.10.5",
 "ed25519-dalek",
 "flate2",
 "generic-array",
 "hex",
- "lazy_static",
 "log",
 "md-5",
 "nom 4.2.3",
@@ -2483,10 +2438,10 @@ dependencies = [
 "num-derive",
 "num-traits",
 "rand 0.8.5",
- "ripemd160",
+ "ripemd",
 "rsa",
- "sha-1 0.9.8",
- "sha2 0.9.9",
+ "sha1",
+ "sha2 0.10.6",
 "sha3",
 "signature",
 "smallvec",
@@ -2530,24 +2485,24 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkcs1"
-version = "0.3.3"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320"
+checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719"
 dependencies = [
 "der",
 "pkcs8",
+ "spki",
 "zeroize",
 ]

 [[package]]
 name = "pkcs8"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 dependencies = [
 "der",
 "spki",
- "zeroize",
 ]

 [[package]]
@@ -2939,21 +2894,19 @@ dependencies = [
 ]

 [[package]]
-name = "ripemd160"
-version = "0.9.1"
+name = "ripemd"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
 dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug",
+ "digest 0.10.5",
 ]

 [[package]]
 name = "rsa"
-version = "0.6.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b"
+checksum = "b0ecc3307be66bfb3574577895555bacfb9a37a8d5cd959444b72ff02495c618"
 dependencies = [
 "byteorder",
 "digest 0.10.5",
@@ -2964,6 +2917,7 @@ dependencies = [
 "pkcs1",
 "pkcs8",
 "rand_core 0.6.3",
+ "signature",
 "smallvec",
 "subtle",
 "zeroize",
@@ -3171,19 +3125,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.10.0"
@@ -3195,6 +3136,17 @@ dependencies = [
 "digest 0.10.5",
 ]

+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.5",
+]
+
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -3221,14 +3173,12 @@ dependencies = [

 [[package]]
 name = "sha3"
-version = "0.9.1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
 dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
+ "digest 0.10.5",
 "keccak",
- "opaque-debug",
 ]

 [[package]]
@@ -3242,9 +3192,13 @@ dependencies = [

 [[package]]
 name = "signature"
-version = "1.5.0"
+version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest 0.10.5",
+ "rand_core 0.6.3",
+]

 [[package]]
 name = "slab"
@@ -3285,9 +3239,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
 name = "spki"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
 "base64ct",
 "der",
@@ -3317,12 +3271,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"

-[[package]]
-name = "strsim"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -3734,7 +3682,7 @@ dependencies = [
 "httparse",
 "log",
 "rand 0.8.5",
- "sha-1 0.10.0",
+ "sha-1",
 "thiserror",
 "url",
 "utf-8",
@@ -3742,13 +3690,11 @@ dependencies = [

 [[package]]
 name = "twofish"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728f6b7e784825d272fe9d2a77e44063f4197a570cbedc6fdcc90a6ddac91296"
+checksum = "a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013"
 dependencies = [
- "byteorder",
 "cipher",
- "opaque-debug",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "deltachat"
-version = "1.99.0"
+version = "1.101.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.56"
+rust-version = "1.57"

 [profile.dev]
 debug = 0
@@ -51,7 +51,7 @@ num-derive = "0.3"
 num-traits = "0.2"
 once_cell = "1.16.0"
 percent-encoding = "2.2"
-pgp = { version = "0.8", default-features = false }
+pgp = { version = "0.9", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
 quick-xml = "0.23"
 r2d2 = "0.8"
@@ -82,7 +82,7 @@ async-channel = "1.6.1"
 futures-lite = "1.12.0"
 tokio-stream = { version = "0.1.11", features = ["fs"] }
 reqwest = { version = "0.11.12", features = ["json"] }
-async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }
+async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }

 [dev-dependencies]
 ansi_term = "0.12.0"
@@ -98,7 +98,8 @@ tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"]
 members = [
  "deltachat-ffi",
  "deltachat_derive",
-  "deltachat-jsonrpc"
+  "deltachat-jsonrpc",
+  "deltachat-rpc-server"
 ]

 [[example]]
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.99.0"
+version = "1.101.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -2056,8 +2056,9 @@ char*           dc_get_contact_encrinfo      (dc_context_t* context, uint32_t co


 /**
- * Delete a contact. The contact is deleted from the local device. It may happen that this is not
- * possible as the contact is in use. In this case, the contact can be blocked.
+ * Delete a contact so that it disappears from the corresponding lists.
+ * Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
+ * The contact is deleted from the local device.
 *
 * May result in a #DC_EVENT_CONTACTS_CHANGED event.
 *
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -2144,7 +2144,10 @@ pub unsafe extern "C" fn dc_delete_contact(
    block_on(async move {
        match Contact::delete(ctx, contact_id).await {
            Ok(_) => 1,
-            Err(_) => 0,
+            Err(err) => {
+                error!(ctx, "cannot delete contact: {}", err);
+                0
+            }
        }
    })
 }
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.99.0"
+version = "1.101.0"
 description = "DeltaChat JSON-RPC API"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
@@ -25,11 +25,12 @@ serde_json = "1.0.87"
 yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
 typescript-type-def = { version = "0.5.3", features = ["json_value"] }
 tokio = { version = "1.21.2" }
+sanitize-filename = "0.4"
+walkdir = "2.3.2"

 # optional dependencies
 axum = { version = "0.5.17", optional = true, features = ["ws"] }
 env_logger = { version = "0.9.1", optional = true }
-walkdir = "2.3.2"

 [dev-dependencies]
 tokio = { version = "1.21.2", features = ["full", "rt-multi-thread"] }
--- a/deltachat-jsonrpc/src/api/mod.rs
+++ b/deltachat-jsonrpc/src/api/mod.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{anyhow, bail, ensure, Context, Result};
 use deltachat::{
    chat::{
        self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, marknoticed_chat,
@@ -22,6 +22,7 @@ use deltachat::{
    stock_str::StockMessage,
    webxdc::StatusUpdateSerial,
 };
+use sanitize_filename::is_sanitized;
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use std::{collections::HashMap, str::FromStr};
@@ -46,7 +47,7 @@ use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;

 use self::types::{
-    chat::{BasicChat, JSONRPCChatVisibility, MuteDuration},
+    chat::{BasicChat, JSONRPCChatVisibility, JSONRPCEncryptionModus, MuteDuration},
    location::JsonrpcLocation,
    message::{
        JSONRPCMessageListItem, MessageNotificationInfo, MessageSearchResult, MessageViewtype,
@@ -527,6 +528,8 @@ impl CommandApi {
        ChatId::new(chat_id).get_encryption_info(&ctx).await
    }

+
+
    /// Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
    /// The QR code is compatible to the OPENPGP4FPR format
    /// so that a basic fingerprint comparison also works e.g. with OpenKeychain.
@@ -556,6 +559,32 @@ impl CommandApi {
        ))
    }

+    async fn set_chat_encryption_modus(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        encryption_modus: JSONRPCEncryptionModus
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let chat = ChatId::new(chat_id);
+        Ok(chat.set_encryption_modus(&ctx, encryption_modus.into_core_type()).await?)
+    }
+
+    async fn get_chat_encryption_modus(
+        &self,
+        account_id: u32,
+        chat_id: u32
+    ) -> Result<Option<JSONRPCEncryptionModus>> {
+        let ctx = self.get_context(account_id).await?;
+        let chat = ChatId::new(chat_id);
+        Ok(
+            match chat.encryption_modus(&ctx).await? {
+                Some(encryption_modus) => Some(JSONRPCEncryptionModus::from_core_type(encryption_modus)),
+                None => None,
+            }
+        )
+    }
+
    /// Continue a Setup-Contact or Verified-Group-Invite protocol
    /// started on another device with `get_chat_securejoin_qr_code_svg()`.
    /// This function is typically called when `check_qr()` returns
@@ -1145,12 +1174,12 @@ impl CommandApi {
        Ok(contacts)
    }

-    async fn delete_contact(&self, account_id: u32, contact_id: u32) -> Result<bool> {
+    async fn delete_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        let contact_id = ContactId::new(contact_id);

        Contact::delete(&ctx, contact_id).await?;
-        Ok(true)
+        Ok(())
    }

    async fn change_contact_name(
@@ -1512,7 +1541,7 @@ impl CommandApi {
            .get_dbfile()
            .parent()
            .context("account folder not found")?;
-        let sticker_folder_path = account_folder.join("./stickers");
+        let sticker_folder_path = account_folder.join("stickers");
        fs::create_dir_all(&sticker_folder_path).await?;
        sticker_folder_path
            .to_str()
@@ -1520,15 +1549,55 @@ impl CommandApi {
            .context("path conversion to string failed")
    }

+    /// save a sticker to a collection/folder in the account's sticker folder
+    async fn misc_save_sticker(
+        &self,
+        account_id: u32,
+        msg_id: u32,
+        collection: String,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let message = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
+        ensure!(
+            message.get_viewtype() == Viewtype::Sticker,
+            "message {} is not a sticker",
+            msg_id
+        );
+        let account_folder = ctx
+            .get_dbfile()
+            .parent()
+            .context("account folder not found")?;
+        ensure!(
+            is_sanitized(&collection),
+            "illegal characters in collection name"
+        );
+        let destination_path = account_folder.join("stickers").join(collection);
+        fs::create_dir_all(&destination_path).await?;
+        let file = message.get_file(&ctx).context("no file")?;
+        fs::copy(
+            &file,
+            destination_path.join(format!(
+                "{}.{}",
+                msg_id,
+                file.extension()
+                    .unwrap_or_default()
+                    .to_str()
+                    .unwrap_or_default()
+            )),
+        )
+        .await?;
+        Ok(())
+    }
+
    /// for desktop, get stickers from stickers folder,
-    /// grouped by the folder they are in.
+    /// grouped by the collection/folder they are in.
    async fn misc_get_stickers(&self, account_id: u32) -> Result<HashMap<String, Vec<String>>> {
        let ctx = self.get_context(account_id).await?;
        let account_folder = ctx
            .get_dbfile()
            .parent()
            .context("account folder not found")?;
-        let sticker_folder_path = account_folder.join("./stickers");
+        let sticker_folder_path = account_folder.join("stickers");
        fs::create_dir_all(&sticker_folder_path).await?;
        let mut result = HashMap::new();

@@ -1674,8 +1743,11 @@ async fn set_config(
    if key.starts_with("ui.") {
        ctx.set_ui_config(key, value).await?;
    } else {
-        ctx.set_config(Config::from_str(key).context("unknown key")?, value)
-            .await?;
+        ctx.set_config(
+            Config::from_str(key).with_context(|| format!("unknown key {:?}", key))?,
+            value,
+        )
+        .await?;

        match key {
            "sentbox_watch" | "mvbox_move" | "only_fetch_mvbox" => {
@@ -1694,7 +1766,7 @@ async fn get_config(
    if key.starts_with("ui.") {
        ctx.get_ui_config(key).await
    } else {
-        ctx.get_config(Config::from_str(key).context("unknown key")?)
+        ctx.get_config(Config::from_str(key).with_context(|| format!("unknown key {:?}", key))?)
            .await
    }
 }
--- a/deltachat-jsonrpc/src/api/types/chat.rs
+++ b/deltachat-jsonrpc/src/api/types/chat.rs
@@ -2,7 +2,7 @@ use std::time::{Duration, SystemTime};

 use anyhow::{anyhow, bail, Result};
 use deltachat::chat::{self, get_chat_contacts, ChatVisibility};
-use deltachat::chat::{Chat, ChatId};
+use deltachat::chat::{Chat, ChatId, EncryptionModus};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
 use deltachat::context::Context;
@@ -211,3 +211,33 @@ impl JSONRPCChatVisibility {
        }
    }
 }
+
+
+#[derive(Clone, Serialize, Deserialize, TypeDef)]
+#[serde(rename = "EncryptionModus")]
+pub enum JSONRPCEncryptionModus {
+    Opportunistic = 0,
+    ForcePlaintext = 1,
+    ForceEncrypted = 2,
+    ForceVerified = 3,
+}
+
+impl JSONRPCEncryptionModus {
+    pub fn into_core_type(self) -> EncryptionModus {
+        match self {
+            JSONRPCEncryptionModus::Opportunistic => EncryptionModus::Opportunistic,
+            JSONRPCEncryptionModus::ForcePlaintext => EncryptionModus::ForcePlaintext,
+            JSONRPCEncryptionModus::ForceEncrypted => EncryptionModus::ForceEncrypted,
+            JSONRPCEncryptionModus::ForceVerified => EncryptionModus::ForceVerified
+        }
+    }
+
+    pub fn from_core_type(core_encryption_modus: EncryptionModus) -> Self {
+        match core_encryption_modus {
+            EncryptionModus::Opportunistic => JSONRPCEncryptionModus::Opportunistic,
+            EncryptionModus::ForcePlaintext => JSONRPCEncryptionModus::ForcePlaintext,
+            EncryptionModus::ForceEncrypted => JSONRPCEncryptionModus::ForceEncrypted,
+            EncryptionModus::ForceVerified => JSONRPCEncryptionModus::ForceVerified
+        }
+    }
+}
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -127,6 +127,7 @@ impl MessageObject {
                        override_sender_name: quote.get_override_sender_name(),
                        image: if quote.get_viewtype() == Viewtype::Image
                            || quote.get_viewtype() == Viewtype::Gif
+                            || quote.get_viewtype() == Viewtype::Sticker
                        {
                            match quote.get_file(context) {
                                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
--- a/deltachat-jsonrpc/typescript/generated/client.ts
+++ b/deltachat-jsonrpc/typescript/generated/client.ts
@@ -331,6 +331,16 @@ export class RawClient {
    return (this._transport.request('get_chat_securejoin_qr_code_svg', [accountId, chatId] as RPC.Params)) as Promise<[string,string]>;
  }

+
+  public setChatEncryptionModus(accountId: T.U32, chatId: T.U32, encryptionModus: T.EncryptionModus): Promise<null> {
+    return (this._transport.request('set_chat_encryption_modus', [accountId, chatId, encryptionModus] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getChatEncryptionModus(accountId: T.U32, chatId: T.U32): Promise<(T.EncryptionModus|null)> {
+    return (this._transport.request('get_chat_encryption_modus', [accountId, chatId] as RPC.Params)) as Promise<(T.EncryptionModus|null)>;
+  }
+
  /**
   * Continue a Setup-Contact or Verified-Group-Invite protocol
   * started on another device with `get_chat_securejoin_qr_code_svg()`.
@@ -730,8 +740,8 @@ export class RawClient {
  }


-  public deleteContact(accountId: T.U32, contactId: T.U32): Promise<boolean> {
-    return (this._transport.request('delete_contact', [accountId, contactId] as RPC.Params)) as Promise<boolean>;
+  public deleteContact(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('delete_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
  }


@@ -912,9 +922,16 @@ export class RawClient {
    return (this._transport.request('misc_get_sticker_folder', [accountId] as RPC.Params)) as Promise<string>;
  }

+  /**
+   * save a sticker to a collection/folder in the account's sticker folder
+   */
+  public miscSaveSticker(accountId: T.U32, msgId: T.U32, collection: string): Promise<null> {
+    return (this._transport.request('misc_save_sticker', [accountId, msgId, collection] as RPC.Params)) as Promise<null>;
+  }
+
  /**
   * for desktop, get stickers from stickers folder,
-   * grouped by the folder they are in.
+   * grouped by the collection/folder they are in.
   */
  public miscGetStickers(accountId: T.U32): Promise<Record<string,(string)[]>> {
    return (this._transport.request('misc_get_stickers', [accountId] as RPC.Params)) as Promise<Record<string,(string)[]>>;
--- a/deltachat-jsonrpc/typescript/generated/types.ts
+++ b/deltachat-jsonrpc/typescript/generated/types.ts
@@ -50,6 +50,7 @@ export type BasicChat=
 * used when you only need the basic metadata of a chat like type, name, profile picture
 */
 {"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"color":string;"isContactRequest":boolean;"isDeviceChat":boolean;"isMuted":boolean;};
+export type EncryptionModus=("Opportunistic"|"ForcePlaintext"|"ForceEncrypted"|"ForceVerified");
 export type ChatVisibility=("Normal"|"Archived"|"Pinned");
 export type MuteDuration=("NotMuted"|"Forever"|{"Until":I64;});
 export type MessageListItem=(({"kind":"message";}&{"msg_id":U32;})|({
@@ -195,4 +196,4 @@ export type MessageNotificationInfo={"id":U32;"chatId":U32;"accountId":U32;"imag
 export type MessageSearchResult={"id":U32;"authorProfileImage":(string|null);"authorName":string;"authorColor":string;"chatName":(string|null);"message":string;"timestamp":I64;};
 export type F64=number;
 export type Location={"locationId":U32;"isIndependent":boolean;"latitude":F64;"longitude":F64;"accuracy":F64;"timestamp":I64;"contactId":U32;"msgId":U32;"chatId":U32;"marker":(string|null);};
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],null,null,U32,null,U32,null,U32,Account,U32,U64,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,Record<U32,string>,null,U32,null,U32,null,U32,string,(string|null),null,U32,string,(string|null),null,U32,(U32)[],U32,U32,Usize,U32,boolean,I64,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,string,U32,U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,U32,(U32)[],U32,string,boolean,U32,U32,U32,U32,U32,string,null,U32,U32,(string|null),null,U32,U32,ChatVisibility,null,U32,U32,U32,null,U32,U32,U32,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,U32,(MessageListItem)[],U32,U32,Message,U32,U32,(string|null),U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,null,U32,string,(U32|null),(U32)[],U32,(U32)[],Record<U32,MessageSearchResult>,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,boolean,U32,U32,string,null,U32,U32,string,U32,string,(U32|null),U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],U32,string,(string|null),null,U32,string,(string|null),null,null,U32,U32,U32,string,U32,(U32|null),(U32|null),I64,I64,(Location)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,string,U32,U32,U32,(string)[],U32,U32,U32,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,Record<string,(string)[]>,U32,U32,string,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];
+export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],null,null,U32,null,U32,null,U32,Account,U32,U64,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,Record<U32,string>,null,U32,null,U32,null,U32,string,(string|null),null,U32,string,(string|null),null,U32,(U32)[],U32,U32,Usize,U32,boolean,I64,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,U32,EncryptionModus,null,U32,U32,(EncryptionModus|null),U32,string,U32,U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,U32,(U32)[],U32,string,boolean,U32,U32,U32,U32,U32,string,null,U32,U32,(string|null),null,U32,U32,ChatVisibility,null,U32,U32,U32,null,U32,U32,U32,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,U32,(MessageListItem)[],U32,U32,Message,U32,U32,(string|null),U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,null,U32,string,(U32|null),(U32)[],U32,(U32)[],Record<U32,MessageSearchResult>,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,null,U32,U32,string,null,U32,U32,string,U32,string,(U32|null),U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],U32,string,(string|null),null,U32,string,(string|null),null,null,U32,U32,U32,string,U32,(U32|null),(U32|null),I64,I64,(Location)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,string,U32,U32,U32,(string)[],U32,U32,U32,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,U32,string,null,U32,Record<string,(string)[]>,U32,U32,string,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -1,8 +1,8 @@
 {
  "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
  "dependencies": {
+    "@deltachat/tiny-emitter": "3.0.0",
    "isomorphic-ws": "^4.0.1",
-    "tiny-emitter": "git+https://github.com/Simon-Laux/tiny-emitter.git",
    "yerpc": "^0.3.3"
  },
  "devDependencies": {
@@ -41,12 +41,12 @@
    "prettier:check": "prettier --check **.ts",
    "prettier:fix": "prettier --write **.ts",
    "test": "run-s test:prepare test:run-coverage test:report-coverage",
-    "test:prepare": "cargo build --features webserver --bin deltachat-jsonrpc-server",
+    "test:prepare": "cargo build --package deltachat-rpc-server --bin deltachat-rpc-server",
    "test:report-coverage": "node report_api_coverage.mjs",
    "test:run": "mocha dist/test",
    "test:run-coverage": "COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include 'dist/*' -r text -r html -r json mocha dist/test"
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.99.0"
+  "version": "1.101.0"
 }
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -3,7 +3,7 @@ import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
 import { Event } from "../generated/events.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
-import { TinyEmitter } from "tiny-emitter";
+import { TinyEmitter } from "@deltachat/tiny-emitter";

 type DCWireEvent<T extends Event> = {
  event: T;
@@ -28,14 +28,14 @@ type ContextEvents = { ALL: (event: Event) => void } & {
 };

 export type DcEvent = Event;
-export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>
+export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>;

 export class BaseDeltaChat<
  Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
  rpc: RawClient;
  account?: T.Account;
-  private contextEmitters: TinyEmitter<ContextEvents>[] = [];
+  private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
  constructor(public transport: Transport) {
    super();
    this.rpc = new RawClient(this.transport);
@@ -43,12 +43,14 @@ export class BaseDeltaChat<
      const method = request.method;
      if (method === "event") {
        const event = request.params! as DCWireEvent<Event>;
+	//@ts-ignore
        this.emit(event.event.type, event.contextId, event.event as any);
        this.emit("ALL", event.contextId, event.event as any);

        if (this.contextEmitters[event.contextId]) {
          this.contextEmitters[event.contextId].emit(
            event.event.type,
+            //@ts-ignore
            event.event as any
          );
          this.contextEmitters[event.contextId].emit("ALL", event.event);
@@ -92,3 +94,34 @@ export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
    this.opts = opts;
  }
 }
+
+export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
+  close() {}
+  constructor(input: any, output: any) {
+    const transport = new StdioTransport(input, output);
+    super(transport);
+  }
+}
+
+export class StdioTransport extends BaseTransport {
+  constructor(public input: any, public output: any) {
+    super();
+
+    var buffer = "";
+    this.output.on("data", (data: any) => {
+      buffer += data.toString();
+      while (buffer.includes("\n")) {
+        const n = buffer.indexOf("\n");
+        const line = buffer.substring(0, n);
+        const message = JSON.parse(line);
+        this._onmessage(message);
+        buffer = buffer.substring(n + 1);
+      }
+    });
+  }
+
+  _send(message: RPC.Message): void {
+    const serialized = JSON.stringify(message);
+    this.input.write(serialized + "\n");
+  }
+}
--- a/deltachat-jsonrpc/typescript/test/basic.ts
+++ b/deltachat-jsonrpc/typescript/test/basic.ts
@@ -2,7 +2,7 @@ import { strictEqual } from "assert";
 import chai, { assert, expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
-import { DeltaChat } from "../deltachat.js";
+import { StdioDeltaChat as DeltaChat } from "../deltachat.js";

 import {
  RpcServerHandle,
@@ -15,9 +15,7 @@ describe("basic tests", () => {

  before(async () => {
    serverHandle = await startServer();
-    // make sure server is up by the time we continue
-    await new Promise((res) => setTimeout(res, 100));
-    dc = new DeltaChat(serverHandle.url)
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout)
    // dc.on("ALL", (event) => {
      //console.log("event", event);
    // });
--- a/deltachat-jsonrpc/typescript/test/online.ts
+++ b/deltachat-jsonrpc/typescript/test/online.ts
@@ -1,5 +1,5 @@
 import { assert, expect } from "chai";
-import { DeltaChat, DcEvent } from "../deltachat.js";
+import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
 import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";

 const EVENT_TIMEOUT = 20000;
@@ -27,7 +27,7 @@ describe("online tests", function () {
      this.skip();
    }
    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.url);
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);

    dc.on("ALL", (contextId, { type }) => {
      if (type !== "Info") console.log(contextId, type);
--- a/deltachat-jsonrpc/typescript/test/test_base.ts
+++ b/deltachat-jsonrpc/typescript/test/test_base.ts
@@ -1,39 +1,38 @@
 import { tmpdir } from "os";
 import { join, resolve } from "path";
 import { mkdtemp, rm } from "fs/promises";
-import { existsSync } from "fs";
 import { spawn, exec } from "child_process";
 import fetch from "node-fetch";
-
-export const RPC_SERVER_PORT = 20808;
+import { Readable, Writable } from "node:stream";

 export type RpcServerHandle = {
-  url: string,
-  close: () => Promise<void>
-}
+  stdin: Writable;
+  stdout: Readable;
+  close: () => Promise<void>;
+};

-export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcServerHandle> {
+export async function startServer(): Promise<RpcServerHandle> {
  const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));

-  const pathToServerBinary = resolve(join(await getTargetDir(), "debug/deltachat-jsonrpc-server"));
-  console.log('using server binary: ' + pathToServerBinary);
-
-  if (!existsSync(pathToServerBinary)) {
-    throw new Error(
-      "server executable does not exist, you need to build it first" +
-        "\nserver executable not found at " +
-        pathToServerBinary
-    );
-  }
+  const pathToServerBinary = resolve(
+    join(await getTargetDir(), "debug/deltachat-rpc-server")
+  );

  const server = spawn(pathToServerBinary, {
    cwd: tmpDir,
    env: {
      RUST_LOG: process.env.RUST_LOG || "info",
-      DC_PORT: '' + port,
-      RUST_MIN_STACK: "8388608"
+      RUST_MIN_STACK: "8388608",
    },
  });
+
+  server.on("error", (err) => {
+    throw new Error(
+      "Failed to start server executable " +
+        pathToServerBinary +
+        ", make sure you built it first."
+    );
+  });
  let shouldClose = false;

  server.on("exit", () => {
@@ -44,12 +43,10 @@ export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcSe
  });

  server.stderr.pipe(process.stderr);
-  server.stdout.pipe(process.stdout)
-
-  const url = `ws://localhost:${port}/ws`

  return {
-    url,
+    stdin: server.stdin,
+    stdout: server.stdout,
    close: async () => {
      shouldClose = true;
      if (!server.kill()) {
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "deltachat-rpc-server"
+version = "1.101.0"
+description = "DeltaChat JSON-RPC server"
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
+edition = "2021"
+readme = "README.md"
+license = "MPL-2.0"
+
+keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
+categories = ["cryptography", "std", "email"]
+
+[[bin]]
+name = "deltachat-rpc-server"
+
+[dependencies]
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc" }
+
+anyhow = "1"
+env_logger = { version = "0.9.1" }
+futures-lite = "1.12.0"
+log = "0.4"
+serde_json = "1.0.85"
+serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.21.2", features = ["io-std"] }
+yerpc = { version = "0.3.1", features = ["anyhow_expose"] }
--- a/deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs
+++ b/deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs
@@ -0,0 +1,68 @@
+///! Delta Chat core RPC server.
+///!
+///! It speaks JSON Lines over stdio.
+use std::path::PathBuf;
+
+use anyhow::Result;
+use deltachat_jsonrpc::api::events::event_to_json_rpc_notification;
+use deltachat_jsonrpc::api::{Accounts, CommandApi};
+use futures_lite::stream::StreamExt;
+use tokio::io::{self, AsyncBufReadExt, BufReader};
+use tokio::task::JoinHandle;
+use yerpc::{RpcClient, RpcSession};
+
+#[tokio::main(flavor = "multi_thread")]
+async fn main() -> Result<()> {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+
+    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
+    log::info!("Starting with accounts directory `{}`.", path);
+    let accounts = Accounts::new(PathBuf::from(&path)).await?;
+    let events = accounts.get_event_emitter();
+
+    log::info!("Creating JSON-RPC API.");
+    let state = CommandApi::new(accounts);
+
+    let (client, mut out_receiver) = RpcClient::new();
+    let session = RpcSession::new(client.clone(), state);
+
+    // Events task converts core events to JSON-RPC notifications.
+    let events_task: JoinHandle<Result<()>> = tokio::spawn(async move {
+        while let Some(event) = events.recv().await {
+            let event = event_to_json_rpc_notification(event);
+            client.send_notification("event", Some(event)).await?;
+        }
+        Ok(())
+    });
+
+    // Send task prints JSON responses to stdout.
+    let send_task: JoinHandle<anyhow::Result<()>> = tokio::spawn(async move {
+        while let Some(message) = out_receiver.next().await {
+            let message = serde_json::to_string(&message)?;
+            log::trace!("RPC send {}", message);
+            println!("{}", message);
+        }
+        Ok(())
+    });
+
+    // Receiver task reads JSON requests from stdin.
+    let recv_task: JoinHandle<anyhow::Result<()>> = tokio::spawn(async move {
+        let stdin = io::stdin();
+        let mut lines = BufReader::new(stdin).lines();
+        while let Some(message) = lines.next_line().await? {
+            log::trace!("RPC recv {}", message);
+            session.handle_incoming(&message).await;
+        }
+        log::info!("EOF reached on stdin");
+        Ok(())
+    });
+
+    // Wait for the end of stdin.
+    recv_task.await??;
+
+    // Shutdown the server.
+    send_task.abort();
+    events_task.abort();
+
+    Ok(())
+}
--- a/node/test/test.js
+++ b/node/test/test.js
@@ -616,7 +616,7 @@ describe('Offline Tests with unconfigured account', function () {
    const id = context.createContact('someuser', 'someuser@site.com')
    const contact = context.getContact(id)
    strictEqual(contact.getId(), id, 'contact id matches')
-    strictEqual(context.deleteContact(id), true, 'delete call succesful')
+    context.deleteContact(id)
    strictEqual(context.getContact(id), null, 'contact is gone')
  })

--- a/package.json
+++ b/package.json
@@ -60,5 +60,5 @@
    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.99.0"
+  "version": "1.101.0"
 }
--- a/python/tests/test_3_offline.py
+++ b/python/tests/test_3_offline.py
@@ -200,11 +200,11 @@ class TestOfflineContact:
        assert ac1.delete_contact(contact1)
        assert contact1 not in ac1.get_contacts()

-    def test_get_contacts_and_delete_fails(self, acfactory):
+    def test_delete_referenced_contact_hides_contact(self, acfactory):
        ac1 = acfactory.get_pseudo_configured_account()
        contact1 = ac1.create_contact("some1@example.com", name="some1")
        msg = contact1.create_chat().send_text("one message")
-        assert not ac1.delete_contact(contact1)
+        assert ac1.delete_contact(contact1)
        assert not msg.filemime

    def test_create_chat_flexibility(self, acfactory):
--- a/scripts/set_core_version.py
+++ b/scripts/set_core_version.py
@@ -63,8 +63,13 @@ def main():
    parser = ArgumentParser(prog="set_core_version")
    parser.add_argument("newversion")

-    toml_list = ["Cargo.toml", "deltachat-ffi/Cargo.toml",  "deltachat-jsonrpc/Cargo.toml"]
    json_list = ["package.json",  "deltachat-jsonrpc/typescript/package.json"]
+    toml_list = [
+        "Cargo.toml",
+        "deltachat-ffi/Cargo.toml",
+        "deltachat-jsonrpc/Cargo.toml",
+        "deltachat-rpc-server/Cargo.toml",
+    ]
    try:
        opts = parser.parse_args()
    except SystemExit:
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -75,6 +75,29 @@ pub enum ProtectionStatus {
    Protected = 1,
 }

+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    FromPrimitive,
+    ToPrimitive,
+    FromSql,
+    ToSql,
+    IntoStaticStr,
+    Serialize,
+    Deserialize,
+)]
+#[repr(u32)]
+pub enum EncryptionModus {
+    Opportunistic = 0,
+    ForcePlaintext = 1,
+    ForceEncrypted = 2,
+    ForceVerified = 3,
+}
+
 impl Default for ProtectionStatus {
    fn default() -> Self {
        ProtectionStatus::Unprotected
@@ -898,6 +921,38 @@ impl ChatId {
        Ok(ret.trim().to_string())
    }

+    /// This sets a protection modus for the chat and enforces that messages are only send if they
+    /// meet the encryption modus (ForcePlaintext, Opportunistic, ForceEncrypted, ForceVerified)
+    pub async fn set_encryption_modus(
+        self,
+        context: &Context,
+        modus: EncryptionModus,
+    ) -> Result<()> {
+        context
+            .sql
+            .execute(
+                "UPDATE chats SET encryption_modus=? WHERE id=?;",
+                paramsv![modus, self],
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    /// This sets a protection modus for the chat and enforces that messages are only send if they
+    /// meet the encryption modus (ForcePlaintext, Opportunistic, ForceEncrypted, ForceVerified)
+    pub async fn encryption_modus(self, context: &Context) -> Result<Option<EncryptionModus>> {
+        let encryption_modus: Option<EncryptionModus> = context
+            .sql
+            .query_get_value(
+                "SELECT encryption_modus FROM chats WHERE id=?;",
+                paramsv![self],
+            )
+            .await?;
+
+        Ok(encryption_modus)
+    }
+
    /// Bad evil escape hatch.
    ///
    /// Avoid using this, eventually types should be cleaned up enough
@@ -1944,6 +1999,14 @@ pub async fn is_contact_in_chat(
 //   the caller can get it from msg.chat_id.  Forwards would need to
 //   be fixed for this somehow too.
 pub async fn send_msg(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result<MsgId> {
+    // Propagate same encryption_mode of chat to message in case messages doesn't yet have an
+    // encryption_mode
+    if let None = msg.encryption_modus(&context).await? {
+        if let Some(encryption_mode) = chat_id.encryption_modus(&context).await? {
+            msg.set_encryption_modus(&context, encryption_mode).await?;
+        }
+    }
+
    if chat_id.is_unset() {
        let forwards = msg.param.get(Param::PrepForwards);
        if let Some(forwards) = forwards {
@@ -5649,4 +5712,27 @@ mod tests {

        Ok(())
    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_encryption_modus() -> Result<()> {
+        let t = TestContext::new_alice().await;
+        let contact_fiona = Contact::create(&t, "", "fiona@example.net").await?;
+        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "Group").await?;
+
+        assert_eq!(
+            chat_id.encryption_modus(&t).await?,
+            Some(EncryptionModus::Opportunistic)
+        );
+
+        chat_id
+            .set_encryption_modus(&t, EncryptionModus::ForceEncrypted)
+            .await?;
+
+        assert_eq!(
+            chat_id.encryption_modus(&t).await?,
+            Some(EncryptionModus::ForceEncrypted)
+        );
+
+        Ok(())
+    }
 }
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -229,7 +229,7 @@ pub enum Origin {
    /// set on Bob's side for contacts scanned and verified from a QR code. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling contact_is_verified() !
    SecurejoinJoined = 0x0200_0000,

-    /// contact added mannually by create_contact(), this should be the largest origin as otherwise the user cannot modify the names
+    /// contact added manually by create_contact(), this should be the largest origin as otherwise the user cannot modify the names
    ManuallyCreated = 0x0400_0000,
 }

@@ -455,7 +455,7 @@ impl Contact {
    /// - "row_authname": name as authorized from a contact, set only through a From-header
    /// Depending on the origin, both, "row_name" and "row_authname" are updated from "name".
    ///
-    /// Returns the contact_id and a `Modifier` value indicating if a modification occured.
+    /// Returns the contact_id and a `Modifier` value indicating if a modification occurred.
    pub(crate) async fn add_or_lookup(
        context: &Context,
        name: &str,
@@ -944,43 +944,36 @@ impl Contact {
        Ok(ret)
    }

-    /// Delete a contact. The contact is deleted from the local device. It may happen that this is not
-    /// possible as the contact is in use. In this case, the contact can be blocked.
+    /// Delete a contact so that it disappears from the corresponding lists.
+    /// Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
+    /// The contact is deleted from the local device.
    ///
    /// May result in a `#DC_EVENT_CONTACTS_CHANGED` event.
    pub async fn delete(context: &Context, contact_id: ContactId) -> Result<()> {
        ensure!(!contact_id.is_special(), "Can not delete special contact");

-        let count_chats = context
+        context
            .sql
-            .count(
-                "SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?;",
-                paramsv![contact_id],
-            )
+            .transaction(move |transaction| {
+                // make sure, the transaction starts with a write command and becomes EXCLUSIVE by that -
+                // upgrading later may be impossible by races.
+                let deleted_contacts = transaction.execute(
+                    "DELETE FROM contacts WHERE id=?
+                     AND (SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?)=0;",
+                    paramsv![contact_id, contact_id],
+                )?;
+                if deleted_contacts == 0 {
+                    transaction.execute(
+                        "UPDATE contacts SET origin=? WHERE id=?;",
+                        paramsv![Origin::Hidden, contact_id],
+                    )?;
+                }
+                Ok(())
+            })
            .await?;

-        if count_chats == 0 {
-            match context
-                .sql
-                .execute("DELETE FROM contacts WHERE id=?;", paramsv![contact_id])
-                .await
-            {
-                Ok(_) => {
-                    context.emit_event(EventType::ContactsChanged(None));
-                    return Ok(());
-                }
-                Err(err) => {
-                    error!(context, "delete_contact {} failed ({})", contact_id, err);
-                    return Err(err);
-                }
-            }
-        }
-
-        info!(
-            context,
-            "could not delete contact {}, there are {} chats with it", contact_id, count_chats
-        );
-        bail!("Could not delete contact with ongoing chats");
+        context.emit_event(EventType::ContactsChanged(None));
+        Ok(())
    }

    /// Get a single contact object.  For a list, see eg. get_contacts().
@@ -1524,7 +1517,7 @@ impl RecentlySeenLoop {
            if let Ok(duration) = until.duration_since(now) {
                info!(
                    context,
-                    "Recently seen loop waiting for {} or interupt",
+                    "Recently seen loop waiting for {} or interrupt",
                    duration_to_str(duration)
                );

@@ -1550,6 +1543,17 @@ impl RecentlySeenLoop {
                        unseen_queue.push((Reverse(timestamp + SEEN_RECENTLY_SECONDS), contact_id));
                    }
                }
+            } else {
+                info!(
+                    context,
+                    "Recently seen loop is not waiting, event is already due."
+                );
+
+                // Event is already in the past.
+                if let Some(contact_id) = contact_id {
+                    context.emit_event(EventType::ContactsChanged(Some(*contact_id)));
+                }
+                unseen_queue.pop();
            }
        }
    }
@@ -1727,7 +1731,7 @@ mod tests {
        );
        assert_eq!(Contact::add_address_book(&t, book).await.unwrap(), 4);

-        // check first added contact, this modifies authname beacuse it is empty
+        // check first added contact, this modifies authname because it is empty
        let (contact_id, sth_modified) =
            Contact::add_or_lookup(&t, "bla foo", "one@eins.org", Origin::IncomingUnknownTo)
                .await
@@ -1935,21 +1939,70 @@ mod tests {
        // Create Bob contact
        let (contact_id, _) =
            Contact::add_or_lookup(&alice, "Bob", "bob@example.net", Origin::ManuallyCreated)
-                .await
-                .unwrap();
-
+                .await?;
        let chat = alice
            .create_chat_with_contact("Bob", "bob@example.net")
            .await;
+        assert_eq!(
+            Contact::get_all(&alice, 0, Some("bob@example.net"))
+                .await?
+                .len(),
+            1
+        );

-        // Can't delete a contact with ongoing chats.
-        assert!(Contact::delete(&alice, contact_id).await.is_err());
+        // If a contact has ongoing chats, contact is only hidden on deletion
+        Contact::delete(&alice, contact_id).await?;
+        let contact = Contact::load_from_db(&alice, contact_id).await?;
+        assert_eq!(contact.origin, Origin::Hidden);
+        assert_eq!(
+            Contact::get_all(&alice, 0, Some("bob@example.net"))
+                .await?
+                .len(),
+            0
+        );

        // Delete chat.
        chat.get_id().delete(&alice).await?;

-        // Can delete contact now.
+        // Can delete contact physically now
        Contact::delete(&alice, contact_id).await?;
+        assert!(Contact::load_from_db(&alice, contact_id).await.is_err());
+        assert_eq!(
+            Contact::get_all(&alice, 0, Some("bob@example.net"))
+                .await?
+                .len(),
+            0
+        );
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_delete_and_recreate_contact() -> Result<()> {
+        let t = TestContext::new_alice().await;
+
+        // test recreation after physical deletion
+        let contact_id1 = Contact::create(&t, "Foo", "foo@bar.de").await?;
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
+        Contact::delete(&t, contact_id1).await?;
+        assert!(Contact::load_from_db(&t, contact_id1).await.is_err());
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);
+        let contact_id2 = Contact::create(&t, "Foo", "foo@bar.de").await?;
+        assert_ne!(contact_id2, contact_id1);
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
+
+        // test recreation after hiding
+        t.create_chat_with_contact("Foo", "foo@bar.de").await;
+        Contact::delete(&t, contact_id2).await?;
+        let contact = Contact::load_from_db(&t, contact_id2).await?;
+        assert_eq!(contact.origin, Origin::Hidden);
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);
+
+        let contact_id3 = Contact::create(&t, "Foo", "foo@bar.de").await?;
+        let contact = Contact::load_from_db(&t, contact_id3).await?;
+        assert_eq!(contact.origin, Origin::ManuallyCreated);
+        assert_eq!(contact_id3, contact_id2);
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);

        Ok(())
    }
--- a/src/context.rs
+++ b/src/context.rs
@@ -570,6 +570,10 @@ impl Context {
            .await?
            .unwrap_or_default();

+        let configured_inbox_folder = self
+            .get_config(Config::ConfiguredInboxFolder)
+            .await?
+            .unwrap_or_else(|| "<unset>".to_string());
        let configured_sentbox_folder = self
            .get_config(Config::ConfiguredSentboxFolder)
            .await?
@@ -641,6 +645,7 @@ impl Context {
        res.insert("mvbox_move", mvbox_move.to_string());
        res.insert("only_fetch_mvbox", only_fetch_mvbox.to_string());
        res.insert("folders_configured", folders_configured.to_string());
+        res.insert("configured_inbox_folder", configured_inbox_folder);
        res.insert("configured_sentbox_folder", configured_sentbox_folder);
        res.insert("configured_mvbox_folder", configured_mvbox_folder);
        res.insert("mdns_enabled", mdns_enabled.to_string());
--- a/src/download.rs
+++ b/src/download.rs
@@ -428,14 +428,14 @@ mod tests {
            .await?;
        alice.flush_status_updates().await?;
        let sent2 = alice.pop_sent_msg().await;
-        let sent2_rfc742_mid = Message::load_from_db(&alice, sent2.sender_msg_id)
+        let sent2_rfc724_mid = Message::load_from_db(&alice, sent2.sender_msg_id)
            .await?
            .rfc724_mid;

        // not downloading the status update results in an placeholder
        receive_imf_inner(
            &bob,
-            &sent2_rfc742_mid,
+            &sent2_rfc724_mid,
            sent2.payload().as_bytes(),
            false,
            Some(sent2.payload().len() as u32),
@@ -451,7 +451,7 @@ mod tests {
        // (usually status updates are too small for not being downloaded directly)
        receive_imf_inner(
            &bob,
-            &sent2_rfc742_mid,
+            &sent2_rfc724_mid,
            sent2.payload().as_bytes(),
            false,
            None,
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -494,6 +494,8 @@ impl Imap {
    }

    async fn disconnect(&mut self, context: &Context) {
+        info!(context, "disconnecting");
+
        // Close folder if messages should be expunged
        if let Err(err) = self.close_folder(context).await {
            warn!(context, "failed to close folder: {:?}", err);
@@ -778,8 +780,7 @@ impl Imap {
        let show_emails = ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?)
            .unwrap_or_default();
        let download_limit = context.download_limit().await?;
-        let mut uids_fetch_fully = Vec::with_capacity(msgs.len());
-        let mut uids_fetch_partially = Vec::with_capacity(msgs.len());
+        let mut uids_fetch = Vec::<(_, bool /* partially? */)>::with_capacity(msgs.len() + 1);
        let mut uid_message_ids = BTreeMap::new();
        let mut largest_uid_skipped = None;

@@ -838,14 +839,11 @@ impl Imap {
                .await?
            {
                match download_limit {
-                    Some(download_limit) => {
-                        if fetch_response.size.unwrap_or_default() > download_limit {
-                            uids_fetch_partially.push(uid);
-                        } else {
-                            uids_fetch_fully.push(uid)
-                        }
-                    }
-                    None => uids_fetch_fully.push(uid),
+                    Some(download_limit) => uids_fetch.push((
+                        uid,
+                        fetch_response.size.unwrap_or_default() > download_limit,
+                    )),
+                    None => uids_fetch.push((uid, false)),
                }
                uid_message_ids.insert(uid, message_id);
            } else {
@@ -853,33 +851,37 @@ impl Imap {
            }
        }

-        if !uids_fetch_fully.is_empty() || !uids_fetch_partially.is_empty() {
+        if !uids_fetch.is_empty() {
            self.connectivity.set_working(context).await;
        }

        // Actually download messages.
-        let (largest_uid_fully_fetched, mut received_msgs) = self
-            .fetch_many_msgs(
-                context,
-                folder,
-                uids_fetch_fully,
-                &uid_message_ids,
-                false,
-                fetch_existing_msgs,
-            )
-            .await?;
-
-        let (largest_uid_partially_fetched, received_msgs_2) = self
-            .fetch_many_msgs(
-                context,
-                folder,
-                uids_fetch_partially,
-                &uid_message_ids,
-                true,
-                fetch_existing_msgs,
-            )
-            .await?;
-        received_msgs.extend(received_msgs_2);
+        let mut largest_uid_fetched: u32 = 0;
+        let mut received_msgs = Vec::with_capacity(uids_fetch.len());
+        let mut uids_fetch_in_batch = Vec::with_capacity(max(uids_fetch.len(), 1));
+        let mut fetch_partially = false;
+        uids_fetch.push((0, !uids_fetch.last().unwrap_or(&(0, false)).1));
+        for (uid, fp) in uids_fetch {
+            if fp != fetch_partially {
+                let (largest_uid_fetched_in_batch, received_msgs_in_batch) = self
+                    .fetch_many_msgs(
+                        context,
+                        folder,
+                        uids_fetch_in_batch.split_off(0),
+                        &uid_message_ids,
+                        fetch_partially,
+                        fetch_existing_msgs,
+                    )
+                    .await?;
+                received_msgs.extend(received_msgs_in_batch);
+                largest_uid_fetched = max(
+                    largest_uid_fetched,
+                    largest_uid_fetched_in_batch.unwrap_or(0),
+                );
+                fetch_partially = fp;
+            }
+            uids_fetch_in_batch.push(uid);
+        }

        // determine which uid_next to use to update to
        // receive_imf() returns an `Err` value only on recoverable errors, otherwise it just logs an error.
@@ -887,13 +889,7 @@ impl Imap {

        // So: Update the uid_next to the largest uid that did NOT recoverably fail. Not perfect because if there was
        // another message afterwards that succeeded, we will not retry. The upside is that we will not retry an infinite amount of times.
-        let largest_uid_without_errors = max(
-            max(
-                largest_uid_fully_fetched.unwrap_or(0),
-                largest_uid_partially_fetched.unwrap_or(0),
-            ),
-            largest_uid_skipped.unwrap_or(0),
-        );
+        let largest_uid_without_errors = max(largest_uid_fetched, largest_uid_skipped.unwrap_or(0));
        let new_uid_next = largest_uid_without_errors + 1;

        if new_uid_next > old_uid_next {
@@ -1947,15 +1943,20 @@ fn get_folder_meaning_by_name(folder_name: &str) -> FolderMeaning {

 fn get_folder_meaning(folder_name: &Name) -> FolderMeaning {
    for attr in folder_name.attributes() {
-        if let NameAttribute::Extension(ref label) = attr {
-            match label.as_ref() {
-                "\\Trash" => return FolderMeaning::Other,
-                "\\Sent" => return FolderMeaning::Sent,
-                "\\Spam" | "\\Junk" => return FolderMeaning::Spam,
-                "\\Drafts" => return FolderMeaning::Drafts,
-                "\\All" | "\\Important" | "\\Flagged" => return FolderMeaning::Virtual,
-                _ => {}
-            };
+        match attr {
+            NameAttribute::Trash => return FolderMeaning::Other,
+            NameAttribute::Sent => return FolderMeaning::Sent,
+            NameAttribute::Junk => return FolderMeaning::Spam,
+            NameAttribute::Drafts => return FolderMeaning::Drafts,
+            NameAttribute::All | NameAttribute::Flagged => return FolderMeaning::Virtual,
+            NameAttribute::Extension(ref label) => {
+                match label.as_ref() {
+                    "\\Spam" => return FolderMeaning::Spam,
+                    "\\Important" => return FolderMeaning::Virtual,
+                    _ => {}
+                };
+            }
+            _ => {}
        }
    }
    FolderMeaning::Unknown
--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -54,10 +54,10 @@ impl Imap {
                Interrupt(InterruptInfo),
            }

+            let folder_name = watch_folder.as_deref().unwrap_or("None");
            info!(
                context,
-                "{}: Idle entering wait-on-remote state",
-                watch_folder.as_deref().unwrap_or("None")
+                "{}: Idle entering wait-on-remote state", folder_name
            );
            let fut = idle_wait.map(|ev| ev.map(Event::IdleResponse)).race(async {
                let info = self.idle_interrupt.recv().await;
@@ -70,26 +70,36 @@ impl Imap {

            match fut.await {
                Ok(Event::IdleResponse(IdleResponse::NewData(x))) => {
-                    info!(context, "Idle has NewData {:?}", x);
+                    info!(context, "{}: Idle has NewData {:?}", folder_name, x);
                }
                Ok(Event::IdleResponse(IdleResponse::Timeout)) => {
-                    info!(context, "Idle-wait timeout or interruption");
+                    info!(
+                        context,
+                        "{}: Idle-wait timeout or interruption", folder_name
+                    );
                }
                Ok(Event::IdleResponse(IdleResponse::ManualInterrupt)) => {
-                    info!(context, "Idle wait was interrupted");
+                    info!(
+                        context,
+                        "{}: Idle wait was interrupted manually", folder_name
+                    );
                }
                Ok(Event::Interrupt(i)) => {
+                    info!(
+                        context,
+                        "{}: Idle wait was interrupted: {:?}", folder_name, &i
+                    );
                    info = i;
-                    info!(context, "Idle wait was interrupted");
                }
                Err(err) => {
-                    warn!(context, "Idle wait errored: {:?}", err);
+                    warn!(context, "{}: Idle wait errored: {:?}", folder_name, err);
                }
            }

            let session = tokio::time::timeout(Duration::from_secs(15), handle.done())
-                .await?
-                .context("IMAP IDLE protocol timed out")?;
+                .await
+                .with_context(|| format!("{}: IMAP IDLE protocol timed out", folder_name))?
+                .with_context(|| format!("{}: IMAP IDLE failed", folder_name))?;
            self.session = Some(Session { inner: session });
        } else {
            warn!(context, "Attempted to idle without a session");
@@ -173,6 +183,7 @@ impl Imap {
                }
                Event::Interrupt(info) => {
                    // Interrupt
+                    info!(context, "Fake IDLE interrupted");
                    break info;
                }
            }
--- a/src/imap/select_folder.rs
+++ b/src/imap/select_folder.rs
@@ -19,35 +19,31 @@ pub enum Error {
    #[error("Got a NO response when trying to select {0}, usually this means that it doesn't exist: {1}")]
    NoFolder(String, String),

-    #[error("IMAP close/expunge failed")]
-    CloseExpungeFailed(#[from] async_imap::error::Error),
-
    #[error("IMAP other error: {0}")]
    Other(String),
 }

+impl From<anyhow::Error> for Error {
+    fn from(err: anyhow::Error) -> Error {
+        Error::Other(format!("{:#}", err))
+    }
+}
+
 impl Imap {
    /// Issues a CLOSE command to expunge selected folder.
    ///
    /// CLOSE is considerably faster than an EXPUNGE, see
    /// <https://tools.ietf.org/html/rfc3501#section-6.4.2>
-    pub(super) async fn close_folder(&mut self, context: &Context) -> Result<()> {
+    pub(super) async fn close_folder(&mut self, context: &Context) -> anyhow::Result<()> {
        if let Some(ref folder) = self.config.selected_folder {
            info!(context, "Expunge messages in \"{}\".", folder);

-            if let Some(ref mut session) = self.session {
-                match session.close().await {
-                    Ok(_) => {
-                        info!(context, "close/expunge succeeded");
-                    }
-                    Err(err) => {
-                        self.trigger_reconnect(context).await;
-                        return Err(Error::CloseExpungeFailed(err));
-                    }
-                }
-            } else {
-                return Err(Error::NoSession);
+            let session = self.session.as_mut().context("no session")?;
+            if let Err(err) = session.close().await.context("IMAP close/expunge failed") {
+                self.trigger_reconnect(context).await;
+                return Err(err);
            }
+            info!(context, "close/expunge succeeded");
        }
        self.config.selected_folder = None;
        self.config.selected_folder_needs_expunge = false;
@@ -56,7 +52,7 @@ impl Imap {
    }

    /// Issues a CLOSE command if selected folder needs expunge.
-    pub(crate) async fn maybe_close_folder(&mut self, context: &Context) -> Result<()> {
+    pub(crate) async fn maybe_close_folder(&mut self, context: &Context) -> anyhow::Result<()> {
        if self.config.selected_folder_needs_expunge {
            self.close_folder(context).await?;
        }
--- a/src/message.rs
+++ b/src/message.rs
@@ -8,6 +8,7 @@ use deltachat_derive::{FromSql, ToSql};
 use rusqlite::types::ValueRef;
 use serde::{Deserialize, Serialize};

+use crate::chat::EncryptionModus;
 use crate::chat::{self, Chat, ChatId};
 use crate::config::Config;
 use crate::constants::{
@@ -302,6 +303,7 @@ impl Message {
                    "    m.hidden AS hidden,",
                    "    m.location_id AS location,",
                    "    c.blocked AS blocked",
+                    "    m.encryption_modus as encryption_modus",
                    " FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id",
                    " WHERE m.id=?;"
                ),
@@ -848,10 +850,39 @@ impl Message {
    }

    /// Force the message to be sent in plain text.
+    /// Deprecated: use Message::set_encryption_modus(EncryptionModus::ForcePlaintext)
    pub fn force_plaintext(&mut self) {
        self.param.set_int(Param::ForcePlaintext, 1);
    }

+    pub async fn set_encryption_modus(
+        &mut self,
+        context: &Context,
+        encryption_modus: EncryptionModus,
+    ) -> Result<()> {
+        context
+            .sql
+            .execute(
+                "UPDATE msgs SET encryption_modus=? WHERE id=?;",
+                paramsv![encryption_modus, self.id],
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    pub async fn encryption_modus(&self, context: &Context) -> Result<Option<EncryptionModus>> {
+        let encryption_modus: Option<EncryptionModus> = context
+            .sql
+            .query_get_value(
+                "SELECT encryption_modus FROM msgs WHERE id=?;",
+                paramsv![self.id],
+            )
+            .await?;
+
+        Ok(encryption_modus)
+    }
+
    pub async fn update_param(&self, context: &Context) -> Result<()> {
        context
            .sql
@@ -1122,6 +1153,28 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String> {
    }
    if !msg.rfc724_mid.is_empty() {
        ret += &format!("\nMessage-ID: {}", msg.rfc724_mid);
+
+        let server_uids = context
+            .sql
+            .query_map(
+                "SELECT folder, uid FROM imap WHERE rfc724_mid=?",
+                paramsv![msg.rfc724_mid],
+                |row| {
+                    let folder: String = row.get("folder")?;
+                    let uid: u32 = row.get("uid")?;
+                    Ok((folder, uid))
+                },
+                |rows| {
+                    rows.collect::<std::result::Result<Vec<_>, _>>()
+                        .map_err(Into::into)
+                },
+            )
+            .await?;
+
+        for (folder, uid) in server_uids {
+            // Format as RFC 5092 relative IMAP URL.
+            ret += &format!("\n</{}/;UID={}>", folder, uid);
+        }
    }
    let hop_info: Option<String> = context
        .sql
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -9,6 +9,7 @@ use tokio::fs;

 use crate::blob::BlobObject;
 use crate::chat::Chat;
+use crate::chat::EncryptionModus;
 use crate::config::Config;
 use crate::constants::{Chattype, DC_FROM_HANDSHAKE};
 use crate::contact::Contact;
@@ -324,7 +325,7 @@ impl<'a> MimeFactory<'a> {
        }
    }

-    fn should_force_plaintext(&self) -> bool {
+    fn should_force_plaintext(&self, encryption_modus: &EncryptionModus) -> bool {
        match &self.loaded {
            Loaded::Message { chat } => {
                if chat.is_protected() {
@@ -333,6 +334,8 @@ impl<'a> MimeFactory<'a> {
                    // encryption may disclose recipients;
                    // this is probably a worse issue than not opportunistically (!) encrypting
                    true
+                } else if encryption_modus == &EncryptionModus::ForcePlaintext {
+                    true
                } else {
                    self.msg
                        .param
@@ -602,7 +605,11 @@ impl<'a> MimeFactory<'a> {

        let min_verified = self.min_verified();
        let grpimage = self.grpimage();
-        let force_plaintext = self.should_force_plaintext();
+        let encryption_modus = match self.msg.encryption_modus(context).await? {
+            Some(encryption_modus) => encryption_modus,
+            None => EncryptionModus::Opportunistic,
+        };
+        let force_plaintext = self.should_force_plaintext(&encryption_modus);
        let skip_autocrypt = self.should_skip_autocrypt();
        let e2ee_guaranteed = self.is_e2ee_guaranteed();
        let encrypt_helper = EncryptHelper::new(context).await?;
@@ -644,6 +651,34 @@ impl<'a> MimeFactory<'a> {
            encrypt_helper.should_encrypt(context, e2ee_guaranteed, &peerstates)?;
        let is_encrypted = should_encrypt && !force_plaintext;

+        // Ensure we fulfill encryption_modus
+        match encryption_modus {
+            EncryptionModus::Opportunistic => {}
+            EncryptionModus::ForcePlaintext => {
+                ensure!(
+                    !is_encrypted,
+                    "EncryptionModus is ForcePlaintext but message is encrypted"
+                );
+            }
+            EncryptionModus::ForceEncrypted => {
+                ensure!(
+                    is_encrypted,
+                    "EncryptionModus is ForceEncrypted but message is unencrypted"
+                );
+            }
+            EncryptionModus::ForceVerified => {
+                let chat_is_protected = if let Loaded::Message { chat } = &self.loaded {
+                    chat.is_protected()
+                } else {
+                    false
+                };
+                ensure!(
+                    is_encrypted && chat_is_protected,
+                    "EncryptionModus is ForceVerified but chat is not protected"
+                );
+            }
+        };
+
        let message = if parts.is_empty() {
            // Single part, render as regular message.
            main_part
--- a/src/param.rs
+++ b/src/param.rs
@@ -51,6 +51,7 @@ pub enum Param {
    ErroneousE2ee = b'e',

    /// For Messages: force unencrypted message, a value from `ForcePlaintext` enum.
+    /// Deprecated: Use EncryptionModus::ForcePlaintext
    ForcePlaintext = b'u',

    /// For Messages: do not include Autocrypt header.
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -166,112 +166,117 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
        .await;
 }

-async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> InterruptInfo {
-    match ctx.get_config(folder).await {
-        Ok(Some(watch_folder)) => {
-            // connect and fake idle if unable to connect
-            if let Err(err) = connection.prepare(ctx).await {
-                warn!(ctx, "imap connection failed: {}", err);
-                return connection.fake_idle(ctx, Some(watch_folder)).await;
-            }
-
-            if folder == Config::ConfiguredInboxFolder {
-                if let Err(err) = connection
-                    .store_seen_flags_on_imap(ctx)
-                    .await
-                    .context("store_seen_flags_on_imap failed")
-                {
-                    warn!(ctx, "{:#}", err);
-                }
-            }
-
-            // Fetch the watched folder.
-            if let Err(err) = connection
-                .fetch_move_delete(ctx, &watch_folder, false)
-                .await
-            {
-                connection.trigger_reconnect(ctx).await;
-                warn!(ctx, "{:#}", err);
-                return InterruptInfo::new(false);
-            }
-
-            // Mark expired messages for deletion. Marked messages will be deleted from the server
-            // on the next iteration of `fetch_move_delete`. `delete_expired_imap_messages` is not
-            // called right before `fetch_move_delete` because it is not well optimized and would
-            // otherwise slow down message fetching.
-            if let Err(err) = delete_expired_imap_messages(ctx)
-                .await
-                .context("delete_expired_imap_messages failed")
-            {
-                warn!(ctx, "{:#}", err);
-            }
-
-            // Scan additional folders only after finishing fetching the watched folder.
-            //
-            // On iOS the application has strictly limited time to work in background, so we may not
-            // be able to scan all folders before time is up if there are many of them.
-            if folder == Config::ConfiguredInboxFolder {
-                // Only scan on the Inbox thread in order to prevent parallel scans, which might lead to duplicate messages
-                match connection.scan_folders(ctx).await {
-                    Err(err) => {
-                        // Don't reconnect, if there is a problem with the connection we will realize this when IDLEing
-                        // but maybe just one folder can't be selected or something
-                        warn!(ctx, "{}", err);
-                    }
-                    Ok(true) => {
-                        // Fetch the watched folder again in case scanning other folder moved messages
-                        // there.
-                        //
-                        // In most cases this will select the watched folder and return because there are
-                        // no new messages. We want to select the watched folder anyway before going IDLE
-                        // there, so this does not take additional protocol round-trip.
-                        if let Err(err) = connection
-                            .fetch_move_delete(ctx, &watch_folder, false)
-                            .await
-                        {
-                            connection.trigger_reconnect(ctx).await;
-                            warn!(ctx, "{:#}", err);
-                            return InterruptInfo::new(false);
-                        }
-                    }
-                    Ok(false) => {}
-                }
-            }
-
-            // Synchronize Seen flags.
-            connection
-                .sync_seen_flags(ctx, &watch_folder)
-                .await
-                .context("sync_seen_flags")
-                .ok_or_log(ctx);
-
-            connection.connectivity.set_connected(ctx).await;
-
-            // idle
-            if connection.can_idle() {
-                match connection.idle(ctx, Some(watch_folder)).await {
-                    Ok(v) => v,
-                    Err(err) => {
-                        connection.trigger_reconnect(ctx).await;
-                        warn!(ctx, "{}", err);
-                        InterruptInfo::new(false)
-                    }
-                }
-            } else {
-                connection.fake_idle(ctx, Some(watch_folder)).await
-            }
-        }
-        Ok(None) => {
-            connection.connectivity.set_not_configured(ctx).await;
-            info!(ctx, "Can not watch {} folder, not set", folder);
-            connection.fake_idle(ctx, None).await
-        }
+async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config) -> InterruptInfo {
+    let folder = match ctx.get_config(folder_config).await {
+        Ok(folder) => folder,
        Err(err) => {
            warn!(
                ctx,
-                "Can not watch {} folder, failed to retrieve config: {:?}", folder, err
+                "Can not watch {} folder, failed to retrieve config: {:#}", folder_config, err
            );
-            connection.fake_idle(ctx, None).await
+            return connection.fake_idle(ctx, None).await;
+        }
+    };
+
+    let watch_folder = if let Some(watch_folder) = folder {
+        watch_folder
+    } else {
+        connection.connectivity.set_not_configured(ctx).await;
+        info!(ctx, "Can not watch {} folder, not set", folder_config);
+        return connection.fake_idle(ctx, None).await;
+    };
+
+    // connect and fake idle if unable to connect
+    if let Err(err) = connection.prepare(ctx).await {
+        warn!(ctx, "imap connection failed: {}", err);
+        return connection.fake_idle(ctx, Some(watch_folder)).await;
+    }
+
+    if folder_config == Config::ConfiguredInboxFolder {
+        if let Err(err) = connection
+            .store_seen_flags_on_imap(ctx)
+            .await
+            .context("store_seen_flags_on_imap failed")
+        {
+            warn!(ctx, "{:#}", err);
+        }
+    }
+
+    // Fetch the watched folder.
+    if let Err(err) = connection
+        .fetch_move_delete(ctx, &watch_folder, false)
+        .await
+        .context("fetch_move_delete")
+    {
+        connection.trigger_reconnect(ctx).await;
+        warn!(ctx, "{:#}", err);
+        return InterruptInfo::new(false);
+    }
+
+    // Mark expired messages for deletion. Marked messages will be deleted from the server
+    // on the next iteration of `fetch_move_delete`. `delete_expired_imap_messages` is not
+    // called right before `fetch_move_delete` because it is not well optimized and would
+    // otherwise slow down message fetching.
+    if let Err(err) = delete_expired_imap_messages(ctx)
+        .await
+        .context("delete_expired_imap_messages")
+    {
+        warn!(ctx, "{:#}", err);
+    }
+
+    // Scan additional folders only after finishing fetching the watched folder.
+    //
+    // On iOS the application has strictly limited time to work in background, so we may not
+    // be able to scan all folders before time is up if there are many of them.
+    if folder_config == Config::ConfiguredInboxFolder {
+        // Only scan on the Inbox thread in order to prevent parallel scans, which might lead to duplicate messages
+        match connection.scan_folders(ctx).await.context("scan_folders") {
+            Err(err) => {
+                // Don't reconnect, if there is a problem with the connection we will realize this when IDLEing
+                // but maybe just one folder can't be selected or something
+                warn!(ctx, "{:#}", err);
+            }
+            Ok(true) => {
+                // Fetch the watched folder again in case scanning other folder moved messages
+                // there.
+                //
+                // In most cases this will select the watched folder and return because there are
+                // no new messages. We want to select the watched folder anyway before going IDLE
+                // there, so this does not take additional protocol round-trip.
+                if let Err(err) = connection
+                    .fetch_move_delete(ctx, &watch_folder, false)
+                    .await
+                    .context("fetch_move_delete after scan_folders")
+                {
+                    connection.trigger_reconnect(ctx).await;
+                    warn!(ctx, "{:#}", err);
+                    return InterruptInfo::new(false);
+                }
+            }
+            Ok(false) => {}
+        }
+    }
+
+    // Synchronize Seen flags.
+    connection
+        .sync_seen_flags(ctx, &watch_folder)
+        .await
+        .context("sync_seen_flags")
+        .ok_or_log(ctx);
+
+    connection.connectivity.set_connected(ctx).await;
+
+    // idle
+    if !connection.can_idle() {
+        return connection.fake_idle(ctx, Some(watch_folder)).await;
+    }
+
+    match connection.idle(ctx, Some(watch_folder)).await {
+        Ok(v) => v,
+        Err(err) => {
+            connection.trigger_reconnect(ctx).await;
+            warn!(ctx, "{:#}", err);
+            InterruptInfo::new(false)
        }
    }
 }
@@ -280,11 +285,11 @@ async fn simple_imap_loop(
    ctx: Context,
    started: Sender<()>,
    inbox_handlers: ImapConnectionHandlers,
-    folder: Config,
+    folder_config: Config,
 ) {
    use futures::future::FutureExt;

-    info!(ctx, "starting simple loop for {}", folder.as_ref());
+    info!(ctx, "starting simple loop for {}", folder_config);
    let ImapConnectionHandlers {
        mut connection,
        stop_receiver,
@@ -300,7 +305,7 @@ async fn simple_imap_loop(
        }

        loop {
-            fetch_idle(&ctx, &mut connection, folder).await;
+            fetch_idle(&ctx, &mut connection, folder_config).await;
        }
    };

--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -10,7 +10,7 @@ use crate::provider::get_provider_by_domain;
 use crate::sql::Sql;
 use crate::tools::EmailAddress;

-const DBVERSION: i32 = 68;
+const DBVERSION: i32 = 69;
 const VERSION_CFG: &str = "dbversion";
 const TABLES: &str = include_str!("./tables.sql");

@@ -616,6 +616,15 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        )
        .await?;
    }
+    if dbversion < 94 {
+        sql.execute_migration(
+            r#"
+ALTER TABLE chats ADD COLUMN encryption_modus INTEGER DEFAULT 0;
+ALTER TABLE msgs ADD COLUMN encryption_modus INTEGER DEFAULT 0;"#,
+            94,
+        )
+        .await?;
+    }

    let new_version = sql
        .get_raw_config_int(VERSION_CFG)
Author	SHA1	Message	Date
jikstra	41a87a0626	Use sql migration over direct tables.sql modification	2022-12-01 15:15:04 +01:00
jikstra	d5faf75f56	Fix test_encryption_modus()	2022-12-01 13:50:20 +01:00
jikstra	e3ff786eb7	Add {get, set}_chat_encryption_mods() methdos to jsonrpc	2022-11-29 23:37:30 +01:00
jikstra	540cc8b205	Fix warning of unused result	2022-11-29 23:34:46 +01:00
jikstra	7533f863d1	- Don't pass EncryptionModus by reference - rename get_encryption_modus() to encryption_modus()	2022-11-18 03:06:40 +01:00
jikstra	bc4eea0c28	cargo fmt	2022-11-18 02:44:19 +01:00
jikstra	d8844a0524	Propagate encryption_mode from Chat to Message	2022-11-18 02:44:02 +01:00
jikstra	a714a4c2da	- Add encryption_modus field for msgs table and expose getters/setters on Message - Mind the encryption modus in RenderedEmail	2022-11-18 01:26:08 +01:00
jikstra	cb03e93570	Start working on encryption_modus	2022-11-17 22:32:16 +01:00
iequidoo	25be8ccd05	fetch_new_messages(): fetch messages sequentially (#3688 ) If we fetch messages out of order, then f.e. reactions don't work because if we process a reaction not yet having the corresponding message processed, the reaction is thrown away.	2022-11-17 15:51:59 -03:00
link2xt	da6c68629d	jsonrpc: do not return a result from deleteContact() It was always true anyway.	2022-11-17 18:36:38 +00:00
link2xt	b63baf939e	Ignore two typescript errors `as any` is not enough anymore.	2022-11-16 14:06:17 +00:00
link2xt	90d8e0cedc	Fix detection of Trash, Junk, All etc. folders imap_proto has been updated, so attributes like `\All`, `\Junk` from RFC 3501 and RFC 6154 are no longer considered extensions.	2022-11-15 23:40:07 +00:00
link2xt	1c2d4c518e	Fix typos	2022-11-15 23:23:44 +00:00
bjoern	0c030e811f	prepare 1.101.0 (#3757 ) * update changelog for core101 * bump version to 1.101.0	2022-11-15 16:08:29 +01:00
link2xt	428ef11157	Add IMAP UIDs to message info (#3755 )	2022-11-15 15:19:32 +01:00
link2xt	ee34b64f5d	Pop recently seen loop event out of the queue when it's in the past	2022-11-15 11:29:13 +00:00
bjoern	c1f9d8f7a1	allow deleting referenced contacts in UI (#3751 ) * allow deleting referenced contacts in UI we are quite often getting requests of users who want to get rid of some contact in the "new chat" list. there is already a "delete" option, but it does not work for referenced contacts - however, it is not obvious for users that a contact is in use, esp. of some mailing list or larger chat, old contacts, whatever. this pr revives an old idea [^1] of "soft deleting" referenced contacts - this way, the user can remove the annoying entry without the need to understand complicated things and finally saying that deletion is impossible :) once the contact is reused, it will reappear, however, this is already explained in the confirmation dialog of the UIs. technically, this pr was simpler as expected as we already have a Origin::Hidden, that is just reused here. [^1]: https://github.com/deltachat/deltachat-core/pull/542 * update rust doccomment * update changelog * avoid races on contact deletion chats may be created between checking for "no chats" and contact deletion. this is prevented by putting the statement into an EXCLUSIVE transaction. * fix failing python test	2022-11-15 11:02:47 +01:00
link2xt	996be5d247	Improve IMAP logging https://github.com/deltachat/deltachat-core-rust/pull/3749	2022-11-14 11:41:52 +00:00
link2xt	7d45419724	Convert anyhow errors to select_folder errors with alternate fmt	2022-11-14 11:40:40 +00:00
link2xt	c0ae5c0fb7	Use anyhow for close_folder() errors	2022-11-13 23:49:34 +00:00
link2xt	09042d12d4	Changelog	2022-11-13 20:35:05 +00:00
link2xt	7db147da14	Log fake IDLE interruptions	2022-11-13 20:35:05 +00:00
link2xt	1324b5da13	Rename `folder` argument into `folder_config`	2022-11-13 20:35:05 +00:00
link2xt	4ee14e6e77	Add more contexts to IMAP errors	2022-11-13 20:35:05 +00:00
link2xt	e1d50757b3	Better format for `scan_folders` errors	2022-11-13 20:35:05 +00:00
link2xt	9a447e8554	Log IDLE errors with all contexts	2022-11-13 20:35:05 +00:00
link2xt	516a5e9c5f	Add contexts to both the timeout and actual IDLE error Note that `IMAP IDLE protocol timed out` was previously added to the wrong error: not the timeout error (first `?`) but actual error happened during IDLE, such as a network error.	2022-11-13 20:35:05 +00:00
link2xt	4744f5eecf	Add folder name to IMAP IDLE interrupt logs	2022-11-13 22:11:47 +03:00
link2xt	33839b5667	imap: log disconnection attempts	2022-11-13 17:59:28 +00:00
link2xt	43f2d64a6f	imap: flatten fetch_idle()	2022-11-13 17:59:28 +00:00
link2xt	13f30c3167	Add configured_inbox_folder to account info This goes into the log on Android.	2022-11-13 16:21:44 +00:00
Hocuri	749f00766f	Go back to standard async_zip, fix build failures (#3747 ) If building DC failed with some long error message about "spurious network error" and "async_io_utilities", then this PR fixes that. Majored deleted the rs-async-io-utilities repo because he [doesn't need it anymore](`618f700811`), so that https://github.com/dignifiedquire/rs-async-zip doesn't have its dependency anymore. The latter was a hotfix-fork of https://github.com/Majored/rs-async-zip because https://github.com/Majored/rs-async-zip/pull/27, fixing https://github.com/deltachat/deltachat-core-rust/issues/3476, wasn't merged. But apparently the problem of https://github.com/deltachat/deltachat-core-rust/issues/3476 is fixed in `async_zip = "0.0.9"`, at least all the webxdcs from https://webxdc.org/ worked fine for me. So, let's just go back to the official async_zip.	2022-11-12 22:01:04 +01:00
bjoern	d2cc343649	prepare 1.100.0 💯 (#3745 ) * update changelog for core100 * bump version to 1.100.0	2022-11-09 16:19:17 +00:00
Simon Laux	f20c3e08d4	jsonrpc: show sticker image in quote (#3744 ) * jsonrpc: show sticker image in quote * add pr number to changelog	2022-11-09 16:43:57 +01:00
Simon Laux	ae4c7b635d	jsonrpc: add `miscSaveSticker` method (#3743 ) * jsonrpc: add `miscSaveSticker` method * apply suggestions from link2xt	2022-11-09 16:43:34 +01:00
link2xt	b9f1f9c41e	jsonrpc: add invalid key to {get,set}_config error	2022-11-08 21:55:25 +00:00
Simon Laux	b46d40aa07	use dc fork of tiny emitter (#3741 ) * use dc fork of tiny emitter * add pr number to changelog	2022-11-08 21:22:58 +01:00
Simon Laux	11a6991b5c	jsonrpc: ts-client use object instead of array for `contextEmitters` (#3740 ) reason: the array solution has many empty elements in between accounts in practice, which is annoying when debugging desktop	2022-11-08 21:22:51 +01:00
link2xt	fcf0cb5d69	MSRV is now 1.57	2022-11-07 18:24:54 +00:00
link2xt	a271baa1ae	Update rpgp to 0.9 and bump MSRV to 1.57.0	2022-11-07 18:23:26 +00:00
Hocuri	0194c7fcbc	Typo fix (#3738 )	2022-11-07 18:07:22 +01:00
link2xt	5ee6cba557	Update Cargo.lock	2022-11-06 21:27:21 +00:00
link2xt	475d18bd37	Update deltachat-rpc-server version	2022-11-06 21:26:05 +00:00
link2xt	75ed4fe398	JSON-RPC stdio server It speaks JSON-RPC serialized into JSON Lines over stdio.	2022-11-06 20:33:24 +00:00