From 7a648035e7cd4247a40e2baf0b8f9713660e3bc6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 20 Aug 2023 09:56:17 +0200
Subject: [PATCH] Liberal word boundary

---
 .../java/eu/faircode/email/BoundaryCallbackMessages.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 516fd2d1ae..2871b7b9c9 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -897,14 +897,18 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         if (word.size() == 0)
             return true;
 
+        // \b is limited to [0-9A-Za-z_]
+        String b = "(^|\\s+)";
+        String a = "($|\\s+)";
+
         StringBuilder sb = new StringBuilder();
-        sb.append(partial ? ".*(" : ".*?\\b(");
+        sb.append(partial ? ".*(" : ".*?" + b + "(");
         for (int i = 0; i < word.size(); i++) {
             if (i > 0)
                 sb.append("\\s+");
             sb.append(Pattern.quote(word.get(i)));
         }
-        sb.append(partial ? ").*" : ")\\b.*?");
+        sb.append(partial ? ").*" : ")" + a + ".*?");
 
         Pattern pat = Pattern.compile(sb.toString(), Pattern.DOTALL);
         return pat.matcher(text).matches();