From 8d9cfba0a450175e8768395327470a247a1e6b83 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 20 Aug 2026 11:23:19 +0200
Subject: [PATCH] Relaxed qmail and nullmailer checks

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 0373ea0a35..5abc922721 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3269,8 +3269,8 @@ public class MessageHelper {
 
         // (qmail nnn invoked by uid nnn); 1 Jan 2022 00:00:00 -0000
         // Postfix: by <host name> (<name>, from userid nnn)
-        if (header.matches(".*\\(qmail \\d+ invoked by uid \\d+\\).*") ||
-                header.matches(".*\\(nullmailer pid \\d+ invoked by uid \\d+\\).*") ||
+        if (header.matches(".*\\(qmail .* invoked .*\\).*") ||
+                header.matches(".*\\(nullmailer .* invoked .*\\).*") ||
                 header.matches(".*\\(.*, from userid \\d+\\).*")) {
             Log.i("--- phrase");
             return true;