diff --git a/python/tests/test_account.py b/python/tests/test_account.py
index e2429b2ee..50e88c38c 100644
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -214,14 +214,13 @@ class TestOnlineAccount:
         c2 = ac1.create_contact(email=ac1.get_config("addr"))
         chat = ac1.create_chat_by_contact(c2)
         assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
-        #wait_successful_IMAP_SMTP_connection(ac1)
+        wait_successful_IMAP_SMTP_connection(ac1)
         wait_configuration_progress(ac1, 1000)
 
         msg_out = chat.send_text("message2")
         # wait for other account to receive
         ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
         assert ev[1] == msg_out.id
-        assert 0
 
     def test_two_acocunts_send_receive(self, acfactory):
         ac1 = acfactory.get_online_configuring_account()
diff --git a/src/smtp.rs b/src/smtp.rs
index 0e2a4ac70..db039c801 100644
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -6,7 +6,6 @@ use lettre::*;
 use crate::constants::Event;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_log::*;
 use crate::dc_loginparam::*;
 use crate::dc_tools::*;
 use crate::oauth2::*;
@@ -62,14 +61,10 @@ impl Smtp {
         let lp = unsafe { *lp };
 
         if lp.addr.is_null() || lp.send_server.is_null() || lp.send_port == 0 {
-            unsafe {
-                dc_log_event(
-                    context,
-                    Event::ERROR_NETWORK,
-                    0,
-                    b"SMTP bad parameters.\x00" as *const u8 as *const libc::c_char,
-                );
-            }
+            log_event!(
+                context, Event::ERROR_NETWORK, 0, 
+                "SMTP bad parameters.",
+            );
         }
 
         let raw_addr = unsafe {
@@ -166,21 +161,15 @@ impl Smtp {
 
             match transport.send(mail) {
                 Ok(_) => {
-                    unsafe {
-                        dc_log_event(
-                            context,
-                            Event::SMTP_MESSAGE_SENT,
-                            0,
-                            b"Message was sent to SMTP server\x00" as *const u8
-                                as *const libc::c_char,
-                        );
-                    }
+                    log_event!(
+                        context, Event::SMTP_MESSAGE_SENT, 0, 
+                        "Message was sent to SMTP server",
+                    );
                     self.transport_connected = true;
                     1
                 }
                 Err(err) => {
                     warn!(context, 0, "SMTP failed to send message: {}", err);
-
                     0
                 }
             }