diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 3e0c0ad457..126d2d9686 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1278,14 +1278,20 @@ public class MessageHelper {
     String[] getAuthentication() throws MessagingException {
         ensureHeaders();
 
-        String[] headers = imessage.getHeader("Authentication-Results");
-        if (headers == null)
-            return null;
-
-        for (int i = 0; i < headers.length; i++)
-            headers[i] = MimeUtility.unfold(headers[i]);
+        List<String> auths = new ArrayList<>();
+        Enumeration<Header> headers = imessage.getAllHeaders();
+        while (headers.hasMoreElements()) {
+            Header header = headers.nextElement();
+            if ("Received".equals(header.getName()))
+                break;
+            else if ("Authentication-Results".equals(header.getName()))
+                auths.add(MimeUtility.unfold(header.getValue()));
+        }
 
-        return headers;
+        if (auths.size() == 0)
+            return null;
+        else
+            return auths.toArray(new String[0]);
     }
 
     static Boolean getAuthentication(String type, String[] headers) {