diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 560fad63164a6dda15974c264328c3fdcebde102..64023b833fd1fbf8b02bfffc80e166bdd9f1ce10 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -102,54 +102,6 @@ class MailHandler {
     
     func sendTravelBackup(to addr: String, encryptedWith keyID: String, keyPair: String, keyPairKeyID: String, callback: @escaping (Error?) -> Void) {
         //TODO: convert to OutgoingMail
-        
-        
-        /*let useraddr = (UserManager.loadUserValue(Attribute.userAddr) as! String)
-        let session = createSMTPSession()
-        let builder = MCOMessageBuilder()
-        let userID: MCOAddress = MCOAddress(displayName: useraddr, mailbox: useraddr)
-        
-        //do not use autocrypt to be able to parse new key as related to the prevoius one
-        createHeader(builder, toEntrys: [addr], ccEntrys: [], bccEntrys: [], subject: "Travel Message", autocrypt: false) //TODO: rename subject to 'Call for use Key Message' ?
-        
-        builder.addAttachment(MCOAttachment.init(text: "This is a backup mail of your key you used while traveling. The key is attached."))
-        
-        builder.header.setExtraHeaderValue(TravelHandler.backupHeader, forName: TravelHandler.backupHeader)
-        
-        
-        if let keyAttachment = MCOAttachment.init(text: keyPair){
-            builder.addAttachment(keyAttachment)
-        }
-        
-        var filename = keyPairKeyID+".asc.asc" //have a look at MailHandler.sendSecretKey()
-        if let keyAttachment = MCOAttachment.init(contentsOfFile: filename){
-            keyAttachment.mimeType = "application/pgp-keys"
-            keyAttachment.setContentTypeParameterValue("UTF-8", forName: "charset")
-            keyAttachment.setContentTypeParameterValue(filename, forName: "name")
-            keyAttachment.filename = filename
-            keyAttachment.data = keyPair.data(using: .utf8)
-            builder.addAttachment(keyAttachment)
-        }
-        
-        let data = builder.dataForEncryption()
-        let message = String(data: data!, encoding: .utf8)!
-        
-        let pgp = SwiftPGP()
-        
-        //since it is checked in Travel.prepare before there are objects stored, we can safly force unwrap here
-        let adr = DataHandler.handler.findMailAddress(adr: addr)!
-        let cryptoObject = pgp.encrypt(plaintext: message, ids: [keyID], myId: keyPairKeyID, encryptForMyID: false)
-        let mco = MCOAddress(displayName: addr, mailbox: addr)!
-        
-        let sendOperation = session.sendOperation(with: builder.openPGPEncryptedMessageData(withEncryptedData: cryptoObject.chiphertext!), from: userID, recipients: [mco])
-        sendOperation?.start({ error in
-            guard error == nil else {
-                //TODO: errorhandling
-                //self.errorhandling(error: error, originalCall: {self.sendSecretKey(keyID: keyID, key: key, passcode: passcode, callback: callback)}, completionCallback: nil)
-                return
-            }
-            callback(nil)
-        })*/
     }
     
     func sendSMTP(mail: OutgoingMail, callback: ((MailServerConnectionError?) -> Void)?) {
diff --git a/enzevalos_iphone/Onboarding.swift b/enzevalos_iphone/Onboarding.swift
index 0ea21980cf7c8466836c75e064280253fbd6e5dd..8c7769ca0a0494f906d70c3e7db2100ffe8fdcad 100644
--- a/enzevalos_iphone/Onboarding.swift
+++ b/enzevalos_iphone/Onboarding.swift
@@ -27,11 +27,11 @@ class Onboarding: NSObject {
     }
 
     static var textDelegate = TextFieldDelegate.init()
-    static let defaultColor = UIColor.darkGray//UIColor.init(red: 0.6, green: 0.6, blue: 1, alpha: 1)
+    static let defaultColor = UIColor.darkGray
     static let textColor = UIColor.white
     static var mailaddress = UITextField.init()
     static var username = UITextField.init()
-    static var password = HideShowPasswordTextField.init()//UITextField.init()
+    static var password = HideShowPasswordTextField.init()
     static var googleButton = UIBarButtonItem.init()
     static var credentials: UIView? = nil
     static var imapServer = UITextField.init()