Merge branch 'master' into flub/send-backup

Cargo.lock

@@ -1010,7 +1010,6 @@ dependencies = [
  "bitflags",
  "chrono",
  "criterion",
- "crossbeam-queue",
  "deltachat_derive",
  "email",
  "encoded-words",
@@ -1027,11 +1026,11 @@ dependencies = [
  "libc",
  "log",
  "mailparse",
- "native-tls",
  "num-derive",
  "num-traits",
  "num_cpus",
  "once_cell",
+ "parking_lot",
  "percent-encoding",
  "pgp",
  "pretty_env_logger",