diff --git a/enzevalos_iphone/OutgoingMail.swift b/enzevalos_iphone/OutgoingMail.swift
index 55c681cf54603ad66434c9d0db0aebe5b3f87b7d..52904e4394bb752a37498454792a2f42634242e9 100644
--- a/enzevalos_iphone/OutgoingMail.swift
+++ b/enzevalos_iphone/OutgoingMail.swift
@@ -116,11 +116,13 @@ class OutgoingMail {
         self.sendEncryptedIfPossible = sendEncryptedIfPossible
         self.attachments = attachments
         self.orderReceivers()
-        let signature = OutgoingMail.extractPGPSignature(attachment: attachments.first!)
-        guard let SignatureData =  signature.first?.data(using: .utf8) else {
-            return
+        if let attachment = attachments.first {
+            let signature = OutgoingMail.extractPGPSignature(attachment: attachment)
+            if let signatureData =  signature.first?.data(using: .utf8) {
+                self.attachedSignature = signatureData
+            }
         }
-        self.attachedSignature = SignatureData
+        
     }
     
     init(mail: PersistentMail){