diff --git a/enzevalos_iphone/Logger.swift b/enzevalos_iphone/Logger.swift
index 36b8eb6bc8913281766525d38a0ef3f0d32980e6..03682a6dc6ce05c3b3394c0cadf80390c4f549e4 100644
--- a/enzevalos_iphone/Logger.swift
+++ b/enzevalos_iphone/Logger.swift
@@ -19,7 +19,8 @@ class Logger {
     
     
     static fileprivate func sendCheck() {
-        if nextDeadline <= Date() && AppDelegate.getAppDelegate().currentReachabilityStatus != .notReachable && UserManager.loadUserValue(Attribute.accountname) != nil && UserDefaults.standard.bool(forKey: "launchedBefore"){
+        let deadlineIsNow = nextDeadline <= Date()
+        if  deadlineIsNow && AppDelegate.getAppDelegate().currentReachabilityStatus != .notReachable && UserManager.loadUserValue(Attribute.accountname) != nil && UserDefaults.standard.bool(forKey: "launchedBefore"){
             //Do not send duplicate mails
             let tmpNextDeadline = Date(timeIntervalSinceNow: TimeInterval(loggingInterval))
             nextDeadline = tmpNextDeadline
@@ -316,7 +317,8 @@ class Logger {
     static private func sendLog(logMailAddress: String = logReceiver) {
         let jsonEncoder = JSONEncoder()
         if let data = try? jsonEncoder.encode(Maildata()), let text = String(data: data, encoding: .utf8), text.count > 0 {
-            AppDelegate.getAppDelegate().mailHandler.send([logMailAddress], ccEntrys: [], bccEntrys: [], subject: "[Enzevalos] Log", message: text, callback: sendCallback, loggingMail: true, uiState: .letter)
+            let mail = OutgoingMail.createLoggingMail(addr: logMailAddress, textcontent: text)
+            mail.send()
         }
         LogInUserDefaults.handler.reset()
     }