display failed messages

2026-07-01 20:14:57 +03:00 · 2019-11-02 00:34:14 +01:00
38 changed files with 314 additions and 783 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,5 @@
 # Changelog 

-## 1.0.0-beta.7
-
- fix location-streaming #782
-
- fix display of messages that could not be decrypted #785
- 
- fix smtp MAILER-DAEMON bug #786 
-
- fix a logging of durations #783
-
- add more error logging #779
-
- do not panic on some bad utf-8 mime #776
-
 ## 1.0.0-beta.6

 - fix chatlist.get_msg_id to return id, instead of wrongly erroring
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -480,7 +480,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.7"
+version = "1.0.0-beta.6"
 dependencies = [
 "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -550,9 +550,9 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.7"
+version = "1.0.0-beta.6"
 dependencies = [
- "deltachat 1.0.0-beta.7",
+ "deltachat 1.0.0-beta.6",
 "deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.7"
+version = "1.0.0-beta.6"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"
--- a/assets/icon-device.png
+++ b/assets/icon-device.png
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.7"
+version = "1.0.0-beta.6"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -1098,27 +1098,6 @@ uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t ch
 void            dc_set_draft                 (dc_context_t* context, uint32_t chat_id, dc_msg_t* msg);


-/**
- * Add a message to the device-chat.
- * Device-messages usually contain update information
- * and some hints that are added during the program runs, multi-device etc.
- *
- * Device-messages may be added from the core,
- * however, with this function, this can be done from the ui as well.
- * If needed, the device-chat is created before.
- *
- * Sends the event #DC_EVENT_MSGS_CHANGED on success.
- * To check, if a given chat is a device-chat, see dc_chat_is_device_talk()
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param msg Message to be added to the device-chat.
- *     The message appears to the user as an incoming message.
- * @return The ID of the added message.
- */
-uint32_t        dc_add_device_msg            (dc_context_t* context, dc_msg_t* msg);
-
-
 /**
 * Get draft for a chat, if any.
 * See dc_set_draft() for more details about drafts.
@@ -2736,39 +2715,6 @@ int             dc_chat_is_unpromoted        (const dc_chat_t* chat);
 int             dc_chat_is_self_talk         (const dc_chat_t* chat);


-/**
- * Check if a chat is a device-talk.
- * Device-talks contain update information
- * and some hints that are added during the program runs, multi-device etc.
- *
- * From the ui view, device-talks are not very special,
- * the user can delete and forward messages, archive the chat, set notifications etc.
- *
- * Messages may be added from the core to the device chat,
- * so the chat just pops up as usual.
- * However, if needed the ui can also add messages using dc_add_device_msg()
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return 1=chat is device-talk, 0=chat is no device-talk
- */
-int             dc_chat_is_device_talk       (const dc_chat_t* chat);
-
-
-/**
- * Check if messages can be sent to a give chat.
- * This is not true eg. for the deaddrop or for the device-talk, cmp. dc_chat_is_device_talk().
- *
- * Calling dc_send_msg() for these chats will fail
- * and the ui may decide to hide input controls therefore.
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return 1=chat is writable, 0=chat is not writable
- */
-int             dc_chat_can_send              (const dc_chat_t* chat);
-
-
 /**
 * Check if a chat is verified.  Verified chats contain only verified members
 * and encryption is alwasy enabled.  Verified chats are created using
@@ -3424,8 +3370,7 @@ void            dc_msg_latefiling_mediasize   (dc_msg_t* msg, int width, int hei


 #define         DC_CONTACT_ID_SELF           1
-#define         DC_CONTACT_ID_INFO           2 // centered messages as "member added", used in all chats
-#define         DC_CONTACT_ID_DEVICE         5 // messages "update info" in the device-chat
+#define         DC_CONTACT_ID_DEVICE         2
 #define         DC_CONTACT_ID_LAST_SPECIAL   9


--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -811,23 +811,6 @@ pub unsafe extern "C" fn dc_set_draft(
        .unwrap_or(())
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_add_device_msg(context: *mut dc_context_t, msg: *mut dc_msg_t) -> u32 {
-    if context.is_null() || msg.is_null() {
-        eprintln!("ignoring careless call to dc_add_device_msg()");
-        return 0;
-    }
-    let ffi_context = &mut *context;
-    let ffi_msg = &mut *msg;
-    ffi_context
-        .with_inner(|ctx| {
-            chat::add_device_msg(ctx, &mut ffi_msg.message)
-                .unwrap_or_log_default(ctx, "Failed to add device message")
-        })
-        .map(|msg_id| msg_id.to_u32())
-        .unwrap_or(0)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32) -> *mut dc_msg_t {
    if context.is_null() {
@@ -2281,26 +2264,6 @@ pub unsafe extern "C" fn dc_chat_is_self_talk(chat: *mut dc_chat_t) -> libc::c_i
    ffi_chat.chat.is_self_talk() as libc::c_int
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_is_device_talk(chat: *mut dc_chat_t) -> libc::c_int {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_is_device_talk()");
-        return 0;
-    }
-    let ffi_chat = &*chat;
-    ffi_chat.chat.is_device_talk() as libc::c_int
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_can_send(chat: *mut dc_chat_t) -> libc::c_int {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_can_send()");
-        return 0;
-    }
-    let ffi_chat = &*chat;
-    ffi_chat.chat.can_send() as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_chat_is_verified(chat: *mut dc_chat_t) -> libc::c_int {
    if chat.is_null() {
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -353,7 +353,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 configure\n\
                 connect\n\
                 disconnect\n\
-                 interrupt\n\
                 maybenetwork\n\
                 housekeeping\n\
                 help imex (Import/Export)\n\
@@ -379,7 +378,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 sendimage <file> [<text>]\n\
                 sendfile <file> [<text>]\n\
                 draft [<text>]\n\
-                 devicemsg <text>\n\
                 listmedia\n\
                 archive <chat-id>\n\
                 unarchive <chat-id>\n\
@@ -495,9 +493,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
        "info" => {
            println!("{:#?}", context.get_info());
        }
-        "interrupt" => {
-            interrupt_imap_idle(context);
-        }
        "maybenetwork" => {
            maybe_network(context);
        }
@@ -522,12 +517,13 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E

                for i in (0..cnt).rev() {
                    let chat = Chat::load_from_db(context, chatlist.get_chat_id(i))?;
+                    let temp_name = chat.get_name();
                    info!(
                        context,
                        "{}#{}: {} [{} fresh]",
                        chat_prefix(&chat),
                        chat.get_id(),
-                        chat.get_name(),
+                        temp_name,
                        chat::get_fresh_msg_cnt(context, chat.get_id()),
                    );
                    let lot = chatlist.get_summary(context, i, Some(&chat));
@@ -586,33 +582,25 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E

            let msglist = chat::get_chat_msgs(context, sel_chat.get_id(), 0x1, None);
            let members = chat::get_chat_contacts(context, sel_chat.id);
-            let subtitle = if sel_chat.is_device_talk() {
-                "device-talk".to_string()
-            } else if sel_chat.get_type() == Chattype::Single && members.len() >= 1 {
+            let temp2 = if sel_chat.get_type() == Chattype::Single && members.len() >= 1 {
                let contact = Contact::get_by_id(context, members[0])?;
                contact.get_addr().to_string()
            } else {
                format!("{} member(s)", members.len())
            };
+            let temp_name = sel_chat.get_name();
            info!(
                context,
-                "{}#{}: {} [{}]{}{}",
+                "{}#{}: {} [{}]{}",
                chat_prefix(sel_chat),
                sel_chat.get_id(),
-                sel_chat.get_name(),
-                subtitle,
+                temp_name,
+                temp2,
                if sel_chat.is_sending_locations() {
                    "📍"
                } else {
                    ""
                },
-                match sel_chat.get_profile_image(context) {
-                    Some(icon) => match icon.to_str() {
-                        Some(icon) => format!(" Icon: {}", icon),
-                        _ => " Icon: Err".to_string(),
-                    },
-                    _ => "".to_string(),
-                },
            );
            log_msglist(context, &msglist)?;
            if let Some(draft) = chat::get_draft(context, sel_chat.get_id())? {
@@ -830,15 +818,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                println!("Draft deleted.");
            }
        }
-        "devicemsg" => {
-            ensure!(
-                !arg1.is_empty(),
-                "Please specify text to add as device message."
-            );
-            let mut msg = Message::new(Viewtype::Text);
-            msg.set_text(Some(arg1.to_string()));
-            chat::add_device_msg(context, &mut msg)?;
-        }
        "listmedia" => {
            ensure!(sel_chat.is_some(), "No chat selected.");

--- a/proptest-regressions/dc_mimeparser.txt
+++ b/proptest-regressions/dc_mimeparser.txt
@@ -1,7 +0,0 @@
-# Seeds for failure cases proptest has generated in the past. It is
-# automatically read and these particular cases re-run before any
-# novel cases are generated.
-#
-# It is recommended to check this file in to source control so that
-# everyone who runs the test benefits from these saved cases.
-cc 03cab93c6d1f3a8245f63cf84dacb307944294fe6333c1e38f078a6600659c7a # shrinks to data = "a\t0aA\ta\t0 \ta\t0 \ta a\t\ta  A\tAA0a0a 0\t a\t aA   \t a\t  A0\t  AAa\taA0\taAAaA\t0\taa0a\ta Aa Aaaa A0A\t  a aA 0\t  A\t0\t0\t\t\t\t\t\tA \t\t a\tA Aa aAA0A0AA0aaA A\t\t  aa0\ta\t  \tAa\taA\t00  AA  A a\tA a aAAa \t 00\t0 \t\t  a A  0\t\t\t aAA Aa \taAAAA0a A0A\t\t1\\E$\t$R\tc\t^=\t\"\tQ<Uk\t\t>A\t\t&\t}v&\tM^\'|\tW5?dn\t\t+\t\tP\te`\t\t>:Brlq--?\t$#Q\tK=zJ\tb\"9*.\"\t`\tF&T*\tBs,\tg\'*\\\t:\t?l$\t\t|A\"HR:Hk\t\\KkV\t\t{=&!^e%:|_*0wV\t[$`\t:\t$%f\t\t[!\"Y. \tP\t\th\'?\'/?%:++NfQo#@\"+?\t(\\??{\t\'\'$Dzj\t0.?{s4?&?Y=/yj]Z=\t4n\t?Ja\"\t{I\t$\t;I}_8V\t&\t?N\'\tI2/\t9.\tFT%9%`\'\tz\to7Y\t|AXP&@G12g\t\'w\t\t%??\t\"h$?F\"\"6%q\\\\{\tT\t\"]$87$}h\'\t<\t$\tc%U:mT2:<v\t#Rl!;U\t\t\"^D\tRZ(BZ{n\t%[$fgH`\t{B}:*\t\t%%*F`%W\t//B}PQ\t\tsu2\tLz<1*!p-X\tnKv&&0\thm4<n\\.\\/.w\'\t<)E1g3#ood\t`?\t\\({N?,8_?h\ty\t0%\t*$A\t\t*w-ViQUj\tTiH\t%\t%&0p\'\'\tA%r**Fo\'Z\\\tNI*ely4=I?}$.o`\t$\ts\'&lt\t\",:~=Nv/0O%=+<LS\t%P\'\t$r%d.\t{G{/L:\t&I&8-`cy*\"{\t/%fP9.P<\t\t\'/`\t\t`\t\t`!t:\t::\t\tW\'X^\t@.uL&a\tN\t\t\t.\t?0*\tvUK>UJ\\\tQbj%w]P=Js\t\"R\t&s^?</=%\t\'VI:\" kT`{b*<\t\tF&?Y\t\t:/\t!C\'e0`\t\t\tx-\t*\\N\\wwu.I4\tb/y\t\"P:P%\"\t\tQ][\\\t^x\t\t):\t\t&s\t$1-\t\t\tXt`0\t;\t/UeCP*\"G\t\t\':\tk@91Hf&#\t(Uzz&`p2;\t{]\t\"I_%=\\%,XD\"\'06QfCd<;$:q^\t8:\"*\"H\t\to\t&xK/\t\ty0/<}<j<|*`~::b\t=S.=}=Ki\t<Y.\'{\tf\t{Ub*H%(_4*?*\tn2\t/\'\t\t\t/,4]\tt\t<y\t\t\tWi\t\tT&\"\t\t\t\t\t=/1Wu?\t\'A\"W-P\t$?e\\\t`\t6`vD\t8`\t\tccD J\tY&jI//?_\t\\j\t_\tsiq$\t?9\tQ\t.^%&..?%Jm??A%+<\tN&*\t.g\tS$W\"\"\tMpq\t\t:&\\\thTz&<iz%/%T&\'F\t\\]&\t\t}\t\t\tXr=dtp`:+<,\t%60Y*<(&K*kJ\todO\t=<V?&\tMU/\"\t= Y!)<\tV\t9\t)\t&v8q{\t\t&pT\t3\ttB,qcq\'i$;gv%j_%M_{[\"&;\t\t\t.B;6Y\\%\t\"\tY/a\t\\`:?\t<\t?]\taNwD;\\\t%l*74%5T?QS :~yR/E*R\t\t=u\t\\\t\t.Q<;\\\t_S/{&F$^\tw_>\'h=|%\t\t:W!\\<U2\'$\tb&`\t=|=L9\t\t\t\\WZ:! }{\t ;\t;\t\t 0.*\t.%\"\'r%{<Mh_t[[}\t-\tJo\"b/AC*-=`=T\tz$2\tC\t\t/k{47\"\t\t,q%\tZ\tT3\t\tf>%\t\'?%@^tx\t7\"1Bk{b{n\t\"Pj3\tHc\t\tt\tY<\t#?\tSh\\yk/N\\\t8 7=R4*9Cw&m\t\\-\'f\t|\'#t(Etu.Hdu(E\t%&v:\'aqW~A5\t\t w.s{J%lX<\"\t\'*%m<&:/B<&\':U}$&`.{)\t\t6S\t:/$*kQ-Z\t^\'t${/tH*\'v\t3\t=\t\tDyp:B\t`I_R&4SO\t\t&-j=*.\t87&\'e*( \t\t\t\'<$\\DJ<$p?{}\'&\tv\t\\Xk<Y:Y`!$K{\tF&\tzd\t\t*i$\tj\'\t<)R*\t%?\t!.\t=\"@#~:=*\t\tXO=_T,1\"\'.%%\"`{\\:\t\"\tfkeOb/\'$I~\ta\t|&\t[\\KK\"1&Z\t<k\t\t)%\'-~\"2n\tj\tW?*<@w{g%d\ta\\\'\'I\t;:ySR%ke:4\tc\t$=\t&9P]x4\tJ=\t6C6%a\t`0\tF\tm-\tTr\t}\t\tQum\t&@\typ|w2&\t\t3`i&t\t\tT5\"\t.&b&e*/==1.\'*\\[U*\tqPL%?$-0/}~|q`\t\t}\t$\tq==o+T$\'!H\t\ti&um\"?\"%%\t/\'p\tg>?{0{J{\t\t/\t\t{zKZ&>=\t[\"1h<H%z/8,/]s\tv{7\t\t:j*H,M//\t\t\td\'.)\t"
--- a/python/doc/api.rst
+++ b/python/doc/api.rst
@@ -8,8 +8,8 @@ high level API reference

 - :class:`deltachat.account.Account` (your main entry point, creates the
  other classes)
- :class:`deltachat.contact.Contact`
- :class:`deltachat.chat.Chat`
+- :class:`deltachat.chatting.Contact`
+- :class:`deltachat.chatting.Chat`
 - :class:`deltachat.message.Message`

 Account
@@ -22,13 +22,13 @@ Account
 Contact
 -------

-.. autoclass:: deltachat.contact.Contact
+.. autoclass:: deltachat.chatting.Contact
    :members:

 Chat
 ----

-.. autoclass:: deltachat.chat.Chat
+.. autoclass:: deltachat.chatting.Chat
    :members:

 Message
--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -15,14 +15,12 @@ import deltachat
 from . import const
 from .capi import ffi, lib
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array, DCLot
-from .chat import Chat
-from .message import Message
-from .contact import Contact
+from .chatting import Contact, Chat, Message


 class Account(object):
    """ Each account is tied to a sqlite database file which is fully managed
-    by the underlying deltachat core library.  All public Account methods are
+    by the underlying deltachat c-library.  All public Account methods are
    meant to be memory-safe and return memory-safe objects.
    """
    def __init__(self, db_path, logid=None, eventlogging=True, debug=True):
@@ -153,14 +151,6 @@ class Account(object):
        self.check_is_configured()
        return from_dc_charpointer(lib.dc_get_info(self._dc_context))

-    def get_latest_backupfile(self, backupdir):
-        """ return the latest backup file in a given directory.
-        """
-        res = lib.dc_imex_has_backup(self._dc_context, as_dc_charpointer(backupdir))
-        if res == ffi.NULL:
-            return None
-        return from_dc_charpointer(res)
-
    def get_blobdir(self):
        """ return the directory for files.

@@ -170,9 +160,9 @@ class Account(object):
        return from_dc_charpointer(lib.dc_get_blobdir(self._dc_context))

    def get_self_contact(self):
-        """ return this account's identity as a :class:`deltachat.contact.Contact`.
+        """ return this account's identity as a :class:`deltachat.chatting.Contact`.

-        :returns: :class:`deltachat.contact.Contact`
+        :returns: :class:`deltachat.chatting.Contact`
        """
        self.check_is_configured()
        return Contact(self._dc_context, const.DC_CONTACT_ID_SELF)
@@ -184,7 +174,7 @@ class Account(object):

        :param email: email-address (text type)
        :param name: display name for this contact (optional)
-        :returns: :class:`deltachat.contact.Contact` instance.
+        :returns: :class:`deltachat.chatting.Contact` instance.
        """
        name = as_dc_charpointer(name)
        email = as_dc_charpointer(email)
@@ -210,7 +200,7 @@ class Account(object):
                      whose name or e-mail matches query.
        :param only_verified: if true only return verified contacts.
        :param with_self: if true the self-contact is also returned.
-        :returns: list of :class:`deltachat.contact.Contact` objects.
+        :returns: list of :class:`deltachat.chatting.Contact` objects.
        """
        flags = 0
        query = as_dc_charpointer(query)
@@ -228,7 +218,7 @@ class Account(object):
        """ create or get an existing 1:1 chat object for the specified contact or contact id.

        :param contact: chat_id (int) or contact object.
-        :returns: a :class:`deltachat.chat.Chat` object.
+        :returns: a :class:`deltachat.chatting.Chat` object.
        """
        if hasattr(contact, "id"):
            if contact._dc_context != self._dc_context:
@@ -245,7 +235,7 @@ class Account(object):
        the specified message.

        :param message: messsage id or message instance.
-        :returns: a :class:`deltachat.chat.Chat` object.
+        :returns: a :class:`deltachat.chatting.Chat` object.
        """
        if hasattr(message, "id"):
            if self._dc_context != message._dc_context:
@@ -263,7 +253,7 @@ class Account(object):
        Chats are unpromoted until the first message is sent.

        :param verified: if true only verified contacts can be added.
-        :returns: a :class:`deltachat.chat.Chat` object.
+        :returns: a :class:`deltachat.chatting.Chat` object.
        """
        bytes_name = name.encode("utf8")
        chat_id = lib.dc_create_group_chat(self._dc_context, int(verified), bytes_name)
@@ -272,7 +262,7 @@ class Account(object):
    def get_chats(self):
        """ return list of chats.

-        :returns: a list of :class:`deltachat.chat.Chat` objects.
+        :returns: a list of :class:`deltachat.chatting.Chat` objects.
        """
        dc_chatlist = ffi.gc(
            lib.dc_get_chatlist(self._dc_context, 0, ffi.NULL, 0),
@@ -290,24 +280,9 @@ class Account(object):
        return Chat(self, const.DC_CHAT_ID_DEADDROP)

    def get_message_by_id(self, msg_id):
-        """ return Message instance.
-        :param msg_id: integer id of this message.
-        :returns: :class:`deltachat.message.Message` instance.
-        """
+        """ return Message instance. """
        return Message.from_db(self, msg_id)

-    def get_chat_by_id(self, chat_id):
-        """ return Chat instance.
-        :param chat_id: integer id of this chat.
-        :returns: :class:`deltachat.chat.Chat` instance.
-        :raises: ValueError if chat does not exist.
-        """
-        res = lib.dc_get_chat(self._dc_context, chat_id)
-        if res == ffi.NULL:
-            raise ValueError("cannot get chat with id={}".format(chat_id))
-        lib.dc_chat_unref(res)
-        return Chat(self, chat_id)
-
    def mark_seen_messages(self, messages):
        """ mark the given set of messages as seen.

@@ -324,7 +299,7 @@ class Account(object):
        """ Forward list of messages to a chat.

        :param messages: list of :class:`deltachat.message.Message` object.
-        :param chat: :class:`deltachat.chat.Chat` object.
+        :param chat: :class:`deltachat.chatting.Chat` object.
        :returns: None
        """
        msg_ids = [msg.id for msg in messages]
@@ -436,7 +411,7 @@ class Account(object):
        """ setup contact and return a Chat after contact is established.

        Note that this function may block for a long time as messages are exchanged
-        with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
+        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
        is returned.
        :param qr: valid "setup contact" QR code (all other QR codes will result in an exception)
        """
@@ -450,7 +425,7 @@ class Account(object):
        """ join a chat group through a QR code.

        Note that this function may block for a long time as messages are exchanged
-        with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
+        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
        is returned which is the chat that we just joined.

        :param qr: valid "join-group" QR code (all other QR codes will result in an exception)
@@ -485,9 +460,8 @@ class Account(object):

    def stop_threads(self, wait=True):
        """ stop IMAP/SMTP threads. """
-        if self._threads.is_started():
-            self.stop_ongoing()
-            self._threads.stop(wait=wait)
+        self.stop_ongoing()
+        self._threads.stop(wait=wait)

    def shutdown(self, wait=True):
        """ stop threads and close and remove underlying dc_context and callbacks. """
@@ -518,20 +492,6 @@ class Account(object):
    def on_dc_event_imex_file_written(self, data1, data2):
        self._imex_events.put(data1)

-    def set_location(self, latitude=0.0, longitude=0.0, accuracy=0.0):
-        """set a new location. It effects all chats where we currently
-        have enabled location streaming.
-
-        :param latitude: float (use 0.0 if not known)
-        :param longitude: float (use 0.0 if not known)
-        :param accuracy: float (use 0.0 if not known)
-        :raises: ValueError if no chat is currently streaming locations
-        :returns: None
-        """
-        dc_res = lib.dc_set_location(self._dc_context, latitude, longitude, accuracy)
-        if dc_res == 0:
-            raise ValueError("no chat is streaming locations")
-

 class IOThreads:
    def __init__(self, dc_context, log_event=lambda *args: None):
--- a/python/src/deltachat/chatting.py
+++ b/python/src/deltachat/chatting.py
@@ -1,15 +1,58 @@
-""" Chat and Location related API. """
+""" chatting related objects: Contact, Chat, Message. """

 import mimetypes
-import calendar
-from datetime import datetime
 import os
+from . import props
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .capi import lib, ffi
 from . import const
 from .message import Message


+class Contact(object):
+    """ Delta-Chat Contact.
+
+    You obtain instances of it through :class:`deltachat.account.Account`.
+    """
+    def __init__(self, dc_context, id):
+        self._dc_context = dc_context
+        self.id = id
+
+    def __eq__(self, other):
+        return self._dc_context == other._dc_context and self.id == other.id
+
+    def __ne__(self, other):
+        return not (self == other)
+
+    def __repr__(self):
+        return "<Contact id={} addr={} dc_context={}>".format(self.id, self.addr, self._dc_context)
+
+    @property
+    def _dc_contact(self):
+        return ffi.gc(
+            lib.dc_get_contact(self._dc_context, self.id),
+            lib.dc_contact_unref
+        )
+
+    @props.with_doc
+    def addr(self):
+        """ normalized e-mail address for this account. """
+        return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
+
+    @props.with_doc
+    def display_name(self):
+        """ display name for this contact. """
+        return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
+
+    def is_blocked(self):
+        """ Return True if the contact is blocked. """
+        return lib.dc_contact_is_blocked(self._dc_contact)
+
+    def is_verified(self):
+        """ Return True if the contact is verified. """
+        return lib.dc_contact_is_verified(self._dc_contact)
+
+
 class Chat(object):
    """ Chat object which manages members and through which you can send and retrieve messages.

@@ -269,10 +312,9 @@ class Chat(object):
    def get_contacts(self):
        """ get all contacts for this chat.
        :params: contact object.
-        :returns: list of :class:`deltachat.contact.Contact` objects for this chat
+        :returns: list of :class:`deltachat.chatting.Contact` objects for this chat

        """
-        from .contact import Contact
        dc_array = ffi.gc(
            lib.dc_get_chat_contacts(self._dc_context, self.id),
            lib.dc_array_unref
@@ -323,62 +365,3 @@ class Chat(object):
        if dc_res == ffi.NULL:
            return None
        return from_dc_charpointer(dc_res)
-
-    # ------  location streaming API ------------------------------
-
-    def is_sending_locations(self):
-        """return True if this chat has location-sending enabled currently.
-        :returns: True if location sending is enabled.
-        """
-        return lib.dc_is_sending_locations_to_chat(self._dc_context, self.id)
-
-    def enable_sending_locations(self, seconds):
-        """enable sending locations for this chat.
-
-        all subsequent messages will carry a location with them.
-        """
-        lib.dc_send_locations_to_chat(self._dc_context, self.id, seconds)
-
-    def get_locations(self, contact=None, timestamp_from=None, timestamp_to=None):
-        """return list of locations for the given contact in the given timespan.
-
-        :param contact: the contact for which locations shall be returned.
-        :param timespan_from: a datetime object or None (indicating "since beginning")
-        :param timespan_to: a datetime object or None (indicating up till now)
-        :returns: list of :class:`deltachat.chat.Location` objects.
-        """
-        if timestamp_from is None:
-            time_from = 0
-        else:
-            time_from = calendar.timegm(timestamp_from.utctimetuple())
-        if timestamp_to is None:
-            time_to = 0
-        else:
-            time_to = calendar.timegm(timestamp_to.utctimetuple())
-
-        if contact is None:
-            contact_id = 0
-        else:
-            contact_id = contact.id
-
-        dc_array = lib.dc_get_locations(self._dc_context, self.id, contact_id, time_from, time_to)
-        return [
-            Location(
-                latitude=lib.dc_array_get_latitude(dc_array, i),
-                longitude=lib.dc_array_get_longitude(dc_array, i),
-                accuracy=lib.dc_array_get_accuracy(dc_array, i),
-                timestamp=datetime.utcfromtimestamp(lib.dc_array_get_timestamp(dc_array, i)))
-            for i in range(lib.dc_array_get_cnt(dc_array))
-        ]
-
-
-class Location:
-    def __init__(self, latitude, longitude, accuracy, timestamp):
-        assert isinstance(timestamp, datetime)
-        self.latitude = latitude
-        self.longitude = longitude
-        self.accuracy = accuracy
-        self.timestamp = timestamp
-
-    def __eq__(self, other):
-        return self.__dict__ == other.__dict__
--- a/python/src/deltachat/const.py
+++ b/python/src/deltachat/const.py
@@ -47,8 +47,7 @@ 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_DEVICE = 2
 DC_CONTACT_ID_LAST_SPECIAL = 9
 DC_MSG_TEXT = 10
 DC_MSG_IMAGE = 20
--- a/python/src/deltachat/contact.py
+++ b/python/src/deltachat/contact.py
@@ -1,49 +0,0 @@
-""" Contact object. """
-
-from . import props
-from .cutil import from_dc_charpointer
-from .capi import lib, ffi
-
-
-class Contact(object):
-    """ Delta-Chat Contact.
-
-    You obtain instances of it through :class:`deltachat.account.Account`.
-    """
-    def __init__(self, dc_context, id):
-        self._dc_context = dc_context
-        self.id = id
-
-    def __eq__(self, other):
-        return self._dc_context == other._dc_context and self.id == other.id
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "<Contact id={} addr={} dc_context={}>".format(self.id, self.addr, self._dc_context)
-
-    @property
-    def _dc_contact(self):
-        return ffi.gc(
-            lib.dc_get_contact(self._dc_context, self.id),
-            lib.dc_contact_unref
-        )
-
-    @props.with_doc
-    def addr(self):
-        """ normalized e-mail address for this account. """
-        return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
-
-    @props.with_doc
-    def display_name(self):
-        """ display name for this contact. """
-        return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
-
-    def is_blocked(self):
-        """ Return True if the contact is blocked. """
-        return lib.dc_contact_is_blocked(self._dc_contact)
-
-    def is_verified(self):
-        """ Return True if the contact is verified. """
-        return lib.dc_contact_is_verified(self._dc_contact)
--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -1,4 +1,4 @@
-""" The Message object. """
+""" chatting related objects: Contact, Chat, Message. """

 import os
 import shutil
@@ -13,7 +13,7 @@ class Message(object):
    """ Message object.

    You obtain instances of it through :class:`deltachat.account.Account` or
-    :class:`deltachat.chat.Chat`.
+    :class:`deltachat.chatting.Chat`.
    """
    def __init__(self, account, dc_msg):
        self.account = account
@@ -169,18 +169,18 @@ class Message(object):
    def chat(self):
        """chat this message was posted in.

-        :returns: :class:`deltachat.chat.Chat` object
+        :returns: :class:`deltachat.chatting.Chat` object
        """
-        from .chat import Chat
+        from .chatting import Chat
        chat_id = lib.dc_msg_get_chat_id(self._dc_msg)
        return Chat(self.account, chat_id)

    def get_sender_contact(self):
        """return the contact of who wrote the message.

-        :returns: :class:`deltachat.chat.Contact` instance
+        :returns: :class:`deltachat.chatting.Contact` instance
        """
-        from .contact import Contact
+        from .chatting import Contact
        contact_id = lib.dc_msg_get_from_id(self._dc_msg)
        return Contact(self._dc_context, contact_id)

--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -2,7 +2,6 @@ from __future__ import print_function
 import pytest
 import os
 import queue
-import time
 from deltachat import const, Account
 from deltachat.message import Message
 from datetime import datetime, timedelta
@@ -122,12 +121,6 @@ class TestOfflineChat:
        str(chat1)
        repr(chat1)

-    def test_chat_by_id(self, chat1):
-        chat2 = chat1.account.get_chat_by_id(chat1.id)
-        assert chat2 == chat1
-        with pytest.raises(ValueError):
-            chat1.account.get_chat_by_id(123123)
-
    def test_chat_idempotent(self, chat1, ac1):
        contact1 = chat1.get_contacts()[0]
        chat2 = ac1.create_chat_by_contact(contact1.id)
@@ -642,29 +635,18 @@ class TestOnlineAccount:
        assert os.path.exists(msg_in.filename)
        assert os.stat(msg_in.filename).st_size == os.stat(path).st_size

-    def test_import_export_online_all_twice(self, acfactory, tmpdir, lp):
+    def test_import_export_online_all(self, acfactory, tmpdir):
        ac1 = acfactory.get_online_configuring_account()
        wait_configuration_progress(ac1, 1000)

-        lp.sec("create some chat content")
        contact1 = ac1.create_contact("some1@hello.com", name="some1")
        chat = ac1.create_chat_by_contact(contact1)
        chat.send_text("msg1")
        backupdir = tmpdir.mkdir("backup")
-
-        lp.sec("export all to {}".format(backupdir))
        path = ac1.export_all(backupdir.strpath)
        assert os.path.exists(path)
-        t = time.time()

-        lp.sec("get fresh empty account")
        ac2 = acfactory.get_unconfigured_account()
-
-        lp.sec("get latest backup file")
-        path2 = ac2.get_latest_backupfile(backupdir.strpath)
-        assert path2 == path
-
-        lp.sec("import backup and check it's proper")
        ac2.import_all(path)
        contacts = ac2.get_contacts(query="some1")
        assert len(contacts) == 1
@@ -675,17 +657,6 @@ class TestOnlineAccount:
        assert len(messages) == 1
        assert messages[0].text == "msg1"

-        # wait until a second passed since last backup
-        # because get_latest_backupfile() shall return the latest backup
-        # from a UI it's unlikely anyone manages to export two
-        # backups in one second.
-        time.sleep(max(0, 1 - (time.time() - t)))
-        lp.sec("Second-time export all to {}".format(backupdir))
-        path2 = ac1.export_all(backupdir.strpath)
-        assert os.path.exists(path2)
-        assert path2 != path
-        assert ac2.get_latest_backupfile(backupdir.strpath) == path2
-
    def test_ac_setup_message(self, acfactory, lp):
        # note that the receiving account needs to be configured and running
        # before ther setup message is send. DC does not read old messages
@@ -839,54 +810,6 @@ class TestOnlineAccount:
        assert chat1b.get_profile_image() is None
        assert chat.get_profile_image() is None

-    def test_send_receive_locations(self, acfactory, lp):
-        now = datetime.utcnow()
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        lp.sec("ac1: create chat with ac2")
-        chat1 = self.get_chat(ac1, ac2)
-        chat2 = self.get_chat(ac2, ac1)
-
-        assert not chat1.is_sending_locations()
-        with pytest.raises(ValueError):
-            ac1.set_location(latitude=0.0, longitude=10.0)
-
-        ac1._evlogger.consume_events()
-        ac2._evlogger.consume_events()
-
-        lp.sec("ac1: enable location sending in chat")
-        chat1.enable_sending_locations(seconds=100)
-        assert chat1.is_sending_locations()
-        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-
-        ac1.set_location(latitude=2.0, longitude=3.0, accuracy=0.5)
-        ac1._evlogger.get_matching("DC_EVENT_LOCATION_CHANGED")
-        chat1.send_text("hello")
-        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-
-        lp.sec("ac2: wait for incoming location message")
-        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")  # "enabled-location streaming"
-
-        # currently core emits location changed before event_incoming message
-        ac2._evlogger.get_matching("DC_EVENT_LOCATION_CHANGED")
-        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")  # text message with location
-
-        locations = chat2.get_locations()
-        assert len(locations) == 1
-        assert locations[0].latitude == 2.0
-        assert locations[0].longitude == 3.0
-        assert locations[0].accuracy == 0.5
-        assert locations[0].timestamp > now
-
-        contact = ac2.create_contact(ac1.get_config("addr"))
-        locations2 = chat2.get_locations(contact=contact)
-        assert len(locations2) == 1
-        assert locations2 == locations
-
-        contact = ac2.create_contact("nonexisting@example.org")
-        locations3 = chat2.get_locations(contact=contact)
-        assert not locations3
-

 class TestOnlineConfigureFails:
    def test_invalid_password(self, acfactory):
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -25,8 +25,7 @@ impl<'a> BlobObject<'a> {
    /// Creates a new file in the blob directory.  The name will be
    /// derived from the platform-agnostic basename of the suggested
    /// name, followed by a random number and followed by a possible
-    /// extension.  The `data` will be written into the file without
-    /// race-conditions.
+    /// extension.  The `data` will be written into the file.
    ///
    /// # Errors
    ///
@@ -43,33 +42,29 @@ impl<'a> BlobObject<'a> {
        data: &[u8],
    ) -> std::result::Result<BlobObject<'a>, BlobError> {
        let blobdir = context.get_blobdir();
-        let (stem, ext) = BlobObject::sanitise_name(suggested_name.as_ref());
-        let (name, mut file) = BlobObject::create_new_file(&blobdir, &stem, &ext)?;
-        file.write_all(data)
-            .map_err(|err| BlobError::new_write_failure(blobdir, &name, err))?;
-        let blob = BlobObject {
-            blobdir,
-            name: format!("$BLOBDIR/{}", name),
-        };
-        context.call_cb(Event::NewBlobFile(blob.as_name().to_string()));
-        Ok(blob)
-    }
-
-    // Creates a new file, returning a tuple of the name and the handle.
-    fn create_new_file(dir: &Path, stem: &str, ext: &str) -> Result<(String, fs::File), BlobError> {
-        let max_attempt = 15;
+        let (stem, ext) = BlobObject::sanitise_name(suggested_name.as_ref().to_string());
        let mut name = format!("{}{}", stem, ext);
+        let max_attempt = 15;
        for attempt in 0..max_attempt {
-            let path = dir.join(&name);
+            let path = blobdir.join(&name);
            match fs::OpenOptions::new()
                .create_new(true)
                .write(true)
                .open(&path)
            {
-                Ok(file) => return Ok((name, file)),
+                Ok(mut file) => {
+                    file.write_all(data)
+                        .map_err(|err| BlobError::new_write_failure(blobdir, &name, err))?;
+                    let blob = BlobObject {
+                        blobdir,
+                        name: format!("$BLOBDIR/{}", name),
+                    };
+                    context.call_cb(Event::NewBlobFile(blob.as_name().to_string()));
+                    return Ok(blob);
+                }
                Err(err) => {
                    if attempt == max_attempt {
-                        return Err(BlobError::new_create_failure(dir, &name, err));
+                        return Err(BlobError::new_create_failure(blobdir, &name, err));
                    } else {
                        name = format!("{}-{}{}", stem, rand::random::<u32>(), ext);
                    }
@@ -77,7 +72,7 @@ impl<'a> BlobObject<'a> {
            }
        }
        Err(BlobError::new_create_failure(
-            dir,
+            blobdir,
            &name,
            format_err!("Unreachable code - supposedly"),
        ))
@@ -86,9 +81,7 @@ impl<'a> BlobObject<'a> {
    /// Creates a new blob object with unique name by copying an existing file.
    ///
    /// This creates a new blob as described in [BlobObject::create]
-    /// but also copies an existing file into it.  This is done in a
-    /// in way which avoids race-conditions when multiple files are
-    /// concurrently created.
+    /// but also copies an existing file into it.
    ///
    /// # Errors
    ///
@@ -99,24 +92,11 @@ impl<'a> BlobObject<'a> {
        context: &'a Context,
        src: impl AsRef<Path>,
    ) -> std::result::Result<BlobObject<'a>, BlobError> {
-        let mut src_file = fs::File::open(src.as_ref()).map_err(|err| {
-            BlobError::new_copy_failure(context.get_blobdir(), "", src.as_ref(), err)
+        let blob = BlobObject::create(context, src.as_ref().to_string_lossy(), b"")?;
+        fs::copy(src.as_ref(), blob.to_abs_path()).map_err(|err| {
+            fs::remove_file(blob.to_abs_path()).ok();
+            BlobError::new_copy_failure(blob.blobdir, &blob.name, src.as_ref(), err)
        })?;
-        let (stem, ext) = BlobObject::sanitise_name(&src.as_ref().to_string_lossy());
-        let (name, mut dst_file) = BlobObject::create_new_file(context.get_blobdir(), &stem, &ext)?;
-        std::io::copy(&mut src_file, &mut dst_file).map_err(|err| {
-            {
-                // Attempt to remove the failed file, swallow errors resulting from that.
-                let path = context.get_blobdir().join(&name);
-                fs::remove_file(path).ok();
-            }
-            BlobError::new_copy_failure(context.get_blobdir(), &name, src.as_ref(), err)
-        })?;
-        let blob = BlobObject {
-            blobdir: context.get_blobdir(),
-            name: format!("$BLOBDIR/{}", name),
-        };
-        context.call_cb(Event::NewBlobFile(blob.as_name().to_string()));
        Ok(blob)
    }

@@ -259,8 +239,7 @@ impl<'a> BlobObject<'a> {
    /// ".txt")` while "bar" is returned as `("bar", "")`.
    ///
    /// The extension part will always be lowercased.
-    fn sanitise_name(name: &str) -> (String, String) {
-        let mut name = name.to_string();
+    fn sanitise_name(mut name: String) -> (String, String) {
        for part in name.rsplit('/') {
            if part.len() > 0 {
                name = part.to_string();
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -97,8 +97,6 @@ impl Chat {

                        if chat.param.exists(Param::Selftalk) {
                            chat.name = context.stock_str(StockMessage::SelfMsg).into();
-                        } else if chat.param.exists(Param::Devicetalk) {
-                            chat.name = context.stock_str(StockMessage::DeviceMessages).into();
                        }
                    }
                }
@@ -111,14 +109,6 @@ impl Chat {
        self.param.exists(Param::Selftalk)
    }

-    pub fn is_device_talk(&self) -> bool {
-        self.param.exists(Param::Devicetalk)
-    }
-
-    pub fn can_send(&self) -> bool {
-        self.id > DC_CHAT_ID_LAST_SPECIAL && !self.is_device_talk()
-    }
-
    pub fn update_param(&mut self, context: &Context) -> Result<(), Error> {
        sql::execute(
            context,
@@ -268,7 +258,7 @@ impl Chat {
        }

        if (self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup)
-            && !is_contact_in_chat(context, self.id, DC_CONTACT_ID_SELF)
+            && !is_contact_in_chat(context, self.id, 1 as u32)
        {
            emit_event!(
                context,
@@ -424,7 +414,7 @@ impl Chat {
                    &context.sql,
                    "INSERT INTO locations \
                     (timestamp,from_id,chat_id, latitude,longitude,independent)\
-                     VALUES (?,?,?, ?,?,1);", // 1=DC_CONTACT_ID_SELF
+                     VALUES (?,?,?, ?,?,1);",
                    params![
                        timestamp,
                        DC_CONTACT_ID_SELF,
@@ -456,7 +446,7 @@ impl Chat {
                        params![
                            new_rfc724_mid,
                            self.id as i32,
-                            DC_CONTACT_ID_SELF,
+                            1i32,
                            to_id as i32,
                            timestamp,
                            msg.type_0,
@@ -592,12 +582,6 @@ pub fn set_blocking(context: &Context, chat_id: u32, new_blocking: Blocked) -> b
    .is_ok()
 }

-fn copy_device_icon_to_blobs(context: &Context) -> Result<String, Error> {
-    let icon = include_bytes!("../assets/icon-device.png");
-    let blob = BlobObject::create(context, "icon-device.png".to_string(), icon)?;
-    Ok(blob.as_name().to_string())
-}
-
 pub fn create_or_lookup_by_contact_id(
    context: &Context,
    contact_id: u32,
@@ -621,14 +605,7 @@ pub fn create_or_lookup_by_contact_id(
            "INSERT INTO chats (type, name, param, blocked, grpid) VALUES({}, '{}', '{}', {}, '{}')",
            100,
            chat_name,
-            match contact_id {
-                DC_CONTACT_ID_SELF => "K=1".to_string(), // K = Param::Selftalk
-                DC_CONTACT_ID_DEVICE => {
-                    let icon = copy_device_icon_to_blobs(context)?;
-                    format!("D=1\ni={}", icon) // D = Param::Devicetalk, i = Param::ProfileImage
-                },
-                _ => "".to_string()
-            },
+            if contact_id == DC_CONTACT_ID_SELF as u32 { "K=1" } else { "" },
            create_blocked as u8,
            contact.get_addr(),
        ),
@@ -700,7 +677,8 @@ pub fn msgtype_has_file(msgtype: Viewtype) -> bool {
    }
 }

-fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<(), Error> {
+fn prepare_msg_common(context: &Context, chat_id: u32, msg: &mut Message) -> Result<MsgId, Error> {
+    msg.id = MsgId::new_unset();
    if msg.type_0 == Viewtype::Text {
        // the caller should check if the message text is empty
    } else if msgtype_has_file(msg.type_0) {
@@ -736,16 +714,10 @@ fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<(), Error> {
    } else {
        bail!("Cannot send messages of type #{}.", msg.type_0);
    }
-    Ok(())
-}

-fn prepare_msg_common(context: &Context, chat_id: u32, msg: &mut Message) -> Result<MsgId, Error> {
-    msg.id = MsgId::new_unset();
-    prepare_msg_blob(context, msg)?;
    unarchive(context, chat_id)?;

    let mut chat = Chat::load_from_db(context, chat_id)?;
-    ensure!(chat.can_send(), "cannot send to chat #{}", chat_id);

    // The OutPreparing state is set by dc_prepare_msg() before it
    // calls this function and the message is left in the OutPreparing
@@ -942,7 +914,7 @@ fn do_set_draft(context: &Context, chat_id: u32, msg: &mut Message) -> Result<()
         VALUES (?,?,?, ?,?,?,?,?);",
        params![
            chat_id as i32,
-            DC_CONTACT_ID_SELF,
+            1,
            time(),
            msg.type_0,
            MessageState::OutDraft,
@@ -1021,8 +993,8 @@ pub fn get_chat_msgs(
                "        ON m.chat_id=chats.id",
                " LEFT JOIN contacts",
                "        ON m.from_id=contacts.id",
-                " WHERE m.from_id!=1", // 1=DC_CONTACT_ID_SELF
-                "   AND m.from_id!=2", // 2=DC_CONTACT_ID_INFO
+                " WHERE m.from_id!=1",
+                "   AND m.from_id!=2",
                "   AND m.hidden=0",
                "   AND chats.blocked=2",
                "   AND contacts.blocked=0",
@@ -1378,7 +1350,7 @@ pub fn create_group_chat(
    let chat_id = sql::get_rowid(context, &context.sql, "chats", "grpid", grpid);

    if chat_id != 0 {
-        if add_to_chat_contacts_table(context, chat_id, DC_CONTACT_ID_SELF) {
+        if add_to_chat_contacts_table(context, chat_id, 1) {
            let mut draft_msg = Message::new(Viewtype::Text);
            draft_msg.set_text(Some(draft_txt));
            set_draft_raw(context, chat_id, &mut draft_msg);
@@ -1585,7 +1557,7 @@ pub fn remove_contact_from_chat(
    /* this allows to delete pending references to deleted contacts.  Of course, this should _not_ happen. */
    if let Ok(chat) = Chat::load_from_db(context, chat_id) {
        if real_group_exists(context, chat_id) {
-            if !is_contact_in_chat(context, chat_id, DC_CONTACT_ID_SELF) {
+            if !is_contact_in_chat(context, chat_id, 1 as u32) {
                emit_event!(
                    context,
                    Event::ErrorSelfNotInGroup(
@@ -1681,7 +1653,7 @@ pub fn set_chat_name(
    if real_group_exists(context, chat_id) {
        if chat.name == new_name.as_ref() {
            success = true;
-        } else if !is_contact_in_chat(context, chat_id, DC_CONTACT_ID_SELF) {
+        } else if !is_contact_in_chat(context, chat_id, 1) {
            emit_event!(
                context,
                Event::ErrorSelfNotInGroup("Cannot set chat name; self not in group".into())
@@ -1926,46 +1898,15 @@ pub fn get_chat_id_by_grpid(context: &Context, grpid: impl AsRef<str>) -> (u32,
        .unwrap_or((0, false, Blocked::Not))
 }

-pub fn add_device_msg(context: &Context, msg: &mut Message) -> Result<MsgId, Error> {
-    let (chat_id, _blocked) =
-        create_or_lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE, Blocked::Not)?;
-    let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
-
-    prepare_msg_blob(context, msg)?;
-    unarchive(context, chat_id)?;
-
-    context.sql.execute(
-        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,param,rfc724_mid) \
-         VALUES (?,?,?, ?,?,?, ?,?,?);",
-        params![
-            chat_id,
-            DC_CONTACT_ID_DEVICE,
-            DC_CONTACT_ID_SELF,
-            dc_create_smeared_timestamp(context),
-            msg.type_0,
-            MessageState::InFresh,
-            msg.text.as_ref().map_or("", String::as_str),
-            msg.param.to_string(),
-            rfc724_mid,
-        ],
-    )?;
-
-    let row_id = sql::get_rowid(context, &context.sql, "msgs", "rfc724_mid", &rfc724_mid);
-    let msg_id = MsgId::new(row_id);
-    context.call_cb(Event::IncomingMsg { chat_id, msg_id });
-
-    Ok(msg_id)
-}
-
-pub fn add_info_msg(context: &Context, chat_id: u32, text: impl AsRef<str>) {
+pub fn add_device_msg(context: &Context, chat_id: u32, text: impl AsRef<str>) {
    let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");

    if context.sql.execute(
        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,rfc724_mid) VALUES (?,?,?, ?,?,?, ?,?);",
        params![
            chat_id as i32,
-            DC_CONTACT_ID_INFO,
-            DC_CONTACT_ID_INFO,
+            2,
+            2,
            dc_create_smeared_timestamp(context),
            Viewtype::Text,
            MessageState::InNoticed,
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -295,7 +295,7 @@ impl Chatlist {
        let mut lastcontact = None;

        let lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) {
-            if lastmsg.from_id != DC_CONTACT_ID_SELF
+            if lastmsg.from_id != 1
                && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
            {
                lastcontact = Contact::load_from_db(context, lastmsg.from_id).ok();
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -531,26 +531,21 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
        param.send_user, param.send_server, param.send_port, param.server_flags
    );
    info!(context, "Trying: {}", inf);
-    match context
+    if context
        .smtp
        .clone()
        .lock()
        .unwrap()
        .connect(context, &param)
    {
-        Ok(()) => {
-            info!(context, "success: {}", inf);
-            Some(true)
-        }
-        Err(err) => {
-            if context.shall_stop_ongoing() {
-                Some(false)
-            } else {
-                warn!(context, "could not connect: {}", err);
-                None
-            }
-        }
+        info!(context, "success: {}", inf);
+        return Some(true);
    }
+    if context.shall_stop_ongoing() {
+        return Some(false);
+    }
+    info!(context, "could not connect: {}", inf);
+    None
 }

 /*******************************************************************************
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -130,8 +130,7 @@ const DC_MAX_GET_INFO_LEN: usize = 100000;

 pub const DC_CONTACT_ID_UNDEFINED: u32 = 0;
 pub const DC_CONTACT_ID_SELF: u32 = 1;
-pub const DC_CONTACT_ID_INFO: u32 = 2;
-pub const DC_CONTACT_ID_DEVICE: u32 = 5;
+pub const DC_CONTACT_ID_DEVICE: u32 = 2;
 pub const DC_CONTACT_ID_LAST_SPECIAL: u32 = 9;

 pub const DC_CREATE_MVBOX: usize = 1;
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -153,16 +153,7 @@ impl Contact {
                blocked: false,
                origin: Origin::Unknown,
            };
-            return Ok(contact);
-        } else if contact_id == DC_CONTACT_ID_DEVICE {
-            let contact = Contact {
-                id: contact_id,
-                name: context.stock_str(StockMessage::DeviceMessages).into(),
-                authname: "".into(),
-                addr: "device@localhost".into(),
-                blocked: false,
-                origin: Origin::Unknown,
-            };
+
            return Ok(contact);
        }

@@ -273,7 +264,7 @@ impl Contact {
            .unwrap_or_default();

        if addr_normalized == addr_self {
-            return DC_CONTACT_ID_SELF;
+            return 1;
        }

        context.sql.query_get_value(
@@ -310,7 +301,7 @@ impl Contact {
            .unwrap_or_default();

        if addr == addr_self {
-            return Ok((DC_CONTACT_ID_SELF, sth_modified));
+            return Ok((1, sth_modified));
        }

        if !may_be_valid_addr(&addr) {
--- a/src/dc_mimeparser.rs
+++ b/src/dc_mimeparser.rs
@@ -611,7 +611,7 @@ impl<'a> MimeParser<'a> {
        let mut decoded_data = match wrapmime::mailmime_transfer_decode(mime) {
            Ok(decoded_data) => decoded_data,
            Err(_) => {
-                // Note that it's not always an error - might be no data
+                // Note that it's now always an error - might be no data
                return false;
            }
        };
@@ -749,13 +749,27 @@ impl<'a> MimeParser<'a> {
                        return false;
                    }
                }
-                self.do_add_single_file_part(
-                    msg_type,
-                    mime_type,
-                    raw_mime.as_ref(),
-                    &decoded_data,
-                    &desired_filename,
-                );
+                if desired_filename.starts_with("location") && desired_filename.ends_with(".kml") {
+                    if !decoded_data.is_empty() {
+                        let d = std::string::String::from_utf8_lossy(&decoded_data);
+                        self.location_kml = location::Kml::parse(self.context, &d).ok();
+                    }
+                } else if desired_filename.starts_with("message")
+                    && desired_filename.ends_with(".kml")
+                {
+                    if !decoded_data.is_empty() {
+                        let d = std::string::String::from_utf8_lossy(&decoded_data);
+                        self.message_kml = location::Kml::parse(self.context, &d).ok();
+                    }
+                } else if !decoded_data.is_empty() {
+                    self.do_add_single_file_part(
+                        msg_type,
+                        mime_type,
+                        raw_mime.as_ref(),
+                        &decoded_data,
+                        &desired_filename,
+                    );
+                }
            }
            _ => {}
        }
@@ -769,44 +783,20 @@ impl<'a> MimeParser<'a> {
        mime_type: libc::c_int,
        raw_mime: Option<&String>,
        decoded_data: &[u8],
-        filename: &str,
+        desired_filename: &str,
    ) {
-        if decoded_data.is_empty() {
-            return;
-        }
-        // treat location/message kml file attachments specially
-        if filename.ends_with(".kml") {
-            // XXX what if somebody sends eg an "location-highlights.kml"
-            // attachment unrelated to location streaming?
-            if filename.starts_with("location") || filename.starts_with("message") {
-                let parsed = location::Kml::parse(self.context, decoded_data)
-                    .map_err(|err| {
-                        warn!(self.context, "failed to parse kml part: {}", err);
-                    })
-                    .ok();
-                if filename.starts_with("location") {
-                    self.location_kml = parsed;
-                } else {
-                    self.message_kml = parsed;
-                }
-                return;
-            }
-        }
-        /* we have a regular file attachment,
-        write decoded data to new blob object */
-
-        let blob = match BlobObject::create(self.context, filename, decoded_data) {
+        /* write decoded data to new blob file */
+        let blob = match BlobObject::create(self.context, desired_filename, decoded_data) {
            Ok(blob) => blob,
            Err(err) => {
                error!(
                    self.context,
-                    "Could not add blob for mime part {}, error {}", filename, err
+                    "Could not add blob for mime part {}, error {}", desired_filename, err
                );
                return;
            }
        };

-        /* create and register Mime part referencing the new Blob object */
        let mut part = Part::default();
        part.typ = msg_type;
        part.mimetype = mime_type;
@@ -826,15 +816,10 @@ impl<'a> MimeParser<'a> {
    }

    fn do_add_single_part(&mut self, mut part: Part) {
-        if self.encrypted {
-            if self.signatures.len() > 0 {
-                part.param.set_int(Param::GuaranteeE2ee, 1);
-            } else {
-                // XXX if the message was encrypted but not signed
-                // it's not neccessarily an error we need to signal.
-                // we could just treat it as if it was not encrypted.
-                part.param.set_int(Param::ErroneousE2ee, 0x2);
-            }
+        if self.encrypted && self.signatures.len() > 0 {
+            part.param.set_int(Param::GuaranteeE2ee, 1);
+        } else if self.encrypted {
+            part.param.set_int(Param::ErroneousE2ee, 0x2);
        }
        self.parts.push(part);
    }
@@ -1257,13 +1242,13 @@ mod tests {
        #[ignore]
        #[test]
        fn test_dc_mailmime_parse_crash_fuzzy(data in "[!-~\t ]{2000,}") {
+            // this test doesn't exercise much of dc_mimeparser anymore
+            // because a missing From-field early aborts parsing
            let context = dummy_context();
            let mut mimeparser = MimeParser::new(&context.ctx);
-
-            // parsing should always succeed
-            // but the returned header will normally be empty on random data
-            assert!(unsafe {mimeparser.parse(data.as_bytes()).is_ok()});
-            assert!(mimeparser.header.is_empty());
+            unsafe {
+                assert!(mimeparser.parse(data.as_bytes()).is_err());
+            }
        }
    }

--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -227,7 +227,7 @@ pub unsafe fn dc_receive_imf(
            &mut created_db_entries,
            &mut create_event_to_send,
        ) {
-            warn!(context, "{}", err);
+            info!(context, "{}", err);

            cleanup(
                context,
@@ -257,7 +257,7 @@ pub unsafe fn dc_receive_imf(
        );
    }

-    if mime_parser.location_kml.is_some() || mime_parser.message_kml.is_some() {
+    if !mime_parser.message_kml.is_none() && chat_id > DC_CHAT_ID_LAST_SPECIAL {
        save_locations(
            context,
            &mime_parser,
@@ -391,7 +391,7 @@ unsafe fn add_parts(
        } else {
            MessageState::InFresh
        };
-        *to_id = DC_CONTACT_ID_SELF;
+        *to_id = 1;
        // handshake messages must be processed _before_ chats are created
        // (eg. contacs may be marked as verified)
        if mime_parser.lookup_field("Secure-Join").is_some() {
@@ -551,9 +551,8 @@ unsafe fn add_parts(
            if to_ids.is_empty() && 0 != to_self {
                // from_id==to_id==DC_CONTACT_ID_SELF - this is a self-sent messages,
                // maybe an Autocrypt Setup Messag
-                let (id, bl) =
-                    chat::create_or_lookup_by_contact_id(context, DC_CONTACT_ID_SELF, Blocked::Not)
-                        .unwrap_or_default();
+                let (id, bl) = chat::create_or_lookup_by_contact_id(context, 1, Blocked::Not)
+                    .unwrap_or_default();
                *chat_id = id;
                chat_id_blocked = bl;

@@ -605,7 +604,6 @@ unsafe fn add_parts(
    // into only one message; mails sent by other clients may result in several messages
    // (eg. one per attachment))
    let icnt = mime_parser.parts.len();
-
    let mut txt_raw = None;

    context.sql.prepare(
@@ -646,6 +644,17 @@ unsafe fn add_parts(
                        .set_int(Param::Cmd, mime_parser.is_system_message as i32);
                }

+                /*
+                info!(
+                    context,
+                    "received mime message {:?}",
+                    String::from_utf8_lossy(std::slice::from_raw_parts(
+                        imf_raw_not_terminated as *const u8,
+                        imf_raw_bytes,
+                    ))
+                );
+                */
+
                stmt.execute(params![
                    rfc724_mid,
                    server_folder.as_ref(),
@@ -841,16 +850,13 @@ fn save_locations(
    insert_msg_id: MsgId,
    hidden: i32,
 ) {
-    if chat_id <= DC_CHAT_ID_LAST_SPECIAL {
-        return ();
-    }
    let mut location_id_written = false;
    let mut send_event = false;

-    if mime_parser.message_kml.is_some() {
+    if !mime_parser.message_kml.is_none() && chat_id > DC_CHAT_ID_LAST_SPECIAL as libc::c_uint {
        let locations = &mime_parser.message_kml.as_ref().unwrap().locations;
        let newest_location_id =
-            location::save(context, chat_id, from_id, locations, true).unwrap_or_default();
+            location::save(context, chat_id, from_id, locations, 1).unwrap_or_default();
        if 0 != newest_location_id && 0 == hidden {
            if location::set_msg_location_id(context, insert_msg_id, newest_location_id).is_ok() {
                location_id_written = true;
@@ -859,14 +865,15 @@ fn save_locations(
        }
    }

-    if mime_parser.location_kml.is_some() {
+    if !mime_parser.location_kml.is_none() && chat_id > DC_CHAT_ID_LAST_SPECIAL as libc::c_uint {
        if let Some(ref addr) = mime_parser.location_kml.as_ref().unwrap().addr {
            if let Ok(contact) = Contact::get_by_id(context, from_id) {
-                if contact.get_addr().to_lowercase() == addr.to_lowercase() {
+                if !contact.get_addr().is_empty()
+                    && contact.get_addr().to_lowercase() == addr.to_lowercase()
+                {
                    let locations = &mime_parser.location_kml.as_ref().unwrap().locations;
                    let newest_location_id =
-                        location::save(context, chat_id, from_id, locations, false)
-                            .unwrap_or_default();
+                        location::save(context, chat_id, from_id, locations, 0).unwrap_or_default();
                    if newest_location_id != 0 && hidden == 0 && !location_id_written {
                        if let Err(err) = location::set_msg_location_id(
                            context,
@@ -1352,8 +1359,8 @@ unsafe fn create_or_lookup_adhoc_group(
    if !member_ids.contains(&from_id) {
        member_ids.push(from_id);
    }
-    if !member_ids.contains(&DC_CONTACT_ID_SELF) {
-        member_ids.push(DC_CONTACT_ID_SELF);
+    if !member_ids.contains(&1) {
+        member_ids.push(1);
    }
    if member_ids.len() < 3 {
        // too few contacts given
@@ -1473,7 +1480,7 @@ fn create_adhoc_grp_id(context: &Context, member_ids: &[u32]) -> String {
        .sql
        .query_map(
            format!(
-                "SELECT addr FROM contacts WHERE id IN({}) AND id!=1", // 1=DC_CONTACT_ID_SELF
+                "SELECT addr FROM contacts WHERE id IN({}) AND id!=1",
                member_ids_str
            ),
            params![],
@@ -1527,7 +1534,7 @@ fn search_chat_ids_by_contact_ids(
                       WHERE cc.chat_id IN(SELECT chat_id FROM chats_contacts WHERE contact_id IN({})) \
                         AND c.type=120 \
                         AND cc.contact_id!=1 \
-                       ORDER BY cc.chat_id, cc.contact_id;", // 1=DC_CONTACT_ID_SELF
+                       ORDER BY cc.chat_id, cc.contact_id;",
                    contact_ids_str
                ),
                params![],
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -249,10 +249,12 @@ pub(crate) fn dc_create_incoming_rfc724_mid(
    contact_id_from: u32,
    contact_ids_to: &[u32],
 ) -> Option<String> {
-    /* create a deterministic rfc724_mid from input such that
-    repeatedly calling it with the same input results in the same Message-id */
-
+    if contact_ids_to.is_empty() {
+        return None;
+    }
+    /* find out the largest receiver ID (we could also take the smallest, but it should be unique) */
    let largest_id_to = contact_ids_to.iter().max().copied().unwrap_or_default();
+
    let result = format!(
        "{}-{}-{}@stub",
        message_timestamp, contact_id_from, largest_id_to
@@ -427,55 +429,21 @@ pub(crate) fn dc_delete_file(context: &Context, path: impl AsRef<std::path::Path

 pub(crate) fn dc_copy_file(
    context: &Context,
-    src_path: impl AsRef<std::path::Path>,
-    dest_path: impl AsRef<std::path::Path>,
+    src: impl AsRef<std::path::Path>,
+    dest: impl AsRef<std::path::Path>,
 ) -> bool {
-    let src_abs = dc_get_abs_path(context, &src_path);
-    let mut src_file = match fs::File::open(&src_abs) {
-        Ok(file) => file,
-        Err(err) => {
-            warn!(
-                context,
-                "failed to open for read '{}': {}",
-                src_abs.display(),
-                err
-            );
-            return false;
-        }
-    };
-
-    let dest_abs = dc_get_abs_path(context, &dest_path);
-    let mut dest_file = match fs::OpenOptions::new()
-        .create_new(true)
-        .write(true)
-        .open(&dest_abs)
-    {
-        Ok(file) => file,
-        Err(err) => {
-            warn!(
-                context,
-                "failed to open for write '{}': {}",
-                dest_abs.display(),
-                err
-            );
-            return false;
-        }
-    };
-
-    match std::io::copy(&mut src_file, &mut dest_file) {
+    let src_abs = dc_get_abs_path(context, &src);
+    let dest_abs = dc_get_abs_path(context, &dest);
+    match fs::copy(&src_abs, &dest_abs) {
        Ok(_) => true,
        Err(err) => {
            error!(
                context,
                "Cannot copy \"{}\" to \"{}\": {}",
-                src_abs.display(),
-                dest_abs.display(),
+                src.as_ref().display(),
+                dest.as_ref().display(),
                err
            );
-            {
-                // Attempt to remove the failed file, swallow errors resulting from that.
-                fs::remove_file(dest_abs).ok();
-            }
            false
        }
    }
@@ -1264,8 +1232,6 @@ mod tests {
    fn test_dc_create_incoming_rfc724_mid() {
        let res = dc_create_incoming_rfc724_mid(123, 45, &vec![6, 7]);
        assert_eq!(res, Some("123-45-7@stub".into()));
-        let res = dc_create_incoming_rfc724_mid(123, 45, &vec![]);
-        assert_eq!(res, Some("123-45-0@stub".into()));
    }

    #[test]
@@ -1317,9 +1283,6 @@ mod tests {

        assert!(dc_copy_file(context, "$BLOBDIR/foobar", "$BLOBDIR/dada",));

-        // attempting to copy a second time should fail
-        assert!(!dc_copy_file(context, "$BLOBDIR/foobar", "$BLOBDIR/dada",));
-
        assert_eq!(dc_get_filebytes(context, "$BLOBDIR/dada",), 7);

        let buf = dc_read_file(context, "$BLOBDIR/dada").unwrap();
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -502,8 +502,8 @@ impl Imap {
        }

        info!(context, "IMAP unsetup_handle step 3 (clearing config).");
-        // self.config.write().unwrap().selected_folder = None;
-        // self.config.write().unwrap().selected_mailbox = None;
+        self.config.write().unwrap().selected_folder = None;
+        self.config.write().unwrap().selected_mailbox = None;
        info!(context, "IMAP unsetup_handle step 4 (disconnected).",);
    }

--- a/src/imex.rs
+++ b/src/imex.rs
@@ -1,5 +1,5 @@
 use core::cmp::{max, min};
-use std::path::Path;
+use std::path::{Path, PathBuf};

 use num_traits::FromPrimitive;
 use rand::{thread_rng, Rng};
@@ -75,7 +75,7 @@ pub fn imex(context: &Context, what: ImexMode, param1: Option<impl AsRef<Path>>)
    job_add(context, Action::ImexImap, 0, param, 0);
 }

-/// Returns the filename of the backup found (otherwise an error)
+/// Returns the filename of the backup if found, nullptr otherwise.
 pub fn has_backup(context: &Context, dir_name: impl AsRef<Path>) -> Result<String> {
    let dir_name = dir_name.as_ref();
    let dir_iter = std::fs::read_dir(dir_name)?;
@@ -90,15 +90,13 @@ pub fn has_backup(context: &Context, dir_name: impl AsRef<Path>) -> Result<Strin
                if name.starts_with("delta-chat") && name.ends_with(".bak") {
                    let sql = Sql::new();
                    if sql.open(context, &path, true) {
-                        let curr_backup_time = sql
-                            .get_raw_config_int(context, "backup_time")
-                            .unwrap_or_default();
+                        let curr_backup_time =
+                            sql.get_raw_config_int(context, "backup_time")
+                                .unwrap_or_default() as u64;
                        if curr_backup_time > newest_backup_time {
                            newest_backup_path = Some(path);
                            newest_backup_time = curr_backup_time;
                        }
-                        info!(context, "backup_time of {} is {}", name, curr_backup_time);
-                        sql.close(&context);
                    }
                }
            }
@@ -107,7 +105,7 @@ pub fn has_backup(context: &Context, dir_name: impl AsRef<Path>) -> Result<Strin
    }
    match newest_backup_path {
        Some(path) => Ok(path.to_string_lossy().into_owned()),
-        None => bail!("no backup found in {}", dir_name.display()),
+        None => bail!("no backup found"),
    }
 }

@@ -485,13 +483,10 @@ fn export_backup(context: &Context, dir: impl AsRef<Path>) -> Result<()> {
    // let dest_path_filename = dc_get_next_backup_file(context, dir, res);
    let now = time();
    let dest_path_filename = dc_get_next_backup_path(dir, now)?;
-    let dest_path_string = dest_path_filename.to_string_lossy().to_string();

    sql::housekeeping(context);

    sql::try_execute(context, &context.sql, "VACUUM;").ok();
-
-    // we close the database during the copy of the dbfile
    context.sql.close(context);
    info!(
        context,
@@ -501,40 +496,38 @@ fn export_backup(context: &Context, dir: impl AsRef<Path>) -> Result<()> {
    );
    let copied = dc_copy_file(context, context.get_dbfile(), &dest_path_filename);
    context.sql.open(&context, &context.get_dbfile(), false);
-
    if !copied {
+        let s = dest_path_filename.to_string_lossy().to_string();
        bail!(
            "could not copy file from '{}' to '{}'",
            context.get_dbfile().display(),
-            dest_path_string
+            s
        );
    }
-    let dest_sql = Sql::new();
-    ensure!(
-        dest_sql.open(context, &dest_path_filename, false),
-        "could not open exported database {}",
-        dest_path_string
-    );
-    let res = match add_files_to_export(context, &dest_sql) {
+    match add_files_to_export(context, &dest_path_filename) {
        Err(err) => {
            dc_delete_file(context, &dest_path_filename);
            error!(context, "backup failed: {}", err);
            Err(err)
        }
        Ok(()) => {
-            dest_sql.set_raw_config_int(context, "backup_time", now as i32)?;
+            context
+                .sql
+                .set_raw_config_int(context, "backup_time", now as i32)?;
            context.call_cb(Event::ImexFileWritten(dest_path_filename.clone()));
            Ok(())
        }
-    };
-    dest_sql.close(context);
-
-    res
+    }
 }

-fn add_files_to_export(context: &Context, sql: &Sql) -> Result<()> {
+fn add_files_to_export(context: &Context, dest_path_filename: &PathBuf) -> Result<()> {
    // add all files as blobs to the database copy (this does not require
    // the source to be locked, neigher the destination as it is used only here)
+    let sql = Sql::new();
+    ensure!(
+        sql.open(context, &dest_path_filename, false),
+        "could not open db"
+    );
    if !sql.table_exists("backup_blobs") {
        sql::execute(
            context,
--- a/src/job.rs
+++ b/src/job.rs
@@ -135,7 +135,8 @@ impl Job {
        if !context.smtp.lock().unwrap().is_connected() {
            let loginparam = LoginParam::from_database(context, "configured_");
            let connected = context.smtp.lock().unwrap().connect(context, &loginparam);
-            if connected.is_err() {
+
+            if !connected {
                self.try_again_later(3, None);
                return;
            }
@@ -172,10 +173,10 @@ impl Job {
                    // its ok/error response processing. Note that if a message
                    // was sent we need to mark it in the database ASAP as we
                    // otherwise might send it twice.
-                    let mut smtp = context.smtp.lock().unwrap();
-                    match smtp.send(context, recipients_list, body, self.job_id) {
+                    let mut sock = context.smtp.lock().unwrap();
+                    match sock.send(context, recipients_list, body) {
                        Err(err) => {
-                            smtp.disconnect();
+                            sock.disconnect();
                            warn!(context, "smtp failed: {}", err);
                            self.try_again_later(-1, Some(err.to_string()));
                        }
@@ -402,7 +403,7 @@ pub fn perform_imap_fetch(context: &Context) {
    info!(
        context,
        "INBOX-fetch done in {:.4} ms.",
-        start.elapsed().as_nanos() as f64 / 1_000_000.0,
+        start.elapsed().as_nanos() as f64 / 1000.0,
    );
 }

@@ -1022,9 +1023,8 @@ pub fn interrupt_smtp_idle(context: &Context) {
 }

 pub fn interrupt_imap_idle(context: &Context) {
-    info!(context, "Interrupting INBOX-IDLE...",);
+    info!(context, "Interrupting IMAP-IDLE...",);

    *context.perform_inbox_jobs_needed.write().unwrap() = true;
-
    context.inbox.read().unwrap().interrupt_idle();
 }
--- a/src/job_thread.rs
+++ b/src/job_thread.rs
@@ -15,7 +15,7 @@ pub struct JobThread {
 #[derive(Clone, Debug, Default)]
 pub struct JobState {
    idle: bool,
-    jobs_needed: bool,
+    jobs_needed: i32,
    suspended: bool,
    using_handle: bool,
 }
@@ -58,7 +58,7 @@ impl JobThread {

    pub fn interrupt_idle(&self, context: &Context) {
        {
-            self.state.0.lock().unwrap().jobs_needed = true;
+            self.state.0.lock().unwrap().jobs_needed = 1;
        }

        info!(context, "Interrupting {}-IDLE...", self.name);
@@ -139,13 +139,13 @@ impl JobThread {
            let &(ref lock, ref cvar) = &*self.state.clone();
            let mut state = lock.lock().unwrap();

-            if state.jobs_needed {
+            if 0 != state.jobs_needed {
                info!(
                    context,
                    "{}-IDLE will not be started as it was interrupted while not ideling.",
                    self.name,
                );
-                state.jobs_needed = false;
+                state.jobs_needed = 0;
                return;
            }

--- a/src/location.rs
+++ b/src/location.rs
@@ -62,11 +62,14 @@ impl Kml {
        Default::default()
    }

-    pub fn parse(context: &Context, content: &[u8]) -> Result<Self, Error> {
-        ensure!(content.len() <= 1024 * 1024, "kml-file is too large");
+    pub fn parse(context: &Context, content: impl AsRef<str>) -> Result<Self, Error> {
+        ensure!(
+            content.as_ref().len() <= (1024 * 1024),
+            "A kml-files with {} bytes is larger than reasonably expected.",
+            content.as_ref().len()
+        );

-        let to_parse = String::from_utf8_lossy(content);
-        let mut reader = quick_xml::Reader::from_str(&to_parse);
+        let mut reader = quick_xml::Reader::from_str(content.as_ref());
        reader.trim_text(true);

        let mut kml = Kml::new();
@@ -219,7 +222,7 @@ pub fn send_locations_to_chat(context: &Context, chat_id: u32, seconds: i64) {
            } else if 0 == seconds && is_sending_locations_before {
                let stock_str =
                    context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
-                chat::add_info_msg(context, chat_id, stock_str);
+                chat::add_device_msg(context, chat_id, stock_str);
            }
            context.call_cb(Event::ChatModified(chat_id));
            if 0 != seconds {
@@ -275,7 +278,7 @@ pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> b
                        accuracy,
                        time(),
                        chat_id,
-                        DC_CONTACT_ID_SELF,
+                        1,
                    ]
            ) {
                warn!(context, "failed to store location {:?}", err);
@@ -366,6 +369,9 @@ pub fn delete_all(context: &Context) -> Result<(), Error> {
 }

 pub fn get_kml(context: &Context, chat_id: u32) -> Result<(String, u32), Error> {
+    let now = time();
+    let mut location_count = 0;
+    let mut ret = String::new();
    let mut last_added_location_id = 0;

    let self_addr = context
@@ -382,17 +388,14 @@ pub fn get_kml(context: &Context, chat_id: u32) -> Result<(String, u32), Error>
            Ok((send_begin, send_until, last_sent))
        })?;

-    let now = time();
-    let mut location_count = 0;
-    let mut ret = String::new();
-    if locations_send_begin != 0 && now <= locations_send_until {
+    if !(locations_send_begin == 0 || now > locations_send_until) {
        ret += &format!(
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
            self_addr,
        );

        context.sql.query_map(
-            "SELECT id, latitude, longitude, accuracy, timestamp \
+            "SELECT id, latitude, longitude, accuracy, timestamp\
             FROM locations  WHERE from_id=? \
             AND timestamp>=? \
             AND (timestamp>=? OR timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
@@ -413,7 +416,7 @@ pub fn get_kml(context: &Context, chat_id: u32) -> Result<(String, u32), Error>
                for row in rows {
                    let (location_id, latitude, longitude, accuracy, timestamp) = row?;
                    ret += &format!(
-                        "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n",
+                        "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n\x00",
                        timestamp,
                        accuracy,
                        longitude,
@@ -425,10 +428,10 @@ pub fn get_kml(context: &Context, chat_id: u32) -> Result<(String, u32), Error>
                Ok(())
            }
        )?;
-        ret += "</Document>\n</kml>";
    }

    ensure!(location_count > 0, "No locations processed");
+    ret += "</Document>\n</kml>";

    Ok((ret, last_added_location_id))
 }
@@ -492,7 +495,7 @@ pub fn save(
    chat_id: u32,
    contact_id: u32,
    locations: &[Location],
-    independent: bool,
+    independent: i32,
 ) -> Result<u32, Error> {
    ensure!(chat_id > DC_CHAT_ID_LAST_SPECIAL, "Invalid chat id");
    context.sql.prepare2(
@@ -507,7 +510,7 @@ pub fn save(
            for location in locations {
                let exists = stmt_test.exists(params![location.timestamp, contact_id as i32])?;

-                if independent || !exists {
+                if 0 != independent || !exists {
                    stmt_insert.execute(params![
                        location.timestamp,
                        contact_id as i32,
@@ -651,7 +654,7 @@ pub fn job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context: &Context, job: &mut Job) {
                    params![chat_id as i32],
                ).is_ok() {
                    let stock_str = context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
-                    chat::add_info_msg(context, chat_id, stock_str);
+                    chat::add_device_msg(context, chat_id, stock_str);
                    context.call_cb(Event::ChatModified(chat_id));
                }
            }
@@ -669,9 +672,9 @@ mod tests {
        let context = dummy_context();

        let xml =
-            b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>";
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>";

-        let kml = Kml::parse(&context.ctx, xml).expect("parsing failed");
+        let kml = Kml::parse(&context.ctx, &xml).expect("parsing failed");

        assert!(kml.addr.is_some());
        assert_eq!(kml.addr.as_ref().unwrap(), "user@example.org",);
--- a/src/message.rs
+++ b/src/message.rs
@@ -476,8 +476,8 @@ impl Message {

    pub fn is_info(&self) -> bool {
        let cmd = self.param.get_cmd();
-        self.from_id == DC_CONTACT_ID_INFO as libc::c_uint
-            || self.to_id == DC_CONTACT_ID_INFO as libc::c_uint
+        self.from_id == DC_CONTACT_ID_DEVICE as libc::c_uint
+            || self.to_id == DC_CONTACT_ID_DEVICE as libc::c_uint
            || cmd != SystemMessage::Unknown && cmd != SystemMessage::AutocryptSetupMessage
    }

@@ -714,7 +714,7 @@ pub fn get_msg_info(context: &Context, msg_id: MsgId) -> String {
        ret += "\n";
    }

-    if msg.from_id == DC_CONTACT_ID_INFO || msg.to_id == DC_CONTACT_ID_INFO {
+    if msg.from_id == 2 || msg.to_id == 2 {
        // device-internal message, no further details needed
        return ret;
    }
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -484,7 +484,6 @@ impl<'a> MimeFactory<'a> {
                if !meta_part.is_null() {
                    mailmime_smart_add_part(message, meta_part);
                }
-
                if self.msg.param.exists(Param::SetLatitude) {
                    let param = &self.msg.param;
                    let kml_file = location::get_message_kml(
@@ -501,21 +500,18 @@ impl<'a> MimeFactory<'a> {
                }

                if location::is_sending_locations_to_chat(context, self.msg.chat_id) {
-                    match location::get_kml(context, self.msg.chat_id) {
-                        Ok((kml_content, last_added_location_id)) => {
-                            wrapmime::add_filename_part(
-                                message,
-                                "location.kml",
-                                "application/vnd.google-earth.kml+xml",
-                                &kml_content,
-                            )?;
-                            if !self.msg.param.exists(Param::SetLatitude) {
-                                // otherwise, the independent location is already filed
-                                self.out_last_added_location_id = last_added_location_id;
-                            }
-                        }
-                        Err(err) => {
-                            warn!(context, "mimefactory: could not get location: {}", err);
+                    if let Ok((kml_file, last_added_location_id)) =
+                        location::get_kml(context, self.msg.chat_id)
+                    {
+                        wrapmime::add_filename_part(
+                            message,
+                            "location.kml",
+                            "application/vnd.google-earth.kml+xml",
+                            &kml_file,
+                        )?;
+                        if !self.msg.param.exists(Param::SetLatitude) {
+                            // otherwise, the independent location is already filed
+                            self.out_last_added_location_id = last_added_location_id;
                        }
                    }
                }
--- a/src/param.rs
+++ b/src/param.rs
@@ -76,8 +76,6 @@ pub enum Param {
    ProfileImage = b'i',
    // For Chats
    Selftalk = b'K',
-    // For Chats
-    Devicetalk = b'D',
    // For QR
    Auth = b's',
    // For QR
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -150,7 +150,7 @@ fn decode_openpgp(context: &Context, qr: &str) -> Lot {
            let (id, _) = chat::create_or_lookup_by_contact_id(context, lot.id, Blocked::Deaddrop)
                .unwrap_or_default();

-            chat::add_info_msg(
+            chat::add_device_msg(
                context,
                id,
                format!("{} verified.", peerstate.addr.unwrap_or_default()),
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -638,7 +638,7 @@ fn secure_connection_established(context: &Context, contact_chat_id: u32) {
        "?"
    };
    let msg = context.stock_string_repl_str(StockMessage::ContactVerified, addr);
-    chat::add_info_msg(context, contact_chat_id, msg);
+    chat::add_device_msg(context, contact_chat_id, msg);
    emit_event!(context, Event::ChatModified(contact_chat_id));
 }

@@ -654,7 +654,7 @@ fn could_not_establish_secure_connection(context: &Context, contact_chat_id: u32
        },
    );

-    chat::add_info_msg(context, contact_chat_id, &msg);
+    chat::add_device_msg(context, contact_chat_id, &msg);
    error!(context, "{} ({})", &msg, details);
 }

@@ -735,7 +735,7 @@ pub fn handle_degrade_event(context: &Context, peerstate: &Peerstate) -> Result<
            };
            let msg = context.stock_string_repl_str(StockMessage::ContactSetupChanged, peeraddr);

-            chat::add_info_msg(context, contact_chat_id, msg);
+            chat::add_device_msg(context, contact_chat_id, msg);
            emit_event!(context, Event::ChatModified(contact_chat_id));
        }
    }
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -44,24 +44,27 @@ impl Smtp {
    }

    /// Connect using the provided login params
-    pub fn connect(&mut self, context: &Context, lp: &LoginParam) -> Result<(), Error> {
+    pub fn connect(&mut self, context: &Context, lp: &LoginParam) -> bool {
        if self.is_connected() {
            warn!(context, "SMTP already connected.");
-            return Ok(());
+            return true;
        }

        if lp.send_server.is_empty() || lp.send_port == 0 {
            context.call_cb(Event::ErrorNetwork("SMTP bad parameters.".into()));
-            bail!("SMTP Bad parameters");
        }

-        self.from = match EmailAddress::new(lp.addr.clone()) {
-            Ok(addr) => Some(addr),
-            Err(err) => {
-                bail!("invalid login address {}: {}", lp.addr, err);
-            }
+        self.from = if let Ok(addr) = EmailAddress::new(lp.addr.clone()) {
+            Some(addr)
+        } else {
+            None
        };

+        if self.from.is_none() {
+            // TODO: print error
+            return false;
+        }
+
        let domain = &lp.send_server;
        let port = lp.send_port as u16;

@@ -73,12 +76,11 @@ impl Smtp {
            let addr = &lp.addr;
            let send_pw = &lp.send_pw;
            let access_token = dc_get_oauth2_access_token(context, addr, send_pw, false);
-            ensure!(
-                access_token.is_some(),
-                "could not get oaut2_access token addr={}",
-                addr
-            );
+            if access_token.is_none() {
+                return false;
+            }
            let user = &lp.send_user;
+
            (
                lettre::smtp::authentication::Credentials::new(
                    user.to_string(),
@@ -123,27 +125,27 @@ impl Smtp {
                            "SMTP-LOGIN as {} ok",
                            lp.send_user,
                        )));
-                        return Ok(());
+                        return true;
                    }
                    Err(err) => {
-                        bail!("SMTP: failed to connect {:?}", err);
+                        warn!(context, "SMTP: failed to connect {:?}", err);
                    }
                }
            }
            Err(err) => {
-                bail!("SMTP: failed to setup connection {:?}", err);
+                warn!(context, "SMTP: failed to setup connection {:?}", err);
            }
        }
+        false
    }

    /// SMTP-Send a prepared mail to recipients.
-    /// on successful send out Ok() is returned.
+    /// returns boolean whether send was successful.
    pub fn send<'a>(
        &mut self,
        context: &Context,
        recipients: Vec<EmailAddress>,
        message: Vec<u8>,
-        job_id: u32,
    ) -> Result<(), Error> {
        let message_len = message.len();

@@ -154,15 +156,12 @@ impl Smtp {
            .join(",");

        if let Some(ref mut transport) = self.transport {
-            let envelope = match Envelope::new(self.from.clone(), recipients) {
-                Ok(env) => env,
-                Err(err) => {
-                    bail!("{}", err);
-                }
-            };
+            let envelope = Envelope::new(self.from.clone(), recipients);
+            ensure!(envelope.is_ok(), "internal smtp-message construction fail");
+            let envelope = envelope.unwrap();
            let mail = SendableEmail::new(
                envelope,
-                format!("{}", job_id), // only used for internal logging
+                "mail-id".into(), // TODO: random id
                message,
            );

--- a/src/sql.rs
+++ b/src/sql.rs
@@ -92,7 +92,8 @@ impl Sql {
        self.start_stmt(sql.to_string());
        self.with_conn(|conn| {
            let stmt = conn.prepare(sql)?;
-            g(stmt, conn)
+            let res = g(stmt, conn)?;
+            Ok(res)
        })
    }

@@ -105,7 +106,8 @@ impl Sql {
            let stmt1 = conn.prepare(sql1)?;
            let stmt2 = conn.prepare(sql2)?;

-            g(stmt1, stmt2, conn)
+            let res = g(stmt1, stmt2, conn)?;
+            Ok(res)
        })
    }

@@ -383,8 +385,8 @@ fn open(
            )?;
            sql.execute(
                "INSERT INTO contacts (id,name,origin) VALUES \
-                 (1,'self',262144), (2,'info',262144), (3,'rsvd',262144), \
-                 (4,'rsvd',262144), (5,'device',262144), (6,'rsvd',262144), \
+                 (1,'self',262144), (2,'device',262144), (3,'rsvd',262144), \
+                 (4,'rsvd',262144), (5,'rsvd',262144), (6,'rsvd',262144), \
                 (7,'rsvd',262144), (8,'rsvd',262144), (9,'rsvd',262144);",
                params![],
            )?;
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -110,8 +110,6 @@ pub enum StockMessage {
    Location = 66,
    #[strum(props(fallback = "Sticker"))]
    Sticker = 67,
-    #[strum(props(fallback = "Device Messages"))]
-    DeviceMessages = 68,
 }

 impl StockMessage {