diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 3344bb615b..db0e11111d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2206,6 +2206,10 @@ public class MessageHelper {
 
         String signer = null;
         for (String header : headers) {
+            String v = getKeyValues(header).get(type);
+            if (v == null)
+                continue;
+
             if (signer == null)
                 signer = getSigner(header);
             else {
@@ -2216,10 +2220,6 @@ public class MessageHelper {
                 }
             }
 
-            String v = getKeyValues(header).get(type);
-            if (v == null)
-                continue;
-
             String[] val = v.split("[^A-za-z]+");
             if (val.length == 0)
                 continue;