diff --git a/enzevalos_iphone/mail/IncomingMail.swift b/enzevalos_iphone/mail/IncomingMail.swift
index bb03240f212e885f153d6b4eda5bd0cf1d65f683..0ebfafeb90b48fe7b56809ca0a65ed1c87aeb188 100644
--- a/enzevalos_iphone/mail/IncomingMail.swift
+++ b/enzevalos_iphone/mail/IncomingMail.swift
@@ -246,7 +246,11 @@ class IncomingMail {
         self.firstParser = MCOMessageParser(data: rawData)
         self.msgParser = firstParser
         self.parseHeader()
-        self.parseBody()
+        if subject == "Autocrypt Setup Message" {
+           body = "Not supported yet. Coming soon."
+        } else {
+            self.parseBody()
+        }
     }
     
     func store(keyRecord: KeyRecord?) -> PersistentMail? {