diff --git a/enzevalos_iphone/CNMailAddressesExtension.swift b/enzevalos_iphone/CNMailAddressesExtension.swift
index 7666d0af53166bb193429c3886dcc97b5f6895fd..cf4de43c21bbd0bf3af6b8ee19a854b3d47b2a91 100644
--- a/enzevalos_iphone/CNMailAddressesExtension.swift
+++ b/enzevalos_iphone/CNMailAddressesExtension.swift
@@ -22,6 +22,15 @@ import Foundation
 import Contacts
 
 open class CNMailAddressExtension: MailAddress {
+    public var isUser: Bool {
+        get {
+            if let userAdr = UserManager.loadUserValue(.userAddr) as? String {
+                return self.mailAddress.lowercased() == userAdr.lowercased()
+            }
+            return false
+        }
+    }
+    
     public var primaryKey: PersistentKey?
 
     public var publicKeys: Set<PersistentKey>
diff --git a/enzevalos_iphone/DataHandler.swift b/enzevalos_iphone/DataHandler.swift
index 616d2a93aba869a2cafbd98e816ba400c38ad66c..3394c4a57537e4e608075f0c2d996c104b7830b8 100644
--- a/enzevalos_iphone/DataHandler.swift
+++ b/enzevalos_iphone/DataHandler.swift
@@ -277,7 +277,7 @@ class DataHandler {
             sk.importedDate = Date()
             UserManager.storeUserValue(keyID as AnyObject, attribute: Attribute.prefSecretKeyID)
             let adr = UserManager.loadUserValue(Attribute.userAddr) as! String
-            let name = UserManager.loadUserValue(Attribute.accountname) as? String ?? adr
+            let name = adr // TODO Change here displayname
             _ = getContact(name: name, address: adr, key: keyID, prefer_enc: true)
             if addPk {
                 _ = newPublicKey(keyID: keyID, cryptoType: CryptoScheme.PGP, adr: adr, autocrypt: false)
diff --git a/enzevalos_iphone/InboxViewController.swift b/enzevalos_iphone/InboxViewController.swift
index d9c742f12c5b28beff88f66f2de97c8d2135c81d..f61db19679977b70277e0f1c103d918eecc9e1d4 100644
--- a/enzevalos_iphone/InboxViewController.swift
+++ b/enzevalos_iphone/InboxViewController.swift
@@ -206,9 +206,7 @@ class InboxViewController: UITableViewController, InboxCellDelegator {
                 if let DestinationViewController = DestinationNavigationController.topViewController as? ContactViewController {
                     DestinationViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(dismissView)) 
                     let records = folder.records.filter({
-                        $0.addresses.contains(where: {
-                            $0.mailAddress == UserManager.loadUserValue(.userAddr) as? String ?? ""
-                        })
+                        $0.isUser
                     })
                     if let record = records.filter({ $0.isSecure }).first {
                         DestinationViewController.keyRecord = record
diff --git a/enzevalos_iphone/Logger.swift b/enzevalos_iphone/Logger.swift
index 95028fbd3c9e533c2bf06d01a6c88946b94efec1..b02b074a4154ae50d0bc759f5c32f7c2aacdb60c 100644
--- a/enzevalos_iphone/Logger.swift
+++ b/enzevalos_iphone/Logger.swift
@@ -806,8 +806,8 @@ class Logger {
     }
 
     static func resolve(mail_address: Mail_Address) -> String {
-        if mail_address.mailAddress == UserManager.loadUserValue(.userAddr) as? String ?? "" {
-            return "self"//mail_address.mailAddress
+        if mail_address.isUser {
+            return "self"
         }
         return mail_address.pseudonym
     }
diff --git a/enzevalos_iphone/MailAddress.swift b/enzevalos_iphone/MailAddress.swift
index 45031420c691dc4a0037975c5291764a8f24a375..122dabdf51529af1b7aff4e8cbe70efb61f311aa 100644
--- a/enzevalos_iphone/MailAddress.swift
+++ b/enzevalos_iphone/MailAddress.swift
@@ -92,8 +92,8 @@ public enum EncState {
 public protocol MailAddress {
     var mailAddress: String { get }
     var label: CNLabeledValue<NSString> { get } //FIXME: ist der NSString hier wirklich richtig? (http://stackoverflow.com/questions/39648830/how-to-add-new-email-to-cnmutablecontact-in-swift-3)
-    // var prefEnc: EncState{get set}
     var hasKey: Bool { get }
+    var isUser: Bool {get }
 
     var primaryKey: PersistentKey? { get }
     var publicKeys: Set<PersistentKey> { get }
diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 5c42d5c89ffdc1b99f1467e89135e1c3332e7b6e..282726259db5f8d7758b8bae0350216e351f08e0 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -69,20 +69,6 @@ class MailHandler {
         }
         return nil
     }
-    
-    
-    
-    var username: String? {
-        get {
-            if let name = UserManager.loadUserValue(Attribute.accountname) as? String {
-                return name
-            }
-            else if let adr = UserManager.loadUserValue(Attribute.userAddr) as? String {
-                return adr
-            }
-            return nil
-        }
-    }
 
     var shouldTryRefreshOAUTH: Bool {
         if let imapAuthType = UserManager.loadUserValue(.imapConnectionType) as? Int,
diff --git a/enzevalos_iphone/Mail_Address+CoreDataClass.swift b/enzevalos_iphone/Mail_Address+CoreDataClass.swift
index cc41f4e1b8ab0575729ba7a905c0849aa13a7bef..5719f7980a9bd8e62df01bb25968d6f72eb1d22d 100644
--- a/enzevalos_iphone/Mail_Address+CoreDataClass.swift
+++ b/enzevalos_iphone/Mail_Address+CoreDataClass.swift
@@ -76,7 +76,7 @@ open class Mail_Address: NSManagedObject, MailAddress {
         return false
     }
     
-    var isUser: Bool {
+    public var isUser: Bool {
         get {
             if let userAddr = UserManager.loadUserValue(Attribute.userAddr) as? String {
                 return self.address.lowercased() == userAddr.lowercased()
diff --git a/enzevalos_iphone/SendViewController.swift b/enzevalos_iphone/SendViewController.swift
index 280dccd904cdfac492d4ce59698fcff9346d22f5..4ea9a1f2f7ae919656f0d23a38a240c7a0bf9220 100644
--- a/enzevalos_iphone/SendViewController.swift
+++ b/enzevalos_iphone/SendViewController.swift
@@ -162,7 +162,7 @@ class SendViewController: UIViewController {
 
         if let prefilledMail = prefilledMail {
             for case let mail as MailAddress in prefilledMail.to {
-                if mail.mailAddress != UserManager.loadUserValue(Attribute.userAddr) as! String {
+                if !mail.isUser{
                     toText.delegate?.tokenField!(toText, didEnterText: mail.mailAddress)
                 }
             }
@@ -170,7 +170,7 @@ class SendViewController: UIViewController {
                 toText.delegate?.tokenField!(toText, didEnterText: mail)
             }
             for case let mail as MailAddress in prefilledMail.cc ?? [] {
-                if mail.mailAddress != UserManager.loadUserValue(Attribute.userAddr) as! String {
+                if !mail.isUser {
                     ccText.delegate?.tokenField!(ccText, didEnterText: mail.mailAddress)
                 }
             }