try to make linter happier

cargo fmt
add provider db documentation url
2026-07-08 00:15:13 +03:00 · 2019-12-20 20:34:42 +01:00 · 2019-12-20 20:18:32 +01:00 · 2019-12-20 15:17:07 +01:00 · 2019-12-19 18:33:43 +01:00
37 changed files with 515 additions and 886 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,5 @@
 # Changelog 

-## 1.0.0-beta.22
-
- #1095 normalize email lineends to CRLF
-
- #1095 enable link-time-optimization, saves eg. on android 11 mb
-
- #1099 fix import regarding devicechats
-
- #1092 improve logging
-
- #1096 #1097 #1094 #1090 #1091 internal cleanups
-
-## 1.0.0-beta.21
-
- #1078 #1082 ensure RFC compliance by producing 78 column lines for
-  encoded attachments. 
-
- #1080 don't recreate and thus break group membership if an unknown 
-  sender (or mailer-daemon) sends a message referencing the group chat 
-
- #1081 #1079 some internal cleanups 
-
- update imap-proto dependency, to fix yandex/oauth 
-
 ## 1.0.0-beta.20

 - #1074 fix OAUTH2/gmail
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -89,7 +89,7 @@ source = "git+https://github.com/async-email/async-imap?branch=dcc-stable#50e843
 dependencies = [
 "async-attributes 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "async-native-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -104,6 +104,15 @@ dependencies = [
 "stop-token 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "async-macros"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "async-native-tls"
 version = "0.1.1"
@@ -119,7 +128,7 @@ version = "0.1.0"
 source = "git+https://github.com/async-email/async-smtp#6a4830032953f06020edc09db8daa06193e2b93f"
 dependencies = [
 "async-native-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "async-trait 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -130,17 +139,18 @@ dependencies = [
 "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 "snafu 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "async-std"
-version = "1.4.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "async-macros 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "async-task 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "broadcaster 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -373,8 +383,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -413,7 +423,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -476,7 +486,7 @@ dependencies = [
 "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -614,7 +624,7 @@ dependencies = [
 "ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -648,12 +658,12 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.22"
+version = "1.0.0-beta.20"
 dependencies = [
 "async-imap 0.1.1 (git+https://github.com/async-email/async-imap?branch=dcc-stable)",
 "async-native-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "async-smtp 0.1.0 (git+https://github.com/async-email/async-smtp)",
- "async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -673,7 +683,7 @@ dependencies = [
 "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lettre_email 0.9.2 (git+https://github.com/deltachat/lettre)",
+ "lettre_email 0.9.2 (git+https://github.com/deltachat/lettre?branch=native_tls)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "mailparse 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -684,19 +694,19 @@ dependencies = [
 "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-xml 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-xml 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "r2d2_sqlite 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "sanitize-filename 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "stop-token 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -706,12 +716,13 @@ dependencies = [

 [[package]]
 name = "deltachat-provider-database"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -725,10 +736,10 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.22"
+version = "1.0.0-beta.20"
 dependencies = [
- "deltachat 1.0.0-beta.22",
- "deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "deltachat 1.0.0-beta.20",
+ "deltachat-provider-database 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -840,7 +851,7 @@ source = "git+https://github.com/async-email/encoded-words#2631c258183620f6d976a
 dependencies = [
 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "charset 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -906,7 +917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "encoding_rs"
-version = "0.8.22"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1243,7 +1254,7 @@ dependencies = [

 [[package]]
 name = "hermit-abi"
-version = "0.1.5"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1297,8 +1308,8 @@ dependencies = [
 "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1408,7 +1419,7 @@ dependencies = [
 [[package]]
 name = "imap-proto"
 version = "0.9.1"
-source = "git+https://github.com/djc/tokio-imap#de420791b4e240242592616938407b742454c46c"
+source = "git+https://github.com/djc/tokio-imap#2b8701b83c50085b7ffcdf26a95146b91f93a6d5"
 dependencies = [
 "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1492,7 +1503,7 @@ dependencies = [
 [[package]]
 name = "lettre"
 version = "0.9.2"
-source = "git+https://github.com/deltachat/lettre#12e4f22d8d691fb5d1606e4c9034f5d4d9ba635b"
+source = "git+https://github.com/deltachat/lettre?branch=native_tls#6453051a470e020a02228dc62f7aed2d9c90cf01"
 dependencies = [
 "fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1501,14 +1512,12 @@ dependencies = [
 [[package]]
 name = "lettre_email"
 version = "0.9.2"
-source = "git+https://github.com/deltachat/lettre#12e4f22d8d691fb5d1606e4c9034f5d4d9ba635b"
+source = "git+https://github.com/deltachat/lettre?branch=native_tls#6453051a470e020a02228dc62f7aed2d9c90cf01"
 dependencies = [
 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "email 0.0.21 (git+https://github.com/deltachat/rust-email)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lettre 0.9.2 (git+https://github.com/deltachat/lettre)",
+ "lettre 0.9.2 (git+https://github.com/deltachat/lettre?branch=native_tls)",
 "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1767,8 +1776,8 @@ dependencies = [
 "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1834,7 +1843,7 @@ name = "num_cpus"
 version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1953,7 +1962,7 @@ dependencies = [
 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -2007,7 +2016,7 @@ dependencies = [
 "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "twofish 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "x25519-dalek 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2161,7 +2170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "quick-xml"
-version = "0.17.2"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2449,14 +2458,14 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.9.24"
+version = "0.9.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2466,7 +2475,7 @@ dependencies = [
 "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2650,7 +2659,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -2660,15 +2669,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "serde"
-version = "1.0.104"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.104"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2683,7 +2692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -2693,7 +2702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -2771,7 +2780,7 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.1.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -2813,7 +2822,7 @@ name = "stop-token"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -2835,7 +2844,7 @@ dependencies = [

 [[package]]
 name = "strsim"
-version = "0.9.3"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -3139,7 +3148,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -3196,7 +3205,7 @@ name = "unicode-normalization"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -3464,9 +3473,10 @@ dependencies = [
 "checksum ascii_utils 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a"
 "checksum async-attributes 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423"
 "checksum async-imap 0.1.1 (git+https://github.com/async-email/async-imap?branch=dcc-stable)" = "<none>"
+"checksum async-macros 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "644a5a8de80f2085a1e7e57cd1544a2a7438f6e003c0790999bd43b92a77cdb2"
 "checksum async-native-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a29e9e4ed87f4070dd6099d0bd5edfc7692c94442c80d656b50a802c6fde23b7"
 "checksum async-smtp 0.1.0 (git+https://github.com/async-email/async-smtp)" = "<none>"
-"checksum async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf6039b315300e057d198b9d3ab92ee029e31c759b7f1afae538145e6f18a3e"
+"checksum async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "513ee3c49800679a319912340f5601afda9e72848d7dea3a48bab489e8c1a46f"
 "checksum async-task 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de6bd58f7b9cc49032559422595c81cbfcf04db2f2133592f70af19e258a1ced"
 "checksum async-trait 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "8b6dd385bb33043b833ba049048d57bdbb4d654a121ed68c71871ca51ff67070"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
@@ -3525,7 +3535,7 @@ dependencies = [
 "checksum darling_macro 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 "checksum debug_stub_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "496b7f8a2f853313c3ca370641d7ff3e42c32974fdccda8f0684599ed0a3ff6b"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-"checksum deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "814dba060d9fdc7a989fccdc4810ada9d1c7a1f09131c78e42412bc6c634b93b"
+"checksum deltachat-provider-database 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc18fb898a7bc90565c801d7bd17a4b61478f0da0ea06ecf7f0428bd20242c52"
 "checksum derive_builder 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
 "checksum derive_builder_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
 "checksum des 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74ba5f1b5aee9772379c2670ba81306e65a93c0ee3caade7a1d22b188d88a3af"
@@ -3545,7 +3555,7 @@ dependencies = [
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
+"checksum encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)" = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9"
 "checksum entities 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
 "checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"
@@ -3587,7 +3597,7 @@ dependencies = [
 "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-"checksum hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7"
+"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
@@ -3613,8 +3623,8 @@ dependencies = [
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum kv-log-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c54d9f465d530a752e6ebdc217e081a7a614b48cb200f6f0aee21ba6bc9aabb"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum lettre 0.9.2 (git+https://github.com/deltachat/lettre)" = "<none>"
-"checksum lettre_email 0.9.2 (git+https://github.com/deltachat/lettre)" = "<none>"
+"checksum lettre 0.9.2 (git+https://github.com/deltachat/lettre?branch=native_tls)" = "<none>"
+"checksum lettre_email 0.9.2 (git+https://github.com/deltachat/lettre?branch=native_tls)" = "<none>"
 "checksum lexical-core 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2304bccb228c4b020f3a4835d247df0a02a7c4686098d4167762cfbbe4c5cb14"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
@@ -3684,7 +3694,7 @@ dependencies = [
 "checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
 "checksum pulldown-cmark 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eef52fac62d0ea7b9b4dc7da092aa64ea7ec3d90af6679422d3d7e0e14b6ee15"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quick-xml 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fe1e430bdcf30c9fdc25053b9c459bb1a4672af4617b6c783d7d91dc17c6bbb0"
+"checksum quick-xml 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7219717e55033c0c1c2368d6c469baaf10115ffdb54b1e83a8b1e8bfd95cde19"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
@@ -3716,7 +3726,7 @@ dependencies = [
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum rental 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f"
 "checksum rental-impl 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
-"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
+"checksum reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2064233e442ce85c77231ebd67d9eca395207dec2127fe0bbedde4bd29a650"
 "checksum ripemd160 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a"
 "checksum rsa 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ed8692d8e0ea3baae03f0f32ecfc13a6c6f1f85fcd6d9fdefcdf364e70f4df9"
 "checksum rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a194373ef527035645a1bc21b10dc2125f73497e6e155771233eb187aedd051"
@@ -3737,8 +3747,8 @@ dependencies = [
 "checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
+"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
 "checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
 "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
@@ -3748,7 +3758,7 @@ dependencies = [
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slice-deque 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffddf594f5f597f63533d897427a570dbaa9feabaaa06595b74b71b7014507d7"
 "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
+"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
 "checksum snafu 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41207ca11f96a62cd34e6b7fdf73d322b25ae3848eb9d38302169724bb32cf27"
 "checksum snafu-derive 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5e338c8b0577457c9dda8e794b6ad7231c96e25b1b0dd5842d52249020c1c0"
 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
@@ -3757,7 +3767,7 @@ dependencies = [
 "checksum stop-token 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "06855fb7c94d3be9b3a57c4d82dfc8a43bb658fbb3b1dda79de89e748d9eb9dd"
 "checksum stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c"
 "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
-"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
+"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6"
 "checksum strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22"
 "checksum strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
 "checksum subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,10 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.22"
+version = "1.0.0-beta.20"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"

-[profile.release]
-lto = true
-
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }

@@ -22,7 +19,7 @@ num-derive = "0.3.0"
 num-traits = "0.2.6"
 async-smtp = { git = "https://github.com/async-email/async-smtp" }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
+lettre_email = { git = "https://github.com/deltachat/lettre", branch = "native_tls" }

 # XXX newer commits of async-imap lead to import-export tests hanging
 async-imap = { git = "https://github.com/async-email/async-imap", branch = "dcc-stable" }
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.22"
+version = "1.0.0-beta.20"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -16,7 +16,7 @@ crate-type = ["cdylib", "staticlib"]

 [dependencies]
 deltachat = { path = "../", default-features = false }
-deltachat-provider-database = "0.2.1"
+deltachat-provider-database = "0.3.0"
 libc = "0.2"
 human-panic = "1.0.1"
 num-traits = "0.2.6"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -18,7 +18,6 @@ typedef struct _dc_chat     dc_chat_t;
 typedef struct _dc_msg      dc_msg_t;
 typedef struct _dc_contact  dc_contact_t;
 typedef struct _dc_lot      dc_lot_t;
-typedef struct _dc_provider dc_provider_t;


 /**
@@ -3660,106 +3659,30 @@ int             dc_contact_is_verified       (dc_contact_t* contact);

 /**
 * @class dc_provider_t
- *
- * Opaque object containing information about one single email provider.
 */

-
 /**
- * Create a provider struct for the given domain.
+ * Get the provider json object for the given domain.
+ * For more documentation see https://docs.rs/deltachat-provider-database/
 *
 * @memberof dc_provider_t
 * @param domain The domain to get provider info for.
- * @return a dc_provider_t struct which can be used with the dc_provider_get_*
- *     accessor functions.  If no provider info is found, NULL will be
- *     returned.
+ * @return a provider json object as string. If no provider info is found, an empty string will be returned.
 */
-dc_provider_t*  dc_provider_new_from_domain           (const char* domain);
+char*            dc_provider_json_from_domain           (const char* domain);


 /**
- * Create a provider struct for the given email address.
+ * Get the provider json object for the given email address.
+ * For more documentation see https://docs.rs/deltachat-provider-database/
 *
 * The provider is extracted from the email address and it's information is returned.
 *
 * @memberof dc_provider_t
 * @param email The user's email address to extract the provider info form.
- * @return a dc_provider_t struct which can be used with the dc_provider_get_*
- *     accessor functions.  If no provider info is found, NULL will be
- *     returned.
+ * @return a provider json object as string. If no provider info is found, an empty string will be returned.
 */
-dc_provider_t*  dc_provider_new_from_email            (const char* email);
-
-
-/**
- * URL of the overview page.
- *
- * This URL allows linking to the providers page on providers.delta.chat.
- *
- * @memberof dc_provider_t
- * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
- */
-char*           dc_provider_get_overview_page         (const dc_provider_t* provider);
-
-
-/**
- * The provider's name.
- *
- * The name of the provider, e.g. "POSTEO".
- *
- * @memberof dc_provider_t
- * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
- */
-char*           dc_provider_get_name                  (const dc_provider_t* provider);
-
-
-/**
- * The markdown content of the providers page.
- *
- * This contains the preparation steps or additional information if the status
- * is @ref DC_PROVIDER_STATUS_BROKEN.
- *
- * @memberof dc_provider_t
- * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
- */
-char*           dc_provider_get_markdown              (const dc_provider_t* provider);
-
-
-/**
- * Date of when the state was last checked/updated.
- *
- * This is returned as a string.
- *
- * @memberof dc_provider_t
- * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
- */
-char*           dc_provider_get_status_date           (const dc_provider_t* provider);
-
-
-/**
- * Whether DC works with this provider.
- *
- * Can be one of @ref DC_PROVIDER_STATUS_OK, @ref
- * DC_PROVIDER_STATUS_PREPARATION and @ref DC_PROVIDER_STATUS_BROKEN.
- *
- * @memberof dc_provider_t
- * @param provider The dc_provider_t struct.
- * @return The status as a constant number.
- */
-int             dc_provider_get_status                (const dc_provider_t* provider);
-
-
-/**
- * Free the provider info struct.
- *
- * @memberof dc_provider_t
- * @param provider The dc_provider_t struct.
- */
-void            dc_provider_unref                     (const dc_provider_t* provider);
+char*            dc_provider_json_from_email           (const char* email);


 /**
@@ -4475,41 +4398,6 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
 #define DC_SHOW_EMAILS_ALL               2


-/**
- * @defgroup DC_PROVIDER_STATUS DC_PROVIDER_STATUS
- *
- * These constants are used as return values for dc_provider_get_status().
- *
- * @addtogroup DC_PROVIDER_STATUS
- * @{
- */
-
-/**
- * Provider status returned by dc_provider_get_status().
- *
- * Works right out of the box without any preperation steps needed
- */
-#define         DC_PROVIDER_STATUS_OK           1
-
-/**
- * Provider status returned by dc_provider_get_status().
- *
- * Works, but preparation steps are needed
- */
-#define         DC_PROVIDER_STATUS_PREPARATION  2
-
-/**
- * Provider status returned by dc_provider_get_status().
- *
- * Doesn't work (too unstable to use falls also in this category)
- */
-#define         DC_PROVIDER_STATUS_BROKEN       3
-
-/**
- * @}
- */
-
-
 /*
 * TODO: Strings need some doumentation about used placeholders.
 *
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -10,7 +10,6 @@
 #[macro_use]
 extern crate human_panic;
 extern crate num_traits;
-extern crate serde_json;

 use std::collections::HashMap;
 use std::convert::TryInto;
@@ -122,79 +121,74 @@ impl ContextWrapper {
    }

    /// Translates the callback from the rust style to the C-style version.
-    unsafe fn translate_cb(&self, event: Event) {
-        if let Some(ffi_cb) = self.cb {
-            let event_id = event.as_id();
-            match event {
-                Event::Info(msg)
-                | Event::SmtpConnected(msg)
-                | Event::ImapConnected(msg)
-                | Event::SmtpMessageSent(msg)
-                | Event::ImapMessageDeleted(msg)
-                | Event::ImapMessageMoved(msg)
-                | Event::ImapFolderEmptied(msg)
-                | Event::NewBlobFile(msg)
-                | Event::DeletedBlobFile(msg)
-                | Event::Warning(msg)
-                | Event::Error(msg)
-                | Event::ErrorNetwork(msg)
-                | Event::ErrorSelfNotInGroup(msg) => {
-                    let data2 = CString::new(msg).unwrap_or_default();
-                    ffi_cb(self, event_id, 0, data2.as_ptr() as uintptr_t);
-                }
-                Event::MsgsChanged { chat_id, msg_id }
-                | Event::IncomingMsg { chat_id, msg_id }
-                | Event::MsgDelivered { chat_id, msg_id }
-                | Event::MsgFailed { chat_id, msg_id }
-                | Event::MsgRead { chat_id, msg_id } => {
-                    ffi_cb(
+    unsafe fn translate_cb(&self, event: Event) -> uintptr_t {
+        match self.cb {
+            Some(ffi_cb) => {
+                let event_id = event.as_id();
+                match event {
+                    Event::Info(msg)
+                    | Event::SmtpConnected(msg)
+                    | Event::ImapConnected(msg)
+                    | Event::SmtpMessageSent(msg)
+                    | Event::ImapMessageDeleted(msg)
+                    | Event::ImapMessageMoved(msg)
+                    | Event::ImapFolderEmptied(msg)
+                    | Event::NewBlobFile(msg)
+                    | Event::DeletedBlobFile(msg)
+                    | Event::Warning(msg)
+                    | Event::Error(msg)
+                    | Event::ErrorNetwork(msg)
+                    | Event::ErrorSelfNotInGroup(msg) => {
+                        let data2 = CString::new(msg).unwrap_or_default();
+                        ffi_cb(self, event_id, 0, data2.as_ptr() as uintptr_t)
+                    }
+                    Event::MsgsChanged { chat_id, msg_id }
+                    | Event::IncomingMsg { chat_id, msg_id }
+                    | Event::MsgDelivered { chat_id, msg_id }
+                    | Event::MsgFailed { chat_id, msg_id }
+                    | Event::MsgRead { chat_id, msg_id } => ffi_cb(
                        self,
                        event_id,
                        chat_id as uintptr_t,
                        msg_id.to_u32() as uintptr_t,
-                    );
-                }
-                Event::ChatModified(chat_id) => {
-                    ffi_cb(self, event_id, chat_id as uintptr_t, 0);
-                }
-                Event::ContactsChanged(id) | Event::LocationChanged(id) => {
-                    let id = id.unwrap_or_default();
-                    ffi_cb(self, event_id, id as uintptr_t, 0);
-                }
-                Event::ConfigureProgress(progress) | Event::ImexProgress(progress) => {
-                    ffi_cb(self, event_id, progress as uintptr_t, 0);
-                }
-                Event::ImexFileWritten(file) => {
-                    let data1 = file.to_c_string().unwrap_or_default();
-                    ffi_cb(self, event_id, data1.as_ptr() as uintptr_t, 0);
-                }
-                Event::SecurejoinInviterProgress {
-                    contact_id,
-                    progress,
-                }
-                | Event::SecurejoinJoinerProgress {
-                    contact_id,
-                    progress,
-                } => {
-                    ffi_cb(
+                    ),
+                    Event::ChatModified(chat_id) => ffi_cb(self, event_id, chat_id as uintptr_t, 0),
+                    Event::ContactsChanged(id) | Event::LocationChanged(id) => {
+                        let id = id.unwrap_or_default();
+                        ffi_cb(self, event_id, id as uintptr_t, 0)
+                    }
+                    Event::ConfigureProgress(progress) | Event::ImexProgress(progress) => {
+                        ffi_cb(self, event_id, progress as uintptr_t, 0)
+                    }
+                    Event::ImexFileWritten(file) => {
+                        let data1 = file.to_c_string().unwrap_or_default();
+                        ffi_cb(self, event_id, data1.as_ptr() as uintptr_t, 0)
+                    }
+                    Event::SecurejoinInviterProgress {
+                        contact_id,
+                        progress,
+                    }
+                    | Event::SecurejoinJoinerProgress {
+                        contact_id,
+                        progress,
+                    } => ffi_cb(
                        self,
                        event_id,
                        contact_id as uintptr_t,
                        progress as uintptr_t,
-                    );
-                }
-                Event::SecurejoinMemberAdded {
-                    chat_id,
-                    contact_id,
-                } => {
-                    ffi_cb(
+                    ),
+                    Event::SecurejoinMemberAdded {
+                        chat_id,
+                        contact_id,
+                    } => ffi_cb(
                        self,
                        event_id,
                        chat_id as uintptr_t,
                        contact_id as uintptr_t,
-                    );
+                    ),
                }
            }
+            None => 0,
        }
    }
 }
@@ -2396,27 +2390,12 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
    }
    let ffi_context = &*context;
    ffi_context
-        .with_inner(|ctx| {
-            let chat = match chat::Chat::load_from_db(ctx, chat_id) {
-                Ok(chat) => chat,
-                Err(err) => {
-                    error!(ctx, "dc_get_chat_info_json() failed to load chat: {}", err);
-                    return "".strdup();
-                }
-            };
-            let info = match chat.get_info(ctx) {
-                Ok(info) => info,
-                Err(err) => {
-                    error!(
-                        ctx,
-                        "dc_get_chat_info_json() failed to get chat info: {}", err
-                    );
-                    return "".strdup();
-                }
-            };
-            serde_json::to_string(&info)
-                .unwrap_or_log_default(ctx, "dc_get_chat_info_json() failed to serialise to json")
-                .strdup()
+        .with_inner(|ctx| match chat::get_info_json(ctx, chat_id) {
+            Ok(s) => s.strdup(),
+            Err(err) => {
+                error!(ctx, "get_info_json({}) returned: {}", chat_id, err);
+                return "".strdup();
+            }
        })
        .unwrap_or_else(|_| "".strdup())
 }
--- a/deltachat-ffi/src/providers.rs
+++ b/deltachat-ffi/src/providers.rs
@@ -1,93 +1,35 @@
 extern crate deltachat_provider_database;

-use std::ptr;
-
 use crate::string::{to_string_lossy, StrExt};
-use deltachat_provider_database::StatusState;

 #[no_mangle]
 pub type dc_provider_t = deltachat_provider_database::Provider;

 #[no_mangle]
-pub unsafe extern "C" fn dc_provider_new_from_domain(
+pub unsafe extern "C" fn dc_provider_json_from_domain(
    domain: *const libc::c_char,
-) -> *const dc_provider_t {
-    match deltachat_provider_database::get_provider_info(&to_string_lossy(domain)) {
-        Some(provider) => provider,
-        None => ptr::null(),
+) -> *mut libc::c_char {
+    let domain = to_string_lossy(domain);
+    match deltachat_provider_database::get_provider_info(&domain) {
+        Some(provider) => serde_json::to_string(provider)
+            .unwrap_or("".to_owned())
+            .strdup(),
+        None => "".strdup(),
    }
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_provider_new_from_email(
+pub unsafe extern "C" fn dc_provider_json_from_email(
    email: *const libc::c_char,
-) -> *const dc_provider_t {
+) -> *mut libc::c_char {
    let email = to_string_lossy(email);
    let domain = deltachat_provider_database::get_domain_from_email(&email);
    match deltachat_provider_database::get_provider_info(domain) {
-        Some(provider) => provider,
-        None => ptr::null(),
+        Some(provider) => serde_json::to_string(provider)
+            .unwrap_or("".to_owned())
+            .strdup(),
+        None => "".strdup(),
    }
 }

-macro_rules! null_guard {
-    ($context:tt) => {
-        if $context.is_null() {
-            return ptr::null_mut() as *mut libc::c_char;
-        }
-    };
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_get_overview_page(
-    provider: *const dc_provider_t,
-) -> *mut libc::c_char {
-    null_guard!(provider);
-    format!(
-        "{}/{}",
-        deltachat_provider_database::PROVIDER_OVERVIEW_URL,
-        (*provider).overview_page
-    )
-    .strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_get_name(provider: *const dc_provider_t) -> *mut libc::c_char {
-    null_guard!(provider);
-    (*provider).name.strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_get_markdown(
-    provider: *const dc_provider_t,
-) -> *mut libc::c_char {
-    null_guard!(provider);
-    (*provider).markdown.strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_get_status_date(
-    provider: *const dc_provider_t,
-) -> *mut libc::c_char {
-    null_guard!(provider);
-    (*provider).status.date.strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_get_status(provider: *const dc_provider_t) -> u32 {
-    if provider.is_null() {
-        return 0;
-    }
-    match (*provider).status.state {
-        StatusState::OK => 1,
-        StatusState::PREPARATION => 2,
-        StatusState::BROKEN => 3,
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_unref(_provider: *const dc_provider_t) {
-    ()
-}
-
 // TODO expose general provider overview url?
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -20,14 +20,14 @@ use deltachat::qr::*;
 use deltachat::sql;
 use deltachat::Event;

-/// Reset database tables.
+/// Reset database tables. This function is called from Core cmdline.
 /// Argument is a bitmask, executing single or multiple actions in one call.
 /// e.g. bitmask 7 triggers actions definded with bits 1, 2 and 4.
-fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
-    println!("Resetting tables ({})...", bits);
+pub fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
+    info!(context, "Resetting tables ({})...", bits);
    if 0 != bits & 1 {
        sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]).unwrap();
-        println!("(1) Jobs reset.");
+        info!(context, "(1) Jobs reset.");
    }
    if 0 != bits & 2 {
        sql::execute(
@@ -37,11 +37,11 @@ fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
            params![],
        )
        .unwrap();
-        println!("(2) Peerstates reset.");
+        info!(context, "(2) Peerstates reset.");
    }
    if 0 != bits & 4 {
        sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]).unwrap();
-        println!("(4) Private keypairs reset.");
+        info!(context, "(4) Private keypairs reset.");
    }
    if 0 != bits & 8 {
        sql::execute(
@@ -80,7 +80,7 @@ fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
        )
        .unwrap();
        sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]).unwrap();
-        println!("(8) Rest but server config reset.");
+        info!(context, "(8) Rest but server config reset.");
    }

    context.call_cb(Event::MsgsChanged {
@@ -155,7 +155,7 @@ fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
                let name = name_f.to_string_lossy();
                if name.ends_with(".eml") {
                    let path_plus_name = format!("{}/{}", &real_spec, name);
-                    println!("Import: {}", path_plus_name);
+                    info!(context, "Import: {}", path_plus_name);
                    if dc_poke_eml_file(context, path_plus_name).is_ok() {
                        read_cnt += 1
                    }
@@ -163,7 +163,10 @@ fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
            }
        }
    }
-    println!("Import: {} items read from \"{}\".", read_cnt, &real_spec);
+    info!(
+        context,
+        "Import: {} items read from \"{}\".", read_cnt, &real_spec
+    );
    if read_cnt > 0 {
        context.call_cb(Event::MsgsChanged {
            chat_id: 0,
@@ -187,7 +190,8 @@ fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
    };
    let temp2 = dc_timestamp_to_str(msg.get_timestamp());
    let msgtext = msg.get_text();
-    println!(
+    info!(
+        context,
        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
        prefix.as_ref(),
        msg.get_id(),
@@ -221,14 +225,16 @@ fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Error> {
    let mut lines_out = 0;
    for &msg_id in msglist {
        if msg_id.is_daymarker() {
-            println!(
+            info!(
+                context,
                "--------------------------------------------------------------------------------"
            );

            lines_out += 1
        } else if !msg_id.is_special() {
            if lines_out == 0 {
-                println!(
+                info!(
+                    context,
                    "--------------------------------------------------------------------------------",
                );
                lines_out += 1
@@ -238,7 +244,8 @@ fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Error> {
        }
    }
    if lines_out > 0 {
-        println!(
+        info!(
+            context,
            "--------------------------------------------------------------------------------"
        );
    }
@@ -288,7 +295,7 @@ fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
                );
            }

-            println!("Contact#{}: {}{}", contact_id, line, line2);
+            info!(context, "Contact#{}: {}{}", contact_id, line, line2);
        }
    }
 }
@@ -503,13 +510,15 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {

            let cnt = chatlist.len();
            if cnt > 0 {
-                println!(
+                info!(
+                    context,
                    "================================================================================"
                );

                for i in (0..cnt).rev() {
                    let chat = Chat::load_from_db(context, chatlist.get_chat_id(i))?;
-                    println!(
+                    info!(
+                        context,
                        "{}#{}: {} [{} fresh]",
                        chat_prefix(&chat),
                        chat.get_id(),
@@ -531,7 +540,8 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                    let timestr = dc_timestamp_to_str(lot.get_timestamp());
                    let text1 = lot.get_text1();
                    let text2 = lot.get_text2();
-                    println!(
+                    info!(
+                        context,
                        "{}{}{}{} [{}]{}",
                        text1.unwrap_or(""),
                        if text1.is_some() { ": " } else { "" },
@@ -544,13 +554,14 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                            ""
                        },
                    );
-                    println!(
+                    info!(
+                        context,
                        "================================================================================"
                    );
                }
            }
            if location::is_sending_locations_to_chat(context, 0) {
-                println!("Location streaming enabled.");
+                info!(context, "Location streaming enabled.");
            }
            println!("{} chats", cnt);
        }
@@ -578,7 +589,8 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
            } else {
                format!("{} member(s)", members.len())
            };
-            println!(
+            info!(
+                context,
                "{}#{}: {} [{}]{}{}",
                chat_prefix(sel_chat),
                sel_chat.get_id(),
@@ -681,7 +693,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
            ensure!(sel_chat.is_some(), "No chat selected.");

            let contacts = chat::get_chat_contacts(context, sel_chat.as_ref().unwrap().get_id());
-            println!("Memberlist:");
+            info!(context, "Memberlist:");

            log_contactlist(context, &contacts);
            println!(
@@ -707,7 +719,8 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
            let default_marker = "-".to_string();
            for location in &locations {
                let marker = location.marker.as_ref().unwrap_or(&default_marker);
-                println!(
+                info!(
+                    context,
                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
                    location.location_id,
                    dc_timestamp_to_str(location.timestamp),
@@ -721,7 +734,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                );
            }
            if locations.is_empty() {
-                println!("No locations.");
+                info!(context, "No locations.");
            }
        }
        "sendlocations" => {
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -41,7 +41,7 @@ use self::cmdline::*;

 // Event Handler

-fn receive_event(_context: &Context, event: Event) {
+fn receive_event(_context: &Context, event: Event) -> libc::uintptr_t {
    match event {
        Event::Info(msg) => {
            /* do not show the event as this would fill the screen */
@@ -111,6 +111,8 @@ fn receive_event(_context: &Context, event: Event) {
            print!("\x1b[33m{{Received {:?}}}\n\x1b[0m", event);
        }
    }
+
+    0
 }

 // Threads for waiting for messages and for jobs
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -16,18 +16,21 @@ use deltachat::job::{
 };
 use deltachat::Event;

-fn cb(_ctx: &Context, event: Event) {
+fn cb(_ctx: &Context, event: Event) -> usize {
    print!("[{:?}]", event);

    match event {
        Event::ConfigureProgress(progress) => {
            print!("  progress: {}\n", progress);
+            0
        }
        Event::Info(msg) | Event::Warning(msg) | Event::Error(msg) | Event::ErrorNetwork(msg) => {
            print!("  {}\n", msg);
+            0
        }
        _ => {
            print!("\n");
+            0
        }
    }
 }
--- a/python/README.rst
+++ b/python/README.rst
@@ -6,81 +6,8 @@ This package provides bindings to the deltachat-core_ Rust -library
 which provides imap/smtp/crypto handling as well as chat/group/messages
 handling to Android, Desktop and IO user interfaces.

-
-Installing bindings from source (Updated: 21-Dec-2019)
-=========================================================
-
-Install Rust and Cargo first.  Deltachat needs a specific nightly
-version, the easiest is probably to first install Rust stable from
-rustup and then use this to install the correct nightly version.
-
-Install rustup using::
-
-   curl https://sh.rustup.rs -sSf | sh
-
-GIT clone the repo and use rustup to check the correct nightly version
-is available, if you do not have the right nightly version rustup will
-download and install it::
-
-   git clone https://github.com/deltachat/deltachat-core-rust
-   cd deltachat-core-rust
-   rustup show
-
-To install the python bindings make sure you have python installed, a
-recent 3.x version will also come with the required venv module.
-E.g. on Debian-based systems `apt install python3 python3-pip
-python3-venv` should give you a usable python installation.  If you
-prefer you can also
-`Install virtualenv <https://virtualenv.pypa.io/en/stable/installation/>`_
-as an alternative to `venv`.
-
-Ensure you are in the deltachat-core-rust/python directory, create the
-vivrtual environment and activate it in your shell::
-
-   cd python
-   python3 -m venv venv  # or: virtualenv venv
-   source venv/bin/activate
-
-You should now be able to build the python bindings using the supplied
-script::
-
-   ./install_python_bindings.py
-
-The installation might take a while, depending on your machine.
-The bindings will be installed in release mode but with debug symbols.
-The release mode is necessary because some tests generate RSA keys
-which is prohibitively slow in debug mode.
-
-After successful binding installation you can install a few more
-python packages before finally running the tests::
-
-    python -m pip install pytest pytest-timeout pytest-rerunfailures
-    pytest -v tests
-
-
-running "live" tests (experimental)
-----------------------------------
-
-If you want to run "liveconfig" functional tests you can set
-``DCC_PY_LIVECONFIG`` to:
-
- a particular https-url that you can ask for from the delta
-  chat devs.
-
- or the path of a file that contains two lines, each describing
-  via "addr=... mail_pw=..." a test account login that will
-  be used for the live tests.
-
-With ``DCC_PY_LIVECONFIG`` set pytest invocations will use real
-e-mail accounts and run through all functional "liveconfig" tests.
-
-
-============================================================================================================================
-(21-Dec-2019) THE BELOW WHEELS ARE CURRENTLY NOT WORKING/BROKEN, COMPILE FROM SOURCE USING ABOVE INSTRUCTIONS INSTEAD 
-============================================================================================================================
-
-Installing pre-built packages (linux-only)  (OUTDATED)
-========================================================
+Installing pre-built packages (linux-only)
+==========================================

 If you have a linux system you may install the ``deltachat`` binary "wheel" package
 without any "build-from-source" steps.
@@ -104,8 +31,8 @@ without any "build-from-source" steps.
        python -c "import deltachat"


-Installing a wheel from a PR/branch    (OUTDATED)
-------------------------------------------------
+Installing a wheel from a PR/branch
+---------------------------------------

 For Linux, we automatically build wheels for all github PR branches
 and push them to a python package index. To install the latest github ``master`` branch::
@@ -119,7 +46,62 @@ and push them to a python package index. To install the latest github ``master``
    `in contact with us <https://delta.chat/en/contribute>`_.


+Installing bindings from source
+===============================

+If you can't use "binary" method above then you need to compile
+to core deltachat library::
+
+    git clone https://github.com/deltachat/deltachat-core-rust
+    cd deltachat-core-rust
+    cd python
+
+If you don't have one active, create and activate a python "virtualenv":
+
+    python virtualenv venv  # or python -m venv
+    source venv/bin/activate
+
+Afterwards ``which python`` tells you that it comes out of the "venv"
+directory that contains all python install artifacts. Let's first
+install test tools::
+
+    pip install pytest pytest-timeout pytest-rerunfailures requests
+
+then cargo-build and install the deltachat bindings::
+
+    python install_python_bindings.py
+
+The bindings will be installed in release mode but with debug symbols.
+The release mode is necessary because some tests generate RSA keys
+which is prohibitively slow in debug mode.
+
+After successful binding installation you can finally run the tests::
+
+    pytest -v tests
+
+.. note::
+
+    Some tests are sometimes failing/hanging because of
+    https://github.com/deltachat/deltachat-core-rust/issues/331
+    and
+    https://github.com/deltachat/deltachat-core-rust/issues/326
+
+
+running "live" tests (experimental)
+-----------------------------------
+
+If you want to run "liveconfig" functional tests you can set
+``DCC_PY_LIVECONFIG`` to:
+
+- a particular https-url that you can ask for from the delta
+  chat devs.
+
+- or the path of a file that contains two lines, each describing
+  via "addr=... mail_pw=..." a test account login that will
+  be used for the live tests.
+
+With ``DCC_PY_LIVECONFIG`` set pytest invocations will use real
+e-mail accounts and run through all functional "liveconfig" tests.



--- a/python/src/deltachat/provider.py
+++ b/python/src/deltachat/provider.py
@@ -1,7 +1,8 @@
 """Provider info class."""

-from .capi import ffi, lib
+from .capi import lib
 from .cutil import as_dc_charpointer, from_dc_charpointer
+import json


 class ProviderNotFoundError(Exception):
@@ -16,13 +17,12 @@ class Provider(object):
    """

    def __init__(self, domain):
-        provider = ffi.gc(
-            lib.dc_provider_new_from_domain(as_dc_charpointer(domain)),
-            lib.dc_provider_unref,
+        provider = from_dc_charpointer(
+            lib.dc_provider_json_from_domain(as_dc_charpointer(domain))
        )
-        if provider == ffi.NULL:
+        if provider == "":
            raise ProviderNotFoundError("Provider not found")
-        self._provider = provider
+        self._provider = json.loads(provider)

    @classmethod
    def from_email(cls, email):
@@ -35,33 +35,30 @@ class Provider(object):
    @property
    def overview_page(self):
        """URL to the overview page of the provider on providers.delta.chat."""
-        return from_dc_charpointer(
-            lib.dc_provider_get_overview_page(self._provider))
+        return "https://providers.delta.chat/" + self._provider['overview_page']

    @property
    def name(self):
        """The name of the provider."""
-        return from_dc_charpointer(lib.dc_provider_get_name(self._provider))
+        return self._provider['name']

    @property
    def markdown(self):
        """Content of the information page, formatted as markdown."""
-        return from_dc_charpointer(
-            lib.dc_provider_get_markdown(self._provider))
+        return self._provider['markdown']

    @property
    def status_date(self):
        """The date the provider info was last updated, as a string."""
-        return from_dc_charpointer(
-            lib.dc_provider_get_status_date(self._provider))
+        return self._provider['status']['date']

    @property
    def status(self):
        """The status of the provider information.

-        This is one of the
-        :attr:`deltachat.const.DC_PROVIDER_STATUS_OK`,
-        :attr:`deltachat.const.DC_PROVIDER_STATUS_PREPARATION` or
-        :attr:`deltachat.const.DC_PROVIDER_STATUS_BROKEN` constants.
+        This is
+        :attr:`"OK"`,
+        :attr:`"PREPARATION"` or
+        :attr:`"BROKEN"`.
        """
-        return lib.dc_provider_get_status(self._provider)
+        return self._provider['status']['state']
--- a/python/tests/test_lowlevel.py
+++ b/python/tests/test_lowlevel.py
@@ -3,6 +3,7 @@ from deltachat import capi, cutil, const, set_context_callback, clear_context_ca
 from deltachat.capi import ffi
 from deltachat.capi import lib
 from deltachat.account import EventLogger
+import json


 def test_empty_context():
@@ -103,18 +104,23 @@ def test_get_special_message_id_returns_empty_message(acfactory):


 def test_provider_info():
-    provider = lib.dc_provider_new_from_email(cutil.as_dc_charpointer("ex@example.com"))
-    assert cutil.from_dc_charpointer(
-        lib.dc_provider_get_overview_page(provider)
-    ) == "https://providers.delta.chat/example.com"
-    assert cutil.from_dc_charpointer(lib.dc_provider_get_name(provider)) == "Example"
-    assert cutil.from_dc_charpointer(lib.dc_provider_get_markdown(provider)) == "\n..."
-    assert cutil.from_dc_charpointer(lib.dc_provider_get_status_date(provider)) == "2018-09"
-    assert lib.dc_provider_get_status(provider) == const.DC_PROVIDER_STATUS_PREPARATION
+    provider_json = cutil.from_dc_charpointer(
+        lib.dc_provider_json_from_email(cutil.as_dc_charpointer("ex@example.com"))
+    )
+    provider = json.loads(provider_json)
+
+    assert provider['overview_page'] == "example.com"
+    assert provider['name'] == "Example"
+    assert provider['markdown'] == "\n..."
+    assert provider['status']['date'] == "2018-09"
+    assert provider['status']['state'] == "PREPARATION"


 def test_provider_info_none():
-    assert lib.dc_provider_new_from_email(cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
+    provider_json = cutil.from_dc_charpointer(
+        lib.dc_provider_json_from_email(cutil.as_dc_charpointer("email@unexistent.no"))
+    )
+    assert provider_json == ""


 def test_get_info_closed():
--- a/python/tests/test_provider_info.py
+++ b/python/tests/test_provider_info.py
@@ -1,6 +1,5 @@
 import pytest

-from deltachat import const
 from deltachat import provider


@@ -10,7 +9,7 @@ def test_provider_info_from_email():
    assert example.name == "Example"
    assert example.markdown == "\n..."
    assert example.status_date == "2018-09"
-    assert example.status == const.DC_PROVIDER_STATUS_PREPARATION
+    assert example.status == "PREPARATION"


 def test_provider_info_from_domain():
@@ -19,7 +18,7 @@ def test_provider_info_from_domain():
    assert example.name == "Example"
    assert example.markdown == "\n..."
    assert example.status_date == "2018-09"
-    assert example.status == const.DC_PROVIDER_STATUS_PREPARATION
+    assert example.status == "PREPARATION"


 def test_provider_info_none():
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};

 use itertools::Itertools;
 use num_traits::FromPrimitive;
-use serde::{Deserialize, Serialize};
+use serde_json::json;

 use crate::blob::{BlobError, BlobObject};
 use crate::chatlist::*;
@@ -240,30 +240,6 @@ impl Chat {
        color
    }

-    /// Returns a struct describing the current state of the chat.
-    ///
-    /// This is somewhat experimental, even more so than the rest of
-    /// deltachat, and the data returned is still subject to change.
-    pub fn get_info(&self, context: &Context) -> Result<ChatInfo, Error> {
-        let draft = match get_draft(context, self.id)? {
-            Some(message) => message.text.unwrap_or_else(String::new),
-            _ => String::new(),
-        };
-        Ok(ChatInfo {
-            id: self.id,
-            type_: self.typ as u32,
-            name: self.name.clone(),
-            archived: self.archived,
-            param: self.param.to_string(),
-            gossiped_timestamp: self.get_gossiped_timestamp(context),
-            is_sending_locations: self.is_sending_locations,
-            color: self.get_color(context),
-            profile_image: self.get_profile_image(context).unwrap_or_else(PathBuf::new),
-            subtitle: self.get_subtitle(context),
-            draft,
-        })
-    }
-
    /// Returns true if the chat is archived.
    pub fn is_archived(&self) -> bool {
        self.archived
@@ -521,68 +497,6 @@ impl Chat {
    }
 }

-/// The current state of a chat.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ChatInfo {
-    /// The chat ID.
-    pub id: u32,
-
-    /// The type of chat as a `u32` representation of [Chattype].
-    ///
-    /// On the C API this number is one of the
-    /// `DC_CHAT_TYPE_UNDEFINED`, `DC_CHAT_TYPE_SINGLE`,
-    /// `DC_CHAT_TYPE_GROUP` or `DC_CHAT_TYPE_VERIFIED_GROUP`
-    /// constants.
-    #[serde(rename = "type")]
-    pub type_: u32,
-
-    /// The name of the chat.
-    pub name: String,
-
-    /// Whether the chat is archived.
-    pub archived: bool,
-
-    /// The "params" of the chat.
-    ///
-    /// This is the string-serialised version of [Params] currently.
-    pub param: String,
-
-    /// Something to do with gossiping and timestamps?
-    pub gossiped_timestamp: i64,
-
-    /// Whether this chat is currently sending location-stream messages.
-    pub is_sending_locations: bool,
-
-    /// Colour this chat should be represented in by the UI.
-    ///
-    /// Yes, spelling colour is hard.
-    pub color: u32,
-
-    /// The path to the profile image.
-    ///
-    /// If there is no profile image set this will be an empty string
-    /// currently.
-    pub profile_image: PathBuf,
-
-    /// Subtitle for the chat.
-    pub subtitle: String,
-
-    /// The draft message text.
-    ///
-    /// If the chat has not draft this is an empty string.
-    ///
-    /// TODO: This doesn't seem rich enough, it can not handle drafts
-    ///       which contain non-text parts.  Perhaps it should be a
-    ///       simple `has_draft` bool instead.
-    pub draft: String,
-    // ToDo:
-    // - [ ] deaddrop,
-    // - [ ] summary,
-    // - [ ] lastUpdated,
-    // - [ ] freshMessageCounter,
-    // - [ ] email
-}
-
 /// Create a normal chat or a group chat by a messages ID that comes typically
 /// from the deaddrop, DC_CHAT_ID_DEADDROP (1).
 ///
@@ -2076,6 +1990,54 @@ pub fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: u32) -> Resul
    Ok(())
 }

+pub fn get_info_json(context: &Context, chat_id: u32) -> Result<String, Error> {
+    let chat = Chat::load_from_db(context, chat_id).unwrap();
+
+    // ToDo:
+    // - [x] id
+    // - [x] type
+    // - [x] name
+    // - [x] archived
+    // - [x] color
+    // - [x] profileImage
+    // - [x] subtitle
+    // - [x] draft,
+    // - [ ] deaddrop,
+    // - [ ] summary,
+    // - [ ] lastUpdated,
+    // - [ ] freshMessageCounter,
+    // - [ ] email
+
+    let profile_image = match chat.get_profile_image(context) {
+        Some(path) => path.into_os_string().into_string().unwrap(),
+        None => "".to_string(),
+    };
+
+    let draft = match get_draft(context, chat_id) {
+        Ok(message) => match message {
+            Some(m) => m.text.unwrap_or_else(|| "".to_string()),
+            None => "".to_string(),
+        },
+        Err(_) => "".to_string(),
+    };
+
+    let s = json!({
+         "id": chat.id,
+         "type": chat.typ as u32,
+         "name": chat.name,
+         "archived": chat.archived,
+         "param": chat.param.to_string(),
+         "gossiped_timestamp": chat.get_gossiped_timestamp(context),
+         "is_sending_locations": chat.is_sending_locations,
+         "color": chat.get_color(context),
+         "profile_image": profile_image,
+         "subtitle": chat.get_subtitle(context),
+         "draft": draft
+    });
+
+    Ok(s.to_string())
+}
+
 pub fn get_chat_contact_cnt(context: &Context, chat_id: u32) -> usize {
    context
        .sql
@@ -2197,22 +2159,6 @@ pub fn was_device_msg_ever_added(context: &Context, label: &str) -> Result<bool,
    Ok(false)
 }

-// needed on device-switches during export/import;
-// - deletion in `msgs` with `DC_CONTACT_ID_DEVICE` makes sure,
-//   no wrong information are shown in the device chat
-// - deletion in `devmsglabels` makes sure,
-//   deleted messages are resetted and useful messages can be added again
-pub fn delete_and_reset_all_device_msgs(context: &Context) -> Result<(), Error> {
-    context.sql.execute(
-        "DELETE FROM msgs WHERE from_id=?;",
-        params![DC_CONTACT_ID_DEVICE],
-    )?;
-    context
-        .sql
-        .execute("DELETE FROM devmsglabels;", params![])?;
-    Ok(())
-}
-
 /// Adds an informational message to chat.
 ///
 /// For example, it can be a message showing that a member was added to a group.
@@ -2246,41 +2192,8 @@ pub fn add_info_msg(context: &Context, chat_id: u32, text: impl AsRef<str>) {
 mod tests {
    use super::*;

-    use crate::contact::Contact;
    use crate::test_utils::*;

-    #[test]
-    fn test_chat_info() {
-        let t = dummy_context();
-        let bob = Contact::create(&t.ctx, "bob", "bob@example.com").unwrap();
-        let chat_id = create_by_contact_id(&t.ctx, bob).unwrap();
-        let chat = Chat::load_from_db(&t.ctx, chat_id).unwrap();
-        let info = chat.get_info(&t.ctx).unwrap();
-
-        // Ensure we can serialise this.
-        println!("{}", serde_json::to_string_pretty(&info).unwrap());
-
-        let expected = r#"
-            {
-                "id": 10,
-                "type": 100,
-                "name": "bob",
-                "archived": false,
-                "param": "",
-                "gossiped_timestamp": 0,
-                "is_sending_locations": false,
-                "color": 15895624,
-                "profile_image": "",
-                "subtitle": "bob@example.com",
-                "draft": ""
-            }
-        "#;
-
-        // Ensure we can deserialise this.
-        let loaded: ChatInfo = serde_json::from_str(expected).unwrap();
-        assert_eq!(info, loaded);
-    }
-
    #[test]
    fn test_get_draft_no_draft() {
        let t = dummy_context();
@@ -2510,25 +2423,6 @@ mod tests {
        assert!(forward_msgs(&t.ctx, &[msg_id], device_chat_id).is_err());
    }

-    #[test]
-    fn test_delete_and_reset_all_device_msgs() {
-        let t = test_context(Some(Box::new(logging_cb)));
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some("message text".to_string());
-        let msg_id1 = add_device_msg(&t.ctx, Some("some-label"), Some(&mut msg)).unwrap();
-
-        // adding a device message with the same label won't be executed again ...
-        assert!(was_device_msg_ever_added(&t.ctx, "some-label").unwrap());
-        let msg_id2 = add_device_msg(&t.ctx, Some("some-label"), Some(&mut msg)).unwrap();
-        assert!(msg_id2.is_unset());
-
-        // ... unless everything is deleted and resetted - as needed eg. on device switch
-        delete_and_reset_all_device_msgs(&t.ctx).unwrap();
-        assert!(!was_device_msg_ever_added(&t.ctx, "some-label").unwrap());
-        let msg_id3 = add_device_msg(&t.ctx, Some("some-label"), Some(&mut msg)).unwrap();
-        assert_ne!(msg_id1, msg_id3);
-    }
-
    fn chatlist_len(ctx: &Context, listflags: usize) -> usize {
        Chatlist::try_load(ctx, listflags, None, None)
            .unwrap()
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -191,7 +191,6 @@ pub const AVATAR_SIZE: u32 = 192;
 #[repr(i32)]
 pub enum Viewtype {
    Unknown = 0,
-
    /// Text message.
    /// The text of the message is set using dc_msg_set_text()
    /// and retrieved with dc_msg_get_text().
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -48,26 +48,20 @@ pub struct Contact {
    ///
    /// Normal contact IDs are larger than these special ones (larger than DC_CONTACT_ID_LAST_SPECIAL).
    pub id: u32,
-
    /// Contact name. It is recommended to use `Contact::get_name`,
    /// `Contact::get_display_name` or `Contact::get_name_n_addr` to access this field.
    /// May be empty, initially set to `authname`.
    name: String,
-
    /// Name authorized by the contact himself. Only this name may be spread to others,
    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_authname`,
    /// to access this field.
    authname: String,
-
    /// E-Mail-Address of the contact. It is recommended to use `Contact::get_addr`` to access this field.
    addr: String,
-
    /// Blocked state. Use dc_contact_is_blocked to access this field.
    blocked: bool,
-
    /// The origin/source of the contact.
    pub origin: Origin,
-
    /// Parameters as Param::ProfileImage
    pub param: Params,
 }
@@ -79,52 +73,36 @@ pub struct Contact {
 #[repr(i32)]
 pub enum Origin {
    Unknown = 0,
-
    /// From: of incoming messages of unknown sender
    IncomingUnknownFrom = 0x10,
-
    /// Cc: of incoming messages of unknown sender
    IncomingUnknownCc = 0x20,
-
    /// To: of incoming messages of unknown sender
    IncomingUnknownTo = 0x40,
-
    /// address scanned but not verified
    UnhandledQrScan = 0x80,
-
    /// Reply-To: of incoming message of known sender
    IncomingReplyTo = 0x100,
-
    /// Cc: of incoming message of known sender
    IncomingCc = 0x200,
-
    /// additional To:'s of incoming message of known sender
    IncomingTo = 0x400,
-
    /// a chat was manually created for this user, but no message yet sent
    CreateChat = 0x800,
-
    /// message sent by us
    OutgoingBcc = 0x1000,
-
    /// message sent by us
    OutgoingCc = 0x2000,
-
    /// message sent by us
    OutgoingTo = 0x4000,
-
    /// internal use
    Internal = 0x40000,
-
    /// address is in our address book
    AdressBook = 0x80000,
-
    /// set on Alice's side for contacts like Bob that have scanned the QR code offered by her. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling dc_contact_is_verified() !
    SecurejoinInvited = 0x0100_0000,
-
    /// 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 dc_contact_is_verified() !
    SecurejoinJoined = 0x0200_0000,
-
    /// contact added mannually by dc_create_contact(), this should be the largets origin as otherwise the user cannot modify the names
    ManuallyCreated = 0x0400_0000,
 }
--- a/src/context.rs
+++ b/src/context.rs
@@ -5,6 +5,8 @@ use std::ffi::OsString;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Condvar, Mutex, RwLock};

+use libc::uintptr_t;
+
 use crate::chat::*;
 use crate::config::Config;
 use crate::constants::*;
@@ -30,7 +32,12 @@ use crate::sql::Sql;
 /// * `event` - One of the [Event] items.
 /// * `data1` - Depends on the event parameter, see [Event].
 /// * `data2` - Depends on the event parameter, see [Event].
-pub type ContextCallback = dyn Fn(&Context, Event) -> () + Send + Sync;
+///
+/// # Returns
+///
+/// This callback must return 0 unless stated otherwise in the event
+/// description at [Event].
+pub type ContextCallback = dyn Fn(&Context, Event) -> uintptr_t + Send + Sync;

 #[derive(DebugStub)]
 pub struct Context {
@@ -79,7 +86,12 @@ pub fn get_info() -> HashMap<&'static str, String> {
        "sqlite_thread_safe",
        unsafe { rusqlite::ffi::sqlite3_threadsafe() }.to_string(),
    );
-    res.insert("arch", (std::mem::size_of::<usize>() * 8).to_string());
+    res.insert(
+        "arch",
+        (std::mem::size_of::<*mut libc::c_void>())
+            .wrapping_mul(8)
+            .to_string(),
+    );
    res.insert("level", "awesome".into());
    res
 }
@@ -160,8 +172,8 @@ impl Context {
        self.blobdir.as_path()
    }

-    pub fn call_cb(&self, event: Event) {
-        (*self.cb)(self, event);
+    pub fn call_cb(&self, event: Event) -> uintptr_t {
+        (*self.cb)(self, event)
    }

    /*******************************************************************************
@@ -521,7 +533,7 @@ mod tests {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
        std::fs::write(&dbfile, b"123").unwrap();
-        let res = Context::new(Box::new(|_, _| ()), "FakeOs".into(), dbfile);
+        let res = Context::new(Box::new(|_, _| 0), "FakeOs".into(), dbfile);
        assert!(res.is_err());
    }

@@ -536,7 +548,7 @@ mod tests {
    fn test_blobdir_exists() {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
-        Context::new(Box::new(|_, _| ()), "FakeOS".into(), dbfile).unwrap();
+        Context::new(Box::new(|_, _| 0), "FakeOS".into(), dbfile).unwrap();
        let blobdir = tmp.path().join("db.sqlite-blobs");
        assert!(blobdir.is_dir());
    }
@@ -547,7 +559,7 @@ mod tests {
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = tmp.path().join("db.sqlite-blobs");
        std::fs::write(&blobdir, b"123").unwrap();
-        let res = Context::new(Box::new(|_, _| ()), "FakeOS".into(), dbfile);
+        let res = Context::new(Box::new(|_, _| 0), "FakeOS".into(), dbfile);
        assert!(res.is_err());
    }

@@ -557,7 +569,7 @@ mod tests {
        let subdir = tmp.path().join("subdir");
        let dbfile = subdir.join("db.sqlite");
        let dbfile2 = dbfile.clone();
-        Context::new(Box::new(|_, _| ()), "FakeOS".into(), dbfile).unwrap();
+        Context::new(Box::new(|_, _| 0), "FakeOS".into(), dbfile).unwrap();
        assert!(subdir.is_dir());
        assert!(dbfile2.is_file());
    }
@@ -567,7 +579,7 @@ mod tests {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = PathBuf::new();
-        let res = Context::with_blobdir(Box::new(|_, _| ()), "FakeOS".into(), dbfile, blobdir);
+        let res = Context::with_blobdir(Box::new(|_, _| 0), "FakeOS".into(), dbfile, blobdir);
        assert!(res.is_err());
    }

@@ -576,7 +588,7 @@ mod tests {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = tmp.path().join("blobs");
-        let res = Context::with_blobdir(Box::new(|_, _| ()), "FakeOS".into(), dbfile, blobdir);
+        let res = Context::with_blobdir(Box::new(|_, _| 0), "FakeOS".into(), dbfile, blobdir);
        assert!(res.is_err());
    }

--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -877,15 +877,10 @@ fn create_or_lookup_group(
                mime_parser.repl_msg_by_error(s);
            }
        }
+        // check if the sender is a member of the existing group -
+        // if not, we'll recreate the group list
        if !chat::is_contact_in_chat(context, chat_id, from_id as u32) {
-            // The From-address is not part of this group.
-            // It could be a new user or a DSN from a mailer-daemon.
-            // in any case we do not want to recreate the member list
-            // but still show the message as part of the chat.
-            // After all, the sender has a reference/in-reply-to that
-            // points to this chat.
-            let s = context.stock_str(StockMessage::UnknownSenderForChat);
-            mime_parser.repl_msg_by_error(s.to_string());
+            recreate_member_list = true;
        }
    }

--- a/src/dc_simplify.rs
+++ b/src/dc_simplify.rs
@@ -1,3 +1,5 @@
+use crate::dehtml::*;
+
 /// Remove standard (RFC 3676, §4.3) footer if it is found.
 fn remove_message_footer<'a>(lines: &'a [&str]) -> &'a [&'a str] {
    for (ix, &line) in lines.iter().enumerate() {
@@ -36,9 +38,15 @@ fn split_lines(buf: &str) -> Vec<&str> {

 /// Simplify message text for chat display.
 /// Remove quotes, signatures, trailing empty lines etc.
-pub fn simplify(mut input: String, is_chat_message: bool) -> (String, bool) {
-    input.retain(|c| c != '\r');
-    let lines = split_lines(&input);
+pub fn simplify(input: &str, is_html: bool, is_chat_message: bool) -> (String, bool) {
+    let mut out = if is_html {
+        dehtml(input)
+    } else {
+        input.to_string()
+    };
+
+    out.retain(|c| c != '\r');
+    let lines = split_lines(&out);
    let (lines, is_forwarded) = skip_forward_header(&lines);

    let lines = remove_message_footer(lines);
@@ -199,29 +207,61 @@ mod tests {
        #[test]
        // proptest does not support [[:graphical:][:space:]] regex.
        fn test_simplify_plain_text_fuzzy(input in "[!-~\t \n]+") {
-            let (output, _is_forwarded) = simplify(input, true);
+            let (output, _is_forwarded) = simplify(&input, false, true);
            assert!(output.split('\n').all(|s| s != "-- "));
        }
    }

    #[test]
    fn test_simplify_trim() {
-        let input = "line1\n\r\r\rline2".to_string();
-        let (plain, is_forwarded) = simplify(input, false);
+        let html = "\r\r\nline1<br>\r\n\r\n\r\rline2\n\r";
+        let (plain, is_forwarded) = simplify(html, true, false);

        assert_eq!(plain, "line1\nline2");
        assert!(!is_forwarded);
    }

+    #[test]
+    fn test_simplify_parse_href() {
+        let html = "<a href=url>text</a";
+        let (plain, is_forwarded) = simplify(html, true, false);
+
+        assert_eq!(plain, "[text](url)");
+        assert!(!is_forwarded);
+    }
+
+    #[test]
+    fn test_simplify_bold_text() {
+        let html = "<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>";
+        let (plain, is_forwarded) = simplify(html, true, false);
+
+        assert_eq!(plain, "text *bold*<>");
+        assert!(!is_forwarded);
+    }
+
    #[test]
    fn test_simplify_forwarded_message() {
-        let input = "---------- Forwarded message ----------\r\nFrom: test@example.com\r\n\r\nForwarded message\r\n-- \r\nSignature goes here".to_string();
-        let (plain, is_forwarded) = simplify(input, false);
+        let text = "---------- Forwarded message ----------\r\nFrom: test@example.com\r\n\r\nForwarded message\r\n-- \r\nSignature goes here";
+        let (plain, is_forwarded) = simplify(text, false, false);

        assert_eq!(plain, "Forwarded message");
        assert!(is_forwarded);
    }

+    #[test]
+    fn test_simplify_html_encoded() {
+        let html =
+                "&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;";
+
+        let (plain, is_forwarded) = simplify(html, true, false);
+
+        assert_eq!(
+            plain,
+            "<>\"\'& äÄöÖüÜß fooÆçÇ \u{2666}\u{200e}\u{200f}\u{200c}&noent;\u{200d}"
+        );
+        assert!(!is_forwarded);
+    }
+
    #[test]
    fn test_simplify_utilities() {
        assert!(is_empty_line(" \t"));
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -486,7 +486,7 @@ pub(crate) fn dc_get_next_backup_path(
 pub(crate) fn time() -> i64 {
    SystemTime::now()
        .duration_since(SystemTime::UNIX_EPOCH)
-        .unwrap_or_default()
+        .unwrap()
        .as_secs() as i64
 }

--- a/src/dehtml.rs
+++ b/src/dehtml.rs
@@ -188,41 +188,4 @@ mod tests {
            assert_eq!(dehtml(input), output);
        }
    }
-
-    #[test]
-    fn test_dehtml_parse_br() {
-        let html = "\r\r\nline1<br>\r\n\r\n\r\rline2\n\r";
-        let plain = dehtml(html);
-
-        assert_eq!(plain, "line1\n\r\r\rline2");
-    }
-
-    #[test]
-    fn test_dehtml_parse_href() {
-        let html = "<a href=url>text</a";
-        let plain = dehtml(html);
-
-        assert_eq!(plain, "[text](url)");
-    }
-
-    #[test]
-    fn test_dehtml_bold_text() {
-        let html = "<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>";
-        let plain = dehtml(html);
-
-        assert_eq!(plain, "text *bold*<>");
-    }
-
-    #[test]
-    fn test_dehtml_html_encoded() {
-        let html =
-                "&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;";
-
-        let plain = dehtml(html);
-
-        assert_eq!(
-            plain,
-            "<>\"\'& äÄöÖüÜß fooÆçÇ \u{2666}\u{200e}\u{200f}\u{200c}&noent;\u{200d}"
-        );
-    }
 }
--- a/src/error.rs
+++ b/src/error.rs
@@ -6,49 +6,34 @@ use lettre_email::mime;
 pub enum Error {
    #[fail(display = "{:?}", _0)]
    Failure(failure::Error),
-
    #[fail(display = "SQL error: {:?}", _0)]
    SqlError(#[cause] crate::sql::Error),
-
    #[fail(display = "{:?}", _0)]
    Io(std::io::Error),
-
    #[fail(display = "{:?}", _0)]
    Message(String),
-
    #[fail(display = "{:?}", _0)]
    Image(image_meta::ImageError),
-
    #[fail(display = "{:?}", _0)]
    Utf8(std::str::Utf8Error),
-
    #[fail(display = "PGP: {:?}", _0)]
    Pgp(pgp::errors::Error),
-
    #[fail(display = "Base64Decode: {:?}", _0)]
    Base64Decode(base64::DecodeError),
-
    #[fail(display = "{:?}", _0)]
    FromUtf8(std::string::FromUtf8Error),
-
    #[fail(display = "{}", _0)]
    BlobError(#[cause] crate::blob::BlobError),
-
    #[fail(display = "Invalid Message ID.")]
    InvalidMsgId,
-
    #[fail(display = "Watch folder not found {:?}", _0)]
    WatchFolderNotFound(String),
-
    #[fail(display = "Invalid Email: {:?}", _0)]
    MailParseError(#[cause] mailparse::MailParseError),
-
    #[fail(display = "Building invalid Email: {:?}", _0)]
    LettreError(#[cause] lettre_email::error::Error),
-
    #[fail(display = "FromStr error: {:?}", _0)]
    FromStr(#[cause] mime::FromStrError),
-
    #[fail(display = "Not Configured")]
    NotConfigured,
 }
--- a/src/events.rs
+++ b/src/events.rs
@@ -21,38 +21,56 @@ pub enum Event {
    /// The library-user may write an informational string to the log.
    /// Passed to the callback given to dc_context_new().
    /// This event should not be reported to the end-user using a popup or something like that.
+    ///
+    /// @return 0
    #[strum(props(id = "100"))]
    Info(String),

    /// Emitted when SMTP connection is established and login was successful.
+    ///
+    /// @return 0
    #[strum(props(id = "101"))]
    SmtpConnected(String),

    /// Emitted when IMAP connection is established and login was successful.
+    ///
+    /// @return 0
    #[strum(props(id = "102"))]
    ImapConnected(String),

    /// Emitted when a message was successfully sent to the SMTP server.
+    ///
+    /// @return 0
    #[strum(props(id = "103"))]
    SmtpMessageSent(String),

    /// Emitted when an IMAP message has been marked as deleted
+    ///
+    /// @return 0
    #[strum(props(id = "104"))]
    ImapMessageDeleted(String),

    /// Emitted when an IMAP message has been moved
+    ///
+    /// @return 0
    #[strum(props(id = "105"))]
    ImapMessageMoved(String),

    /// Emitted when an IMAP folder was emptied
+    ///
+    /// @return 0
    #[strum(props(id = "106"))]
    ImapFolderEmptied(String),

    /// Emitted when an new file in the $BLOBDIR was created
+    ///
+    /// @return 0
    #[strum(props(id = "150"))]
    NewBlobFile(String),

    /// Emitted when an new file in the $BLOBDIR was created
+    ///
+    /// @return 0
    #[strum(props(id = "151"))]
    DeletedBlobFile(String),

@@ -60,6 +78,8 @@ pub enum Event {
    /// Passed to the callback given to dc_context_new().
    ///
    /// This event should not be reported to the end-user using a popup or something like that.
+    ///
+    /// @return 0
    #[strum(props(id = "300"))]
    Warning(String),

@@ -74,6 +94,8 @@ pub enum Event {
    /// it might be better to delay showing these events until the function has really
    /// failed (returned false). It should be sufficient to report only the *last* error
    /// in a messasge box then.
+    ///
+    /// @return
    #[strum(props(id = "400"))]
    Error(String),

@@ -90,6 +112,8 @@ pub enum Event {
    /// Moreover, if the UI detects that the device is offline,
    /// it is probably more useful to report this to the user
    /// instead of the string from data2.
+    ///
+    /// @return 0
    #[strum(props(id = "401"))]
    ErrorNetwork(String),

@@ -98,6 +122,8 @@ pub enum Event {
    /// dc_set_chat_name(), dc_set_chat_profile_image(),
    /// dc_add_contact_to_chat(), dc_remove_contact_from_chat(),
    /// dc_send_text_msg() or another sending function.
+    ///
+    /// @return 0
    #[strum(props(id = "410"))]
    ErrorSelfNotInGroup(String),

@@ -106,6 +132,8 @@ pub enum Event {
    /// - Messages sent, received or removed
    /// - Chats created, deleted or archived
    /// - A draft has been set
+    ///
+    /// @return 0
    #[strum(props(id = "2000"))]
    MsgsChanged { chat_id: u32, msg_id: MsgId },

@@ -113,21 +141,29 @@ pub enum Event {
    /// when receiving this message.
    ///
    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
+    ///
+    /// @return 0
    #[strum(props(id = "2005"))]
    IncomingMsg { chat_id: u32, msg_id: MsgId },

    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
    /// DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
+    ///
+    /// @return 0
    #[strum(props(id = "2010"))]
    MsgDelivered { chat_id: u32, msg_id: MsgId },

    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
    /// DC_STATE_OUT_FAILED, see dc_msg_get_state().
+    ///
+    /// @return 0
    #[strum(props(id = "2012"))]
    MsgFailed { chat_id: u32, msg_id: MsgId },

    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
    /// DC_STATE_OUT_MDN_RCVD, see dc_msg_get_state().
+    ///
+    /// @return 0
    #[strum(props(id = "2015"))]
    MsgRead { chat_id: u32, msg_id: MsgId },

@@ -135,12 +171,15 @@ pub enum Event {
    /// Or the verify state of a chat has changed.
    /// See dc_set_chat_name(), dc_set_chat_profile_image(), dc_add_contact_to_chat()
    /// and dc_remove_contact_from_chat().
+    ///
+    /// @return 0
    #[strum(props(id = "2020"))]
    ChatModified(u32),

    /// Contact(s) created, renamed, blocked or deleted.
    ///
    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
+    /// @return 0
    #[strum(props(id = "2030"))]
    ContactsChanged(Option<u32>),

@@ -149,12 +188,14 @@ pub enum Event {
    /// @param data1 (u32) contact_id of the contact for which the location has changed.
    ///     If the locations of several contacts have been changed,
    ///     eg. after calling dc_delete_all_locations(), this parameter is set to `None`.
+    /// @return 0
    #[strum(props(id = "2035"))]
    LocationChanged(Option<u32>),

    /// Inform about the configuration progress started by configure().
    ///
    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
+    /// @return 0
    #[strum(props(id = "2041"))]
    ConfigureProgress(usize),

@@ -162,6 +203,7 @@ pub enum Event {
    ///
    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
    /// @param data2 0
+    /// @return 0
    #[strum(props(id = "2051"))]
    ImexProgress(usize),

@@ -172,6 +214,7 @@ pub enum Event {
    /// services.
    ///
    /// @param data2 0
+    /// @return 0
    #[strum(props(id = "2052"))]
    ImexFileWritten(PathBuf),

@@ -187,6 +230,7 @@ pub enum Event {
    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
    ///     1000=Protocol finished for this contact.
+    /// @return 0
    #[strum(props(id = "2060"))]
    SecurejoinInviterProgress { contact_id: u32, progress: usize },

@@ -198,12 +242,14 @@ pub enum Event {
    /// @param data2 (int) Progress as:
    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
    ///     (Bob has verified alice and waits until Alice does the same for him)
+    /// @return 0
    #[strum(props(id = "2061"))]
    SecurejoinJoinerProgress { contact_id: u32, progress: usize },

    /// This event is sent out to the inviter when a joiner successfully joined a group.
    /// @param data1 (int) chat_id
    /// @param data2 (int) contact_id
+    /// @return 0
    #[strum(props(id = "2062"))]
    SecurejoinMemberAdded { chat_id: u32, contact_id: u32 },
 }
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -8,7 +8,6 @@ use rand::{thread_rng, Rng};

 use crate::blob::BlobObject;
 use crate::chat;
-use crate::chat::delete_and_reset_all_device_msgs;
 use crate::config::Config;
 use crate::configure::*;
 use crate::constants::*;
@@ -34,19 +33,16 @@ pub enum ImexMode {
    /// and `private-key-default.asc`, if there are more keys, they are written to files as
    /// `public-key-<id>.asc` and `private-key-<id>.asc`
    ExportSelfKeys = 1,
-
    /// Import private keys found in the directory given as `param1`.
    /// The last imported key is made the default keys unless its name contains the string `legacy`.
    /// Public keys are not imported.
    ImportSelfKeys = 2,
-
    /// Export a backup to the directory given as `param1`.
    /// The backup contains all contacts, chats, images and other data and device independent settings.
    /// The backup does not contain device dependent settings as ringtones or LED notification settings.
    /// The name of the backup is typically `delta-chat.<day>.bak`, if more than one backup is create on a day,
    /// the format is `delta-chat.<day>-<number>.bak`
    ExportBackup = 11,
-
    /// `param1` is the file (not: directory) to import. The file is normally
    /// created by DC_IMEX_EXPORT_BACKUP and detected by dc_imex_has_backup(). Importing a backup
    /// is only possible as long as the context is not configured or used in another way.
@@ -442,8 +438,6 @@ fn import_backup(context: &Context, backup_to_import: impl AsRef<Path>) -> Resul
        "could not re-open db"
    );

-    delete_and_reset_all_device_msgs(&context)?;
-
    let total_files_cnt = context
        .sql
        .query_get_value::<_, isize>(context, "SELECT COUNT(*) FROM backup_blobs;", params![])
--- a/src/job.rs
+++ b/src/job.rs
@@ -3,7 +3,7 @@
 //! This module implements a job queue maintained in the SQLite database
 //! and job types.

-use std::{fmt, time};
+use std::time::Duration;

 use deltachat_derive::{FromSql, ToSql};
 use rand::{thread_rng, Rng};
@@ -123,12 +123,6 @@ pub struct Job {
    pub pending_error: Option<String>,
 }

-impl fmt::Display for Job {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "#{}, action {}", self.job_id, self.action)
-    }
-}
-
 impl Job {
    /// Deletes the job from the database.
    fn delete(&self, context: &Context) -> bool {
@@ -207,6 +201,14 @@ impl Job {
                        println!("{}", String::from_utf8_lossy(&body));
                    }
                    match task::block_on(smtp.send(context, recipients_list, body, self.job_id)) {
+                        Err(crate::smtp::send::Error::SendTimeout(err)) => {
+                            warn!(context, "SMTP send timed out {:?}", err);
+                            smtp.disconnect();
+                            self.try_again_later(
+                                TryAgain::AtOnce,
+                                Some("send-timeout".to_string()),
+                            );
+                        }
                        Err(crate::smtp::send::Error::SendError(err)) => {
                            // Remote error, retry later.
                            warn!(context, "SMTP failed to send: {}", err);
@@ -569,7 +571,7 @@ pub fn perform_smtp_idle(context: &Context) {
    info!(context, "SMTP-idle ended.",);
 }

-fn get_next_wakeup_time(context: &Context, thread: Thread) -> time::Duration {
+fn get_next_wakeup_time(context: &Context, thread: Thread) -> Duration {
    let t: i64 = context
        .sql
        .query_get_value(
@@ -579,13 +581,13 @@ fn get_next_wakeup_time(context: &Context, thread: Thread) -> time::Duration {
        )
        .unwrap_or_default();

-    let mut wakeup_time = time::Duration::new(10 * 60, 0);
+    let mut wakeup_time = Duration::new(10 * 60, 0);
    let now = time();
    if t > 0 {
        if t > now {
-            wakeup_time = time::Duration::new((t - now) as u64, 0);
+            wakeup_time = Duration::new((t - now) as u64, 0);
        } else {
-            wakeup_time = time::Duration::new(0, 0);
+            wakeup_time = Duration::new(0, 0);
        }
    }

@@ -739,7 +741,17 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
    let jobs: Vec<Job> = load_jobs(context, thread, probe_network);

    for mut job in jobs {
-        info!(context, "{}-job {} started...", thread, job);
+        info!(
+            context,
+            "{}-job #{}, action {} started...",
+            if thread == Thread::Imap {
+                "INBOX"
+            } else {
+                "SMTP"
+            },
+            job.job_id,
+            job.action,
+        );

        // some configuration jobs are "exclusive":
        // - they are always executed in the imap-thread and the smtp-thread is suspended during execution
@@ -762,12 +774,7 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
            suspend_smtp_thread(context, true);
        }

-        for tries in 0..2 {
-            info!(
-                context,
-                "{} performs immediate try {} of job {}", thread, tries, job
-            );
-
+        for _tries in 0..2 {
            // this can be modified by a job using dc_job_try_again_later()
            job.try_again = TryAgain::Dont;

@@ -797,11 +804,6 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                Action::SendMdnOld => {}
                Action::SendMsgToSmtpOld => {}
            }
-
-            info!(
-                context,
-                "{} finished immediate try {} of job {}", thread, tries, job
-            );
            if job.try_again != TryAgain::AtOnce {
                break;
            }
@@ -823,12 +825,7 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
            break;
        } else if job.try_again == TryAgain::AtOnce || job.try_again == TryAgain::StandardDelay {
            let tries = job.tries + 1;
-
            if tries < JOB_RETRIES {
-                info!(
-                    context,
-                    "{} thread increases job {} tries to {}", thread, job, tries
-                );
                job.tries = tries;
                let time_offset = get_backoff_time_offset(tries);
                job.desired_timestamp = time() + time_offset;
@@ -836,7 +833,11 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                info!(
                    context,
                    "{}-job #{} not succeeded on try #{}, retry in {} seconds.",
-                    thread,
+                    if thread == Thread::Imap {
+                        "INBOX"
+                    } else {
+                        "SMTP"
+                    },
                    job.job_id as u32,
                    tries,
                    time_offset
@@ -851,10 +852,6 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                        .perform_jobs_needed = PerformJobsNeeded::AvoidDos;
                }
            } else {
-                info!(
-                    context,
-                    "{} thread removes job {} as it exhausted {} retries", thread, job, JOB_RETRIES
-                );
                if job.action == Action::SendMsgToSmtp {
                    message::set_msg_failed(
                        context,
@@ -873,10 +870,6 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
            // to give other jobs a chance being tried at least once.
            break;
        } else {
-            info!(
-                context,
-                "{} removes job {} as it cannot be retried", thread, job
-            );
            job.delete(context);
        }
    }
@@ -900,7 +893,7 @@ fn suspend_smtp_thread(context: &Context, suspend: bool) {
            if !context.smtp_state.0.lock().unwrap().doing_jobs {
                return;
            }
-            std::thread::sleep(time::Duration::from_micros(300 * 1000));
+            std::thread::sleep(std::time::Duration::from_micros(300 * 1000));
        }
    }
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -58,7 +58,6 @@ pub mod peerstate;
 pub mod pgp;
 pub mod qr;
 pub mod securejoin;
-mod simplify;
 mod smtp;
 pub mod sql;
 pub mod stock;
@@ -67,6 +66,7 @@ mod token;
 mod dehtml;

 pub mod dc_receive_imf;
+mod dc_simplify;
 pub mod dc_tools;

 /// if set imap/incoming and smtp/outgoing MIME messages will be printed
--- a/src/lot.rs
+++ b/src/lot.rs
@@ -73,28 +73,20 @@ pub enum LotState {
    // Qr States
    /// id=contact
    QrAskVerifyContact = 200,
-
    /// text1=groupname
    QrAskVerifyGroup = 202,
-
    /// id=contact
    QrFprOk = 210,
-
    /// id=contact
    QrFprMissmatch = 220,
-
    /// test1=formatted fingerprint
    QrFprWithoutAddr = 230,
-
    /// id=contact
    QrAddr = 320,
-
    /// text1=text
    QrText = 330,
-
    /// text1=URL
    QrUrl = 332,
-
    /// text1=error string
    QrError = 400,

--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -1002,20 +1002,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
    }
 }

-/// Returns base64-encoded buffer `buf` split into 78-bytes long
-/// chunks separated by CRLF.
-///
-/// This line length limit is an
-/// [RFC5322 requirement](https://tools.ietf.org/html/rfc5322#section-2.1.1).
-fn wrapped_base64_encode(buf: &[u8]) -> String {
-    let base64 = base64::encode(&buf);
-    let mut chars = base64.chars();
-    std::iter::repeat_with(|| chars.by_ref().take(78).collect::<String>())
-        .take_while(|s| !s.is_empty())
-        .collect::<Vec<_>>()
-        .join("\r\n")
-}
-
 fn build_body_file(
    context: &Context,
    msg: &Message,
@@ -1076,7 +1062,7 @@ fn build_body_file(
    };

    let body = std::fs::read(blob.to_abs_path())?;
-    let encoded_body = wrapped_base64_encode(&body);
+    let encoded_body = base64::encode(&body);

    let mail = PartBuilder::new()
        .content_type(&mimetype)
@@ -1098,7 +1084,7 @@ fn build_selfavatar_file(context: &Context, path: String) -> Result<(PartBuilder
        None => mime::APPLICATION_OCTET_STREAM,
    };
    let body = std::fs::read(blob.to_abs_path())?;
-    let encoded_body = wrapped_base64_encode(&body);
+    let encoded_body = base64::encode(&body);

    let part = PartBuilder::new()
        .content_type(&mimetype)
@@ -1217,13 +1203,4 @@ mod tests {
            "<123@q> <456@d>".to_string()
        );
    }
-
-    #[test]
-    fn test_wrapped_base64_encode() {
-        let input = b"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-        let output =
-            "QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU\r\n\
-             FBQUFBQUFBQQ==";
-        assert_eq!(wrapped_base64_encode(input), output);
-    }
 }
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -10,8 +10,8 @@ use crate::config::Config;
 use crate::constants::Viewtype;
 use crate::contact::*;
 use crate::context::Context;
+use crate::dc_simplify::*;
 use crate::dc_tools::*;
-use crate::dehtml::dehtml;
 use crate::e2ee;
 use crate::error::Result;
 use crate::events::Event;
@@ -22,7 +22,6 @@ use crate::message;
 use crate::param::*;
 use crate::peerstate::Peerstate;
 use crate::securejoin::handle_degrade_event;
-use crate::simplify::*;
 use crate::stock::StockMessage;
 use crate::{bail, ensure};

@@ -581,12 +580,7 @@ impl<'a> MimeParser<'a> {
                        ("".into(), false)
                    } else {
                        let is_html = mime_type == mime::TEXT_HTML;
-                        let out = if is_html {
-                            dehtml(&decoded_data)
-                        } else {
-                            decoded_data.clone()
-                        };
-                        simplify(out, self.has_chat_version())
+                        simplify(&decoded_data, is_html, self.has_chat_version())
                    };

                    if !simplified_txt.is_empty() {
--- a/src/param.rs
+++ b/src/param.rs
@@ -16,51 +16,36 @@ use crate::mimeparser::SystemMessage;
 pub enum Param {
    /// For messages and jobs
    File = b'f',
-
    /// For Messages
    Width = b'w',
-
    /// For Messages
    Height = b'h',
-
    /// For Messages
    Duration = b'd',
-
    /// For Messages
    MimeType = b'm',
-
-    /// For Messages: message is encrypted, outgoing: guarantee E2EE or the message is not send
+    /// For Messages: message is encryoted, outgoing: guarantee E2EE or the message is not send
    GuaranteeE2ee = b'c',
-
    /// For Messages: decrypted with validation errors or without mutual set, if neither
    /// 'c' nor 'e' are preset, the messages is only transport encrypted.
    ErroneousE2ee = b'e',
-
    /// For Messages: force unencrypted message, either `ForcePlaintext::AddAutocryptHeader` (1),
    /// `ForcePlaintext::NoAutocryptHeader` (2) or 0.
    ForcePlaintext = b'u',
-
    /// For Messages
    WantsMdn = b'r',
-
    /// For Messages
    Forwarded = b'a',
-
    /// For Messages
    Cmd = b'S',
-
    /// For Messages
    Arg = b'E',
-
    /// For Messages
    Arg2 = b'F',
-
    /// For Messages
    Arg3 = b'G',
-
    /// For Messages
    Arg4 = b'H',
-
    /// For Messages
    Error = b'L',

@@ -77,43 +62,30 @@ pub enum Param {
    /// When the original message is then finally sent this parameter
    /// is used to also send all the forwarded messages.
    PrepForwards = b'P',
-
    /// For Jobs
    SetLatitude = b'l',
-
    /// For Jobs
    SetLongitude = b'n',
-
    /// For Jobs
    ServerFolder = b'Z',
-
    /// For Jobs
    ServerUid = b'z',
-
    /// For Jobs
    AlsoMove = b'M',
-
    /// For Jobs: space-separated list of message recipients
    Recipients = b'R',
-
    // For Groups
    Unpromoted = b'U',
-
    // For Groups and Contacts
    ProfileImage = b'i',
-
    // For Chats
    Selftalk = b'K',
-
    // For Chats
    Devicetalk = b'D',
-
    // For QR
    Auth = b's',
-
    // For QR
    GroupId = b'x',
-
    // For QR
    GroupName = b'g',
 }
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -95,7 +95,6 @@ pub enum ToSave {
 pub enum DegradeEvent {
    /// Recoverable by an incoming encrypted mail.
    EncryptionPaused = 0x01,
-
    /// Recoverable by a new verify.
    FingerprintChanged = 0x02,
 }
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -20,23 +20,18 @@ const SMTP_TIMEOUT: u64 = 30;
 pub enum Error {
    #[fail(display = "Bad parameters")]
    BadParameters,
-
    #[fail(display = "Invalid login address {}: {}", address, error)]
    InvalidLoginAddress {
        address: String,
        #[cause]
        error: error::Error,
    },
-
    #[fail(display = "SMTP failed to connect: {:?}", _0)]
    ConnectionFailure(#[cause] smtp::error::Error),
-
    #[fail(display = "SMTP: failed to setup connection {:?}", _0)]
    ConnectionSetupFailure(#[cause] smtp::error::Error),
-
    #[fail(display = "SMTP: oauth2 error {:?}", _0)]
    Oauth2Error { address: String },
-
    #[fail(display = "TLS error")]
    Tls(#[cause] native_tls::Error),
 }
--- a/src/smtp/send.rs
+++ b/src/smtp/send.rs
@@ -12,12 +12,18 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub enum Error {
    #[fail(display = "Envelope error: {}", _0)]
    EnvelopeError(#[cause] async_smtp::error::Error),
-
    #[fail(display = "Send error: {}", _0)]
    SendError(#[cause] async_smtp::smtp::error::Error),
-
    #[fail(display = "SMTP has no transport")]
    NoTransport,
+    #[fail(display = "SMTP send timed out")]
+    SendTimeout(#[cause] async_std::future::TimeoutError),
+}
+
+impl From<async_std::future::TimeoutError> for Error {
+    fn from(err: async_std::future::TimeoutError) -> Error {
+        Error::SendTimeout(err)
+    }
 }

 impl Smtp {
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -185,9 +185,6 @@ pub enum StockMessage {
                    Recipients don't need to install Delta Chat, visit websites or sign up anywhere - \
                    however, of course, if they like, you may point them to 👉 https://get.delta.chat"))]
    WelcomeMessage = 71,
-
-    #[strum(props(fallback = "Unknown Sender for this chat. See 'info' for more details."))]
-    UnknownSenderForChat = 72,
 }

 /*
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -2,6 +2,7 @@
 //!
 //! This module is only compiled for test runs.

+use libc::uintptr_t;
 use tempfile::{tempdir, TempDir};

 use crate::config::Config;
@@ -30,7 +31,7 @@ pub fn test_context(callback: Option<Box<ContextCallback>>) -> TestContext {
    let dbfile = dir.path().join("db.sqlite");
    let cb: Box<ContextCallback> = match callback {
        Some(cb) => cb,
-        None => Box::new(|_, _| ()),
+        None => Box::new(|_, _| 0),
    };
    let ctx = Context::new(cb, "FakeOs".into(), dbfile).unwrap();
    TestContext { ctx, dir }
@@ -45,13 +46,14 @@ pub fn dummy_context() -> TestContext {
    test_context(None)
 }

-pub fn logging_cb(_ctx: &Context, evt: Event) {
+pub fn logging_cb(_ctx: &Context, evt: Event) -> uintptr_t {
    match evt {
        Event::Info(msg) => println!("I: {}", msg),
        Event::Warning(msg) => println!("W: {}", msg),
        Event::Error(msg) => println!("E: {}", msg),
        _ => (),
    }
+    0
 }

 /// Creates Alice with a pre-generated keypair.
--- a/tests/stress.rs
+++ b/tests/stress.rs
@@ -203,7 +203,9 @@ fn test_encryption_decryption() {
    assert_eq!(plain, original_text);
 }

-fn cb(_context: &Context, _event: Event) {}
+fn cb(_context: &Context, _event: Event) -> libc::uintptr_t {
+    0
+}

 #[allow(dead_code)]
 struct TestContext {
Author	SHA1	Message	Date
Simon Laux	5a6f2529b1	try to make linter happier	2019-12-20 20:34:42 +01:00
Simon Laux	e25b409c7e	cargo fmt	2019-12-20 20:18:32 +01:00
Simon Laux	5479877f65	add provider db documentation url default case for unwrapping try fixing python linting	2019-12-20 15:17:07 +01:00
Simon Laux	7da5fe2726	json api for provider overview	2019-12-19 18:33:43 +01:00