diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 66a00f49e6..cd3adc3e84 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2104,7 +2104,8 @@ public class MessageHelper {
                     String arc = ams.get(ams.size());
                     String signer = verifySignatureHeader(context, arc, ARC_MESSAGE_SIGNATURE, amessage);
                     if (signer != null && !signers.contains(signer)) {
-                        boolean whitelisted = whitelist.contains(signer);
+                        boolean whitelisted = (whitelist.contains(signer) ||
+                                "*".equals(native_arc_whitelist));
                         Log.i("ARC signer=" + signer + " whitelisted=" + whitelisted);
                         if (whitelisted)
                             signers.add(signer);