diff --git a/enzevalos_iphone/About/AboutViewController.swift b/enzevalos_iphone/About/AboutViewController.swift
index 23e1221e8963e63f8b819e93a072d5af0d2b057d..e5437d67fd938c5a699ceee9885a4e3c72e5a457 100644
--- a/enzevalos_iphone/About/AboutViewController.swift
+++ b/enzevalos_iphone/About/AboutViewController.swift
@@ -36,7 +36,7 @@ class AboutViewController: UIViewController {
 
                 let answerTo = sender as? String ?? "" // TODO: Convert String into MailAddress(?)
 
-                let answerMail = EphemeralMail(to: NSSet.init(array: [answerTo]), cc: NSSet.init(array: []), bcc: [], date: Date(), subject: "", body: "", uid: 0, predecessor: nil) // TODO: are these the best values?
+                let answerMail = EphemeralMail(to: [answerTo])
 
                 controller.prefilledMail = answerMail
             }
diff --git a/enzevalos_iphone/ContactViewController.swift b/enzevalos_iphone/ContactViewController.swift
index 134a09d26ec5693528cabdb69935297a7bcbb6cb..1a89d4c1ba3fee2362c74d5b0afc4e0e4ccf9755 100644
--- a/enzevalos_iphone/ContactViewController.swift
+++ b/enzevalos_iphone/ContactViewController.swift
@@ -177,7 +177,7 @@ class ContactViewController: UIViewController {
             tableView.selectRow(at: myPath, animated: false, scrollPosition: .none)
             performSegue(withIdentifier: "otherRecord", sender: nil)
         } else if sender.titleLabel?.text == NSLocalizedString("invite", comment: "invite contact") {
-            let mail = EphemeralMail(to: NSSet.init(array: keyRecord!.addresses), cc: NSSet.init(), bcc: NSSet.init(), date: Date(), subject: NSLocalizedString("inviteSubject", comment: ""), body: String(format: NSLocalizedString("inviteText", comment: ""),StudySettings.studyID), uid: 0, predecessor: nil)
+            let mail = EphemeralMail(to: NSSet.init(array: keyRecord!.addresses), subject: NSLocalizedString("inviteSubject", comment: ""), body: String(format: NSLocalizedString("inviteText", comment: ""),StudySettings.studyID))
             performSegue(withIdentifier: "newMail", sender: mail)
         } else if sender.titleLabel?.text == NSLocalizedString("verifyNow", comment: "Verify now") {
             AppUtility.lockOrientation(.portrait, andRotateTo: .portrait)
@@ -208,7 +208,7 @@ class ContactViewController: UIViewController {
                 } else {
                     let indexPath = tableView.indexPathForSelectedRow
                     if indexPath!.row < keyRecord!.ezContact.getMailAddresses().count {
-                        let prefilledMail = EphemeralMail(to: [keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress], cc: [], bcc: [], date: Date(), subject: nil, body: UserManager.loadUserSignature(), uid: 0, predecessor: nil)
+                        let prefilledMail = EphemeralMail(to: [keyRecord!.ezContact.getMailAddresses()[indexPath!.row].mailAddress])
                         controller.prefilledMail = prefilledMail
                     }
                 }
diff --git a/enzevalos_iphone/EphemeralMail.swift b/enzevalos_iphone/EphemeralMail.swift
index 80378c027e4cf0ceaadd2a9c75194f57bd50dd11..cf309ed698f5432bac6c6f87d4967d11feb22f14 100644
--- a/enzevalos_iphone/EphemeralMail.swift
+++ b/enzevalos_iphone/EphemeralMail.swift
@@ -19,7 +19,7 @@ open class EphemeralMail: Mail {
     public var uid: UInt64
     public var predecessor: PersistentMail?
 
-    public init(to: NSSet, cc: NSSet, bcc: NSSet, date: Date, subject: String?, body: String?, uid: UInt64, predecessor: PersistentMail?) { 
+    public init(to: NSSet = [], cc: NSSet = [], bcc: NSSet = [], date: Date = Date(), subject: String? = nil, body: String? = UserManager.loadUserSignature(), uid: UInt64 = 0, predecessor: PersistentMail? = nil) {
         self.cc = cc
         self.bcc = bcc
         self.to = to
diff --git a/enzevalos_iphone/InviteFriendViewController.swift b/enzevalos_iphone/InviteFriendViewController.swift
index be646adfdac853000a8b412a98a3d45136d6ee70..fe6555035827ca28d6f1bd7862672c07c4723453 100755
--- a/enzevalos_iphone/InviteFriendViewController.swift
+++ b/enzevalos_iphone/InviteFriendViewController.swift
@@ -231,7 +231,7 @@ class InviteFriendViewController: UIViewController, UITableViewDataSource, UITab
             
                 let subject = NSLocalizedString("inviteSubject", comment: "Subject for the invitation mail")
 
-                let answerMail = EphemeralMail(to: NSSet.init(array: sendTo), cc: [], bcc: [], date: Date(), subject: subject, body: body, uid: 0, predecessor: nil)
+                let answerMail = EphemeralMail(to: NSSet.init(array: sendTo), subject: subject, body: body)
 
                 controller.prefilledMail = answerMail
             }
diff --git a/enzevalos_iphone/ReadViewController.swift b/enzevalos_iphone/ReadViewController.swift
index 341930f549f3c0c524754e8244ef6056ad689685..b40761967f9deb33aaea64b91cf1ea37272f2e6e 100644
--- a/enzevalos_iphone/ReadViewController.swift
+++ b/enzevalos_iphone/ReadViewController.swift
@@ -473,7 +473,7 @@ class ReadViewController: UITableViewController {
             if let controller = navigationController?.topViewController as? SendViewController, let mail = mail {
                 controller.sendViewDelegate = self
                 if isDraft {
-                    let prefillMail = EphemeralMail.init(to: mail.to, cc: mail.cc ?? NSSet.init(), bcc: mail.bcc ?? NSSet.init(), date: Date.init(), subject: mail.subject, body: mail.body, uid: mail.uid, predecessor: mail.predecessor)
+                    let prefillMail = EphemeralMail.init(to: mail.to, cc: mail.cc ?? NSSet.init(), bcc: mail.bcc ?? NSSet.init(), subject: mail.subject, body: mail.body, uid: mail.uid, predecessor: mail.predecessor)
                     controller.prefilledMail = prefillMail
                     return
                 }
diff --git a/enzevalos_iphone/SendViewController.swift b/enzevalos_iphone/SendViewController.swift
index a47b9ce3ae2de6fed8d899dc374778272eba7fcd..558948f517518c831bd46573dd64e7b7b3c1ae86 100644
--- a/enzevalos_iphone/SendViewController.swift
+++ b/enzevalos_iphone/SendViewController.swift
@@ -292,7 +292,7 @@ class SendViewController: UIViewController {
                 }
 
                 let body = String(format: NSLocalizedString("inviteText", comment: "Body for the invitation mail"),StudySettings.studyID)
-                let mail = EphemeralMail(to: NSSet.init(array: to), cc: NSSet.init(array: cc), bcc: NSSet.init(), date: Date(), subject: NSLocalizedString("inviteSubject", comment: "Subject for the invitation mail"), body: body, uid: 0, predecessor: nil)
+                let mail = EphemeralMail(to: NSSet.init(array: to), cc: NSSet.init(array: cc), subject: NSLocalizedString("inviteSubject", comment: "Subject for the invitation mail"), body: body)
 
 
                 controller.prefilledMail = mail