diff --git a/enzevalos_iphone/ContactViewController.swift b/enzevalos_iphone/ContactViewController.swift
index 9d91184bae1519f5aeb3f5c89267cab742f38d6d..134a09d26ec5693528cabdb69935297a7bcbb6cb 100644
--- a/enzevalos_iphone/ContactViewController.swift
+++ b/enzevalos_iphone/ContactViewController.swift
@@ -208,7 +208,8 @@ class ContactViewController: UIViewController {
                 } else {
                     let indexPath = tableView.indexPathForSelectedRow
                     if indexPath!.row < keyRecord!.ezContact.getMailAddresses().count {
-                        controller.toField = keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress
+                        let prefilledMail = EphemeralMail(to: [keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress], cc: [], bcc: [], date: Date(), subject: nil, body: UserManager.loadUserSignature(), uid: 0, predecessor: nil)
+                        controller.prefilledMail = prefilledMail
                     }
                 }
             }
diff --git a/enzevalos_iphone/SendViewController.swift b/enzevalos_iphone/SendViewController.swift
index a5a82aa024b095247595eadfbb4b8f9d7f313e05..a47b9ce3ae2de6fed8d899dc374778272eba7fcd 100644
--- a/enzevalos_iphone/SendViewController.swift
+++ b/enzevalos_iphone/SendViewController.swift
@@ -52,7 +52,6 @@ class SendViewController: UIViewController {
     var recognizer: UIGestureRecognizer = UIGestureRecognizer.init()
 
     var prefilledMail: EphemeralMail? = nil
-    var toField: String? = nil
     var sendEncryptedIfPossible = true
     var freeTextInviationTitle = StudySettings.freeTextInvitationTitle
     var freeTextInvitationCall: (() -> (String)) = StudySettings.freeTextInvitationCode
@@ -130,10 +129,7 @@ class SendViewController: UIViewController {
             textView.text.append(UserManager.loadUserSignature())
         }
 
-        if let to = toField {
-            let ezCon = DataHandler.handler.getContactByAddress(to)
-            toText.delegate?.tokenField!(toText, didEnterText: ezCon.name, mail: to)
-        } else if let prefilledMail = prefilledMail {
+        if let prefilledMail = prefilledMail {
             for case let mail as MailAddress in prefilledMail.to {
                 if mail.mailAddress != UserManager.loadUserValue(Attribute.userAddr) as! String {
                     toText.delegate?.tokenField!(toText, didEnterText: mail.mailAddress)