bring back remote_rust tests but comment them

2026-07-01 20:14:57 +03:00 · 2020-06-09 15:00:31 +02:00
47 changed files with 1053 additions and 2789 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -138,6 +138,12 @@ jobs:
            - py-docs
            - wheelhouse

+  remote_tests_rust:
+    machine: true
+    steps:
+      - checkout
+      - run: ci_scripts/remote_tests_rust.sh
+
  remote_tests_python:
    machine: true
    steps:
@@ -172,6 +178,11 @@ workflows:
    jobs:
      # - cargo_fetch

+      #- remote_tests_rust
+      #    filters:
+      #      tags:
+      #        only: /.*/
+
      - remote_tests_python:
          filters:
            tags:
@@ -180,6 +191,7 @@ workflows:
      - remote_python_packaging:
          requires: 
             - remote_tests_python
+             # - remote_tests_rust
          filters:
            branches:
              only: master
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,8 @@ on:
  push:
    branches:
      - master
+      - staging
+      - trying

 jobs:

@@ -18,12 +20,25 @@ jobs:
          profile: minimal
          toolchain: 1.43.1
          override: true
-      - run: rustup component add rustfmt 
+      - run: rustup component add rustfmt
      - uses: actions-rs/cargo@v1
        with:
          command: fmt
          args: --all -- --check

+  run_clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+            toolchain: 1.43.1
+            components: clippy
+            override: true
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+

  build_and_test:
    name: Build and test
@@ -60,6 +75,12 @@ jobs:
        path: target
        key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-build-target-${{ hashFiles('**/Cargo.toml') }}

+    - name: check
+      uses: actions-rs/cargo@v1
+      with:
+        command:  check
+        args: --workspace --all --bins --examples --tests
+
    - name: tests
      uses: actions-rs/cargo@v1
      with:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,28 +1,5 @@
 # Changelog 

-## 1.35.0
-
- enable strict-tls from a new provider-db setting #1587
-
- new subject 'Message from USER' for one-to-one chats #1395
-
- recode images #1563
-
- improve reconnect handling #1549 #1580
-
- improve importing addresses #1544
-
- improve configure and folder detection #1539 #1548
-
- improve test suite #1559 #1564 #1580 #1581 #1582 #1584 #1588:
-
- fix ad-hoc groups #1566
-
- preventions against being marked as spam #1575
-
- refactorings #1542 #1569
-
-
 ## 1.34.0

 - new api for io, thread and event handling #1356,
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,23 +1,23 @@
 [package]
 name = "deltachat"
-version = "1.35.0"
+version = "1.34.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL-2.0"

 [profile.release]
-lto = true
+# lto = true

 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }

 libc = "0.2.51"
-pgp = { version = "0.6.0", default-features = false } 
+pgp = { version = "0.5.1", default-features = false } 
 hex = "0.4.0"
-sha2 = "0.9.0"
+sha2 = "0.8.0"
 rand = "0.7.0"
 smallvec = "1.0.0"
-surf = { version = "2.0.0-alpha.4", default-features = false, features = ["h1-client"] }
+surf = { version = "2.0.0-alpha.2", default-features = false, features = ["h1-client"] }
 num-derive = "0.3.0"
 num-traits = "0.2.6"
 async-smtp = { version = "0.3" }
@@ -25,43 +25,42 @@ email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 async-imap = "0.3.1"
 async-native-tls = { version = "0.3.3" }
-async-std = { version = "1.6.1", features = ["unstable"] }
-base64 = "0.12"
+async-std = { version = "1.6.0", features = ["unstable"] }
+base64 = "0.11"
 charset = "0.1"
 percent-encoding = "2.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 chrono = "0.4.6"
 indexmap = "1.3.0"
-kamadak-exif = "0.5"
 lazy_static = "1.4.0"
 regex = "1.1.6"
-rusqlite = { version = "0.23", features = ["bundled"] }
-r2d2_sqlite = "0.16.0"
+rusqlite = { version = "0.22", features = ["bundled"] }
+r2d2_sqlite = "0.15.0"
 r2d2 = "0.8.5"
-strum = "0.18.0"
-strum_macros = "0.18.0"
+strum = "0.16.0"
+strum_macros = "0.16.0"
 backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.8.0"
 image-meta = "0.1.0"
-quick-xml = "0.18.1"
+quick-xml = "0.17.1"
 escaper = "0.1.0"
 bitflags = "1.1.0"
+debug_stub_derive = "0.3.0"
 sanitize-filename = "0.2.1"
 stop-token = { version = "0.1.1", features = ["unstable"] }
 mailparse = "0.12.1"
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 native-tls = "0.2.3"
-image = { version = "0.23.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.22.4", default-features=false, features = ["gif_codec", "jpeg", "ico", "png_codec", "pnm", "webp", "bmp"] }
 futures = "0.3.4"
 thiserror = "1.0.14"
 anyhow = "1.0.28"
 async-trait = "0.1.31"
 url = "2.1.1"
-async-std-resolver = "0.19.5"

-pretty_env_logger = { version = "0.4.0", optional = true }
+pretty_env_logger = { version = "0.3.1", optional = true }
 log = {version = "0.4.8", optional = true }
 rustyline = { version = "4.1.0", optional = true }
 ansi_term = { version = "0.12.1", optional = true }
@@ -70,8 +69,8 @@ ansi_term = { version = "0.12.1", optional = true }
 [dev-dependencies]
 tempfile = "3.0"
 pretty_assertions = "0.6.1"
-pretty_env_logger = "0.4.0"
-proptest = "0.10"
+pretty_env_logger = "0.3.0"
+proptest = "0.9.4"
 async-std = { version = "1.6.0", features = ["unstable", "attributes"] }
 smol = "0.1.10"

--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.35.0"
+version = "1.34.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -307,9 +307,9 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    DC_MEDIA_QUALITY_WORSE (1)
 *                    allow worse images/videos/voice quality to gain smaller sizes,
 *                    suitable for providers or areas known to have a bad connection.
- *                    The library uses the `media_quality` setting to use different defaults
- *                    for recoding images sent with type DC_MSG_IMAGE.
- *                    If needed, recoding other file types is up to the UI.
+ *                    In contrast to other options, the implementation of this option is currently up to the UIs;
+ *                    this may change in future, however,
+ *                    having the option in the core allows provider-specific-defaults already today.
 *
 * If you want to retrieve a value, use dc_get_config().
 *
@@ -528,20 +528,9 @@ int             dc_is_io_running(const dc_context_t* context);
 void            dc_stop_io(dc_context_t* context);

 /**
- * This function should be called when there is a hint
- * that the network is available again,
- * eg. as a response to system event reporting network availability.
- * The library will try to send pending messages out immediately.
- *
- * Moreover, to have a reliable state
- * when the app comes to foreground with network available,
- * it may be reasonable to call the function also at that moment.
- *
- * It is okay to call the function unconditionally when there is
- * network available, however, calling the function
- * _without_ having network may interfere with the backoff algorithm
- * and will led to let the jobs fail faster, with fewer retries
- * and may avoid messages being sent out.
+ * This function can be called whenever there is a hint
+ * that the network is available again.
+ * The library will try to send pending messages out.
 *
 * @memberof dc_context_t
 * @param context The context as created by dc_context_new().
@@ -765,15 +754,6 @@ uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t ch
 * dc_msg_unref(msg);
 * ~~~
 *
- * If you send images with the DC_MSG_IMAGE type,
- * they will be recoded to a reasonable size before sending, if possible
- * (cmp the dc_set_config()-option `media_quality`).
- * If that fails, is not possible, or the image is already small enough, the image is sent as original.
- * If you want images to be always sent as the original file, use the DC_MSG_FILE type.
- *
- * Videos and other file types are currently not recoded by the library,
- * with dc_prepare_msg(), however, you can do that from the UI.
- *
 * @memberof dc_context_t
 * @param context The context object as returned from dc_context_new().
 * @param chat_id Chat ID to send the message to.
@@ -2802,9 +2782,6 @@ int             dc_msg_get_viewtype           (const dc_msg_t* msg);
 *   If a sent message changes to this state, you'll receive the event #DC_EVENT_MSG_DELIVERED.
 * - DC_STATE_OUT_MDN_RCVD (28) - Outgoing message read by the recipient (two checkmarks; this requires goodwill on the receiver's side)
 *   If a sent message changes to this state, you'll receive the event #DC_EVENT_MSG_READ.
- *   Also messages already read by some recipients
- *   may get into the state DC_STATE_OUT_FAILED at a later point,
- *   eg. when in a group, delivery fails for some recipients.
 *
 * If you just want to check if a message is sent or not, please use dc_msg_is_sent() which regards all states accordingly.
 *
@@ -4140,9 +4117,8 @@ void dc_event_unref(dc_event_t* event);


 /**
- * A single message could not be sent.
- * State changed from DC_STATE_OUT_PENDING, DC_STATE_OUT_DELIVERED or DC_STATE_OUT_MDN_RCVD
- * to DC_STATE_OUT_FAILED, see dc_msg_get_state().
+ * 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().
 *
 * @param data1 (int) chat_id
 * @param data2 (int) msg_id
@@ -4452,21 +4428,12 @@ void dc_event_unref(dc_event_t* event);
 #define DC_STR_WELCOME_MESSAGE            71
 #define DC_STR_UNKNOWN_SENDER_FOR_CHAT    72
 #define DC_STR_SUBJECT_FOR_NEW_CONTACT    73
-#define DC_STR_FAILED_SENDING_TO          74
-
-#define DC_STR_COUNT                      74
+#define DC_STR_COUNT                      73

 /*
 * @}
 */

-#ifdef PY_CFFI_INC
-/* Helper utility to locate the header file when building python bindings. */
-char* _dc_header_file_location(void) {
-    return __FILE__;
-}
-#endif
-

 #ifdef __cplusplus
 }
--- a/python/src/deltachat/init.py
+++ b/python/src/deltachat/init.py
@@ -77,8 +77,8 @@ def run_cmdline(argv=None, account_plugins=None):
        ac.set_config("mvbox_move", "0")
        ac.set_config("mvbox_watch", "0")
        ac.set_config("sentbox_watch", "0")
-        configtracker = ac.configure()
-        configtracker.wait_finish()
+        ac.configure()
+        ac.wait_configure_finish()

    # start IO threads and configure if neccessary
    ac.start_io()
--- a/python/src/deltachat/_build.py
+++ b/python/src/deltachat/_build.py
@@ -1,64 +1,65 @@
 import distutils.ccompiler
 import distutils.log
 import distutils.sysconfig
-import os
-import platform
-import re
-import shutil
-import subprocess
 import tempfile
-import textwrap
-import types
-from os.path import abspath
-from os.path import dirname as dn
-
+import platform
+import os
 import cffi
+import shutil
+from os.path import dirname as dn
+from os.path import abspath


-def local_build_flags(projdir, target):
-    """Construct build flags for building against a checkout.
-
-    :param projdir: The root directory of the deltachat-core-rust project.
-    :param target: The rust build target, `debug` or `release`.
-    """
-    flags = types.SimpleNamespace()
-    if platform.system() == 'Darwin':
-        flags.libs = ['resolv', 'dl']
-        flags.extra_link_args = [
-                '-framework', 'CoreFoundation',
-                '-framework', 'CoreServices',
-                '-framework', 'Security',
-        ]
-    elif platform.system() == 'Linux':
-        flags.libs = ['rt', 'dl', 'm']
-        flags.extra_link_args = []
+def ffibuilder():
+    projdir = os.environ.get('DCC_RS_DEV')
+    if not projdir:
+        p = dn(dn(dn(dn(abspath(__file__)))))
+        projdir = os.environ["DCC_RS_DEV"] = p
+    target = os.environ.get('DCC_RS_TARGET', 'release')
+    if projdir:
+        if platform.system() == 'Darwin':
+            libs = ['resolv', 'dl']
+            extra_link_args = [
+                    '-framework', 'CoreFoundation',
+                    '-framework', 'CoreServices',
+                    '-framework', 'Security',
+            ]
+        elif platform.system() == 'Linux':
+            libs = ['rt', 'dl', 'm']
+            extra_link_args = []
+        else:
+            raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
+        target_dir = os.environ.get("CARGO_TARGET_DIR")
+        if target_dir is None:
+            target_dir = os.path.join(projdir, 'target')
+        objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
+        assert os.path.exists(objs[0]), objs
+        incs = [os.path.join(projdir, 'deltachat-ffi')]
    else:
-        raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
-    target_dir = os.environ.get("CARGO_TARGET_DIR")
-    if target_dir is None:
-        target_dir = os.path.join(projdir, 'target')
-    flags.objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
-    assert os.path.exists(flags.objs[0]), flags.objs
-    flags.incs = [os.path.join(projdir, 'deltachat-ffi')]
-    return flags
-
-
-def system_build_flags():
-    """Construct build flags for building against an installed libdeltachat."""
-    flags = types.SimpleNamespace()
-    flags.libs = ['deltachat']
-    flags.objs = []
-    flags.incs = []
-    flags.extra_link_args = []
-
-
-def extract_functions(flags):
-    """Extract the function definitions from deltachat.h.
-
-    This creates a .h file with a single `#include <deltachat.h>` line
-    in it.  It then runs the C preprocessor to create an output file
-    which contains all function definitions found in `deltachat.h`.
-    """
+        libs = ['deltachat']
+        objs = []
+        incs = []
+        extra_link_args = []
+    builder = cffi.FFI()
+    builder.set_source(
+        'deltachat.capi',
+        """
+            #include <deltachat.h>
+            int dc_event_has_string_data(int e)
+            {
+                return DC_EVENT_DATA2_IS_STRING(e);
+            }
+        """,
+        include_dirs=incs,
+        libraries=libs,
+        extra_objects=objs,
+        extra_link_args=extra_link_args,
+    )
+    builder.cdef("""
+        typedef int... time_t;
+        void free(void *ptr);
+        extern int dc_event_has_string_data(int);
+    """)
    distutils.log.set_verbosity(distutils.log.INFO)
    cc = distutils.ccompiler.new_compiler(force=True)
    distutils.sysconfig.customize_compiler(cc)
@@ -70,133 +71,13 @@ def extract_functions(flags):
            src_fp.write('#include <deltachat.h>')
        cc.preprocess(source=src_name,
                      output_file=dst_name,
-                      include_dirs=flags.incs,
+                      include_dirs=incs,
                      macros=[('PY_CFFI', '1')])
        with open(dst_name, "r") as dst_fp:
-            return dst_fp.read()
+            builder.cdef(dst_fp.read())
    finally:
        shutil.rmtree(tmpdir)

-
-def find_header(flags):
-    """Use the compiler to find the deltachat.h header location.
-
-    This uses a small utility in deltachat.h to find the location of
-    the header file location.
-    """
-    distutils.log.set_verbosity(distutils.log.INFO)
-    cc = distutils.ccompiler.new_compiler(force=True)
-    distutils.sysconfig.customize_compiler(cc)
-    tmpdir = tempfile.mkdtemp()
-    try:
-        src_name = os.path.join(tmpdir, "where.c")
-        obj_name = os.path.join(tmpdir, "where.o")
-        dst_name = os.path.join(tmpdir, "where")
-        with open(src_name, "w") as src_fp:
-            src_fp.write(textwrap.dedent("""
-                #include <stdio.h>
-                #include <deltachat.h>
-
-                int main(void) {
-                    printf("%s", _dc_header_file_location());
-                    return 0;
-                }
-            """))
-        cwd = os.getcwd()
-        try:
-            os.chdir(tmpdir)
-            cc.compile(sources=["where.c"],
-                       include_dirs=flags.incs,
-                       macros=[("PY_CFFI_INC", "1")])
-        finally:
-            os.chdir(cwd)
-        cc.link_executable(objects=[obj_name],
-                           output_progname="where",
-                           output_dir=tmpdir)
-        return subprocess.check_output(dst_name)
-    finally:
-        shutil.rmtree(tmpdir)
-
-
-def extract_defines(flags):
-    """Extract the required #DEFINEs from deltachat.h.
-
-    Since #DEFINEs are interpreted by the C preprocessor we can not
-    use the compiler to extract these and need to parse the header
-    file ourselves.
-
-    The defines are returned in a string that can be passed to CFFIs
-    cdef() method.
-    """
-    header = find_header(flags)
-    defines_re = re.compile(r"""
-        \#define\s+   # The start of a define.
-        (             # Begin capturing group which captures the define name.
-            (?:       # A nested group which is not captured, this allows us
-                      #    to build the list of prefixes to extract without
-                      #    creation another capture group.
-                DC_EVENT
-                | DC_QR
-                | DC_MSG
-                | DC_LP
-                | DC_EMPTY
-                | DC_CERTCK
-                | DC_STATE
-                | DC_STR
-                | DC_CONTACT_ID
-                | DC_GCL
-                | DC_CHAT
-                | DC_PROVIDER
-                | DC_KEY_GEN
-            )         # End of prefix matching
-            _[\w_]+   # Match the suffix, e.g. _RSA2048 in DC_KEY_GEN_RSA2048
-        )             # Close the capturing group, this contains
-                      # the entire name e.g. DC_MSG_TEXT.
-        \s+\S+        # Ensure there is whitespace followed by a value.
-    """, re.VERBOSE)
-    defines = []
-    with open(header) as fp:
-        for line in fp:
-            match = defines_re.match(line)
-            if match:
-                defines.append(match.group(1))
-    return '\n'.join('#define {} ...'.format(d) for d in defines)
-
-
-def ffibuilder():
-    projdir = os.environ.get('DCC_RS_DEV')
-    if not projdir:
-        p = dn(dn(dn(dn(abspath(__file__)))))
-        projdir = os.environ["DCC_RS_DEV"] = p
-    target = os.environ.get('DCC_RS_TARGET', 'release')
-    if projdir:
-        flags = local_build_flags(projdir, target)
-    else:
-        flags = system_build_flags()
-    builder = cffi.FFI()
-    builder.set_source(
-        'deltachat.capi',
-        """
-            #include <deltachat.h>
-            int dc_event_has_string_data(int e)
-            {
-                return DC_EVENT_DATA2_IS_STRING(e);
-            }
-        """,
-        include_dirs=flags.incs,
-        libraries=flags.libs,
-        extra_objects=flags.objs,
-        extra_link_args=flags.extra_link_args,
-    )
-    builder.cdef("""
-        typedef int... time_t;
-        void free(void *ptr);
-        extern int dc_event_has_string_data(int);
-    """)
-    function_defs = extract_functions(flags)
-    defines = extract_defines(flags)
-    builder.cdef(function_defs)
-    builder.cdef(defines)
    return builder


--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -561,24 +561,29 @@ class Account(object):
        :raises MissingCredentials: if `addr` and `mail_pw` values are not set.
        :raises ConfigureFailed: if the account could not be configured.

-        :returns: None
+        :returns: None (account is configured and with io-scheduling running)
        """
        if not self.is_configured():
            raise ValueError("account not configured, cannot start io")
        lib.dc_start_io(self._dc_context)

    def configure(self):
-        """ Start configuration process and return a Configtracker instance
-        on which you can block with wait_finish() to get a True/False success
-        value for the configuration process.
-        """
        assert not self.is_configured()
+        assert not hasattr(self, "_configtracker")
        if not self.get_config("addr") or not self.get_config("mail_pw"):
            raise MissingCredentials("addr or mail_pwd not set in config")
-        configtracker = ConfigureTracker(self)
-        self.add_account_plugin(configtracker)
+        if hasattr(self, "_configtracker"):
+            self.remove_account_plugin(self._configtracker)
+        self._configtracker = ConfigureTracker(self)
+        self.add_account_plugin(self._configtracker)
        lib.dc_configure(self._dc_context)
-        return configtracker
+
+    def wait_configure_finish(self):
+        try:
+            self._configtracker.wait_finish()
+        finally:
+            self.remove_account_plugin(self._configtracker)
+            del self._configtracker

    def is_started(self):
        return self._event_thread.is_alive() and bool(lib.dc_is_io_running(self._dc_context))
--- a/python/src/deltachat/const.py
+++ b/python/src/deltachat/const.py
@@ -1,7 +1,197 @@
-from .capi import lib
+import sys
+import re
+import os
+from os.path import dirname, abspath
+from os.path import join as joinpath
+
+# the following const are generated from deltachat.h
+# this works well when you in a git-checkout
+# run "python deltachat/const.py" to regenerate events
+# begin const generated
+DC_GCL_ARCHIVED_ONLY = 0x01
+DC_GCL_NO_SPECIALS = 0x02
+DC_GCL_ADD_ALLDONE_HINT = 0x04
+DC_GCL_FOR_FORWARDING = 0x08
+DC_GCL_VERIFIED_ONLY = 0x01
+DC_GCL_ADD_SELF = 0x02
+DC_QR_ASK_VERIFYCONTACT = 200
+DC_QR_ASK_VERIFYGROUP = 202
+DC_QR_FPR_OK = 210
+DC_QR_FPR_MISMATCH = 220
+DC_QR_FPR_WITHOUT_ADDR = 230
+DC_QR_ACCOUNT = 250
+DC_QR_ADDR = 320
+DC_QR_TEXT = 330
+DC_QR_URL = 332
+DC_QR_ERROR = 400
+DC_CHAT_ID_DEADDROP = 1
+DC_CHAT_ID_TRASH = 3
+DC_CHAT_ID_MSGS_IN_CREATION = 4
+DC_CHAT_ID_STARRED = 5
+DC_CHAT_ID_ARCHIVED_LINK = 6
+DC_CHAT_ID_ALLDONE_HINT = 7
+DC_CHAT_ID_LAST_SPECIAL = 9
+DC_CHAT_TYPE_UNDEFINED = 0
+DC_CHAT_TYPE_SINGLE = 100
+DC_CHAT_TYPE_GROUP = 120
+DC_CHAT_TYPE_VERIFIED_GROUP = 130
+DC_MSG_ID_MARKER1 = 1
+DC_MSG_ID_DAYMARKER = 9
+DC_MSG_ID_LAST_SPECIAL = 9
+DC_STATE_UNDEFINED = 0
+DC_STATE_IN_FRESH = 10
+DC_STATE_IN_NOTICED = 13
+DC_STATE_IN_SEEN = 16
+DC_STATE_OUT_PREPARING = 18
+DC_STATE_OUT_DRAFT = 19
+DC_STATE_OUT_PENDING = 20
+DC_STATE_OUT_FAILED = 24
+DC_STATE_OUT_DELIVERED = 26
+DC_STATE_OUT_MDN_RCVD = 28
+DC_CONTACT_ID_SELF = 1
+DC_CONTACT_ID_INFO = 2
+DC_CONTACT_ID_DEVICE = 5
+DC_CONTACT_ID_LAST_SPECIAL = 9
+DC_MSG_TEXT = 10
+DC_MSG_IMAGE = 20
+DC_MSG_GIF = 21
+DC_MSG_STICKER = 23
+DC_MSG_AUDIO = 40
+DC_MSG_VOICE = 41
+DC_MSG_VIDEO = 50
+DC_MSG_FILE = 60
+DC_LP_AUTH_OAUTH2 = 0x2
+DC_LP_AUTH_NORMAL = 0x4
+DC_LP_IMAP_SOCKET_STARTTLS = 0x100
+DC_LP_IMAP_SOCKET_SSL = 0x200
+DC_LP_IMAP_SOCKET_PLAIN = 0x400
+DC_LP_SMTP_SOCKET_STARTTLS = 0x10000
+DC_LP_SMTP_SOCKET_SSL = 0x20000
+DC_LP_SMTP_SOCKET_PLAIN = 0x40000
+DC_CERTCK_AUTO = 0
+DC_CERTCK_STRICT = 1
+DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3
+DC_EMPTY_MVBOX = 0x01
+DC_EMPTY_INBOX = 0x02
+DC_EVENT_INFO = 100
+DC_EVENT_SMTP_CONNECTED = 101
+DC_EVENT_IMAP_CONNECTED = 102
+DC_EVENT_SMTP_MESSAGE_SENT = 103
+DC_EVENT_IMAP_MESSAGE_DELETED = 104
+DC_EVENT_IMAP_MESSAGE_MOVED = 105
+DC_EVENT_IMAP_FOLDER_EMPTIED = 106
+DC_EVENT_NEW_BLOB_FILE = 150
+DC_EVENT_DELETED_BLOB_FILE = 151
+DC_EVENT_WARNING = 300
+DC_EVENT_ERROR = 400
+DC_EVENT_ERROR_NETWORK = 401
+DC_EVENT_ERROR_SELF_NOT_IN_GROUP = 410
+DC_EVENT_MSGS_CHANGED = 2000
+DC_EVENT_INCOMING_MSG = 2005
+DC_EVENT_MSG_DELIVERED = 2010
+DC_EVENT_MSG_FAILED = 2012
+DC_EVENT_MSG_READ = 2015
+DC_EVENT_CHAT_MODIFIED = 2020
+DC_EVENT_CONTACTS_CHANGED = 2030
+DC_EVENT_LOCATION_CHANGED = 2035
+DC_EVENT_CONFIGURE_PROGRESS = 2041
+DC_EVENT_IMEX_PROGRESS = 2051
+DC_EVENT_IMEX_FILE_WRITTEN = 2052
+DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
+DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
+DC_EVENT_FILE_COPIED = 2055
+DC_EVENT_IS_OFFLINE = 2081
+DC_EVENT_GET_STRING = 2091
+DC_STR_SELFNOTINGRP = 21
+DC_KEY_GEN_DEFAULT = 0
+DC_KEY_GEN_RSA2048 = 1
+DC_KEY_GEN_ED25519 = 2
+DC_PROVIDER_STATUS_OK = 1
+DC_PROVIDER_STATUS_PREPARATION = 2
+DC_PROVIDER_STATUS_BROKEN = 3
+DC_CHAT_VISIBILITY_NORMAL = 0
+DC_CHAT_VISIBILITY_ARCHIVED = 1
+DC_CHAT_VISIBILITY_PINNED = 2
+DC_STR_NOMESSAGES = 1
+DC_STR_SELF = 2
+DC_STR_DRAFT = 3
+DC_STR_VOICEMESSAGE = 7
+DC_STR_DEADDROP = 8
+DC_STR_IMAGE = 9
+DC_STR_VIDEO = 10
+DC_STR_AUDIO = 11
+DC_STR_FILE = 12
+DC_STR_STATUSLINE = 13
+DC_STR_NEWGROUPDRAFT = 14
+DC_STR_MSGGRPNAME = 15
+DC_STR_MSGGRPIMGCHANGED = 16
+DC_STR_MSGADDMEMBER = 17
+DC_STR_MSGDELMEMBER = 18
+DC_STR_MSGGROUPLEFT = 19
+DC_STR_GIF = 23
+DC_STR_ENCRYPTEDMSG = 24
+DC_STR_E2E_AVAILABLE = 25
+DC_STR_ENCR_TRANSP = 27
+DC_STR_ENCR_NONE = 28
+DC_STR_CANTDECRYPT_MSG_BODY = 29
+DC_STR_FINGERPRINTS = 30
+DC_STR_READRCPT = 31
+DC_STR_READRCPT_MAILBODY = 32
+DC_STR_MSGGRPIMGDELETED = 33
+DC_STR_E2E_PREFERRED = 34
+DC_STR_CONTACT_VERIFIED = 35
+DC_STR_CONTACT_NOT_VERIFIED = 36
+DC_STR_CONTACT_SETUP_CHANGED = 37
+DC_STR_ARCHIVEDCHATS = 40
+DC_STR_STARREDMSGS = 41
+DC_STR_AC_SETUP_MSG_SUBJECT = 42
+DC_STR_AC_SETUP_MSG_BODY = 43
+DC_STR_CANNOT_LOGIN = 60
+DC_STR_SERVER_RESPONSE = 61
+DC_STR_MSGACTIONBYUSER = 62
+DC_STR_MSGACTIONBYME = 63
+DC_STR_MSGLOCATIONENABLED = 64
+DC_STR_MSGLOCATIONDISABLED = 65
+DC_STR_LOCATION = 66
+DC_STR_STICKER = 67
+DC_STR_DEVICE_MESSAGES = 68
+DC_STR_COUNT = 68
+# end const generated


-for name in dir(lib):
-    if name.startswith("DC_"):
-        globals()[name] = getattr(lib, name)
-del name
+def read_event_defines(f):
+    rex = re.compile(r'#define\s+((?:DC_EVENT|DC_QR|DC_MSG|DC_LP|DC_EMPTY|DC_CERTCK|DC_STATE|DC_STR|'
+                     r'DC_CONTACT_ID|DC_GCL|DC_CHAT|DC_PROVIDER|DC_KEY_GEN)_\S+)\s+([x\d]+).*')
+    for line in f:
+        m = rex.match(line)
+        if m:
+            yield m.groups()
+
+
+if __name__ == "__main__":
+    here = abspath(__file__).rstrip("oc")
+    here_dir = dirname(here)
+    if len(sys.argv) >= 2:
+        deltah = sys.argv[1]
+    else:
+        deltah = joinpath(dirname(dirname(dirname(here_dir))), "deltachat-ffi", "deltachat.h")
+    assert os.path.exists(deltah)
+
+    lines = []
+    skip_to_end = False
+    for orig_line in open(here):
+        if skip_to_end:
+            if not orig_line.startswith("# end const"):
+                continue
+            skip_to_end = False
+        lines.append(orig_line)
+        if orig_line.startswith("# begin const"):
+            with open(deltah) as f:
+                for name, item in read_event_defines(f):
+                    lines.append("{} = {}\n".format(name, item))
+            skip_to_end = True
+
+    tmpname = here + ".tmp"
+    with open(tmpname, "w") as f:
+        f.write("".join(lines))
+    os.rename(tmpname, here)
--- a/python/src/deltachat/direct_imap.py
+++ b/python/src/deltachat/direct_imap.py
@@ -187,9 +187,7 @@ class DirectImap:
        """ (blocking) wait for next idle message from server. """
        assert self._idling
        self.account.log("imap-direct: calling idle_check")
-        res = self.conn.idle_check(timeout=30)
-        if len(res) == 0:
-            raise TimeoutError
+        res = self.conn.idle_check()
        if terminate:
            self.idle_done()
        return res
--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -303,25 +303,33 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
            configdict["mvbox_move"] = str(int(move))
            configdict["sentbox_watch"] = str(int(sentbox))
            ac.update_config(configdict)
-            ac._configtracker = ac.configure()
+            ac.configure()
            return ac

        def get_one_online_account(self, pre_generated_key=True, mvbox=False, move=False):
            ac1 = self.get_online_configuring_account(
                pre_generated_key=pre_generated_key, mvbox=mvbox, move=move)
-            self.wait_configure_and_start_io()
+            ac1.wait_configure_finish()
+            ac1.start_io()
            return ac1

        def get_two_online_accounts(self, move=False, quiet=False):
            ac1 = self.get_online_configuring_account(move=move, quiet=quiet)
            ac2 = self.get_online_configuring_account(quiet=quiet)
-            self.wait_configure_and_start_io()
+            ac1.wait_configure_finish()
+            ac1.start_io()
+            ac2.wait_configure_finish()
+            ac2.start_io()
            return ac1, ac2

        def get_many_online_accounts(self, num, move=True):
            accounts = [self.get_online_configuring_account(move=move, quiet=True)
                        for i in range(num)]
-            self.wait_configure_and_start_io()
+            for acc in accounts:
+                acc._configtracker.wait_finish()
+                acc.start_io()
+                print("{}: {} account was successfully setup".format(
+                    acc.get_config("displayname"), acc.get_config("addr")))
            for acc in accounts:
                acc.add_account_plugin(FFIEventLogger(acc))
            return accounts
@@ -341,28 +349,14 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                mvbox_move=account.get_config("mvbox_move"),
                sentbox_watch=account.get_config("sentbox_watch"),
            ))
-            ac._configtracker = ac.configure()
+            ac.configure()
            return ac

-        def wait_configure_and_start_io(self):
-            for acc in self._accounts:
-                if hasattr(acc, "_configtracker"):
-                    acc._configtracker.wait_finish()
-                    del acc._configtracker
-                if acc.is_configured() and not acc.is_started():
-                    acc.start_io()
-                print("{}: {} account was successfully setup".format(
-                    acc.get_config("displayname"), acc.get_config("addr")))
-
        def run_bot_process(self, module, ffi=True):
            fn = module.__file__

            bot_ac, bot_cfg = self.get_online_config()

-            # Avoid starting ac so we don't interfere with the bot operating on
-            # the same database.
-            self._accounts.remove(bot_ac)
-
            args = [
                sys.executable,
                "-u",
--- a/python/src/deltachat/tracker.py
+++ b/python/src/deltachat/tracker.py
@@ -64,7 +64,6 @@ class ConfigureTracker:
        if success:
            self._gm.hook.dc_account_extra_configure(account=self.account)
        self._configure_events.put(success)
-        self.account.remove_account_plugin(self)

    def wait_smtp_connected(self):
        """ wait until smtp is configured. """
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -544,7 +544,10 @@ class TestOnlineAccount:
        )
        # rsa key gen can be slow especially on CI, adjust timeout
        ac1._evtracker.set_timeout(120)
-        acfactory.wait_configure_and_start_io()
+        ac1.wait_configure_finish()
+        ac1.start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
        chat = acfactory.get_accepted_chat(ac1, ac2)

        lp.sec("ac1: send unencrypted message to ac2")
@@ -576,7 +579,7 @@ class TestOnlineAccount:
        ac1._configtracker.wait_progress()
        ac1.stop_ongoing()
        try:
-            ac1._configtracker.wait_finish()
+            ac1.wait_configure_finish()
        except Exception:
            pass

@@ -599,7 +602,12 @@ class TestOnlineAccount:
        # are copied to it via BCC.
        ac1_clone = acfactory.clone_online_account(ac1)

-        acfactory.wait_configure_and_start_io()
+        ac1.wait_configure_finish()
+        ac1.start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
+        ac1_clone.wait_configure_finish()
+        ac1_clone.start_io()

        chat = acfactory.get_accepted_chat(ac1, ac2)

@@ -704,8 +712,13 @@ class TestOnlineAccount:
        lp.sec("ac2: start without mvbox/sentbox threads")
        ac2 = acfactory.get_online_configuring_account()

-        lp.sec("ac2 and ac1: waiting for configuration")
-        acfactory.wait_configure_and_start_io()
+        lp.sec("ac2: waiting for configuration")
+        ac2.wait_configure_finish()
+        ac2.start_io()
+
+        lp.sec("ac1: waiting for configuration")
+        ac1.wait_configure_finish()
+        ac1.start_io()

        lp.sec("ac1: send message and wait for ac2 to receive it")
        acfactory.get_accepted_chat(ac1, ac2).send_text("message1")
@@ -714,7 +727,10 @@ class TestOnlineAccount:
    def test_move_works(self, acfactory):
        ac1 = acfactory.get_online_configuring_account()
        ac2 = acfactory.get_online_configuring_account(mvbox=True, move=True)
-        acfactory.wait_configure_and_start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
+        ac1.wait_configure_finish()
+        ac1.start_io()
        chat = acfactory.get_accepted_chat(ac1, ac2)
        chat.send_text("message1")
        ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
@@ -725,7 +741,10 @@ class TestOnlineAccount:
        ac1 = acfactory.get_online_configuring_account(mvbox=True, move=True)
        ac1.set_config("bcc_self", "1")
        ac2 = acfactory.get_online_configuring_account()
-        acfactory.wait_configure_and_start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
+        ac1.wait_configure_finish()
+        ac1.start_io()

        chat = acfactory.get_accepted_chat(ac1, ac2)
        chat.send_text("message1")
@@ -850,7 +869,6 @@ class TestOnlineAccount:

        lp.sec("mark messages as seen on ac2, wait for changes on ac1")
        ac2.direct_imap.idle_start()
-        ac1.direct_imap.idle_start()
        ac2.mark_seen_messages([msg2, msg4])
        ac2.direct_imap.idle_check(terminate=True)
        lp.step("1")
@@ -859,8 +877,6 @@ class TestOnlineAccount:
            assert ev.data1 > const.DC_CHAT_ID_LAST_SPECIAL
            assert ev.data2 > const.DC_MSG_ID_LAST_SPECIAL
        lp.step("2")
-        ac1.direct_imap.idle_wait_for_seen()  # Check that ac1 marks the read receipt as read
-
        assert msg1.is_out_mdn_received()
        assert msg3.is_out_mdn_received()

@@ -1168,7 +1184,10 @@ class TestOnlineAccount:
        # as of Jul2019
        ac1 = acfactory.get_online_configuring_account()
        ac2 = acfactory.clone_online_account(ac1)
-        acfactory.wait_configure_and_start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
+        ac1.wait_configure_finish()
+        ac1.start_io()

        lp.sec("trigger ac setup message and return setupcode")
        assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
@@ -1191,7 +1210,10 @@ class TestOnlineAccount:
        ac1 = acfactory.get_online_configuring_account()
        ac2 = acfactory.clone_online_account(ac1)
        ac2._evtracker.set_timeout(30)
-        acfactory.wait_configure_and_start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
+        ac1.wait_configure_finish()
+        ac1.start_io()

        lp.sec("trigger ac setup message but ignore")
        assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
@@ -1491,7 +1513,7 @@ class TestOnlineAccount:
        lp.sec("ac3 reinstalls DC and generates a new key")
        ac3.stop_io()
        ac4 = acfactory.clone_online_account(ac3, pre_generated_key=False)
-        ac4._configtracker.wait_finish()
+        ac4.wait_configure_finish()
        # Create contacts to make sure incoming messages are not treated as contact requests
        chat41 = ac4.create_chat(ac1)
        chat42 = ac4.create_chat(ac2)
@@ -1664,26 +1686,26 @@ class TestOnlineConfigureFails:
    def test_invalid_password(self, acfactory):
        ac1, configdict = acfactory.get_online_config()
        ac1.update_config(dict(addr=configdict["addr"], mail_pw="123"))
-        configtracker = ac1.configure()
-        configtracker.wait_progress(500)
-        configtracker.wait_progress(0)
+        ac1.configure()
+        ac1._configtracker.wait_progress(500)
+        ac1._configtracker.wait_progress(0)
        ev = ac1._evtracker.get_matching("DC_EVENT_ERROR_NETWORK")
        assert "cannot login" in ev.data2.lower()

    def test_invalid_user(self, acfactory):
        ac1, configdict = acfactory.get_online_config()
        ac1.update_config(dict(addr="x" + configdict["addr"], mail_pw=configdict["mail_pw"]))
-        configtracker = ac1.configure()
-        configtracker.wait_progress(500)
-        configtracker.wait_progress(0)
+        ac1.configure()
+        ac1._configtracker.wait_progress(500)
+        ac1._configtracker.wait_progress(0)
        ev = ac1._evtracker.get_matching("DC_EVENT_ERROR_NETWORK")
        assert "cannot login" in ev.data2.lower()

    def test_invalid_domain(self, acfactory):
        ac1, configdict = acfactory.get_online_config()
        ac1.update_config((dict(addr=configdict["addr"] + "x", mail_pw=configdict["mail_pw"])))
-        configtracker = ac1.configure()
-        configtracker.wait_progress(500)
-        configtracker.wait_progress(0)
+        ac1.configure()
+        ac1._configtracker.wait_progress(500)
+        ac1._configtracker.wait_progress(0)
        ev = ac1._evtracker.get_matching("DC_EVENT_ERROR_NETWORK")
        assert "could not connect" in ev.data2.lower()
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -14,7 +14,6 @@ use thiserror::Error;
 use crate::config::Config;
 use crate::constants::*;
 use crate::context::Context;
-use crate::error::Error;
 use crate::events::Event;
 use crate::message;

@@ -61,7 +60,7 @@ impl<'a> BlobObject<'a> {
            .map_err(|err| BlobError::WriteFailure {
                blobdir: blobdir.to_path_buf(),
                blobname: name.clone(),
-                cause: err.into(),
+                cause: err,
            })?;
        let blob = BlobObject {
            blobdir,
@@ -376,7 +375,7 @@ impl<'a> BlobObject<'a> {
        img.save(&blob_abs).map_err(|err| BlobError::WriteFailure {
            blobdir: context.get_blobdir().to_path_buf(),
            blobname: blob_abs.to_str().unwrap_or_default().to_string(),
-            cause: err.into(),
+            cause: err,
        })?;

        Ok(())
@@ -409,40 +408,16 @@ impl<'a> BlobObject<'a> {
            return Ok(());
        }

-        let mut img = img.thumbnail(img_wh, img_wh);
-        match self.get_exif_orientation(context) {
-            Ok(90) => img = img.rotate90(),
-            Ok(180) => img = img.rotate180(),
-            Ok(270) => img = img.rotate270(),
-            _ => {}
-        }
+        let img = img.thumbnail(img_wh, img_wh);

        img.save(&blob_abs).map_err(|err| BlobError::WriteFailure {
            blobdir: context.get_blobdir().to_path_buf(),
            blobname: blob_abs.to_str().unwrap_or_default().to_string(),
-            cause: err.into(),
+            cause: err,
        })?;

        Ok(())
    }
-
-    pub fn get_exif_orientation(&self, context: &Context) -> Result<i32, Error> {
-        let file = std::fs::File::open(self.to_abs_path())?;
-        let mut bufreader = std::io::BufReader::new(&file);
-        let exifreader = exif::Reader::new();
-        let exif = exifreader.read_from_container(&mut bufreader)?;
-        if let Some(orientation) = exif.get_field(exif::Tag::Orientation, exif::In::PRIMARY) {
-            // possible orientation values are described at http://sylvana.net/jpegcrop/exif_orientation.html
-            // we only use rotation, in practise, flipping is not used.
-            match orientation.value.get_uint(0) {
-                Some(3) => return Ok(180),
-                Some(6) => return Ok(90),
-                Some(8) => return Ok(270),
-                other => warn!(context, "exif orientation value ignored: {:?}", other),
-            }
-        }
-        Ok(0)
-    }
 }

 impl<'a> fmt::Display for BlobObject<'a> {
@@ -466,7 +441,7 @@ pub enum BlobError {
        blobdir: PathBuf,
        blobname: String,
        #[source]
-        cause: anyhow::Error,
+        cause: std::io::Error,
    },
    #[error("Failed to copy data from {} to blob {blobname} in {}", .src.display(), .blobdir.display())]
    CopyFailure {
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -424,7 +424,7 @@ impl ChatId {
    async fn get_parent_mime_headers(self, context: &Context) -> Option<(String, String, String)> {
        let collect =
            |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?));
-        let (rfc724_mid, mime_in_reply_to, mime_references, error): (
+        let (packed, rfc724_mid, mime_in_reply_to, mime_references): (
            String,
            String,
            String,
@@ -432,14 +432,15 @@ impl ChatId {
        ) = self
            .parent_query(
                context,
-                "rfc724_mid, mime_in_reply_to, mime_references, error",
+                "param, rfc724_mid, mime_in_reply_to, mime_references",
                collect,
            )
            .await
            .ok()
            .flatten()?;

-        if !error.is_empty() {
+        let param = packed.parse::<Params>().ok()?;
+        if param.exists(Param::Error) {
            // Do not reply to error messages.
            //
            // An error message could be a group chat message that we failed to decrypt and
@@ -453,13 +454,12 @@ impl ChatId {
    }

    async fn parent_is_encrypted(self, context: &Context) -> Result<bool, Error> {
-        let collect = |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?));
-        let res: Option<(String, String)> =
-            self.parent_query(context, "param, error", collect).await?;
+        let collect = |row: &rusqlite::Row| Ok(row.get(0)?);
+        let packed: Option<String> = self.parent_query(context, "param", collect).await?;

-        if let Some((ref packed, ref error)) = res {
+        if let Some(ref packed) = packed {
            let param = packed.parse::<Params>()?;
-            Ok(error.is_empty() && param.exists(Param::GuaranteeE2ee))
+            Ok(!param.exists(Param::Error) && param.exists(Param::GuaranteeE2ee))
        } else {
            // No messages
            Ok(false)
@@ -1464,7 +1464,7 @@ pub async fn send_msg(
                }
            }
            msg.param.remove(Param::PrepForwards);
-            msg.update_param(context).await;
+            msg.save_param_to_disk(context).await;
        }
        return send_msg_inner(context, chat_id, msg).await;
    }
@@ -2596,7 +2596,7 @@ pub async fn forward_msgs(
                        .set(Param::PrepForwards, new_msg_id.to_u32().to_string());
                }

-                msg.update_param(context).await;
+                msg.save_param_to_disk(context).await;
                msg.param = save_param;
            } else {
                msg.state = MessageState::OutPending;
@@ -2784,7 +2784,7 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
 pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: impl AsRef<str>) {
    let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");

-    if let Err(e) = context.sql.execute(
+    if context.sql.execute(
        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,rfc724_mid) VALUES (?,?,?, ?,?,?, ?,?);",
        paramsv![
            chat_id,
@@ -2796,8 +2796,7 @@ pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: impl
            text.as_ref().to_string(),
            rfc724_mid,
        ]
-    ).await {
-        warn!(context, "Could not add info msg: {}", e);
+    ).await.is_err() {
        return;
    }

--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -227,19 +227,6 @@ pub async fn dc_receive_imf(
            context
                .do_heuristics_moves(server_folder.as_ref(), insert_msg_id)
                .await;
-            if !mime_parser.mdn_reports.is_empty() && mime_parser.has_chat_version() {
-                // This is a Delta Chat MDN. Mark as read.
-                job::add(
-                    context,
-                    job::Job::new(
-                        Action::MarkseenMsgOnImap,
-                        insert_msg_id.to_u32(),
-                        Params::new(),
-                        0,
-                    ),
-                )
-                .await;
-            }
        }
    }

@@ -251,7 +238,7 @@ pub async fn dc_receive_imf(
    cleanup(context, &create_event_to_send, created_db_entries);

    mime_parser
-        .handle_reports(context, from_id, sent_timestamp, &mime_parser.parts)
+        .handle_reports(context, from_id, sent_timestamp)
        .await;

    Ok(())
@@ -326,6 +313,8 @@ async fn add_parts(
 ) -> Result<()> {
    let mut state: MessageState;
    let mut chat_id_blocked = Blocked::Not;
+    let mut sort_timestamp = 0;
+    let mut rcvd_timestamp = 0;
    let mut mime_in_reply_to = String::new();
    let mut mime_references = String::new();
    let mut incoming_origin = incoming_origin;
@@ -345,7 +334,7 @@ async fn add_parts(
        return Ok(());
    }

-    let mut is_dc_message = if mime_parser.has_chat_version() {
+    let mut msgrmsg = if mime_parser.has_chat_version() {
        MessengerMessage::Yes
    } else if is_reply_to_messenger_message(context, mime_parser).await {
        MessengerMessage::Reply
@@ -357,7 +346,7 @@ async fn add_parts(
    let show_emails =
        ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await).unwrap_or_default();
    if mime_parser.is_system_message != SystemMessage::AutocryptSetupMessage
-        && is_dc_message == MessengerMessage::No
+        && msgrmsg == MessengerMessage::No
    {
        // this message is a classic email not a chat-message nor a reply to one
        match show_emails {
@@ -386,7 +375,7 @@ async fn add_parts(

        // handshake may mark contacts as verified and must be processed before chats are created
        if mime_parser.get(HeaderDef::SecureJoin).is_some() {
-            is_dc_message = MessengerMessage::Yes; // avoid discarding by show_emails setting
+            msgrmsg = MessengerMessage::Yes; // avoid discarding by show_emails setting
            *chat_id = ChatId::new(0);
            allow_creation = true;
            match handle_securejoin_handshake(context, mime_parser, from_id).await {
@@ -418,14 +407,6 @@ async fn add_parts(
                .await
                .unwrap_or_default();

-        if chat_id.is_unset() && mime_parser.failure_report.is_some() {
-            *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
-            info!(
-                context,
-                "Message belongs to an NDN and is not shown in a chat.",
-            );
-        }
-
        // get the chat_id - a chat_id here is no indicator that the chat is displayed in the normal list,
        // it might also be blocked and displayed in the deaddrop as a result
        if chat_id.is_unset() {
@@ -519,7 +500,7 @@ async fn add_parts(
        if Blocked::Not != chat_id_blocked
            && state == MessageState::InFresh
            && !incoming_origin.is_known()
-            && is_dc_message == MessengerMessage::No
+            && msgrmsg == MessengerMessage::No
            && show_emails != ShowEmails::All
        {
            state = MessageState::InNoticed;
@@ -534,7 +515,7 @@ async fn add_parts(

        // handshake may mark contacts as verified and must be processed before chats are created
        if mime_parser.get(HeaderDef::SecureJoin).is_some() {
-            is_dc_message = MessengerMessage::Yes; // avoid discarding by show_emails setting
+            msgrmsg = MessengerMessage::Yes; // avoid discarding by show_emails setting
            *chat_id = ChatId::new(0);
            allow_creation = true;
            match observe_securejoin_on_other_device(context, mime_parser, to_id).await {
@@ -573,7 +554,7 @@ async fn add_parts(
                }
            }
            if chat_id.is_unset() && allow_creation {
-                let create_blocked = if MessengerMessage::No != is_dc_message
+                let create_blocked = if MessengerMessage::No != msgrmsg
                    && !Contact::is_blocked_load(context, to_id).await
                {
                    Blocked::Not
@@ -620,9 +601,17 @@ async fn add_parts(
    }
    // correct message_timestamp, it should not be used before,
    // however, we cannot do this earlier as we need from_id to be set
-    let rcvd_timestamp = time();
-    let sort_timestamp = calc_sort_timestamp(context, *sent_timestamp, *chat_id, !seen).await;
-    *sent_timestamp = std::cmp::min(*sent_timestamp, rcvd_timestamp);
+    calc_timestamps(
+        context,
+        *chat_id,
+        from_id,
+        *sent_timestamp,
+        !seen,
+        &mut sort_timestamp,
+        sent_timestamp,
+        &mut rcvd_timestamp,
+    )
+    .await;

    // unarchive chat
    chat_id.unarchive(context).await?;
@@ -658,7 +647,7 @@ async fn add_parts(
    let sent_timestamp = *sent_timestamp;
    let is_hidden = *hidden;
    let chat_id = *chat_id;
-    let is_mdn = !mime_parser.mdn_reports.is_empty();
+    let is_mdn = !mime_parser.reports.is_empty();

    // TODO: can this clone be avoided?
    let rfc724_mid = rfc724_mid.to_string();
@@ -675,8 +664,8 @@ async fn add_parts(
                    "INSERT INTO msgs \
         (rfc724_mid, server_folder, server_uid, chat_id, from_id, to_id, timestamp, \
         timestamp_sent, timestamp_rcvd, type, state, msgrmsg,  txt, txt_raw, param, \
-         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references, error) \
-         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?, ?);",
+         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references) \
+         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?);",
                )?;

                let is_location_kml = location_kml_is
@@ -710,7 +699,7 @@ async fn add_parts(
                    rcvd_timestamp,
                    part.typ,
                    state,
-                    is_dc_message,
+                    msgrmsg,
                    part.msg,
                    // txt_raw might contain invalid utf8
                    txt_raw,
@@ -720,7 +709,6 @@ async fn add_parts(
                    mime_headers,
                    mime_in_reply_to,
                    mime_references,
-                    part.error,
                ])?;

                drop(stmt);
@@ -849,38 +837,41 @@ async fn save_locations(
    }
 }

-async fn calc_sort_timestamp(
+#[allow(clippy::too_many_arguments)]
+async fn calc_timestamps(
    context: &Context,
-    message_timestamp: i64,
    chat_id: ChatId,
+    from_id: u32,
+    message_timestamp: i64,
    is_fresh_msg: bool,
-) -> i64 {
-    let mut sort_timestamp = message_timestamp;
-
-    // get newest non fresh message for this chat
-    // update sort_timestamp if less than that
+    sort_timestamp: &mut i64,
+    sent_timestamp: &mut i64,
+    rcvd_timestamp: &mut i64,
+) {
+    *rcvd_timestamp = time();
+    *sent_timestamp = message_timestamp;
+    if *sent_timestamp > *rcvd_timestamp {
+        *sent_timestamp = *rcvd_timestamp
+    }
+    *sort_timestamp = message_timestamp;
    if is_fresh_msg {
        let last_msg_time: Option<i64> = context
            .sql
            .query_get_value(
                context,
-                "SELECT MAX(timestamp) FROM msgs WHERE chat_id=? AND state>?",
-                paramsv![chat_id, MessageState::InFresh],
+                "SELECT MAX(timestamp) FROM msgs WHERE chat_id=? and from_id!=? AND timestamp>=?",
+                paramsv![chat_id, from_id as i32, *sort_timestamp],
            )
            .await;
-
        if let Some(last_msg_time) = last_msg_time {
-            if last_msg_time > sort_timestamp {
-                sort_timestamp = last_msg_time;
+            if last_msg_time > 0 && *sort_timestamp <= last_msg_time {
+                *sort_timestamp = last_msg_time + 1;
            }
        }
    }
-
-    if sort_timestamp >= dc_smeared_time(context).await {
-        sort_timestamp = dc_create_smeared_timestamp(context).await;
+    if *sort_timestamp >= dc_smeared_time(context).await {
+        *sort_timestamp = dc_create_smeared_timestamp(context).await;
    }
-
-    sort_timestamp
 }

 /// This function tries extracts the group-id from the message and returns the
@@ -1789,7 +1780,7 @@ mod tests {
    use crate::chat::ChatVisibility;
    use crate::chatlist::Chatlist;
    use crate::message::Message;
-    use crate::test_utils::*;
+    use crate::test_utils::{dummy_context, TestContext};

    #[test]
    fn test_hex_hash() {
@@ -1885,6 +1876,23 @@ mod tests {
        assert!(!is_msgrmsg_rfc724_mid(&t.ctx, "nonexistant@message.id").await);
    }

+    async fn configured_offline_context() -> TestContext {
+        let t = dummy_context().await;
+        t.ctx
+            .set_config(Config::Addr, Some("alice@example.org"))
+            .await
+            .unwrap();
+        t.ctx
+            .set_config(Config::ConfiguredAddr, Some("alice@example.org"))
+            .await
+            .unwrap();
+        t.ctx
+            .set_config(Config::Configured, Some("1"))
+            .await
+            .unwrap();
+        t
+    }
+
    static MSGRMSG: &[u8] = b"From: Bob <bob@example.org>\n\
                    To: alice@example.org\n\
                    Chat-Version: 1.0\n\
@@ -2346,182 +2354,4 @@ mod tests {
            "Carl"
        );
    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_tiscali() {
-        test_parse_ndn(
-            "alice@tiscali.it",
-            "shenauithz@testrun.org",
-            "Mr.un2NYERi1RM.lbQ5F9q-QyJ@tiscali.it",
-            include_bytes!("../test-data/message/tiscali_ndn.eml"),
-            "",
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_testrun() {
-        test_parse_ndn(
-            "alice@testrun.org",
-            "hcksocnsofoejx@five.chat",
-            "Mr.A7pTA5IgrUA.q4bP41vAJOp@testrun.org",
-            include_bytes!("../test-data/message/testrun_ndn.eml"),
-            "Undelivered Mail Returned to Sender – This is the mail system at host hq5.merlinux.eu.\n\nI\'m sorry to have to inform you that your message could not\nbe delivered to one or more recipients. It\'s attached below.\n\nFor further assistance, please send mail to postmaster.\n\nIf you do so, please include this problem report. You can\ndelete your own text from the attached returned message.\n\n                   The mail system\n\n<hcksocnsofoejx@five.chat>: host mail.five.chat[195.62.125.103] said: 550 5.1.1\n    <hcksocnsofoejx@five.chat>: Recipient address rejected: User unknown in\n    virtual mailbox table (in reply to RCPT TO command)"
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_yahoo() {
-        test_parse_ndn(
-            "alice@yahoo.com",
-            "haeclirth.sinoenrat@yahoo.com",
-            "1680295672.3657931.1591783872936@mail.yahoo.com",
-            include_bytes!("../test-data/message/yahoo_ndn.eml"),
-            "Failure Notice – Sorry, we were unable to deliver your message to the following address.\n\n<haeclirth.sinoenrat@yahoo.com>:\n554: delivery error: dd Not a valid recipient - atlas117.free.mail.ne1.yahoo.com"
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_gmail() {
-        test_parse_ndn(
-            "alice@gmail.com",
-            "assidhfaaspocwaeofi@gmail.com",
-            "CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com",
-            include_bytes!("../test-data/message/gmail_ndn.eml"),
-            "Delivery Status Notification (Failure) – ** Die Adresse wurde nicht gefunden **\n\nIhre Nachricht wurde nicht an assidhfaaspocwaeofi@gmail.com zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.\n\nHier erfahren Sie mehr: https://support.google.com/mail/?p=NoSuchUser\n\nAntwort:\n\n550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient\'s email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp",
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_gmx() {
-        test_parse_ndn(
-            "alice@gmx.com",
-            "snaerituhaeirns@gmail.com",
-            "9c9c2a32-056b-3592-c372-d7e8f0bd4bc2@gmx.de",
-            include_bytes!("../test-data/message/gmx_ndn.eml"),
-            "Mail delivery failed: returning message to sender – This message was created automatically by mail delivery software.\n\nA message that you sent could not be delivered to one or more of\nits recipients. This is a permanent error. The following address(es)\nfailed:\n\nsnaerituhaeirns@gmail.com:\nSMTP error from remote server for RCPT TO command, host: gmail-smtp-in.l.google.com (66.102.1.27) reason: 550-5.1.1 The email account that you tried to reach does not exist. Please\n try\n550-5.1.1 double-checking the recipient\'s email address for typos or\n550-5.1.1 unnecessary spaces. Learn more at\n550 5.1.1  https://support.google.com/mail/?p=NoSuchUser f6si2517766wmc.21\n9 - gsmtp"
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_posteo() {
-        test_parse_ndn(
-            "alice@posteo.org",
-            "hanerthaertidiuea@gmx.de",
-            "04422840-f884-3e37-5778-8192fe22d8e1@posteo.de",
-            include_bytes!("../test-data/message/posteo_ndn.eml"),
-            "Undelivered Mail Returned to Sender – This is the mail system at host mout01.posteo.de.\n\nI\'m sorry to have to inform you that your message could not\nbe delivered to one or more recipients. It\'s attached below.\n\nFor further assistance, please send mail to postmaster.\n\nIf you do so, please include this problem report. You can\ndelete your own text from the attached returned message.\n\n                   The mail system\n\n<hanerthaertidiuea@gmx.de>: host mx01.emig.gmx.net[212.227.17.5] said: 550\n    Requested action not taken: mailbox unavailable (in reply to RCPT TO\n    command)",
-        )
-        .await;
-    }
-
-    // ndn = Non Delivery Notification
-    async fn test_parse_ndn(
-        self_addr: &str,
-        foreign_addr: &str,
-        rfc724_mid_outgoing: &str,
-        raw_ndn: &[u8],
-        error_msg: &str,
-    ) {
-        let t = configured_offline_context_with_addr(self_addr).await;
-
-        dc_receive_imf(
-            &t.ctx,
-            format!(
-                "From: {}\n\
-                To: {}\n\
-                Subject: foo\n\
-                Message-ID: <{}>\n\
-                Chat-Version: 1.0\n\
-                Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
-                \n\
-                hello\n",
-                self_addr, foreign_addr, rfc724_mid_outgoing
-            )
-            .as_bytes(),
-            "INBOX",
-            1,
-            false,
-        )
-        .await
-        .unwrap();
-
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        let msg_id = chats.get_msg_id(0).unwrap();
-
-        // Check that the ndn would be downloaded:
-        let headers = mailparse::parse_mail(raw_ndn).unwrap().headers;
-        assert!(
-            crate::imap::prefetch_should_download(&t.ctx, &headers, ShowEmails::Off)
-                .await
-                .unwrap()
-        );
-
-        dc_receive_imf(&t.ctx, raw_ndn, "INBOX", 1, false)
-            .await
-            .unwrap();
-        let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
-
-        assert_eq!(msg.state, MessageState::OutFailed);
-        assert_eq!(msg.error, error_msg);
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_group_msg() {
-        let t = configured_offline_context_with_addr("alice@gmail.com").await;
-
-        dc_receive_imf(
-            &t.ctx,
-            b"From: alice@gmail.com\n\
-                 To: bob@example.org, assidhfaaspocwaeofi@gmail.com\n\
-                 Subject: foo\n\
-                 Message-ID: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>\n\
-                 Chat-Version: 1.0\n\
-                 Chat-Group-ID: abcde\n\
-                 Chat-Group-Name: foo\n\
-                 Chat-Disposition-Notification-To: alice@example.org\n\
-                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
-                 \n\
-                 hello\n",
-            "INBOX",
-            1,
-            false,
-        )
-        .await
-        .unwrap();
-
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        let msg_id = chats.get_msg_id(0).unwrap();
-
-        let raw = include_bytes!("../test-data/message/gmail_ndn_group.eml");
-        dc_receive_imf(&t.ctx, raw, "INBOX", 1, false)
-            .await
-            .unwrap();
-
-        let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
-
-        assert_eq!(msg.state, MessageState::OutFailed);
-
-        let msgs = chat::get_chat_msgs(&t.ctx, msg.chat_id, 0, None).await;
-        let last_msg = Message::load_from_db(&t.ctx, *msgs.last().unwrap())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            last_msg.text,
-            Some(
-                t.ctx
-                    .stock_string_repl_str(
-                        StockMessage::FailedSendingTo,
-                        "assidhfaaspocwaeofi@gmail.com",
-                    )
-                    .await,
-            )
-        );
-        assert_eq!(last_msg.from_id, DC_CONTACT_ID_INFO);
-    }
 }
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -21,7 +21,6 @@ pub enum HeaderDef {
    References,
    InReplyTo,
    Precedence,
-    ContentType,
    ChatVersion,
    ChatGroupId,
    ChatGroupName,
--- a/src/imap/client.rs
+++ b/src/imap/client.rs
@@ -7,7 +7,7 @@ use async_imap::{
 use async_std::net::{self, TcpStream};

 use super::session::Session;
-use crate::login_param::dc_build_tls;
+use crate::login_param::{dc_build_tls, CertificateChecks};

 use super::session::SessionStream;

@@ -78,10 +78,10 @@ impl Client {
    pub async fn connect_secure<A: net::ToSocketAddrs, S: AsRef<str>>(
        addr: A,
        domain: S,
-        strict_tls: bool,
+        certificate_checks: CertificateChecks,
    ) -> ImapResult<Self> {
        let stream = TcpStream::connect(addr).await?;
-        let tls = dc_build_tls(strict_tls);
+        let tls = dc_build_tls(certificate_checks);
        let tls_stream: Box<dyn SessionStream> =
            Box::new(tls.connect(domain.as_ref(), stream).await?);
        let mut client = ImapClient::new(tls_stream);
@@ -118,12 +118,16 @@ impl Client {
        })
    }

-    pub async fn secure<S: AsRef<str>>(self, domain: S, strict_tls: bool) -> ImapResult<Client> {
+    pub async fn secure<S: AsRef<str>>(
+        self,
+        domain: S,
+        certificate_checks: CertificateChecks,
+    ) -> ImapResult<Client> {
        if self.is_secure {
            Ok(self)
        } else {
            let Client { mut inner, .. } = self;
-            let tls = dc_build_tls(strict_tls);
+            let tls = dc_build_tls(certificate_checks);
            inner.run_command_and_check_ok("STARTTLS", None).await?;

            let stream = inner.into_inner();
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -27,7 +27,6 @@ use crate::message::{self, update_server_uid};
 use crate::mimeparser;
 use crate::oauth2::dc_get_oauth2_access_token;
 use crate::param::Params;
-use crate::provider::get_provider_info;
 use crate::{scheduler::InterruptInfo, stock::StockMessage};

 mod client;
@@ -150,7 +149,7 @@ struct ImapConfig {
    pub imap_port: u16,
    pub imap_user: String,
    pub imap_pw: String,
-    pub strict_tls: bool,
+    pub certificate_checks: CertificateChecks,
    pub server_flags: usize,
    pub selected_folder: Option<String>,
    pub selected_mailbox: Option<Mailbox>,
@@ -170,7 +169,7 @@ impl Default for ImapConfig {
            imap_port: 0,
            imap_user: "".into(),
            imap_pw: "".into(),
-            strict_tls: false,
+            certificate_checks: Default::default(),
            server_flags: 0,
            selected_folder: None,
            selected_mailbox: None,
@@ -229,7 +228,7 @@ impl Imap {
                match Client::connect_insecure((imap_server, imap_port)).await {
                    Ok(client) => {
                        if (server_flags & DC_LP_IMAP_SOCKET_STARTTLS) != 0 {
-                            client.secure(imap_server, config.strict_tls).await
+                            client.secure(imap_server, config.certificate_checks).await
                        } else {
                            Ok(client)
                        }
@@ -241,8 +240,12 @@ impl Imap {
                let imap_server: &str = config.imap_server.as_ref();
                let imap_port = config.imap_port;

-                Client::connect_secure((imap_server, imap_port), imap_server, config.strict_tls)
-                    .await
+                Client::connect_secure(
+                    (imap_server, imap_port),
+                    imap_server,
+                    config.certificate_checks,
+                )
+                .await
            };

        let login_res = match connection_res {
@@ -314,15 +317,9 @@ impl Imap {
    }

    async fn unsetup_handle(&mut self, context: &Context) {
-        // Close folder if messages should be expunged
-        if let Err(err) = self.close_folder(context).await {
-            warn!(context, "failed to close folder: {:?}", err);
-        }
-
-        // Logout from the server
        if let Some(mut session) = self.session.take() {
-            if let Err(err) = session.logout().await {
-                warn!(context, "failed to logout: {:?}", err);
+            if let Err(err) = session.close().await {
+                warn!(context, "failed to close connection: {:?}", err);
            }
        }
        self.connected = false;
@@ -382,15 +379,7 @@ impl Imap {
            config.imap_port = imap_port;
            config.imap_user = imap_user.to_string();
            config.imap_pw = imap_pw.to_string();
-            let provider = get_provider_info(&lp.addr);
-            config.strict_tls = match lp.imap_certificate_checks {
-                CertificateChecks::Automatic => {
-                    provider.map_or(false, |provider| provider.strict_tls)
-                }
-                CertificateChecks::Strict => true,
-                CertificateChecks::AcceptInvalidCertificates
-                | CertificateChecks::AcceptInvalidCertificates2 => false,
-            };
+            config.certificate_checks = lp.imap_certificate_checks;
            config.server_flags = server_flags;
        }

@@ -1449,7 +1438,7 @@ async fn prefetch_is_reply_to_chat_message(
    false
 }

-pub(crate) async fn prefetch_should_download(
+async fn prefetch_should_download(
    context: &Context,
    headers: &[mailparse::MailHeader<'_>],
    show_emails: ShowEmails,
@@ -1457,13 +1446,6 @@ pub(crate) async fn prefetch_should_download(
    let is_chat_message = headers.get_header_value(HeaderDef::ChatVersion).is_some();
    let is_reply_to_chat_message = prefetch_is_reply_to_chat_message(context, &headers).await;

-    let maybe_ndn = if let Some(from) = headers.get_header_value(HeaderDef::From_) {
-        let from = from.to_ascii_lowercase();
-        from.contains("mailer-daemon") || from.contains("mail-daemon")
-    } else {
-        false
-    };
-
    // Autocrypt Setup Message should be shown even if it is from non-chat client.
    let is_autocrypt_setup_message = headers
        .get_header_value(HeaderDef::AutocryptSetupMessage)
@@ -1474,7 +1456,6 @@ pub(crate) async fn prefetch_should_download(
    let accepted_contact = origin.is_known();

    let show = is_autocrypt_setup_message
-        || maybe_ndn
        || match show_emails {
            ShowEmails::Off => is_chat_message || is_reply_to_chat_message,
            ShowEmails::AcceptedContacts => {
--- a/src/imap/select_folder.rs
+++ b/src/imap/select_folder.rs
@@ -27,7 +27,7 @@ impl Imap {
    ///
    /// CLOSE is considerably faster than an EXPUNGE, see
    /// https://tools.ietf.org/html/rfc3501#section-6.4.2
-    pub(super) async fn close_folder(&mut self, context: &Context) -> Result<()> {
+    async fn close_folder(&mut self, context: &Context) -> Result<()> {
        if let Some(ref folder) = self.config.selected_folder {
            info!(context, "Expunge messages in \"{}\".", folder);

--- a/src/job.rs
+++ b/src/job.rs
@@ -190,7 +190,7 @@ impl Job {
    /// Saves the job to the database, creating a new entry if necessary.
    ///
    /// The Job is consumed by this method.
-    pub(crate) async fn save(self, context: &Context) -> Result<()> {
+    pub async fn save(self, context: &Context) -> Result<()> {
        let thread: Thread = self.action.into();

        info!(context, "saving job for {}-thread: {:?}", thread, self);
@@ -329,7 +329,7 @@ impl Job {
        }
    }

-    pub(crate) async fn send_msg_to_smtp(&mut self, context: &Context, smtp: &mut Smtp) -> Status {
+    pub async fn send_msg_to_smtp(&mut self, context: &Context, smtp: &mut Smtp) -> Status {
        //  SMTP server, if not yet done
        if !smtp.is_connected().await {
            let loginparam = LoginParam::from_database(context, "configured_").await;
@@ -806,7 +806,7 @@ pub async fn send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<Job

    if rendered_msg.is_encrypted && !needs_encryption {
        msg.param.set_int(Param::GuaranteeE2ee, 1);
-        msg.update_param(context).await;
+        msg.save_param_to_disk(context).await;
    }

    ensure!(!recipients.is_empty(), "no recipients for smtp job set");
@@ -823,7 +823,8 @@ pub async fn send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<Job
    Ok(Some(job))
 }

-pub(crate) enum Connection<'a> {
+#[derive(Debug)]
+pub enum Connection<'a> {
    Inbox(&'a mut Imap),
    Smtp(&'a mut Smtp),
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,6 +11,8 @@ extern crate rusqlite;
 extern crate strum;
 #[macro_use]
 extern crate strum_macros;
+#[macro_use]
+extern crate debug_stub_derive;

 pub trait ToSql: rusqlite::ToSql + Send + Sync {}

--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -130,6 +130,10 @@ impl LoginParam {
        }
    }

+    pub fn addr_str(&self) -> &str {
+        self.addr.as_str()
+    }
+
    /// Save this loginparam to the database.
    pub async fn save_to_database(
        &self,
@@ -273,15 +277,21 @@ fn get_readable_flags(flags: i32) -> String {
    res
 }

-pub fn dc_build_tls(strict_tls: bool) -> async_native_tls::TlsConnector {
+pub fn dc_build_tls(certificate_checks: CertificateChecks) -> async_native_tls::TlsConnector {
    let tls_builder = async_native_tls::TlsConnector::new();
-
-    if strict_tls {
-        tls_builder
-    } else {
-        tls_builder
+    match certificate_checks {
+        CertificateChecks::Automatic => {
+            // Same as AcceptInvalidCertificates for now.
+            // TODO: use provider database when it becomes available
+            tls_builder
+                .danger_accept_invalid_hostnames(true)
+                .danger_accept_invalid_certs(true)
+        }
+        CertificateChecks::Strict => tls_builder,
+        CertificateChecks::AcceptInvalidCertificates
+        | CertificateChecks::AcceptInvalidCertificates2 => tls_builder
            .danger_accept_invalid_hostnames(true)
-            .danger_accept_invalid_certs(true)
+            .danger_accept_invalid_certs(true),
    }
 }

--- a/src/message.rs
+++ b/src/message.rs
@@ -14,7 +14,7 @@ use crate::error::{ensure, Error};
 use crate::events::Event;
 use crate::job::{self, Action};
 use crate::lot::{Lot, LotState, Meaning};
-use crate::mimeparser::{FailureReport, SystemMessage};
+use crate::mimeparser::SystemMessage;
 use crate::param::*;
 use crate::pgp::*;
 use crate::stock::StockMessage;
@@ -255,7 +255,6 @@ pub struct Message {
    pub(crate) starred: bool,
    pub(crate) chat_blocked: Blocked,
    pub(crate) location_id: u32,
-    pub(crate) error: String,
    pub(crate) param: Params,
 }

@@ -290,7 +289,6 @@ impl Message {
                    "    m.timestamp_rcvd AS timestamp_rcvd,",
                    "    m.type AS type,",
                    "    m.state AS state,",
-                    "    m.error AS error,",
                    "    m.msgrmsg AS msgrmsg,",
                    "    m.txt AS txt,",
                    "    m.param AS param,",
@@ -318,7 +316,6 @@ impl Message {
                    msg.timestamp_rcvd = row.get("timestamp_rcvd")?;
                    msg.viewtype = row.get("type")?;
                    msg.state = row.get("state")?;
-                    msg.error = row.get("error")?;
                    msg.is_dc_message = row.get("msgrmsg")?;

                    let text;
@@ -393,7 +390,7 @@ impl Message {
                    }

                    if !self.id.is_unset() {
-                        self.update_param(context).await;
+                        self.save_param_to_disk(context).await;
                    }
                }
            }
@@ -646,10 +643,10 @@ impl Message {
        if duration > 0 {
            self.param.set_int(Param::Duration, duration);
        }
-        self.update_param(context).await;
+        self.save_param_to_disk(context).await;
    }

-    pub async fn update_param(&mut self, context: &Context) -> bool {
+    pub async fn save_param_to_disk(&mut self, context: &Context) -> bool {
        context
            .sql
            .execute(
@@ -766,10 +763,9 @@ impl From<MessageState> for LotState {
 impl MessageState {
    pub fn can_fail(self) -> bool {
        match self {
-            MessageState::OutPreparing
-            | MessageState::OutPending
-            | MessageState::OutDelivered
-            | MessageState::OutMdnRcvd => true, // OutMdnRcvd can still fail because it could be a group message and only some recipients failed.
+            MessageState::OutPreparing | MessageState::OutPending | MessageState::OutDelivered => {
+                true
+            }
            _ => false,
        }
    }
@@ -941,9 +937,8 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> String {
    }

    ret += "\n";
-
-    if !msg.error.is_empty() {
-        ret += &format!("Error: {}", msg.error);
+    if let Some(err) = msg.param.get(Param::Error) {
+        ret += &format!("Error: {}", err)
    }

    if let Some(path) = msg.get_file(context) {
@@ -1256,38 +1251,33 @@ pub async fn exists(context: &Context, msg_id: MsgId) -> bool {

 pub async fn set_msg_failed(context: &Context, msg_id: MsgId, error: Option<impl AsRef<str>>) {
    if let Ok(mut msg) = Message::load_from_db(context, msg_id).await {
-        let error = error.map(|e| e.as_ref().to_string()).unwrap_or_default();
        if msg.state.can_fail() {
            msg.state = MessageState::OutFailed;
-            warn!(context, "{} failed: {}", msg_id, error);
-        } else {
-            warn!(
-                context,
-                "{} seems to have failed ({}), but state is {}", msg_id, error, msg.state
-            )
+        }
+        if let Some(error) = error {
+            msg.param.set(Param::Error, error.as_ref());
+            warn!(context, "Message failed: {}", error.as_ref());
        }

-        match context
+        if context
            .sql
            .execute(
-                "UPDATE msgs SET state=?, error=? WHERE id=?;",
-                paramsv![msg.state, error, msg_id],
+                "UPDATE msgs SET state=?, param=? WHERE id=?;",
+                paramsv![msg.state, msg.param.to_string(), msg_id],
            )
            .await
+            .is_ok()
        {
-            Ok(_) => context.emit_event(Event::MsgFailed {
+            context.emit_event(Event::MsgFailed {
                chat_id: msg.chat_id,
                msg_id,
-            }),
-            Err(e) => {
-                warn!(context, "{:?}", e);
-            }
+            });
        }
    }
 }

 /// returns Some if an event should be send
-pub async fn handle_mdn(
+pub async fn mdn_from_ext(
    context: &Context,
    from_id: u32,
    rfc724_mid: &str,
@@ -1328,10 +1318,10 @@ pub async fn handle_mdn(
    if let Ok((msg_id, chat_id, chat_type, msg_state)) = res {
        let mut read_by_all = false;

-        if msg_state == MessageState::OutPreparing
-            || msg_state == MessageState::OutPending
-            || msg_state == MessageState::OutDelivered
-        {
+        // if already marked as MDNS_RCVD msgstate_can_fail() returns false.
+        // however, it is important, that ret_msg_id is set above as this
+        // will allow the caller eg. to move the message away
+        if msg_state.can_fail() {
            let mdn_already_in_table = context
                .sql
                .exists(
@@ -1394,69 +1384,6 @@ pub async fn handle_mdn(
    None
 }

-/// Marks a message as failed after an ndn (non-delivery-notification) arrived.
-/// Where appropriate, also adds an info message telling the user which of the recipients of a group message failed.
-pub(crate) async fn handle_ndn(
-    context: &Context,
-    failed: &FailureReport,
-    error: Option<impl AsRef<str>>,
-) {
-    if failed.rfc724_mid.is_empty() {
-        return;
-    }
-
-    let res = context
-        .sql
-        .query_row(
-            concat!(
-                "SELECT",
-                "    m.id AS msg_id,",
-                "    c.id AS chat_id,",
-                "    c.type AS type",
-                " FROM msgs m LEFT JOIN chats c ON m.chat_id=c.id",
-                " WHERE rfc724_mid=? AND from_id=1",
-            ),
-            paramsv![failed.rfc724_mid],
-            |row| {
-                Ok((
-                    row.get::<_, MsgId>("msg_id")?,
-                    row.get::<_, ChatId>("chat_id")?,
-                    row.get::<_, Chattype>("type")?,
-                ))
-            },
-        )
-        .await;
-    if let Err(ref err) = res {
-        info!(context, "Failed to select NDN {:?}", err);
-    }
-
-    if let Ok((msg_id, chat_id, chat_type)) = res {
-        set_msg_failed(context, msg_id, error).await;
-
-        if chat_type == Chattype::Group || chat_type == Chattype::VerifiedGroup {
-            if let Some(failed_recipient) = &failed.failed_recipient {
-                let contact_id =
-                    Contact::lookup_id_by_addr(context, failed_recipient, Origin::Unknown).await;
-                if let Ok(contact) = Contact::load_from_db(context, contact_id).await {
-                    // Tell the user which of the recipients failed if we know that (because in a group, this might otherwise be unclear)
-                    chat::add_info_msg(
-                        context,
-                        chat_id,
-                        context
-                            .stock_string_repl_str(
-                                StockMessage::FailedSendingTo,
-                                contact.get_display_name(),
-                            )
-                            .await,
-                    )
-                    .await;
-                    context.emit_event(Event::ChatModified(chat_id));
-                }
-            }
-        }
-    }
-}
-
 /// The number of messages assigned to real chat (!=deaddrop, !=trash)
 pub async fn get_real_msg_cnt(context: &Context) -> i32 {
    match context
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -440,8 +440,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            to.push(from.clone());
        }

-        unprotected_headers.push(Header::new("MIME-Version".into(), "1.0".into()));
-
        if !self.references.is_empty() {
            unprotected_headers.push(Header::new("References".into(), self.references.clone()));
        }
@@ -1207,11 +1205,6 @@ pub fn needs_encoding(to_check: impl AsRef<str>) -> bool {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::chatlist::Chatlist;
-    use crate::dc_receive_imf::dc_receive_imf;
-    use crate::mimeparser::*;
-    use crate::test_utils::configured_offline_context;
-    use crate::test_utils::TestContext;

    #[test]
    fn test_render_email_address() {
@@ -1219,9 +1212,6 @@ mod tests {
        let addr = "x@y.org";

        assert!(!display_name.is_ascii());
-        assert!(!display_name
-            .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == ' '));

        let s = format!(
            "{}",
@@ -1233,25 +1223,6 @@ mod tests {
        assert_eq!(s, "=?utf-8?q?=C3=A4_space?= <x@y.org>");
    }

-    #[test]
-    fn test_render_email_address_noescape() {
-        let display_name = "a space";
-        let addr = "x@y.org";
-
-        assert!(display_name.is_ascii());
-        assert!(display_name
-            .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == ' '));
-
-        let s = format!(
-            "{}",
-            Address::new_mailbox_with_name(display_name.to_string(), addr.to_string())
-        );
-
-        // Addresses should not be unnecessarily be encoded, see https://github.com/deltachat/deltachat-core-rust/issues/1575:
-        assert_eq!(s, "a space <x@y.org>");
-    }
-
    #[test]
    fn test_render_rfc724_mid() {
        assert_eq!(
@@ -1295,6 +1266,25 @@ mod tests {
        assert!(needs_encoding("foo bar"));
    }

+    use crate::test_utils::{dummy_context, TestContext};
+
+    async fn configured_offline_context() -> TestContext {
+        let t = dummy_context().await;
+        t.ctx
+            .set_config(Config::Addr, Some("alice@example.org"))
+            .await
+            .unwrap();
+        t.ctx
+            .set_config(Config::ConfiguredAddr, Some("alice@example.org"))
+            .await
+            .unwrap();
+        t.ctx
+            .set_config(Config::Configured, Some("1"))
+            .await
+            .unwrap();
+        t
+    }
+
    #[async_std::test]
    async fn test_subject() {
        // 1.: Receive a mail from an MUA or Delta Chat
@@ -1407,79 +1397,35 @@ mod tests {
    }

    async fn msg_to_subject_str(imf_raw: &[u8]) -> String {
-        let t = configured_offline_context().await;
-        let new_msg = incoming_msg_to_reply_msg(imf_raw, &t.ctx).await;
-        let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false)
-            .await
-            .unwrap();
-        mf.subject_str().await
-    }
+        use crate::chatlist::Chatlist;
+        use crate::dc_receive_imf::dc_receive_imf;

-    // Creates a mimefactory for a message that replies "Hi" to the incoming message in `imf_raw`.
-    async fn incoming_msg_to_reply_msg(imf_raw: &[u8], context: &Context) -> Message {
-        context
+        let t = configured_offline_context().await;
+        t.ctx
            .set_config(Config::ShowEmails, Some("2"))
            .await
            .unwrap();

-        dc_receive_imf(context, imf_raw, "INBOX", 1, false)
+        dc_receive_imf(&t.ctx, imf_raw, "INBOX", 1, false)
            .await
            .unwrap();

-        let chats = Chatlist::try_load(context, 0, None, None).await.unwrap();
+        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();

-        let chat_id = chat::create_by_msg_id(context, chats.get_msg_id(0).unwrap())
+        let chat_id = chat::create_by_msg_id(&t.ctx, chats.get_msg_id(0).unwrap())
            .await
            .unwrap();

        let mut new_msg = Message::new(Viewtype::Text);
        new_msg.set_text(Some("Hi".to_string()));
        new_msg.chat_id = chat_id;
-        chat::prepare_msg(context, chat_id, &mut new_msg)
+        chat::prepare_msg(&t.ctx, chat_id, &mut new_msg)
            .await
            .unwrap();

-        new_msg
-    }
-
-    #[async_std::test]
-    // This test could still be extended
-    async fn test_render_reply() {
-        let t = configured_offline_context().await;
-        let context = &t.ctx;
-
-        let msg = incoming_msg_to_reply_msg(
-            b"From: Charlie <charlie@example.org>\n\
-                To: alice@example.org\n\
-                Subject: Chat: hello\n\
-                Chat-Version: 1.0\n\
-                Message-ID: <2223@example.org>\n\
-                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-                \n\
-                hello\n",
-            context,
-        )
-        .await;
-
-        let mimefactory = MimeFactory::from_msg(&t.ctx, &msg, false).await.unwrap();
-
-        let recipients = mimefactory.recipients();
-        assert_eq!(recipients, vec!["charlie@example.org"]);
-
-        let rendered_msg = mimefactory.render().await.unwrap();
-
-        let mail = mailparse::parse_mail(&rendered_msg.message).unwrap();
-        assert_eq!(
-            mail.headers
-                .iter()
-                .find(|h| h.get_key() == "MIME-Version")
-                .unwrap()
-                .get_value(),
-            "1.0"
-        );
-
-        let _mime_msg = MimeMessage::from_bytes(context, &rendered_msg.message)
+        let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false)
            .await
            .unwrap();
+        mf.subject_str().await
    }
 }
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -3,7 +3,6 @@ use std::future::Future;
 use std::pin::Pin;

 use deltachat_derive::{FromSql, ToSql};
-use lazy_static::lazy_static;
 use lettre_email::mime::{self, Mime};
 use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo};

@@ -54,8 +53,7 @@ pub struct MimeMessage {
    pub message_kml: Option<location::Kml>,
    pub(crate) user_avatar: Option<AvatarAction>,
    pub(crate) group_avatar: Option<AvatarAction>,
-    pub(crate) mdn_reports: Vec<Report>,
-    pub(crate) failure_report: Option<FailureReport>,
+    pub(crate) reports: Vec<Report>,
 }

 #[derive(Debug, PartialEq)]
@@ -178,16 +176,14 @@ impl MimeMessage {
            signatures,
            gossipped_addr,
            is_forwarded: false,
-            mdn_reports: Vec::new(),
+            reports: Vec::new(),
            is_system_message: SystemMessage::Unknown,
            location_kml: None,
            message_kml: None,
            user_avatar: None,
            group_avatar: None,
-            failure_report: None,
        };
        parser.parse_mime_recursive(context, &mail).await?;
-        parser.heuristically_parse_ndn(context).await;
        parser.parse_headers(context)?;

        Ok(parser)
@@ -357,7 +353,7 @@ impl MimeMessage {
        // just have send a message in the subject with an empty body.
        // Besides, we want to show something in case our incoming-processing
        // failed to properly handle an incoming message.
-        if self.parts.is_empty() && self.mdn_reports.is_empty() {
+        if self.parts.is_empty() && self.reports.is_empty() {
            let mut part = Part::default();
            part.typ = Viewtype::Text;

@@ -531,7 +527,7 @@ impl MimeMessage {
                part.typ = Viewtype::Text;
                part.msg_raw = Some(txt.clone());
                part.msg = txt;
-                part.error = "Decryption failed".to_string();
+                part.param.set(Param::Error, "Decryption failed");

                self.parts.push(part);

@@ -554,10 +550,10 @@ impl MimeMessage {
            (mime::MULTIPART, "report") => {
                /* RFC 6522: the first part is for humans, the second for machines */
                if mail.subparts.len() >= 2 {
-                    match mail.ctype.params.get("report-type").map(|s| s as &str) {
-                        Some("disposition-notification") => {
+                    if let Some(report_type) = mail.ctype.params.get("report-type") {
+                        if report_type == "disposition-notification" {
                            if let Some(report) = self.process_report(context, mail)? {
-                                self.mdn_reports.push(report);
+                                self.reports.push(report);
                            }

                            // Add MDN part so we can track it, avoid
@@ -569,21 +565,9 @@ impl MimeMessage {
                            self.parts.push(part);

                            any_part_added = true;
-                        }
-                        // Some providers, e.g. Tiscali, forget to set the report-type. So, if it's None, assume that it might be delivery-status
-                        Some("delivery-status") | None => {
-                            if let Some(report) = self.process_delivery_status(context, mail)? {
-                                self.failure_report = Some(report);
-                            }
-
-                            // Add all parts (we need another part, preferrably text/plain, to show as an error message)
-                            for cur_data in mail.subparts.iter() {
-                                if self.parse_mime_recursive(context, cur_data).await? {
-                                    any_part_added = true;
-                                }
-                            }
-                        }
-                        Some(_) => {
+                        } else {
+                            /* eg. `report-type=delivery-status`;
+                            maybe we should show them as a little error icon */
                            if let Some(first) = mail.subparts.iter().next() {
                                any_part_added = self.parse_mime_recursive(context, first).await?;
                            }
@@ -856,121 +840,24 @@ impl MimeMessage {
        Ok(None)
    }

-    fn process_delivery_status(
-        &self,
-        context: &Context,
-        report: &mailparse::ParsedMail<'_>,
-    ) -> Result<Option<FailureReport>> {
-        // parse as mailheaders
-        if let Some(original_msg) = report
-            .subparts
-            .iter()
-            .find(|p| p.ctype.mimetype.contains("rfc822") || p.ctype.mimetype == "message/global")
-        {
-            let report_body = original_msg.get_body_raw()?;
-            let (report_fields, _) = mailparse::parse_headers(&report_body)?;
-
-            if let Some(original_message_id) = report_fields
-                .get_header_value(HeaderDef::MessageId)
-                .and_then(|v| parse_message_id(&v).ok())
-            {
-                let mut to_list = get_all_addresses_from_header(&report.headers, |header_key| {
-                    header_key == "x-failed-recipients"
-                });
-                let to = if to_list.len() == 1 {
-                    Some(to_list.pop().unwrap())
-                } else {
-                    None // We do not know which recipient failed
-                };
-
-                return Ok(Some(FailureReport {
-                    rfc724_mid: original_message_id,
-                    failed_recipient: to.map(|s| s.addr),
-                }));
-            }
-
-            warn!(
-                context,
-                "ignoring unknown ndn-notification, Message-Id: {:?}",
-                report_fields.get_header_value(HeaderDef::MessageId)
-            );
+    /// Handle reports (only MDNs for now)
+    pub async fn handle_reports(&self, context: &Context, from_id: u32, sent_timestamp: i64) {
+        if self.reports.is_empty() {
+            return;
        }

-        Ok(None)
-    }
-
-    /// Some providers like GMX and Yahoo do not send standard NDNs (Non Delivery notifications).
-    /// If you improve heuristics here you might also have to change prefetch_should_download() in imap/mod.rs.
-    /// Also you should add a test in dc_receive_imf.rs (there already are lots of test_parse_ndn_* tests).
-    async fn heuristically_parse_ndn(&mut self, context: &Context) -> Option<()> {
-        if self
-            .get(HeaderDef::Subject)?
-            .to_ascii_lowercase()
-            .contains("fail")
-            && self
-                .get(HeaderDef::From_)?
-                .to_ascii_lowercase()
-                .contains("mailer-daemon")
-            && self.failure_report.is_none()
-        {
-            lazy_static! {
-                static ref RE: regex::Regex = regex::Regex::new(r"Message-ID:(.*)").unwrap();
-            }
-            for captures in self
-                .parts
-                .iter()
-                .filter_map(|part| part.msg_raw.as_ref())
-                .flat_map(|part| part.lines())
-                .filter_map(|line| RE.captures(line))
-            {
-                if let Ok(original_message_id) = parse_message_id(&captures[1]) {
-                    if let Ok(Some(_)) =
-                        message::rfc724_mid_exists(context, &original_message_id).await
-                    {
-                        self.failure_report = Some(FailureReport {
-                            rfc724_mid: original_message_id,
-                            failed_recipient: None,
-                        })
-                    }
-                }
-            }
-        }
-        None // Always return None, we just return anything so that we can use the '?' operator.
-    }
-
-    /// Handle reports
-    /// (MDNs = Message Disposition Notification, the message was read
-    /// and NDNs = Non delivery notification, the message could not be delivered)
-    pub async fn handle_reports(
-        &self,
-        context: &Context,
-        from_id: u32,
-        sent_timestamp: i64,
-        parts: &[Part],
-    ) {
-        for report in &self.mdn_reports {
+        for report in &self.reports {
            for original_message_id in
                std::iter::once(&report.original_message_id).chain(&report.additional_message_ids)
            {
                if let Some((chat_id, msg_id)) =
-                    message::handle_mdn(context, from_id, original_message_id, sent_timestamp).await
+                    message::mdn_from_ext(context, from_id, original_message_id, sent_timestamp)
+                        .await
                {
                    context.emit_event(Event::MsgRead { chat_id, msg_id });
                }
            }
        }
-
-        if let Some(failure_report) = &self.failure_report {
-            let error = parts.iter().find(|p| p.typ == Viewtype::Text).map(|p| {
-                let msg = &p.msg;
-                match msg.find("\n--- ") {
-                    Some(footer_start) => &msg[..footer_start],
-                    None => msg,
-                }
-                .trim()
-            });
-            message::handle_ndn(context, failure_report, error).await
-        }
    }
 }

@@ -1027,12 +914,6 @@ pub(crate) struct Report {
    additional_message_ids: Vec<String>,
 }

-#[derive(Debug)]
-pub(crate) struct FailureReport {
-    pub rfc724_mid: String,
-    pub failed_recipient: Option<String>,
-}
-
 pub(crate) fn parse_message_ids(ids: &str) -> Result<Vec<String>> {
    // take care with mailparse::msgidparse() that is pretty untolerant eg. wrt missing `<` or `>`
    let mut msgids = Vec::new();
@@ -1076,7 +957,6 @@ pub struct Part {
    pub bytes: usize,
    pub param: Params,
    org_filename: Option<String>,
-    pub error: String,
 }

 /// return mimetype and viewtype for a parsed mail
@@ -1523,7 +1403,7 @@ Disposition: manual-action/MDN-sent-automatically; displayed\n\
        );

        assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.mdn_reports.len(), 1);
+        assert_eq!(message.reports.len(), 1);
    }

    /// Test parsing multiple MDNs combined in a single message.
@@ -1603,7 +1483,7 @@ Disposition: manual-action/MDN-sent-automatically; displayed\n\
        );

        assert_eq!(message.parts.len(), 2);
-        assert_eq!(message.mdn_reports.len(), 2);
+        assert_eq!(message.reports.len(), 2);
    }

    #[async_std::test]
@@ -1650,13 +1530,10 @@ Additional-Message-IDs: <foo@example.com> <foo@example.net>\n\
        );

        assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.mdn_reports.len(), 1);
+        assert_eq!(message.reports.len(), 1);
+        assert_eq!(message.reports[0].original_message_id, "foo@example.org");
        assert_eq!(
-            message.mdn_reports[0].original_message_id,
-            "foo@example.org"
-        );
-        assert_eq!(
-            &message.mdn_reports[0].additional_message_ids,
+            &message.reports[0].additional_message_ids,
            &["foo@example.com", "foo@example.net"]
        );
    }
--- a/src/oauth2.rs
+++ b/src/oauth2.rs
@@ -1,9 +1,7 @@
 //! OAuth 2 module

-use regex::Regex;
 use std::collections::HashMap;

-use async_std_resolver::{config, resolver};
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use serde::Deserialize;

@@ -17,7 +15,6 @@ const OAUTH2_GMAIL: Oauth2 = Oauth2 {
    init_token: "https://accounts.google.com/o/oauth2/token?client_id=$CLIENT_ID&redirect_uri=$REDIRECT_URI&code=$CODE&grant_type=authorization_code",
    refresh_token: "https://accounts.google.com/o/oauth2/token?client_id=$CLIENT_ID&redirect_uri=$REDIRECT_URI&refresh_token=$REFRESH_TOKEN&grant_type=refresh_token",
    get_userinfo: Some("https://www.googleapis.com/oauth2/v1/userinfo?alt=json&access_token=$ACCESS_TOKEN"),
-    mx_pattern: Some(r"^aspmx\.l\.google\.com\.$"),
 };

 const OAUTH2_YANDEX: Oauth2 = Oauth2 {
@@ -27,11 +24,8 @@ const OAUTH2_YANDEX: Oauth2 = Oauth2 {
    init_token: "https://oauth.yandex.com/token?grant_type=authorization_code&code=$CODE&client_id=$CLIENT_ID&client_secret=58b8c6e94cf44fbe952da8511955dacf",
    refresh_token: "https://oauth.yandex.com/token?grant_type=refresh_token&refresh_token=$REFRESH_TOKEN&client_id=$CLIENT_ID&client_secret=58b8c6e94cf44fbe952da8511955dacf",
    get_userinfo: None,
-    mx_pattern: None,
 };

-const OAUTH2_PROVIDERS: [Oauth2; 1] = [OAUTH2_GMAIL];
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct Oauth2 {
    client_id: &'static str,
@@ -39,7 +33,6 @@ struct Oauth2 {
    init_token: &'static str,
    refresh_token: &'static str,
    get_userinfo: Option<&'static str>,
-    mx_pattern: Option<&'static str>,
 }

 /// OAuth 2 Access Token Response
@@ -60,7 +53,7 @@ pub async fn dc_get_oauth2_url(
    addr: impl AsRef<str>,
    redirect_uri: impl AsRef<str>,
 ) -> Option<String> {
-    if let Some(oauth2) = Oauth2::from_address(addr).await {
+    if let Some(oauth2) = Oauth2::from_address(addr) {
        if context
            .sql
            .set_raw_config(
@@ -88,7 +81,7 @@ pub async fn dc_get_oauth2_access_token(
    code: impl AsRef<str>,
    regenerate: bool,
 ) -> Option<String> {
-    if let Some(oauth2) = Oauth2::from_address(addr).await {
+    if let Some(oauth2) = Oauth2::from_address(addr) {
        let lock = context.oauth2_mutex.lock().await;

        // read generated token
@@ -246,7 +239,7 @@ pub async fn dc_get_oauth2_addr(
    addr: impl AsRef<str>,
    code: impl AsRef<str>,
 ) -> Option<String> {
-    let oauth2 = Oauth2::from_address(addr.as_ref()).await?;
+    let oauth2 = Oauth2::from_address(addr.as_ref())?;
    oauth2.get_userinfo?;

    if let Some(access_token) =
@@ -270,62 +263,23 @@ pub async fn dc_get_oauth2_addr(
 }

 impl Oauth2 {
-    async fn from_address(addr: impl AsRef<str>) -> Option<Self> {
+    fn from_address(addr: impl AsRef<str>) -> Option<Self> {
        let addr_normalized = normalize_addr(addr.as_ref());
        if let Some(domain) = addr_normalized
            .find('@')
            .map(|index| addr_normalized.split_at(index + 1).1)
        {
-            if let Some(provider) = Oauth2::lookup_whitelist(domain) {
-                Some(provider)
-            } else {
-                Oauth2::lookup_mx(domain).await
+            match domain {
+                "gmail.com" | "googlemail.com" => Some(OAUTH2_GMAIL),
+                "yandex.com" | "yandex.by" | "yandex.kz" | "yandex.ru" | "yandex.ua" | "ya.ru"
+                | "narod.ru" => Some(OAUTH2_YANDEX),
+                _ => None,
            }
        } else {
            None
        }
    }

-    fn lookup_whitelist(domain: impl AsRef<str>) -> Option<Self> {
-        let domain = domain.as_ref();
-        match domain {
-            "gmail.com" | "googlemail.com" => Some(OAUTH2_GMAIL),
-            "yandex.com" | "yandex.by" | "yandex.kz" | "yandex.ru" | "yandex.ua" | "ya.ru"
-            | "narod.ru" => Some(OAUTH2_YANDEX),
-            _ => None,
-        }
-    }
-
-    async fn lookup_mx(domain: impl AsRef<str>) -> Option<Self> {
-        if let Ok(resolver) = resolver(
-            config::ResolverConfig::default(),
-            config::ResolverOpts::default(),
-        )
-        .await
-        {
-            for provider in OAUTH2_PROVIDERS.iter() {
-                if let Some(pattern) = provider.mx_pattern {
-                    let re = Regex::new(pattern).unwrap();
-
-                    let mut fqdn: String = String::from(domain.as_ref());
-                    if !fqdn.ends_with('.') {
-                        fqdn.push_str(".");
-                    }
-
-                    if let Ok(res) = resolver.mx_lookup(fqdn).await {
-                        for rr in res.iter() {
-                            if re.is_match(&rr.exchange().to_lowercase().to_utf8()) {
-                                return Some(provider.clone());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        None
-    }
-
    async fn get_addr(&self, context: &Context, access_token: impl AsRef<str>) -> Option<String> {
        let userinfo_url = self.get_userinfo.unwrap_or_else(|| "");
        let userinfo_url = replace_in_uri(&userinfo_url, "$ACCESS_TOKEN", access_token);
@@ -408,34 +362,20 @@ mod tests {
        );
    }

-    #[async_std::test]
-    async fn test_oauth_from_address() {
+    #[test]
+    fn test_oauth_from_address() {
+        assert_eq!(Oauth2::from_address("hello@gmail.com"), Some(OAUTH2_GMAIL));
        assert_eq!(
-            Oauth2::from_address("hello@gmail.com").await,
+            Oauth2::from_address("hello@googlemail.com"),
            Some(OAUTH2_GMAIL)
        );
        assert_eq!(
-            Oauth2::from_address("hello@googlemail.com").await,
-            Some(OAUTH2_GMAIL)
-        );
-        assert_eq!(
-            Oauth2::from_address("hello@yandex.com").await,
-            Some(OAUTH2_YANDEX)
-        );
-        assert_eq!(
-            Oauth2::from_address("hello@yandex.ru").await,
+            Oauth2::from_address("hello@yandex.com"),
            Some(OAUTH2_YANDEX)
        );
+        assert_eq!(Oauth2::from_address("hello@yandex.ru"), Some(OAUTH2_YANDEX));

-        assert_eq!(Oauth2::from_address("hello@web.de").await, None);
-    }
-
-    #[async_std::test]
-    async fn test_oauth_from_mx() {
-        assert_eq!(
-            Oauth2::from_address("hello@google.com").await,
-            Some(OAUTH2_GMAIL)
-        );
+        assert_eq!(Oauth2::from_address("hello@web.de"), None);
    }

    #[async_std::test]
--- a/src/param.rs
+++ b/src/param.rs
@@ -65,6 +65,9 @@ pub enum Param {
    /// For Messages
    Arg4 = b'H',

+    /// For Messages
+    Error = b'L',
+
    /// For Messages
    AttachGroupImage = b'A',

--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -450,11 +450,14 @@ impl<'a> Peerstate<'a> {
    }

    pub fn has_verified_key(&self, fingerprints: &HashSet<Fingerprint>) -> bool {
-        if let Some(vkc) = &self.verified_key_fingerprint {
-            fingerprints.contains(vkc) && self.verified_key.is_some()
-        } else {
-            false
+        if self.verified_key.is_some() && self.verified_key_fingerprint.is_some() {
+            let vkc = self.verified_key_fingerprint.as_ref().unwrap();
+            if fingerprints.contains(vkc) {
+                return true;
+            }
        }
+
+        false
    }
 }

--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -272,14 +272,6 @@ pub async fn pk_encrypt(
    .await
 }

-/// Decrypts the message with keys from the private key keyring.
-///
-/// Receiver private keys are provided in
-/// `private_keys_for_decryption`.
-///
-/// If `ret_signature_fingerprints` is not `None`, stores fingerprints
-/// of all keys from the `public_keys_for_validation` keyring that
-/// have valid signatures there.
 #[allow(clippy::implicit_hasher)]
 pub async fn pk_decrypt(
    ctext: Vec<u8>,
@@ -298,41 +290,36 @@ pub async fn pk_decrypt(
    })
    .await?;

-    if let Some(msg) = msgs.into_iter().next() {
-        // get_content() will decompress the message if needed,
-        // but this avoids decompressing it again to check signatures
-        let msg = msg.decompress()?;
+    ensure!(!msgs.is_empty(), "No valid messages found");

-        let content = match msg.get_content()? {
-            Some(content) => content,
-            None => bail!("The decrypted message is empty"),
-        };
+    let content = match msgs[0].get_content()? {
+        Some(content) => content,
+        None => bail!("Decrypted message is empty"),
+    };

-        if let Some(ret_signature_fingerprints) = ret_signature_fingerprints {
-            if !public_keys_for_validation.is_empty() {
-                let fingerprints = async_std::task::spawn_blocking(move || {
-                    let pkeys = public_keys_for_validation.keys();
+    if let Some(ret_signature_fingerprints) = ret_signature_fingerprints {
+        if !public_keys_for_validation.is_empty() {
+            let fingerprints = async_std::task::spawn_blocking(move || {
+                let dec_msg = &msgs[0];

-                    let mut fingerprints: Vec<Fingerprint> = Vec::new();
-                    if let signed_msg @ pgp::composed::Message::Signed { .. } = msg {
-                        for pkey in pkeys {
-                            if signed_msg.verify(&pkey.primary_key).is_ok() {
-                                let fp = DcKey::fingerprint(pkey);
-                                fingerprints.push(fp);
-                            }
-                        }
+                let pkeys = public_keys_for_validation.keys();
+
+                let mut fingerprints: Vec<Fingerprint> = Vec::new();
+                for pkey in pkeys {
+                    if dec_msg.verify(&pkey.primary_key).is_ok() {
+                        let fp = DcKey::fingerprint(pkey);
+                        fingerprints.push(fp);
                    }
-                    fingerprints
-                })
-                .await;
+                }
+                fingerprints
+            })
+            .await;

-                ret_signature_fingerprints.extend(fingerprints);
-            }
+            ret_signature_fingerprints.extend(fingerprints);
        }
-        Ok(content)
-    } else {
-        bail!("No valid messages found");
    }
+
+    Ok(content)
 }

 /// Symmetric encryption.
--- a/src/provider/data.rs
+++ b/src/provider/data.rs
@@ -19,7 +19,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "newyear.aktivix.org", port: 25, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // aol.md: aol.com
@@ -31,7 +30,6 @@ lazy_static::lazy_static! {
        server: vec![
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // autistici.org.md: autistici.org
@@ -45,7 +43,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: SSL, hostname: "smtp.autistici.org", port: 465, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // bluewin.ch.md: bluewin.ch
@@ -59,21 +56,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: SSL, hostname: "smtpauths.bluewin.ch", port: 465, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
-    };
-
-    // chello.at.md: chello.at
-    static ref P_CHELLO_AT: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/chello-at",
-        server: vec![
-            Server { protocol: IMAP, socket: SSL, hostname: "mail.mymagenta.at", port: 993, username_pattern: EMAIL },
-            Server { protocol: SMTP, socket: SSL, hostname: "mail.mymagenta.at", port: 465, username_pattern: EMAIL },
-        ],
-        config_defaults: None,
-        strict_tls: false,
    };

    // comcast.md: xfinity.com, comcast.net
@@ -83,16 +65,7 @@ lazy_static::lazy_static! {
    // - skipping provider with status OK and no special things to do

    // disroot.md: disroot.org
-    static ref P_DISROOT: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/disroot",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do

    // example.com.md: example.com, example.org
    static ref P_EXAMPLE_COM: Provider = Provider {
@@ -105,7 +78,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.example.com", port: 1337, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // fastmail.md: fastmail.com
@@ -117,19 +89,6 @@ lazy_static::lazy_static! {
        server: vec![
        ],
        config_defaults: None,
-        strict_tls: false,
-    };
-
-    // five.chat.md: five.chat
-    static ref P_FIVE_CHAT: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/five-chat",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
    };

    // freenet.de.md: freenet.de
@@ -143,7 +102,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "mx.freenet.de", port: 587, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // gmail.md: gmail.com, googlemail.com
@@ -157,7 +115,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: SSL, hostname: "smtp.gmail.com", port: 465, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: true,
    };

    // gmx.net.md: gmx.net, gmx.de, gmx.at, gmx.ch, gmx.org, gmx.eu, gmx.info, gmx.biz, gmx.com
@@ -172,7 +129,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "mail.gmx.net", port: 587, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // i.ua.md: i.ua
@@ -189,7 +145,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.mail.me.com", port: 587, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // kolst.com.md: kolst.com
@@ -202,16 +157,7 @@ lazy_static::lazy_static! {
    // - skipping provider with status OK and no special things to do

    // mailbox.org.md: mailbox.org, secure.mailbox.org
-    static ref P_MAILBOX_ORG: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/mailbox-org",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do

    // nauta.cu.md: nauta.cu
    static ref P_NAUTA_CU: Provider = Provider {
@@ -232,7 +178,6 @@ lazy_static::lazy_static! {
            ConfigDefault { key: Config::E2eeEnabled, value: "0" },
            ConfigDefault { key: Config::MediaQuality, value: "1" },
        ]),
-        strict_tls: false,
    };

    // outlook.com.md: hotmail.com, outlook.com, office365.com, outlook.com.tr, live.com
@@ -246,10 +191,9 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp-mail.outlook.com", port: 587, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

-    // posteo.md: posteo.de, posteo.af, posteo.at, posteo.be, posteo.ch, posteo.cl, posteo.co, posteo.co.uk, posteo.com.br, posteo.cr, posteo.cz, posteo.dk, posteo.ee, posteo.es, posteo.eu, posteo.fi, posteo.gl, posteo.gr, posteo.hn, posteo.hr, posteo.hu, posteo.ie, posteo.in, posteo.is, posteo.jp, posteo.la, posteo.li, posteo.lt, posteo.lu, posteo.me, posteo.mx, posteo.my, posteo.net, posteo.nl, posteo.no, posteo.nz, posteo.org, posteo.pe, posteo.pl, posteo.pm, posteo.pt, posteo.ro, posteo.ru, posteo.se, posteo.sg, posteo.si, posteo.tn, posteo.uk, posteo.us
+    // posteo.md: posteo.de
    static ref P_POSTEO: Provider = Provider {
        status: Status::OK,
        before_login_hint: "",
@@ -260,7 +204,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "posteo.de", port: 587, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: true,
    };

    // protonmail.md: protonmail.com, protonmail.ch
@@ -272,35 +215,16 @@ lazy_static::lazy_static! {
        server: vec![
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // riseup.net.md: riseup.net
-    static ref P_RISEUP_NET: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/riseup-net",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do

    // rogers.com.md: rogers.com
    // - skipping provider with status OK and no special things to do

    // systemli.org.md: systemli.org
-    static ref P_SYSTEMLI_ORG: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/systemli-org",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do

    // t-online.md: t-online.de, magenta.de
    static ref P_T_ONLINE: Provider = Provider {
@@ -311,7 +235,6 @@ lazy_static::lazy_static! {
        server: vec![
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // testrun.md: testrun.org
@@ -326,7 +249,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "testrun.org", port: 587, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: true,
    };

    // tiscali.it.md: tiscali.it
@@ -340,7 +262,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: SSL, hostname: "smtp.tiscali.it", port: 465, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // ukr.net.md: ukr.net
@@ -361,13 +282,12 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.web.de", port: 587, username_pattern: EMAILLOCALPART },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // yahoo.md: yahoo.com, yahoo.de, yahoo.it, yahoo.fr, yahoo.es, yahoo.se, yahoo.co.uk, yahoo.co.nz, yahoo.com.au, yahoo.com.ar, yahoo.com.br, yahoo.com.mx, ymail.com, rocketmail.com, yahoodns.net
    static ref P_YAHOO: Provider = Provider {
        status: Status::PREPARATION,
-        before_login_hint: "To use Delta Chat with your Yahoo email address you have to create an \"App-Password\" in the account security screen.",
+        before_login_hint: "To use Delta Chat with your Yahoo email address you have to allow \"less secure apps\" in the Yahoo webinterface.",
        after_login_hint: "",
        overview_page: "https://providers.delta.chat/yahoo",
        server: vec![
@@ -375,7 +295,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: SSL, hostname: "smtp.mail.yahoo.com", port: 465, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    // yandex.ru.md: yandex.ru, yandex.com
@@ -387,7 +306,6 @@ lazy_static::lazy_static! {
        server: vec![
        ],
        config_defaults: None,
-        strict_tls: true,
    };

    // ziggo.nl.md: ziggo.nl
@@ -401,7 +319,6 @@ lazy_static::lazy_static! {
            Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.ziggo.nl", port: 587, username_pattern: EMAIL },
        ],
        config_defaults: None,
-        strict_tls: false,
    };

    pub static ref PROVIDER_DATA: HashMap<&'static str, &'static Provider> = [
@@ -409,12 +326,9 @@ lazy_static::lazy_static! {
        ("aol.com", &*P_AOL),
        ("autistici.org", &*P_AUTISTICI_ORG),
        ("bluewin.ch", &*P_BLUEWIN_CH),
-        ("chello.at", &*P_CHELLO_AT),
-        ("disroot.org", &*P_DISROOT),
        ("example.com", &*P_EXAMPLE_COM),
        ("example.org", &*P_EXAMPLE_COM),
        ("fastmail.com", &*P_FASTMAIL),
-        ("five.chat", &*P_FIVE_CHAT),
        ("freenet.de", &*P_FREENET_DE),
        ("gmail.com", &*P_GMAIL),
        ("googlemail.com", &*P_GMAIL),
@@ -430,8 +344,6 @@ lazy_static::lazy_static! {
        ("icloud.com", &*P_ICLOUD),
        ("me.com", &*P_ICLOUD),
        ("mac.com", &*P_ICLOUD),
-        ("mailbox.org", &*P_MAILBOX_ORG),
-        ("secure.mailbox.org", &*P_MAILBOX_ORG),
        ("nauta.cu", &*P_NAUTA_CU),
        ("hotmail.com", &*P_OUTLOOK_COM),
        ("outlook.com", &*P_OUTLOOK_COM),
@@ -439,58 +351,8 @@ lazy_static::lazy_static! {
        ("outlook.com.tr", &*P_OUTLOOK_COM),
        ("live.com", &*P_OUTLOOK_COM),
        ("posteo.de", &*P_POSTEO),
-        ("posteo.af", &*P_POSTEO),
-        ("posteo.at", &*P_POSTEO),
-        ("posteo.be", &*P_POSTEO),
-        ("posteo.ch", &*P_POSTEO),
-        ("posteo.cl", &*P_POSTEO),
-        ("posteo.co", &*P_POSTEO),
-        ("posteo.co.uk", &*P_POSTEO),
-        ("posteo.com.br", &*P_POSTEO),
-        ("posteo.cr", &*P_POSTEO),
-        ("posteo.cz", &*P_POSTEO),
-        ("posteo.dk", &*P_POSTEO),
-        ("posteo.ee", &*P_POSTEO),
-        ("posteo.es", &*P_POSTEO),
-        ("posteo.eu", &*P_POSTEO),
-        ("posteo.fi", &*P_POSTEO),
-        ("posteo.gl", &*P_POSTEO),
-        ("posteo.gr", &*P_POSTEO),
-        ("posteo.hn", &*P_POSTEO),
-        ("posteo.hr", &*P_POSTEO),
-        ("posteo.hu", &*P_POSTEO),
-        ("posteo.ie", &*P_POSTEO),
-        ("posteo.in", &*P_POSTEO),
-        ("posteo.is", &*P_POSTEO),
-        ("posteo.jp", &*P_POSTEO),
-        ("posteo.la", &*P_POSTEO),
-        ("posteo.li", &*P_POSTEO),
-        ("posteo.lt", &*P_POSTEO),
-        ("posteo.lu", &*P_POSTEO),
-        ("posteo.me", &*P_POSTEO),
-        ("posteo.mx", &*P_POSTEO),
-        ("posteo.my", &*P_POSTEO),
-        ("posteo.net", &*P_POSTEO),
-        ("posteo.nl", &*P_POSTEO),
-        ("posteo.no", &*P_POSTEO),
-        ("posteo.nz", &*P_POSTEO),
-        ("posteo.org", &*P_POSTEO),
-        ("posteo.pe", &*P_POSTEO),
-        ("posteo.pl", &*P_POSTEO),
-        ("posteo.pm", &*P_POSTEO),
-        ("posteo.pt", &*P_POSTEO),
-        ("posteo.ro", &*P_POSTEO),
-        ("posteo.ru", &*P_POSTEO),
-        ("posteo.se", &*P_POSTEO),
-        ("posteo.sg", &*P_POSTEO),
-        ("posteo.si", &*P_POSTEO),
-        ("posteo.tn", &*P_POSTEO),
-        ("posteo.uk", &*P_POSTEO),
-        ("posteo.us", &*P_POSTEO),
        ("protonmail.com", &*P_PROTONMAIL),
        ("protonmail.ch", &*P_PROTONMAIL),
-        ("riseup.net", &*P_RISEUP_NET),
-        ("systemli.org", &*P_SYSTEMLI_ORG),
        ("t-online.de", &*P_T_ONLINE),
        ("magenta.de", &*P_T_ONLINE),
        ("testrun.org", &*P_TESTRUN),
--- a/src/provider/mod.rs
+++ b/src/provider/mod.rs
@@ -72,7 +72,6 @@ pub struct Provider {
    pub overview_page: &'static str,
    pub server: Vec<Server>,
    pub config_defaults: Option<Vec<ConfigDefault>>,
-    pub strict_tls: bool,
 }

 impl Provider {
--- a/src/provider/update.py
+++ b/src/provider/update.py
@@ -100,9 +100,6 @@ def process_data(data, file):

    config_defaults = process_config_defaults(data)

-    strict_tls = data.get("strict_tls", False)
-    strict_tls = "true" if strict_tls else "false"
-
    provider = ""
    before_login_hint = cleanstr(data.get("before_login_hint", ""))
    after_login_hint = cleanstr(data.get("after_login_hint", ""))
@@ -114,7 +111,6 @@ def process_data(data, file):
        provider += "        overview_page: \"" + file2url(file) + "\",\n"
        provider += "        server: vec![\n" + server + "        ],\n"
        provider += "        config_defaults: " + config_defaults + ",\n"
-        provider += "        strict_tls: " + strict_tls + ",\n"
        provider += "    };\n\n"
    else:
        raise TypeError("SMTP and IMAP must be specified together or left out both")
@@ -125,7 +121,7 @@ def process_data(data, file):
    # finally, add the provider
    global out_all, out_domains
    out_all += "    // " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n"
-    if status == "OK" and before_login_hint == "" and after_login_hint == "" and server == "" and config_defaults == "None" and strict_tls == "false":
+    if status == "OK" and before_login_hint == "" and after_login_hint == "" and server == "" and config_defaults == "None":
        out_all += "    // - skipping provider with status OK and no special things to do\n\n"
    else:
        out_all += provider
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -109,7 +109,7 @@ async fn fetch(ctx: &Context, connection: &mut Imap) {
            // fetch
            if let Err(err) = connection.fetch(&ctx, &watch_folder).await {
                connection.trigger_reconnect();
-                warn!(ctx, "{}", err);
+                error!(ctx, "{}", err);
            }
        }
        None => {
@@ -131,7 +131,7 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> Int
            // fetch
            if let Err(err) = connection.fetch(&ctx, &watch_folder).await {
                connection.trigger_reconnect();
-                warn!(ctx, "{}", err);
+                error!(ctx, "{}", err);
            }

            // idle
@@ -141,7 +141,7 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> Int
                    .await
                    .unwrap_or_else(|err| {
                        connection.trigger_reconnect();
-                        warn!(ctx, "{}", err);
+                        error!(ctx, "{}", err);
                        InterruptInfo::new(false, None)
                    })
            } else {
@@ -149,7 +149,7 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> Int
            }
        }
        None => {
-            warn!(ctx, "Can not watch {} folder, not set", folder);
+            warn!(ctx, "Can not watch inbox folder, not set");
            connection.fake_idle(&ctx, None).await
        }
    }
@@ -471,6 +471,7 @@ impl SmtpConnectionState {
    }
 }

+#[derive(Debug)]
 struct SmtpConnectionHandlers {
    connection: Smtp,
    stop_receiver: Receiver<()>,
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -10,9 +10,8 @@ use async_smtp::*;
 use crate::constants::*;
 use crate::context::Context;
 use crate::events::Event;
-use crate::login_param::{dc_build_tls, CertificateChecks, LoginParam};
+use crate::login_param::{dc_build_tls, LoginParam};
 use crate::oauth2::*;
-use crate::provider::get_provider_info;
 use crate::stock::StockMessage;

 /// SMTP write and read timeout in seconds.
@@ -45,8 +44,9 @@ pub enum Error {

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

-#[derive(Default)]
-pub(crate) struct Smtp {
+#[derive(Default, DebugStub)]
+pub struct Smtp {
+    #[debug_stub(some = "SmtpTransport")]
    transport: Option<smtp::SmtpTransport>,

    /// Email address we are sending from.
@@ -113,14 +113,7 @@ impl Smtp {
        let domain = &lp.send_server;
        let port = lp.send_port as u16;

-        let provider = get_provider_info(&lp.addr);
-        let strict_tls = match lp.smtp_certificate_checks {
-            CertificateChecks::Automatic => provider.map_or(false, |provider| provider.strict_tls),
-            CertificateChecks::Strict => true,
-            CertificateChecks::AcceptInvalidCertificates
-            | CertificateChecks::AcceptInvalidCertificates2 => false,
-        };
-        let tls_config = dc_build_tls(strict_tls);
+        let tls_config = dc_build_tls(lp.smtp_certificate_checks);
        let tls_parameters = ClientTlsParameters::new(domain.to_string(), tls_config);

        let (creds, mechanism) = if 0 != lp.server_flags & (DC_LP_AUTH_OAUTH2 as i32) {
@@ -179,7 +172,7 @@ impl Smtp {
                .stock_string_repl_str2(
                    StockMessage::ServerResponse,
                    format!("SMTP {}:{}", domain, port),
-                    format!("{}, ({:?})", err.to_string(), err),
+                    err.to_string(),
                )
                .await;

--- a/src/sql.rs
+++ b/src/sql.rs
@@ -49,7 +49,7 @@ pub enum Error {
 pub type Result<T> = std::result::Result<T, Error>;

 /// A wrapper around the underlying Sqlite3 object.
-#[derive(Debug)]
+#[derive(DebugStub)]
 pub struct Sql {
    pool: RwLock<Option<r2d2::Pool<r2d2_sqlite::SqliteConnectionManager>>>,
 }
@@ -1241,15 +1241,6 @@ async fn open(
                .await?;
            sql.set_raw_config_int(context, "dbversion", 63).await?;
        }
-        if dbversion < 64 {
-            info!(context, "[migration] v64");
-            sql.execute(
-                "ALTER TABLE msgs ADD COLUMN error TEXT DEFAULT '';",
-                paramsv![],
-            )
-            .await?;
-            sql.set_raw_config_int(context, "dbversion", 64).await?;
-        }

        // (2) updates that require high-level objects
        // (the structure is complete now and all objects are usable)
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -182,9 +182,6 @@ pub enum StockMessage {

    #[strum(props(fallback = "Message from %1$s"))]
    SubjectForNewContact = 73,
-
-    #[strum(props(fallback = "Failed to send message to %1$s."))]
-    FailedSendingTo = 74,
 }

 /*
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -40,24 +40,6 @@ pub(crate) async fn dummy_context() -> TestContext {
    test_context().await
 }

-pub(crate) async fn configured_offline_context() -> TestContext {
-    configured_offline_context_with_addr("alice@example.org").await
-}
-
-pub(crate) async fn configured_offline_context_with_addr(addr: &str) -> TestContext {
-    let t = dummy_context().await;
-    t.ctx.set_config(Config::Addr, Some(addr)).await.unwrap();
-    t.ctx
-        .set_config(Config::ConfiguredAddr, Some(addr))
-        .await
-        .unwrap();
-    t.ctx
-        .set_config(Config::Configured, Some("1"))
-        .await
-        .unwrap();
-    t
-}
-
 /// Load a pre-generated keypair for alice@example.com from disk.
 ///
 /// This saves CPU cycles by avoiding having to generate a key.
--- a/test-data/message/gmail_ndn.eml
+++ b/test-data/message/gmail_ndn.eml
@@ -1,242 +0,0 @@
-Delivered-To: alice@gmail.com
-Received: by 2002:a1c:b4d7:0:0:0:0:0 with SMTP id d206csp3026053wmf;
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-X-Received: by 2002:a5d:4651:: with SMTP id j17mr19532177wrs.50.1589819005555;
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1589819005; cv=none;
-        d=google.com; s=arc-20160816;
-        b=IZbNnzzuYzTFuqfuZwpd3ehqpYYGpn31c8DsfGbQ8rpbS0OTTROkVYvihQl8Ne/8X/
-         brEWsrcmaCh9WpFMzpI+cp/TY39uusnI6qdp5rcgrFmFgoANtwf3TBBj1+f7wBPn46BP
-         dQOUsg/J8KVfvzVgvL1x4uyJ0m9QirDgJeJ/BvrswbTleRQK7oY3fIireUCDxj6r2lCB
-         1Z0TKw1mgIb1LiFMZz8kvCNn3R4KSFnwS8rIju0hYwnsioNiExVQgumXL+RVkEZ9BMzf
-         UdoWIAw3VW+MOZFTpfLCEfgIPtLg/gtE0Q1P+a3KKpi8dkPiV2n6DGMecy9lTLtdhCXt
-         pnaA==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
-        h=in-reply-to:references:subject:from:date:message-id:auto-submitted
-         :to:dkim-signature;
-        bh=5xjZvcHbEGbMY0K2QB+3U6tpm1L1LAVv5h1pd4YXDEE=;
-        b=nNP0DktrSjdBaFfhhoDi2O9KVKM0iXE5ZgubQ0q0ff68Z6Ke7c8dDBXEsZoToI0s4Y
-         w90KyJFpgMJLFmP3iVDRqCfohi2y1HGdWg5VXQPTvzM7+YozZRlbNNV9UsuyRY91CXrJ
-         a2XREBgB+LPMGQivwcHtUMZfyNv/4uiwWivk+92ySNDhxqOiDt4R5Jak/7RkZMFwQpsE
-         JGwk6asM6VqZlihkF24lKv3pPaob6feyX3wD5N0+Mqiy1kQTj2JkpQk6nkTmdf0gapZe
-         fOhU1NkbNfbuS3U7m2gEUiyktE+MhV/MgAzgBhm9bgNt2gQLVWju8rHkPndfv1PDmEkC
-         FsYQ==
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=dPisws+O;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-Return-Path: <>
-Received: from mail-sor-f69.google.com (mail-sor-f69.google.com. [209.85.220.69])
-        by mx.google.com with SMTPS id s18sor5584435wrb.25.2020.05.18.09.23.25
-        for <alice@gmail.com>
-        (Google Transport Security);
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) client-ip=209.85.220.69;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=dPisws+O;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=googlemail.com; s=20161025;
-        h=to:auto-submitted:message-id:date:from:subject:references
-         :in-reply-to;
-        bh=5xjZvcHbEGbMY0K2QB+3U6tpm1L1LAVv5h1pd4YXDEE=;
-        b=dPisws+OwGFyOy0a612XYZgvz5T71GcJRJtU068/Tce8vN/+ggIQtUsZnZtsphe71v
-         2NvfP9ULxR4cXvomTvhrYAk19KdxN/S7SeyBbmXv3x/tg+DBVCmmPS/6RXrcl6Ms3Hkw
-         uPFQ9S3KcvHe/2bcb5LSTA/stIP4tuxxAXvsX2j+MjPYPWKAl50jkSbWK98U0Q0U+MTl
-         pKaaC9s9iEBafac8BFZCy4DfpumKlemNEyRa3cSV2hw+DYHKA5peModrK1A2tcsfstFF
-         rZi8yF/D90RIFbE04DI2QCxB3trsChNF1aYF06aSzI//wsfM1+lb+uGPi0YVkw3n4HrX
-         Xw4w==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:to:auto-submitted:message-id:date:from:subject
-         :references:in-reply-to;
-        bh=5xjZvcHbEGbMY0K2QB+3U6tpm1L1LAVv5h1pd4YXDEE=;
-        b=A/NCOtgbpA7VzB1G7ZFo8TA2FfrjuqjGdwMrJr3yXe21FrBFwzssprJwOkynqoVLkK
-         iJU7uMF/KTcQPDEmOLFThzFfe5GCx7eJtZPhwY+FbBlC5sq4I55/xaQLd0gOZ1BYXwMn
-         2bk169d2aoukbaLbGSQZF3d9atd+/e48YzkRxpmUoLcrWk2LcHAeQIG7SgT9pfX5DKPr
-         VpxM5/GMVEBbTRhBIWCeVSfpYCs80l0xEeTC3/B5lzpzMVDE8QCW6Dwh75b4Tb2K6yru
-         Zsy5ZpRmwv0wrkrb2vM+pl4IMkaF7s8XosIvlIT++fQV5xDFItT4atpykZvSDB92RKV0
-         8lEA==
-X-Gm-Message-State: AOAM532RG/PT3ChZHBCDORGLtAjKvX8TGBuOy+AxrnEaJT6v1ieb+VV1
-	+ejly+/6UthxHYlkOJYAszCSgL4dKVFotoVaN7LhEA==
-X-Google-Smtp-Source: ABdhPJz6veVKWhomCL4gK+whrybuMzHCDCq8AowgQvi7sobpMoM/k9CDw79jo1j3OUcTz6MEeUYLxEXuNIuu4zyoS7kVtsUYryGFHAI=
-X-Received: by 2002:a5d:5183:: with SMTP id k3mr20545185wrv.159.1589819005394;
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-Content-Type: multipart/report; boundary="00000000000012d63005a5ee9520"; report-type=delivery-status
-To: alice@gmail.com
-Received: by 2002:a5d:5183:: with SMTP id k3mr13704211wrv.159; Mon, 18 May
- 2020 09:23:25 -0700 (PDT)
-Return-Path: <>
-Auto-Submitted: auto-replied
-Message-ID: <5ec2b67d.1c69fb81.213af.67a5.GMR@mx.google.com>
-Date: Mon, 18 May 2020 09:23:25 -0700 (PDT)
-From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
-Subject: Delivery Status Notification (Failure)
-References: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-In-Reply-To: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-X-Failed-Recipients: assidhfaaspocwaeofi@gmail.com
-
--00000000000012d63005a5ee9520
-Content-Type: multipart/related; boundary="00000000000012dc0005a5ee952f"
-
--00000000000012dc0005a5ee952f
-Content-Type: multipart/alternative; boundary="00000000000012dc0705a5ee9530"
-
--00000000000012dc0705a5ee9530
-Content-Type: text/plain; charset="UTF-8"
-
-
-** Die Adresse wurde nicht gefunden **
-
-Ihre Nachricht wurde nicht an assidhfaaspocwaeofi@gmail.com zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-
-Hier erfahren Sie mehr: https://support.google.com/mail/?p=NoSuchUser
-
-Antwort:
-
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp
-
--00000000000012dc0705a5ee9530
-Content-Type: text/html; charset="UTF-8"
-
-
-<html>
-<head>
-<style>
-* {
-font-family:Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-</style>
-</head>
-<body>
-<table cellpadding="0" cellspacing="0" class="email-wrapper" style="padding-top:32px;background-color:#ffffff;"><tbody>
-<tr><td>
-<table cellpadding=0 cellspacing=0><tbody>
-<tr><td style="max-width:560px;padding:24px 24px 32px;background-color:#fafafa;border:1px solid #e0e0e0;border-radius:2px">
-<img style="padding:0 24px 16px 0;float:left" width=72 height=72 alt="Fehlersymbol" src="cid:icon.png">
-<table style="min-width:272px;padding-top:8px"><tbody>
-<tr><td><h2 style="font-size:20px;color:#212121;font-weight:bold;margin:0">
-Die Adresse wurde nicht gefunden
-</h2></td></tr>
-<tr><td style="padding-top:20px;color:#757575;font-size:16px;font-weight:normal;text-align:left">
-Ihre Nachricht wurde nicht an <a style='color:#212121;text-decoration:none'><b>assidhfaaspocwaeofi@gmail.com</b></a> zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-</td></tr>
-<tr><td style="padding-top:24px;color:#4285F4;font-size:14px;font-weight:bold;text-align:left">
-<a style="text-decoration:none" href="https://support.google.com/mail/?p=NoSuchUser">WEITERE INFORMATIONEN</a>
-</td></tr>
-</tbody></table>
-</td></tr>
-</tbody></table>
-</td></tr>
-<tr style="border:none;background-color:#fff;font-size:12.8px;width:90%">
-<td align="left" style="padding:48px 10px">
-Antwort:<br/>
-<p style="font-family:monospace">
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient&#39;s email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp
-</p>
-</td>
-</tr>
-</tbody></table>
-</body>
-</html>
-
--00000000000012dc0705a5ee9530--
--00000000000012dc0005a5ee952f
-Content-Type: image/png; name="icon.png"
-Content-Disposition: attachment; filename="icon.png"
-Content-Transfer-Encoding: base64
-Content-ID: <icon.png>
-
-iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAACXBIWXMAABYlAAAWJQFJUiTwAAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABTdJREFUeNrsnD9sFEcUh5+PRMqZ
-yA0SPhAUQAQFUkyTgiBASARo6QApqVIkfdxGFJFSgGhJAUIiBaQB0ZIOKVCkwUgURjIg2fxL4kS+
-YDvkbC/388bi8N16Z4/d7J/5PsniuD3fyePP772ZeTsDQRAYQL/UGAJAIEAgQCBAIAAEAgQCBAIE
-AkAgyJT3Mv+Eq7vYK8mTE+MDRCAghQECAeRQA5V2ZOpmg5vDx3NPzRbmGRMEcmTrEbNNB8zWfRD+
-f/Efs2e3zCZvMjaksBg27TfbcuSNPEKP9ZyuAQKtHX2O9ncNgWC57umMPKvRNb0GEKgnLoUyxTQC
-rcns0/6uIRAs8/hGf9cQCJZpTpjdO2f25/03z+mxntM1eLtsZAgiUtX4JcaBCAQIBAgECARQ8CJa
-G5jab4J4pm4WZmO3OALVh802fIwcLkyPkcKAGggAgQCBAIEAgQCBABAIEAjKA/1AnahhbO5FdOOY
-VsrrDbPBYcYKgf5D2wLaV3p+22xh1u17tO3S+DTcvxvagUDeivPgx/a/95J/73w7Sj26Hn4pKo2M
-ehuV/KyBJM6d0f7k6RKx/R63vvL2tmf/ItDdM2ZTP6f7nkp9Y2fDx1v9akmpIU+KSCLVUghUQfSL
-zVKeTklbLxGoctw/nzC5rw8L5KRNbkpnKq6pgSqEClzNnFzY+XnYWrt6VpVk1vbwWvg+RKCKMOUw
-Q1LEOXA+/MX3mpJvGDHb265xtnzmFoUK1HaKQGlMtePYM+q2KKjXuaS1NJYIEKgI8jhEgqHt4cqy
-Ky53j3hyHz2bqSLp2o2LbJ7MxKovkGqXteoWpaOk96O9/yF/dF7NwlS36AuIQIBA5celQK4PIxBE
-4LLzrtoLgaALdSy6CJRkWQCBPGLsTHznomZ9nszUECgJ2ml3WWHe+QVFNPSQx6UdZNtxr9pbEShN
-eTTz8mQXHoHSlke7+Z+c9m6VGoHSkEfs/trLW3wQKApN1V3lGfnGu2Z6BFoLtYCs3GWBPAiUCLVh
-/HoaeRCoT9R873KLM/IgUBfapnCpe5AHgXry4pf412ihEHkQqCdxd5VqrcezhUIESsJMTJ+Pdthp
-Z0WgyNlXXPHc2Mc4IVAELl2Gnh8mhUDvCkfbIVAkcbf/aOoO3fMKhqAD3frTa4quwpn0hUDOkQhI
-YYBAgECAQAAU0QlYObl+5Ug8NcprZkZxjUCxRPVA6zmtEXHCBykskrhjgHXN09PoEcgFl4M4H11j
-nBAoApcj6ZoPGScEAgTKApcDoTw5sgWB+sGlz1n90IBAPdE6j1o21PfcC11jLagL1oFWRyGlKU3p
-OxcSJQ7NZAjkhHp/uG2HFAYIBAgECASAQIBAgECAQAAIBOkxEARBtp9wdVfAMOfIifEBIhCQwgCB
-ABAI0oV2jhxZ+nfBatuPZfgBCy0Eqqo8c01b+uu51XZvzOgDWoHNTGR+pCwpLEd5svuAZXlO2uEr
-PyEQ8hRWHgRCHmqg0sjTnLalv6crJQ8C/U8stqNO0I4+VZOHFIY8COS1PGL2ybd5yUMKK7s8zYmL
-dujyd3n+nESgcsvzZd4/KwIhDwIhT35QA6UyE1qyxZnfvJMHgdKS549JC1qvvJOHFIY8CFR5eV5O
-XimqPAhUdHnmfx+zgxdOFXkoqIGKKs/cswnb/8Oeog8HEai48nxUhiFBIORBIOShBioskkbySCLk
-IQIhDwIhj28p7FApR6b1qlEbHGpkO/rr6215vi/zH1r2x7tApSGFAQIBAgECAQIBIBAgECAQIBBA
-LK8FGADCTxYrr+EVJgAAAABJRU5ErkJggg==
--00000000000012dc0005a5ee952f--
--00000000000012d63005a5ee9520
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; googlemail.com
-Arrival-Date: Mon, 18 May 2020 09:23:25 -0700 (PDT)
-X-Original-Message-ID: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-
-Final-Recipient: rfc822; assidhfaaspocwaeofi@gmail.com
-Action: failed
-Status: 5.1.1
-Diagnostic-Code: smtp; 550-5.1.1 The email account that you tried to reach does not exist. Please try
- 550-5.1.1 double-checking the recipient's email address for typos or
- 550-5.1.1 unnecessary spaces. Learn more at
- 550 5.1.1  https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp
-Last-Attempt-Date: Mon, 18 May 2020 09:23:25 -0700 (PDT)
-
--00000000000012d63005a5ee9520
-Content-Type: message/rfc822
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20161025;
-        h=mime-version:from:date:message-id:subject:to;
-        bh=gtlm3j0shCgZYOVxUt74zkQ69Zq+GTQeHeXLfMlrhlk=;
-        b=a185ogBcMzF9whNVWvuyUoUunNZk3Vc1kEIFmPkX0IxLpAFcI+fOQajOSromGl7Oyi
-         yecLwQevpww2Xd0XjZ3UkZvrI9m9koRmh0QeoHvgTRORiVwj08+PVc3N4F9bCO4w9i0J
-         ir7SSsJqBCDovoIFSFDyNa64vs6Nxno0cH/DaPG7pVTdD+3jfB7nLXIsMQYeX+1eP6rB
-         UhKxH82r7Mh9CI2PWDQpVtGj63AMUEyHgE9Ou08PWbbKjrQOasoG3Tw8tB1GoN1XYssM
-         rxOTgWEoTiduZ35AUH6h+eChOn9OHuI3SPECcVob70Qndayia3dMKfHMO6sEx9J0Wpic
-         29vg==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
-        bh=gtlm3j0shCgZYOVxUt74zkQ69Zq+GTQeHeXLfMlrhlk=;
-        b=miGIfL5BgnkD3wQvS34RtGwRRoh+8gJT5sFFfdX/hVyG/dvjXfdwP4yyNWr8ox8iY2
-         BLlahS4y4VGcbG1e2aYjurnWNytGu6utQcZax/uUngJ0bTOwXW1VaIiEZtqd6gTV+8d/
-         rrfQ459+4vXqIoQf0+Oi/U6dWwgJvPPjjRiToWdF3vIJE8R1iTRdZbW4lkgxSADbmskg
-         noT/gWGWblHtR6uuGuKGJ3bkhJKCBnjavKh0LlbWEeFBZfmVNPRvzEFWHjBDdu5wvSL5
-         0QJ+Qn0Orfn5CJuN3xPfzT1S2rI2iYZx37KX9zyMnZEx0ilkTYqCtBPWkrXRYDSXcxYS
-         Y1ag==
-X-Gm-Message-State: AOAM531vhwpXiK8M12286dOJx0Q5fBl9ZaH6BJKts93GoxvPv0xdryP0
-	jg9wYmoP5MUHudsxAMCYDFsCUMVx2PEywyIsaQqklw==
-X-Google-Smtp-Source: ABdhPJxlVJtTODM3pZZSTbbpAAAQRU8XbmuosDF9fgQZmVwxGZSzRWl22o+moppVRU/r8xMAyf0r3+qXwEBe1vZfjZo=
-X-Received: by 2002:a5d:5183:: with SMTP id k3mr20545162wrv.159.1589819005034;
- Mon, 18 May 2020 09:23:25 -0700 (PDT)
-MIME-Version: 1.0
-From: <alice@gmail.com>
-Date: Mon, 18 May 2020 18:23:39 +0200
-Message-ID: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-Subject: Kommt sowieso nicht an
-To: assidhfaaspocwaeofi@gmail.com
-Content-Type: multipart/alternative; boundary="0000000000000d652a05a5ee95df"
-
--0000000000000d652a05a5ee95df
-Content-Type: text/plain; charset="UTF-8"
-
-Wollte nur was testen
-
--0000000000000d652a05a5ee95df
-Content-Type: text/html; charset="UTF-8"
-
-<div dir="ltr">Wollte nur was testen<br></div>
-
--0000000000000d652a05a5ee95df--
-
--00000000000012d63005a5ee9520--
--- a/test-data/message/gmail_ndn_group.eml
+++ b/test-data/message/gmail_ndn_group.eml
@@ -1,242 +0,0 @@
-Delivered-To: alice@gmail.com
-Received: by 2002:a02:6629:0:0:0:0:0 with SMTP id k41csp368502jac;
-        Wed, 10 Jun 2020 05:17:57 -0700 (PDT)
-X-Received: by 2002:a6b:1448:: with SMTP id 69mr2898530iou.83.1591791475733;
-        Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1591791475; cv=none;
-        d=google.com; s=arc-20160816;
-        b=a0vSKJPbMtGYFnuk1ye/gnnV00Zvva4OOJTMOyfm13xMJD0YAhzGVfa7Z+wn5sQ8dw
-         VAxpmDHCkjp4jol0C1iutiq2Nl0qma819oFPuuoMLLatKQXHpo8Jt+sL3MnwNR7J5bZC
-         1c6Fjk75EIsRWhJd1HCkm44A6UYHxqqsTnzQCaNiHbjsRsvbggxwlMGSrZ4silxqSDvo
-         Pzd/YDLCvsnZNSNIjIckKAwtGmY6sXctZ+JnOTykXAyL32Milfwy1vRL9xm10Q14biTR
-         +qaIQp4E6WE63g1WHvfAjs0Dru7DalUh4GGl/NAwqVhY1gVyRD5E9/nODyHAfxjvaxDD
-         4sMw==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
-        h=in-reply-to:references:subject:from:date:message-id:auto-submitted
-         :to:dkim-signature;
-        bh=XaR1H4XeD+InO7mULPJn53omDGmxN+KG6DbSxyyErPM=;
-        b=OJbgbrktMKyczw25z/ib7lSdRX80PEK3Myh9fj4q6mDlXmPPv//Gv069znRQ4QbadM
-         HUXZH0WLMZcGyqI6SvGL/noxQ1O8yP0FYJJKTkoX0Gk2hHzfaE3x1scOP/o2FMMQXIFm
-         S4CgGBD6HHzBJYj/rSL3gzqLzx1Id/z5kTeDvH2cn8JJAcCE2q/nhjTyWUb87geoNlDJ
-         A1HRrLHK/0JOyRjHfg2zZCqIvSi1xmpiHStMyL9mfVyrQs98tsPxaOkJHjLplFARoPlr
-         mmmDvsFg7MPvFqkkANzz4JDHidnfKRULCgnrVj1yTU66UagUpQEGjZqz8/99YuU6nt1t
-         81sQ==
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=aO4aNy7C;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-Return-Path: <>
-Received: from mail-sor-f69.google.com (mail-sor-f69.google.com. [209.85.220.69])
-        by mx.google.com with SMTPS id w14sor16686480iow.23.2020.06.10.05.17.55
-        for <alice@gmail.com>
-        (Google Transport Security);
-        Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) client-ip=209.85.220.69;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=aO4aNy7C;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=googlemail.com; s=20161025;
-        h=to:auto-submitted:message-id:date:from:subject:references
-         :in-reply-to;
-        bh=XaR1H4XeD+InO7mULPJn53omDGmxN+KG6DbSxyyErPM=;
-        b=aO4aNy7CUOk9O4Jnsue/DvMFY6Ph0C34AbpoxJH+mLZpOmt/KYGCGYWgunZgamF15U
-         Vm8JY5yLKGwkTz2m3abDnKNP4fpl6zeZ5fyk5LvXH2Jema0iocHai6pJZBoFGPnonNmd
-         MscTf1sEltbOxwfOmM1BRHX34c1jW0+8Yd2+Nhg2DPvzuq1brOVin6bUV4VX5EeeuNqT
-         ZTewjJVPmO/B5NQhdpG81FO5w4hKSQ/VzZXnap2thMf3gOmnaoR+tbsnOIAiklcLdJ7b
-         57SKUwI041pwSmh9dffs0STl2GvMRSJyGCtBqMnzXgflqoGTcnPflWgR3LXHM/MIA0q8
-         WqRQ==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:to:auto-submitted:message-id:date:from:subject
-         :references:in-reply-to;
-        bh=XaR1H4XeD+InO7mULPJn53omDGmxN+KG6DbSxyyErPM=;
-        b=iORAzNvXegQ8oSp4RYb/S168muAiBox769seMk49kDBIvXwI+N8P4mUZq/zDi8DmQd
-         +wlLzVzowQq6EofiSpjOJWT9IC/k8otk15PMGtgHE4BGSSeKn7L30d3ocQS93HzYnLmA
-         VBlHBdFTKrsfKhe2+CQyCosTDGRpbkQLuRRyhxChEq8ltvaOHgbu1+eCeb9PsPuh6OxH
-         kvTHJZeA9A+eLOl26pBmqGIWkr7FlYW0wI6YPoEs9WXX5LSFOQs6fm/9l366eIR7IFFI
-         ihX5LrZl/Cf0lwwYX7fqIMgnHy1K+QnKuEb+dRQGqLbxdIEls9bXIF98iPQVkEWzgSZy
-         ip8Q==
-X-Gm-Message-State: AOAM531ahfHE6oS9/nuni8pNf9bwC+DXAcaLV0owBwNCj9kcTPLCCNhX
-	W1JNciK0ivEIVB4dgiyLE/5K7iKbEznQhqyG9Bi1QA==
-X-Google-Smtp-Source: ABdhPJygljUXswH0ycJyHmXVthi5IjlDvP8QdYlMdHUPKEtgIZeUk69Acti5LnswGhg63T9/L0PuGZGBM5XE5BsP0mMNNDRZyt+DgnE=
-X-Received: by 2002:a05:6638:101c:: with SMTP id r28mr2990163jab.84.1591791475516;
-        Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-Content-Type: multipart/report; boundary="00000000000074432a05a7b9d512"; report-type=delivery-status
-To: alice@gmail.com
-Received: by 2002:a05:6638:101c:: with SMTP id r28mr3059870jab.84; Wed, 10 Jun
- 2020 05:17:55 -0700 (PDT)
-Return-Path: <>
-Auto-Submitted: auto-replied
-Message-ID: <5ee0cf73.1c69fb81.6888.c2f4.GMR@mx.google.com>
-Date: Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
-Subject: Delivery Status Notification (Failure)
-References: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-In-Reply-To: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-X-Failed-Recipients: assidhfaaspocwaeofi@gmail.com
-
--00000000000074432a05a7b9d512
-Content-Type: multipart/related; boundary="000000000000745e0805a7b9d51b"
-
--000000000000745e0805a7b9d51b
-Content-Type: multipart/alternative; boundary="000000000000745e1705a7b9d51c"
-
--000000000000745e1705a7b9d51c
-Content-Type: text/plain; charset="UTF-8"
-
-
-** Die Adresse wurde nicht gefunden **
-
-Ihre Nachricht wurde nicht an assidhfaaspocwaeofi@gmail.com zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-
-Hier erfahren Sie mehr: https://support.google.com/mail/?p=NoSuchUser
-
-Antwort:
-
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser h20sor9401601jar.6 - gsmtp
-
--000000000000745e1705a7b9d51c
-Content-Type: text/html; charset="UTF-8"
-
-
-<html>
-<head>
-<style>
-* {
-font-family:Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-</style>
-</head>
-<body>
-<table cellpadding="0" cellspacing="0" class="email-wrapper" style="padding-top:32px;background-color:#ffffff;"><tbody>
-<tr><td>
-<table cellpadding=0 cellspacing=0><tbody>
-<tr><td style="max-width:560px;padding:24px 24px 32px;background-color:#fafafa;border:1px solid #e0e0e0;border-radius:2px">
-<img style="padding:0 24px 16px 0;float:left" width=72 height=72 alt="Fehlersymbol" src="cid:icon.png">
-<table style="min-width:272px;padding-top:8px"><tbody>
-<tr><td><h2 style="font-size:20px;color:#212121;font-weight:bold;margin:0">
-Die Adresse wurde nicht gefunden
-</h2></td></tr>
-<tr><td style="padding-top:20px;color:#757575;font-size:16px;font-weight:normal;text-align:left">
-Ihre Nachricht wurde nicht an <a style='color:#212121;text-decoration:none'><b>assidhfaaspocwaeofi@gmail.com</b></a> zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-</td></tr>
-<tr><td style="padding-top:24px;color:#4285F4;font-size:14px;font-weight:bold;text-align:left">
-<a style="text-decoration:none" href="https://support.google.com/mail/?p=NoSuchUser">WEITERE INFORMATIONEN</a>
-</td></tr>
-</tbody></table>
-</td></tr>
-</tbody></table>
-</td></tr>
-<tr style="border:none;background-color:#fff;font-size:12.8px;width:90%">
-<td align="left" style="padding:48px 10px">
-Antwort:<br/>
-<p style="font-family:monospace">
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient&#39;s email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser h20sor9401601jar.6 - gsmtp
-</p>
-</td>
-</tr>
-</tbody></table>
-</body>
-</html>
-
--000000000000745e1705a7b9d51c--
--000000000000745e0805a7b9d51b
-Content-Type: image/png; name="icon.png"
-Content-Disposition: attachment; filename="icon.png"
-Content-Transfer-Encoding: base64
-Content-ID: <icon.png>
-
-iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAACXBIWXMAABYlAAAWJQFJUiTwAAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABTdJREFUeNrsnD9sFEcUh5+PRMqZ
-yA0SPhAUQAQFUkyTgiBASARo6QApqVIkfdxGFJFSgGhJAUIiBaQB0ZIOKVCkwUgURjIg2fxL4kS+
-YDvkbC/388bi8N16Z4/d7J/5PsniuD3fyePP772ZeTsDQRAYQL/UGAJAIEAgQCBAIAAEAgQCBAIE
-AkAgyJT3Mv+Eq7vYK8mTE+MDRCAghQECAeRQA5V2ZOpmg5vDx3NPzRbmGRMEcmTrEbNNB8zWfRD+
-f/Efs2e3zCZvMjaksBg27TfbcuSNPEKP9ZyuAQKtHX2O9ncNgWC57umMPKvRNb0GEKgnLoUyxTQC
-rcns0/6uIRAs8/hGf9cQCJZpTpjdO2f25/03z+mxntM1eLtsZAgiUtX4JcaBCAQIBAgECARQ8CJa
-G5jab4J4pm4WZmO3OALVh802fIwcLkyPkcKAGggAgQCBAIEAgQCBABAIEAjKA/1AnahhbO5FdOOY
-VsrrDbPBYcYKgf5D2wLaV3p+22xh1u17tO3S+DTcvxvagUDeivPgx/a/95J/73w7Sj26Hn4pKo2M
-ehuV/KyBJM6d0f7k6RKx/R63vvL2tmf/ItDdM2ZTP6f7nkp9Y2fDx1v9akmpIU+KSCLVUghUQfSL
-zVKeTklbLxGoctw/nzC5rw8L5KRNbkpnKq6pgSqEClzNnFzY+XnYWrt6VpVk1vbwWvg+RKCKMOUw
-Q1LEOXA+/MX3mpJvGDHb265xtnzmFoUK1HaKQGlMtePYM+q2KKjXuaS1NJYIEKgI8jhEgqHt4cqy
-Ky53j3hyHz2bqSLp2o2LbJ7MxKovkGqXteoWpaOk96O9/yF/dF7NwlS36AuIQIBA5celQK4PIxBE
-4LLzrtoLgaALdSy6CJRkWQCBPGLsTHznomZ9nszUECgJ2ml3WWHe+QVFNPSQx6UdZNtxr9pbEShN
-eTTz8mQXHoHSlke7+Z+c9m6VGoHSkEfs/trLW3wQKApN1V3lGfnGu2Z6BFoLtYCs3GWBPAiUCLVh
-/HoaeRCoT9R873KLM/IgUBfapnCpe5AHgXry4pf412ihEHkQqCdxd5VqrcezhUIESsJMTJ+Pdthp
-Z0WgyNlXXPHc2Mc4IVAELl2Gnh8mhUDvCkfbIVAkcbf/aOoO3fMKhqAD3frTa4quwpn0hUDOkQhI
-YYBAgECAQAAU0QlYObl+5Ug8NcprZkZxjUCxRPVA6zmtEXHCBykskrhjgHXN09PoEcgFl4M4H11j
-nBAoApcj6ZoPGScEAgTKApcDoTw5sgWB+sGlz1n90IBAPdE6j1o21PfcC11jLagL1oFWRyGlKU3p
-OxcSJQ7NZAjkhHp/uG2HFAYIBAgECASAQIBAgECAQAAIBOkxEARBtp9wdVfAMOfIifEBIhCQwgCB
-ABAI0oV2jhxZ+nfBatuPZfgBCy0Eqqo8c01b+uu51XZvzOgDWoHNTGR+pCwpLEd5svuAZXlO2uEr
-PyEQ8hRWHgRCHmqg0sjTnLalv6crJQ8C/U8stqNO0I4+VZOHFIY8COS1PGL2ybd5yUMKK7s8zYmL
-dujyd3n+nESgcsvzZd4/KwIhDwIhT35QA6UyE1qyxZnfvJMHgdKS549JC1qvvJOHFIY8CFR5eV5O
-XimqPAhUdHnmfx+zgxdOFXkoqIGKKs/cswnb/8Oeog8HEai48nxUhiFBIORBIOShBioskkbySCLk
-IQIhDwIhj28p7FApR6b1qlEbHGpkO/rr6215vi/zH1r2x7tApSGFAQIBAgECAQIBIBAgECAQIBBA
-LK8FGADCTxYrr+EVJgAAAABJRU5ErkJggg==
--000000000000745e0805a7b9d51b--
--00000000000074432a05a7b9d512
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; googlemail.com
-Arrival-Date: Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-X-Original-Message-ID: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-
-Final-Recipient: rfc822; assidhfaaspocwaeofi@gmail.com
-Action: failed
-Status: 5.1.1
-Diagnostic-Code: smtp; 550-5.1.1 The email account that you tried to reach does not exist. Please try
- 550-5.1.1 double-checking the recipient's email address for typos or
- 550-5.1.1 unnecessary spaces. Learn more at
- 550 5.1.1  https://support.google.com/mail/?p=NoSuchUser h20sor9401601jar.6 - gsmtp
-Last-Attempt-Date: Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-
--00000000000074432a05a7b9d512
-Content-Type: message/rfc822
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20161025;
-        h=mime-version:from:date:message-id:subject:to;
-        bh=Y1ylbv3YC5frF/LtF2it4tQQ0OVZstDdWqivvggIOB0=;
-        b=eyr60XbgOrgHoZFpRYzw9WQIR7aEBaYKWhiEcqdnugB+hn0W2KVcTkKiL2C6zSF+jh
-         l+lM+dNZZTUcMqWx4kVgTVtqwUNea8OUqe+WLqx04ULwdKZn1okbKYovaiavCLKOKDnf
-         ZP5mNz3Ka/ywpCGoq8rdgnXc7NunnkWeaBpYY/BWOmLU4WNXX8zS7etXXhQE4YPQEJT4
-         Sh2o/YIIjDLncJFMyE+25n3tbd2mIoLt4sjaCHE5ibm9w7zojyHM+LDCQ37cM74FEAAa
-         88KTn0gSnCFBCfojhfxOH78CpySHG3FFfTlpCefwP2A5J9MQlb6QdSVa9STYSx3IntJ4
-         L7Tg==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
-        bh=Y1ylbv3YC5frF/LtF2it4tQQ0OVZstDdWqivvggIOB0=;
-        b=pBL4/bKUDw5E2zo1uR2Tl69h2iTlMgIAcnzQgodPCbU4jZ9kH+F5H9rfbzXCjT06J7
-         L72SYpdfgc5fOwM4GhRcdYnyK3wiXQ8ugpL19nbYt2iWo/vRF3GidawXXDGb2GUYpkzX
-         1Mz531cy2/HOsmQbUQ7304KV+OUghtcg8eLNnFuhQch7n12Kk3yy3AOzjrLoktcdgIsy
-         /HxBjyut0Au+A2t6si+PVwTHvC647a0BioeV0tUYLigzu3/jgP9Hb8eRZaXTX5VC6iZi
-         9QMH/+rXp05IK7OpGWh22xDpeV8CDkQ2sLFaBhKxtJ+nYoerM64t8EJXBBsVQb18ojGz
-         pW/A==
-X-Gm-Message-State: AOAM5330q6kn/TKataMNEVigNfNdr/xii/PQgHXzJyMbwLvsETlNfLoy
-	1rM9JBIGrcHeEDRx4qhZfl5S4bircceU7c3i6Fyn2fRO
-X-Google-Smtp-Source: ABdhPJwysG+S90b/g+9mK7LgeHhmJTBowst6JMhL16+a0coTi7P1NVp9jjaNHJfhvhLodYG6eHIvWdbQGJnAP2brEzI=
-X-Received: by 2002:a05:6638:101c:: with SMTP id r28mr2990137jab.84.1591791475066;
- Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-MIME-Version: 1.0
-From: Deltachat Test <alice@gmail.com>
-Date: Wed, 10 Jun 2020 14:18:26 +0200
-Message-ID: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-Subject: test
-To: bob@example.org, assidhfaaspocwaeofi@gmail.com
-Content-Type: multipart/alternative; boundary="0000000000006d8d7d05a7b9d5b3"
-
--0000000000006d8d7d05a7b9d5b3
-Content-Type: text/plain; charset="UTF-8"
-
-test
-
--0000000000006d8d7d05a7b9d5b3
-Content-Type: text/html; charset="UTF-8"
-
-<div dir="ltr">test<br></div>
-
--0000000000006d8d7d05a7b9d5b3--
-
--00000000000074432a05a7b9d512--
--- a/test-data/message/gmx_ndn.eml
+++ b/test-data/message/gmx_ndn.eml
@@ -1,113 +0,0 @@
-Return-Path: <>
-Received: from mout-bounce.gmx.net ([212.227.15.44]) by mx-ha.gmx.net
- (mxgmx101 [212.227.17.5]) with ESMTPS (Nemesis) id 1Mr97m-1jC6Y01o86-00oEqk
- for <alice@gmx.de>; Tue, 09 Jun 2020 14:35:30 +0200
-Received: from localhost by mout-bounce.gmx.net id 0LhiZF-1jDTj11ZoH-00msO3
-    Tue, 09 Jun 2020 14:35:30 +0200
-Date: Tue, 09 Jun 2020 14:35:30 +0200
-From: "GMX Mailer Daemon" <mailer-daemon@gmx.de>
-To: alice@gmx.de
-Subject: Mail delivery failed: returning message to sender
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-X-UI-Out-Filterresults: unknown:0;V03:K0:O8yx6kuPaGQ=:0wIDPNXEr0wX2oNsLnXaWA
- ==
-Envelope-To: <alice@gmx.de>
-X-GMX-Antispam: 0 (Mail was not recognized as spam); Detail=V3;
-X-Spam-Flag: NO
-X-UI-Filterresults: notjunk:1;V03:K0:QcE43EBhMmU=:IC5vvzi9jhPS/698Wuubzw1Q4N
- h87X9j9B3CBN0ZKXB67KepwyNHmh9pxmFIUOMimylv7UK9np+j3X55roOd0nX9BmaaZ3Twvqf
- UaSsxmyU+cNr6m3+oOb3udJBLe2pJEZDk1cOwACb5NXzYPSaIj4APfGCyvrzIx3FGkNuScNBb
- tCbbKUJ0GB/VmJLB34XfF6dNN+Iwv9IQ9Yrvw/VXv9vWKsi3qRGGUt3yRw5jUKhQlBY21Pnoq
- m0LqoMbAKfH1tKEQ/5TymH1ei50YKyWzZ89ISkQwkbYLaqN+6meGACpY18j43VCU9Fk4WQR7y
- 3XvBYh2CO0CnCn+M9VsnasYag2sNrySe9nzyKfRTaxEg8qlJtl7kS4GX/FsxhHPavkqnU62Gl
- 9V5TxIG7tmIR0Bf11sPzG/WGegoOHxrfz+qYR81llLMOHznpdDRKjsYDtO/rFBGZzYTiCZsrW
- dZPVXV25SVcrDGZOaop3JoCbglmXLcSLLhmfE5MzyJEGte3I+6EiZJNeIe8qN3wMDTsRtJL9S
- J6b2F/5/kTGVAWnXtNlf69BholCrxvjC4Snt3Xjc+7WIO8iw2c5YjmWy+4bAwd4uWll529hZd
- 6pUYGwjFRnKleivCaJIt7DqbvbE7GZSbQH8fXm3zYqYTrrxiWdlykdoOA1OGbeM06RHJt3mJB
- osZPU8BZKt0OiBOW64vg6gyAsNC0f02EA7dvRWYgFYqlSogfWZQIOKDKibMVHpIaA0foXg4BG
- TEQDlsTIL0n2WC9WVqkMdm6xUXHgpArCrAsUhw3mEqPywEfJeBHn60tP2vQ9+pDIQAj5dQCDV
- y96qSiCX4p31HfrWwAXB9mHfl4OO/tPcKUGBclj2rZ/NMc4O+7yDedLWXQnRzQExfOJLBbBh3
- xgiNlWFHvDLn0pKG9EI1+3wJ7m2GF2jzDtbQTBv9z26DuAq5WbHZHupzeyfP7VCVXcKuB6sG1
- 3+LWcdYtcXfqT58HwcvDLwowC4uJpiHfHwtVdiGMtHnmYLysp0V425g+vofQfNzBgR3d9JC15
- G+HS44o6x6Legm6KnHYH3k0KhR7fgcgswJv/S+I/ryppUhGb2jezVZIUzgvAplzIUDAWnrHdF
- KVqZ5wBJ0acShIfgMlsIxnBmcnIQ4R4jq3zAyj4XTFxVUFanU8ySiXubxV5PzJqj+GsVa2sjx
- 9n/xQRJLwgMC4BYqzP6lEPwg/g5AneDAnl7ZlcQPC4SCMblC8N1KZyyIDTXPOI/o4lfdMYb9P
- 7DmBp2S8aA2yuDe5XT20OmX3kVWeBOsBaAGvVFpIn7gwIDqnFh9WSMP6mkCwfChN3D1yLquYB
- KAODgRZV5lVNmK+eOjW8m2oiRxmfxrjXLtw5PEhn3RkiRN4HnoePJeoYC7SG4EUwg+wYPu3M6
- exP/YigoE6bjuBS5d0imUTRDMiwg469GyrFo1J1GkRVvj3lXSF4Nt11j6waqu1l0ReDYfU+QM
- EMPGLEh1vRChCaqz4L7YI5FlSAVXxfmst0JRyE4k5r9CToEbZuYlPQ+jbcvptwBSaqzMb/YfT
- cCrU2RWHUfmYIy8x8A/t8ScRbYPzs1lTK3yn1hYeXpw8Fgkip6DIIXAJwUUp+2SLcELICIo+p
- uumMN0P/OZHH3V/hZ0dPr9xsYi7gdd/vyRIRPUwiL1rSp2WJGi+w4atun8kQBgnbAznRObDh1
- 4zzKhApX9jo5gtFN6640QDEI5KpsMuPoty4rj9OK163ntKWGR451n+5ZX2FilTlpZYlIPO9Hy
- SrjHzBog4texceR1OLh4pb/WFB0XFSjQchPAltXCYQFs82aDDk/A0nOPk=
-
-This message was created automatically by mail delivery software.
-
-A message that you sent could not be delivered to one or more of
-its recipients. This is a permanent error. The following address(es)
-failed:
-
-snaerituhaeirns@gmail.com:
-SMTP error from remote server for RCPT TO command, host: gmail-smtp-in.l.google.com (66.102.1.27) reason: 550-5.1.1 The email account that you tried to reach does not exist. Please
- try
-550-5.1.1 double-checking the recipient's email address for typos or
-550-5.1.1 unnecessary spaces. Learn more at
-550 5.1.1  https://support.google.com/mail/?p=NoSuchUser f6si2517766wmc.21
-9 - gsmtp
-
-
-
--- The header of the original message is following. ---
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
-	s=badeba3b8450; t=1591706130;
-	bh=g3zLYH4xKxcPrHOD18z9YfpQcnk/GaJedfustWU5uGs=;
-	h=X-UI-Sender-Class:To:From:Subject:Date;
-	b=NwY6W33mI1bAq6lpr6kbY+LD2hO9cDJBItTgY3NRIT94A6rKTVlSmhFM3AxYgFnj0
-	 Db0hncsNRDqcdtRoOo8Emcah5NJURvEQohG37lkug3GqneB4+FNTdYCeQbOKlZn6on
-	 pYYD/T9CmeL2HG3+8voeBjZIUenyXrF2WXG37hFY=
-X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
-Received: from [192.168.178.30] ([84.57.126.154]) by mail.gmx.com (mrgmx005
- [212.227.17.190]) with ESMTPSA (Nemesis) id 1MKbkM-1jNoq60HKm-00KyL2 for
- <snaerituhaeirns@gmail.com>; Tue, 09 Jun 2020 14:35:30 +0200
-To: snaerituhaeirns@gmail.com
-From: Alice <alice@gmx.de>
-Subject: test
-Message-ID: <9c9c2a32-056b-3592-c372-d7e8f0bd4bc2@gmx.de>
-Date: Tue, 9 Jun 2020 14:36:10 +0200
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
- Thunderbird/68.8.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-Content-Language: de-DE
-X-Provags-ID: V03:K1:7awoptmynaF5MqxCAincdsa7zFCwQFNkFb6xRxigK06uEiGN00b
- Mv2wJU91CEd4mvCCWzrTtaWLZDLH8pjAWaT4+HvYIUbpwNx2jC6WHTppkYYRMVJnm4lG9pr
- SUx1OlIcp0kbsnl3mB9xYNFwm9jzpR9Kx8QEHwIbZiiSFBcH56498UGQi//kKXVMos8C14o
- I7cmwYmr8xB09DwLMKXfg==
-X-Spam-Flag: NO
-X-UI-Out-Filterresults: notjunk:1;V03:K0:NWQAUbhAkBc=:yAaolOnVCDWEZhgUwwvtEs
- wXbSJ/GfMvDRpCkYpFBvHXOTpGm6hjdjQ0vLK2hvu/Hz22UdlWbIdc1J2oO9S5U20mIdc+1bS
- TPSSpqPFc7ICPx4Wbvv2SEp9ZqH2q7ORC52UvUWfI6OjAJEPDNrXQFdUiZAa72hLj1NPeG6Qi
- 4AbL2HwLfJ8s6TeOCm6TXRRuD+w1o/ASFOqQmoao2dFyZ2BaoAgOKPKxXYfwVGceuUygpchyS
- 0d2bZYOXSLR+6rUYevjZAq1OCi9AIC6/wlkOe5yIRk4gJFMfPauaICsdnq3uZ9ikCAX83VWun
- PJVMxTLTP54lgo2h0jMBX3uKk10+/wzXWplllxX9NnSa3x1V28n6raslNF0IoC6Pm72kC6Jzr
- GkC22viCm3/Y4uHlPMOXbY5WFrQe/D9GKeJeXBLoGciNwIFkUG12a+iqWtoT+h5HVObTW8LxM
- +UtEl97nAwxYSM+sGfIpasRpZc7r/SgN3JWGO9R9WaXpW4Cc1dH7RI+hzuZDsDUBEGTUTVPDo
- 0SvjKHiJ6sUqGDyfv4HUgVutus6EYP27LALND4ekfom2DPRFopZhbtV5fZT7CL1Q1NogU7tYf
- /FdmR1T1J1zCAZSFvyR5LBkfglZlHzgdnTF2heuxyqKq4dm0hnLFSULB1+CVWsg8hzrruvO5q
- XzA6qIhBQUZmWo7wBpqpkBPxzjgTGGtXc5y5e6+crxYbbuQdnUWEnyw2xI4d6pJPqtHDA2/vT
- ZgvNDUGceavTR5Rtyb14hhX4Q6dWK3ATy16j4hs9Aq+q/IKyVAX3A5nFYbJRIz+2YnoLr2YOa
- IrScEorXjvTxjw+aBy73SZBe2REPzJ+O6k7chVrYjV9Q28FiGVuRYJYxWw/59Pes7IAbmfQBV
- 4vqGCQQr4eG78gVwjw+SNdp4/6jdNkIHDqR4XW9id/r5wYxKKj4UUkSor3/+h9Rd9srh+GApy
- uOxw/ejFvbRcxFIjvadpq1KLnO7nM27nJ4lp44ul3i7VUGefLM/45TCsuds2HM1iQWhPFQ54y
- SA5sYjf73EUJdkHchaf5i+4uSOmbOWQ4Yvmd8+IoyoXAxvEzY2Xh53nWi8ZPY1Tu4Bw8GRrz7
- L+VK0QiWCg3/hM7wRlFFyshmMrScMk5fOf9ynqd0JbHB7u+n4/GUwx3im/w8+NgSd3YOz7wNU
- KD1snDWoMUO8f23Ik1Osym688OLWNwKYT+mZbMIMXcz1fB+olRZn4czMhN5DiSb8hyOxRI8NE
- PNfaoN87CXiRkgazV6U1eiRkfcK2AvI7zOJF1tclUHZ9awyYoXtxfEzZ+J/2TCXiC7V2iSkUF
- EjwgPxlJmccccjsxc46v1ajnTxLo0tJbZ0+DJXWkCgQ0d/iiScQ=
-
-
--- a/test-data/message/posteo_ndn.eml
+++ b/test-data/message/posteo_ndn.eml
@@ -1,113 +0,0 @@
-Return-Path: <>
-Delivered-To: alice@posteo.org
-Received: from proxy02.posteo.name ([127.0.0.1])
-	by dovecot03.posteo.local (Dovecot) with LMTP id zvCFJRzX317LGQIA+3EWog
-	for <alice@posteo.org>; Tue, 09 Jun 2020 20:44:24 +0200
-Received: from proxy02.posteo.de ([127.0.0.1])
-	by proxy02.posteo.name (Dovecot) with LMTP id mhNkNAnR316xBQMAGFAyLg
-	; Tue, 09 Jun 2020 20:44:23 +0200
-Received: from mailin06.posteo.de (unknown [10.0.1.6])
-	by proxy02.posteo.de (Postfix) with ESMTPS id 49hJtv3RRcz11m7
-	for <alice@posteo.org>; Tue,  9 Jun 2020 20:44:23 +0200 (CEST)
-Received: from mx04.posteo.de (mailin06.posteo.de [127.0.0.1])
-	by mailin06.posteo.de (Postfix) with ESMTPS id 6935920DD2
-	for <alice@posteo.org>; Tue,  9 Jun 2020 20:44:23 +0200 (CEST)
-X-Virus-Scanned: amavisd-new at posteo.de
-X-Spam-Flag: NO
-X-Spam-Score: -1
-X-Spam-Level: 
-X-Spam-Status: No, score=-1 tagged_above=-1000 required=8
-	tests=[ALL_TRUSTED=-1] autolearn=disabled
-Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65])
-	by mx04.posteo.de (Postfix) with ESMTPS id 49hJtv001Vz10kT
-	for <alice@posteo.org>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-Authentication-Results: mx04.posteo.de; dmarc=none (p=none dis=none) header.from=mout01.posteo.de
-Received: by mout01.posteo.de (Postfix)
-	id DCB6B1200DD; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-Date: Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-From: MAILER-DAEMON@mout01.posteo.de (Mail Delivery System)
-Subject: Undelivered Mail Returned to Sender
-To: alice@posteo.org
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-	boundary="B39111200B9.1591728262/mout01.posteo.de"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20200609184422.DCB6B1200DD@mout01.posteo.de>
-
-This is a MIME-encapsulated message.
-
--B39111200B9.1591728262/mout01.posteo.de
-Content-Description: Notification
-Content-Type: text/plain; charset=us-ascii
-
-This is the mail system at host mout01.posteo.de.
-
-I'm sorry to have to inform you that your message could not
-be delivered to one or more recipients. It's attached below.
-
-For further assistance, please send mail to postmaster.
-
-If you do so, please include this problem report. You can
-delete your own text from the attached returned message.
-
-                   The mail system
-
-<hanerthaertidiuea@gmx.de>: host mx01.emig.gmx.net[212.227.17.5] said: 550
-    Requested action not taken: mailbox unavailable (in reply to RCPT TO
-    command)
-
--B39111200B9.1591728262/mout01.posteo.de
-Content-Description: Delivery report
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; mout01.posteo.de
-X-Postfix-Queue-ID: B39111200B9
-X-Postfix-Sender: rfc822; alice@posteo.org
-Arrival-Date: Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-
-Final-Recipient: rfc822; hanerthaertidiuea@gmx.de
-Original-Recipient: rfc822;hanerthaertidiuea@gmx.de
-Action: failed
-Status: 5.0.0
-Remote-MTA: dns; mx01.emig.gmx.net
-Diagnostic-Code: smtp; 550 Requested action not taken: mailbox unavailable
-
--B39111200B9.1591728262/mout01.posteo.de
-Content-Description: Undelivered Message Headers
-Content-Type: text/rfc822-headers
-
-Return-Path: <alice@posteo.org>
-Received: from mout01.posteo.de (unknown [10.0.0.65])
-	by mout01.posteo.de (Postfix) with ESMTPS id B39111200B9
-	for <hanerthaertidiuea@gmx.de>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-Received: from submission-encrypt01.posteo.de (unknown [10.0.0.75])
-	by mout01.posteo.de (Postfix) with ESMTPS id 8A684160060
-	for <hanerthaertidiuea@gmx.de>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017;
-	t=1591728262; bh=g3zLYH4xKxcPrHOD18z9YfpQcnk/GaJedfustWU5uGs=;
-	h=To:From:Subject:Date:From;
-	b=brJnt4PLAX3Tda1RHCo91aB1kMAL/Ku9dmO7D2DD41Zu5ShNsyqqyDkyxb1DsDn3O
-	 6KuBZe3/8gemBuCJ/mxzwd9v8sBnlrV+5afIk0Ye9VvthZsc4HoG79+FiVOi9F38o0
-	 DtJJFYFw/X7mAc5Xyt0B0JvtiTPpBdRAkluUQm+QW6cW6GGlwicVW19qvebzq+sHyP
-	 X2bZ8wpo78yVgvjPBK3DLaXa+pKFMBjLdDUcIE2bZnY6u6F1x8SXGKGBoxVwdJipJx
-	 v14so5IejNsf4LYJjH3Qb8xgK1aAi6e6nQn4YXV0INL6ahzgALiT9N6vwunNKYVJNi
-	 fPPKvBWDfUS4Q==
-Received: from customer (localhost [127.0.0.1])
-	by submission (posteo.de) with ESMTPSA id 49hJtt1WPbz6tmV
-	for <hanerthaertidiuea@gmx.de>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-To: hanerthaertidiuea@gmx.de
-From: deltachat <alice@posteo.org>
-Subject: test
-Message-ID: <04422840-f884-3e37-5778-8192fe22d8e1@posteo.de>
-Date: Tue, 9 Jun 2020 20:45:02 +0200
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
- Thunderbird/68.8.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-Content-Language: de-DE
-Posteo-User: alice@posteo.org
-Posteo-Dkim: ok
-
--B39111200B9.1591728262/mout01.posteo.de--
--- a/test-data/message/testrun_ndn.eml
+++ b/test-data/message/testrun_ndn.eml
@@ -1,107 +0,0 @@
-Return-Path: <>
-Delivered-To: alice@testrun.org
-Received: from hq5.merlinux.eu
-	by hq5.merlinux.eu (Dovecot) with LMTP id Ye02K6PB5F43cQAAPzvFDg
-	for <alice@testrun.org>; Sat, 13 Jun 2020 14:08:03 +0200
-Received: by hq5.merlinux.eu (Postfix)
-	id 9EBE627A0B2E; Sat, 13 Jun 2020 14:08:03 +0200 (CEST)
-Date: Sat, 13 Jun 2020 14:08:03 +0200 (CEST)
-From: MAILER-DAEMON@hq5.merlinux.eu (Mail Delivery System)
-Subject: Undelivered Mail Returned to Sender
-To: alice@testrun.org
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-	boundary="CDB8D27A0B2C.1592050083/hq5.merlinux.eu"
-Content-Transfer-Encoding: 8bit
-Message-Id: <20200613120803.9EBE627A0B2E@hq5.merlinux.eu>
-
-This is a MIME-encapsulated message.
-
--CDB8D27A0B2C.1592050083/hq5.merlinux.eu
-Content-Description: Notification
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This is the mail system at host hq5.merlinux.eu.
-
-I'm sorry to have to inform you that your message could not
-be delivered to one or more recipients. It's attached below.
-
-For further assistance, please send mail to postmaster.
-
-If you do so, please include this problem report. You can
-delete your own text from the attached returned message.
-
-                   The mail system
-
-<hcksocnsofoejx@five.chat>: host mail.five.chat[195.62.125.103] said: 550 5.1.1
-    <hcksocnsofoejx@five.chat>: Recipient address rejected: User unknown in
-    virtual mailbox table (in reply to RCPT TO command)
-
--CDB8D27A0B2C.1592050083/hq5.merlinux.eu
-Content-Description: Delivery report
-Content-Type: message/global-delivery-status
-Content-Transfer-Encoding: 8bit
-
-Reporting-MTA: dns; hq5.merlinux.eu
-X-Postfix-Queue-ID: CDB8D27A0B2C
-X-Postfix-Sender: rfc822; alice@testrun.org
-Arrival-Date: Sat, 13 Jun 2020 14:08:01 +0200 (CEST)
-
-Final-Recipient: rfc822; hcksocnsofoejx@five.chat
-Original-Recipient: rfc822;hcksocnsofoejx@five.chat
-Action: failed
-Status: 5.1.1
-Remote-MTA: dns; mail.five.chat
-Diagnostic-Code: smtp; 550 5.1.1 <hcksocnsofoejx@five.chat>: Recipient address
-    rejected: User unknown in virtual mailbox table
-
--CDB8D27A0B2C.1592050083/hq5.merlinux.eu
-Content-Description: Undelivered Message
-Content-Type: message/global
-Content-Transfer-Encoding: 8bit
-
-Return-Path: <alice@testrun.org>
-Received: from localhost (p200300edb723070079835ce22985a199.dip0.t-ipconnect.de [IPv6:2003:ed:b723:700:7983:5ce2:2985:a199])
-	by hq5.merlinux.eu (Postfix) with UTF8SMTPSA id CDB8D27A0B2C;
-	Sat, 13 Jun 2020 14:08:01 +0200 (CEST)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=testrun.org;
-	s=testrun; t=1592050082;
-	bh=Kvhta0OMsTRVC7OlaAqo68TBE0KuGBv4vUBp6Ez/7VY=;
-	h=Subject:References:In-Reply-To:Date:To:From:From;
-	b=Ql60JEGFXLNvjsyihATw2z34ct++8xZvTPNw0snXe6+oqdqsRZJ9tWNDTxOgx8Iqf
-	 HQ4puBVGcWjIlszYQVLlq3APi04o2ep3GrD8EF0J0GpDdW8yw6wCos6Q8r+TWmXwET
-	 kGXHTRPVaUIqZF2i/utypxMfd1ua0S3jBDnIXTe/p2+XvfC3Cf3hZGW+FQ/Zd7G8Vh
-	 /U2rgX5BTIGf26ZCbmcMaXWkftgv6+yns0AmzorV9yB+EhTkWIUjk+C25bRtMbJ5mZ
-	 93dwdr+sXrrSZLSi+LBqc57Dv9j4p/SUmB4zPlvfUv7/bqLi36pypvtCJ5Ul8UEXSb
-	 XNFZPaEl+mwjA==
-Content-Type: text/plain; charset=utf-8
-Chat-Disposition-Notification-To: alice@testrun.org
-Subject: =?utf-8?q?Message_from_hocuri1=40testrun=2Eorg?=
-MIME-Version: 1.0
-References: <Mr.VSg3KXFUOTG.9sn7JBxZn1W@testrun.org>
-	<Mr.F4nR4LnXb6v.gqVbCJRgsmn@testrun.org>
-In-Reply-To: <Mr.F4nR4LnXb6v.gqVbCJRgsmn@testrun.org>
-Date: Sat, 13 Jun 2020 12:08:01 +0000
-X-Mailer: Delta Chat Core 1.35.0/Android 1.9.5
-Chat-Version: 1.0
-Autocrypt: addr=alice@testrun.org; prefer-encrypt=mutual;
-	keydata=xjMEXt3z1xYJKwYBBAHaRw8BAQdAf6MctU/8cmEqwEN9VFZ3gHBFIxKiEaARZl1DFUkI7e
-	rNFTxob2N1cmkxQHRlc3RydW4ub3JnPsKLBBAWCAAzAhkBBQJe3fPXAhsDBAsJCAcGFQgJCgsCAxYC
-	ARYhBIZ3ajRUkki89+04sgctAtaIXygAAAoJEActAtaIXygAG2IA/1nTmmmkHAc1Bjtx2FOstbaS+N
-	XHjxaK+hkoWllsyhz0AQDJJ1++u7jVZPRn/j1LlByrT3Jv/D1aY14J5rjj+ADVBM44BF7d89cSCisG
-	AQQBl1UBBQEBB0DpSTaZ30dAVwM9PkBe2h+gFyxn9HSorP4XCHJu/lIdPAMBCAfCeAQYFggAIAUCXt
-	3z1wIbDBYhBIZ3ajRUkki89+04sgctAtaIXygAAAoJEActAtaIXygA2QkA/16toWCtseYKw8G1X2j7
-	xYR3Cyabq37hgbesDOThIIzNAP0UCUS8mnunmkS5adEbftRaDi2JZoGxDw46jtJJ2+13Cw==
-Message-ID: <Mr.A7pTA5IgrUA.q4bP41vAJOp@testrun.org>
-To: <hcksocnsofoejx@five.chat>
-From:  <alice@testrun.org>
-
-F
-
-- 
-Sent with my Delta Chat Messenger: https://delta.chat
-
-
--CDB8D27A0B2C.1592050083/hq5.merlinux.eu--
--- a/test-data/message/tiscali_ndn.eml
+++ b/test-data/message/tiscali_ndn.eml
@@ -1,91 +0,0 @@
-Return-Path: <>
-Delivered-To: alice@tiscali.it
-Received: from director-5.mail.tiscali.sys ([10.39.80.174])
-	by dovecot-08.mail.tiscali.sys with LMTP id SBRfEpGb517VAgAAd2fHbg
-	for <alice@tiscali.it>; Mon, 15 Jun 2020 16:02:25 +0000
-Received: from cmgw-4.mail.tiscali.it ([10.39.80.174])
-	by director-5.mail.tiscali.sys with LMTP id MFUPL5Cb516tawAArQJVuQ
-	; Mon, 15 Jun 2020 16:02:25 +0000
-Received: from michael.mail.tiscali.it ([213.205.33.246])
-	by cmgw-4.mail.tiscali.it with 
-	id rTtS2200V5JdeUd01U2RlV; Mon, 15 Jun 2020 16:02:25 +0000
-x-cnfs-analysis: v=2.3 cv=ZdPMyfdA c=1 sm=1 tr=0 cx=a_idp_d
- a=AfTPebshMYb+aQOCLa9q3Q==:117 a=HpEJnUlJZJkA:10 a=jmdcTMp_Gj4A:10
- a=r77TgQKjGQsHNAKrUKIA:9 a=b8iBRs35AAAA:8 a=NMdB-582e605uxHDr_AA:9
- a=QEXdDO2ut3YA:10 a=MhhPCb74-dYA:10 a=HXlsH_Kov2KnitTn7A4A:9
- a=BkuCPOF3BOzethIN9HQA:9 a=qG5HpJ6ZyD35YNEB:21 a=kvHihYffoorsyJbA:21
- a=xD8EQi6zkreDqSNPYj5l:22
-Date: Mon, 15 Jun 2020 16:02:25 +0000
-From: Mail Delivery System <mail-daemon@smtp.tiscali.it>
-To: alice@tiscali.it
-Subject: Delivery status notification
-MIME-Version: 1.0
-Content-Type: multipart/report; boundary="------------I305M09060309060P_896715922369450"
-
-This is a multi-part message in MIME format.
-
--------------I305M09060309060P_896715922369450
-Content-Type: text/plain; charset=UTF-8;
-Content-Transfer-Encoding: 8bit
-
-      This is an automatically generated Delivery Status Notification.      
-
-Delivery to the following recipients was aborted after 2 second(s):
-
-  * shenauithz@testrun.org
-
-
-
--------------I305M09060309060P_896715922369450
-Content-Type: message/delivery-status; charset=UTF-8;
-Content-Transfer-Encoding: 8bit
-
-Reporting-MTA: dns; michael.mail.tiscali.it [213.205.33.13]
-Received-From-MTA: dns; localhost [146.241.100.150]
-Arrival-Date: Mon, 15 Jun 2020 16:02:23 +0000
-
-
-Final-recipient: rfc822; shenauithz@testrun.org
-Action: failed
-Status: 5.1.1
-Diagnostic-Code: smtp; 550 5.1.1 <shenauithz@testrun.org>: Recipient address rejected: User unknown in virtual mailbox table
-Last-attempt-Date: Mon, 15 Jun 2020 16:02:25 +0000
-
-
-
--------------I305M09060309060P_896715922369450
-Content-Type: text/rfc822-headers; Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment
-
-x-auth-user: alice@tiscali.it
-Chat-Disposition-Notification-To: alice@tiscali.it
-Chat-User-Avatar: avatar.jpg
-Subject: =?utf-8?q?Message_from_=F0=9F=8F=9E=EF=B8=8F_Mefiscali?=
-MIME-Version: 1.0
-Date: Mon, 15 Jun 2020 16:02:22 +0000
-X-Mailer: Delta Chat Core 1.35.0/Android 1.9.5
-Chat-Version: 1.0
-Autocrypt: addr=alice@tiscali.it; prefer-encrypt=mutual;
-	keydata=xjMEXtFRUBYJKwYBBAHaRw8BAQdA5sqHJqkWlveCgsNd0rtwtZrT1mmo1gwaGC5+WheYk5
-	nNHTxhbmRyZWFzLmxhdHRtYW5uQHRpc2NhbGkuaXQ+wosEEBYIADMCGQEFAl7RUXoCGwMECwkIBwYV
-	CAkKCwIDFgIBFiEEJUsbRIjZEaRNAs1p1Z5M1vshkrAACgkQ1Z5M1vshkrAAaAEA4wssXeU2IXnowv
-	iu3zmcNzDgE4HdmW4RFyqJC6bgxXQA/3aTfE/PhQgZvi6RrKMvP4zygXpD9y+3ydIZP88Bp8kIzjgE
-	XtFRUBIKKwYBBAGXVQEFAQEHQKaAwlP0j9m0aYsCtO+qD9+foH0kiTN5BWDe5YcZrckVAwEIB8J4BB
-	gWCAAgBQJe0VF6AhsMFiEEJUsbRIjZEaRNAs1p1Z5M1vshkrAACgkQ1Z5M1vshkrA1JgEAkscCQlps
-	h3ZxlLqBlbf2+85f4S4aGQfFPtIYEkKKhYEBAJbQulNNp9UarvhfyBiIdvkBVDcCnJZwzbORqp8RM0 gC
-Message-ID: <Mr.un2NYERi1RM.lbQ5F9q-QyJ@tiscali.it>
-To: <shenauithz@testrun.org>
-From: =?utf-8?b?8J+Pnu+4jyBNZWZpc2NhbGk=?= <alice@tiscali.it>
-Content-Type: multipart/mixed; boundary="5uAmYQux1HZxxriijTjjKSp4DMoJwq"
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tiscali.it; s=smtp;
-	t=1592236943; bh=C3taz+zuSre1ko5Q5CzGPmbyrgegKYBClx/3Dv7t/Xw=;
-	h=Subject:Date:To:From;
-	b=LrcfLfrQoemOkHTQsqR8MExqNlx5KPYNFWhwlBWylvVc5GlmlhzqM6SAVKd0NVsKE
-	 gVRlBId5FvnlwoJ2WZnXaw/+3lWKilMTuzzQ1oFGvLnZ1XUaUEfuliIv+9NI79dJWX
-	 +S3jsSgzJMJc9+fO6s9bJsX1EHQ2a8GXNbwDtLXs=
-
-
-
--------------I305M09060309060P_896715922369450--
-
-
--- a/test-data/message/yahoo_ndn.eml
+++ b/test-data/message/yahoo_ndn.eml
@@ -1,100 +0,0 @@
-X-Atlas-Received: from 10.218.250.153 by atlas222.free.mail.ne1.yahoo.com with http; Wed, 10 Jun 2020 10:11:23 +0000
-Return-Path: <>
-Received: from 77.238.177.145 (EHLO sonic314-19.consmr.mail.ir2.yahoo.com)
- by atlas222.free.mail.ne1.yahoo.com with SMTPs; Wed, 10 Jun 2020 10:11:23 +0000
-X-Originating-Ip: [77.238.177.145]
-Received-SPF: none (domain of sonic314-19.consmr.mail.ir2.yahoo.com does not designate permitted sender hosts)
-Authentication-Results: atlas222.free.mail.ne1.yahoo.com;
- dkim=pass header.i=@yahoo.com header.s=@bounce;
- spf=none smtp.mailfrom=sonic314-19.consmr.mail.ir2.yahoo.com;
- dmarc=success(p=REJECT) header.from=yahoo.com;
-X-Apparently-To: alice@yahoo.com; Wed, 10 Jun 2020 10:11:23 +0000
-X-YMailISG: RT5ZnycWLDvIW52uqHS_EWNgl31NdJPyLLB2F4SYb1GCAoo9
- pcninuVU5GDMBZykeMT4cSUt4ZqXxS5FdEeWJqtGIAtbEGbIL8Uhcoszqm4m
- JuMJiQZwEE7W_fsS_9MUK5gZtMkhKkSnAuaeaOLKNYAwFZdBqA0uEYA5EmVf
- EC9J4RGQ4hZvrMqMj_W.cj4pvbEC.pyirLxTfkICuUkZVguYoxG16y1EOJPw
- B48fhXvF5ErU7WAHKxyRM3bMOg7b5pXHKn1dtRSVAXEuqBAQrWig1pePpYH1
- wO54sYT7cgmdiFvfLY5rR7YcBzopmKJBycKzBVoRLCY4gvoNyTLPKx9o3AAz
- WU4B7TGejDBElYSLpfnyvQg8wU27zzo2IVBZWUNztP0Ca8CQ07Y7TxUZAO.f
- DNO5c7nd81PHMRDbSeaw1BTV2Yd9vlBc7syYmwGvtVBJQwRU7qPN.DpFO2jC
- 9j9DytVhm5231gdBBRSzW78yG.VvaIdJgq_YViKNM9VxFseTz3Sjt3TaYznP
- gAVq.MxpopNsSZf_tedwAhXDWyrjKsRPK.v2ANivmuWGPednniEaMYhxJ05M
- _5SnJ.hAU.l6h3HCEfiU.SH390_3tZgYNfxCo4GPPFMfnNPmKa3.rgpChBCz
- 9CRexJ8BSFyCEeAhuqQ8vSJfSuittJmXvS6Tk8Rxd9HUJAtKzZ.xCWZQ4tA6
- Yp2aRG23_rK_C6hH8ArkkvbG.uVQTt6DltSX6avJLObBfIhBH0x64RoFjGee
- vYXxM741Okm0jH7r79c8GhnAwas_bwfkaTW9e1nhYP0eyI36z_QwLYgOH3Mm
- LrUcejpOMDR60QWDuDyRbWXOJdr3Q2K0ERhuAy6YnINq0sL3HX7t5wjsFLvp
- _7Ri_eruTfIst4C7DZwERwui6aDSEAdF1Z8oZukBVmiyZsHmhJQCUik646iy
- 3ASMR3lX7R3q2PBHQo2oC3qte8Fzz1FhKoMtfCGtIpeCazlkhDEJ6eTBSQ3R
- Pe7M_GPiv3QNp7qu5CWHlzy6hWEKIkNwx.WRGYzfxkyJMmJm4UrhQYUfa4lG
- Wb8n.mfYnS_KGYtzyRFNqAL0IGo.1MB9aG6qQk456Fz9GJgbHLWrMXVtyfrr
- Uo7mKih8FCrdUKv5X6KBnpY0vvyoH5jrWyrvo3DW0bq_JvZ9U51JwUhoGY5U
- c1t.yCSJbs8tnrGZHuUTOvouWzpCAJsk34AqRyH0wDJZQsAwBW5UZ3jx8ARA
- FicoSqZCa4wEP9WaaXvfzFbmLW0-
-X-Originating-IP: [77.238.177.145]
-Received: from 10.217.135.165  (EHLO sonic314-19.consmr.mail.ir2.yahoo.com) (77.238.177.145)
-  by mta4277.mail.ne1.yahoo.com with SMTPS; Wed, 10 Jun 2020 10:11:21 +0000
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=bounce; t=1591783879; bh=4BmZzBC/nu0AJ9r0i0xNuCENks2KZcuXCbjSHdzbg9Y=; h=Date:From:To:Subject:From:Subject; b=lPxu8goOGOLVgnwbndfdptZ7zI5VEo0lSSr+ONGxwdtuhrySKDU6Sp41/g6jWbAiVPT1947j/B5wOlPfa5tv4XkWrGf0JCbT1I20ZJIkNfNwt4F0qPnbJAiHFIDPxcY68utjC9IgPWJd0cGqJNXbFwbJBu88rtrbMoInzLakh5I=
-Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ir2.yahoo.com with HTTP; Wed, 10 Jun 2020 10:11:19 +0000
-Date: Wed, 10 Jun 2020 10:11:19 +0000
-From: MAILER-DAEMON@yahoo.com
-To: alice@yahoo.com
-Message-ID: <1713051795.39992.1591783879940@sonic314.consmr.mail.ir2.yahoo.com>
-Subject: Failure Notice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-Content-Length: 3347
-
-Sorry, we were unable to deliver your message to the following address.
-
-<haeclirth.sinoenrat@yahoo.com>:
-554: delivery error: dd Not a valid recipient - atlas117.free.mail.ne1.yahoo.com
-
--- Below this line is a copy of the message.
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1591783876; bh=kXD6TZuQDjqZf/AEAJ2HCX32Titkj3IywytG6GSm4yQ=; h=Date:From:To:Subject:References:From:Subject; b=PexnIBxnVSkyutv/jVn+Wlt5QPuVHnWleP3baWlvqkXaKR51pCaZIoGJggMEonitEeJkcYpgplBawEBz0hlGf63NqOHHkxUk6U1olwc0y9kj5kDH5lrORgXrf7U4z5t+i5n0II36MxbG9n/5tDRXoiabLFoWx//3O9x/ZJvVWPlq8RBFzVG8aoL2TkBQAVcqX/vW1f3WJuopaUYWB4AzR3TyuC2kVQPFqbPMk+G/VmyuZFmZesh1bSBva5hdKYLxES5v8hvTIDRqSYZrnZ4V67MqicZ8m229Xf4Za8qOE+a2Z+Vv5VrQ+CjjPZwRAcmKHkLY80VCSkpeL2R2YG4APg==
-X-YMail-OSG: 4spnw98VM1k_g51CM6oepdNEMiPFRtZ0ZG_zOBGIlhcNvS1mkzr8l8VTB0CY_Q0
- dR52ikl7QVYESerRQgcGqBfLwKpem7i1XSrCl2HuyHeWzF6Gu5MqFPMCak.v8GyDXNO075NEwNt1
- i18CJ29cEjiHthoamgmj0oqerAglglKRhTuuAFy4wUmZZm7VyvaW4wHUD1g7DeWGijQsCglSYMUK
- CmoFcKsWOZBSYPMkp7iRwUp52pXHFin3qf4uQ27K_Sh.6s7KLAfWVkV7L_5AR3MyCPAVzm71.1yG
- G7Vy5HSBgGMQ90B7VbcjOkCg3F4JNl4Z_P2ejV1KZ.tNoPLgO.FmsfFy1OXBGf3m2mDmRcuEO4K2
- mTRhsjZf.2iiWpx02b3tY.oUtYrIBXBVIFPbTB9sBMn_9Z_qdVmO3gjD6gCPEBzuVvEO0eZIrgaw
- EDTZt8Z9tSRDm1.4gV8LWQBYShF7XuMV0togiLYIO8s_iTHcTbhKhPlwxP.mxr06xcx_9kzReVTL
- 9lB1FkB5Jm0WccWHGhLBqeMjGDoaNqPxLqJ.1tI58tLXsPoR6m1NFVEdzI1G.4AVBeXZ_9BjgUhm
- KY33sEg.GwIjUlWWWuSyRZ1q1K2nqi1z29wH2R1Glmdmx0lyqfMg9Xe8HV7YZu2CuZ8SlDLLB.rX
- NU4PwMsNfU6pK2HejQPsJuyOlI5Q824rXRF5xTLYKsYcQptoFXyLe6MXKW1ThBLQV2nWYDRs_V.e
- SBmt22TfuOwu4Y5ju0sXmztZ8zpiIC8_rnAa5bVBEHxzkic64UZdukDX9V12Pk3G2sGYRyPTH472
- wBX33JpDuq6BtrKr4FXjCLeVppARTHpiKM0jHMjmNf1bF0TvrcCsC9zAYtitAqgcGZNFETNuV3KM
- 57XifdDEwUPOuww0ApSWO.iwP2POvIRBVlrxdgA8MbLmuuX4UxNCw23z1f7MVY6F3L60LUrX5GZO
- aKaMmD1XTzx32J6c_TUmyuViT5vphqpEooTzHG2X7ALb4xC8yHlE4wDKyaEDARZ.8P2lO9T18oCz
- OQvJjwDaLOkeAmo23yRMn70bYJK3tP9Z5cS1C0TE8PEtz4sd1syQUIZZ2g8JG_AQcE4lUZSZlIKN
- AHjB8h8Uin35zKe0Le1DBjdQUmpgAETlmYE7V0nJDEmagB3dtpbokgRBuuBfhXlFpxHcnAmBFFFm
- XOSLWEPnmxu2o8CCjjz3QUBy2fr3EI_D2VFpy..MuZgRwtES.l24m_95xtQxI28R4SWZN6LsS_rr
- 1S33BJCCCAfXtCAFzCfz5.qSzHRYbLdY5do6yKj0pPLQTUTjlMwmCUGPcSJhsyxkkEVIK1W_Z16R
- ZRls-
-Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ir2.yahoo.com with HTTP; Wed, 10 Jun 2020 10:11:16 +0000
-Date: Wed, 10 Jun 2020 10:11:12 +0000 (UTC)
-From: Delta Chat Test <alice@yahoo.com>
-To: "haeclirth.sinoenrat@yahoo.com" <haeclirth.sinoenrat@yahoo.com>
-Message-ID: <1680295672.3657931.1591783872936@mail.yahoo.com>
-Subject: test
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-	boundary="----=_Part_3657930_145367320.1591783872935"
-References: <1680295672.3657931.1591783872936.ref@mail.yahoo.com>
-X-Mailer: WebService/1.1.16072 YMailNorrin Mozilla/5.0 (X11; Linux x86_64; rv:77.0) Gecko/20100101 Firefox/77.0
-Content-Length: 494
-
------=_Part_3657930_145367320.1591783872935
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-test
-
------=_Part_3657930_145367320.1591783872935
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-<html><head></head><body><div class="yahoo-style-wrap" style="font-family:Helvetica Neue, Helvetica, Arial, sans-serif;font-size:16px;"><div dir="ltr" data-setdir="false">test<br></div></div></body></html>
------=_Part_3657930_145367320.1591783872935--