From 6b2a4dd91b4c7331ccaa79f1921a54ce5e0bbe64 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 15 Oct 2020 16:40:27 +0200
Subject: [PATCH] =?UTF-8?q?=C4=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/eu/faircode/email/BoundaryCallbackMessages.java | 4 +++-
 app/src/main/java/eu/faircode/email/Core.java                 | 4 +++-
 2 files 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 0645ed0b97..ccb439d23c 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -697,7 +697,9 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 String search = query;
 
                 if (!utf8) {
-                    search = search.replace("ß", "ss"); // Eszett
+                    search = search
+                            .replace("ß", "ss") // Eszett
+                            .replace("ij", "ij");
                     search = Normalizer
                             .normalize(search, Normalizer.Form.NFKD)
                             .replaceAll("[^\\p{ASCII}]", "");
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 22b0561cbc..09254cf9f7 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3978,7 +3978,9 @@ class Core {
                 if (sb.length() > 0) {
                     String ascii = Normalizer
                             .normalize(sb.toString(), Normalizer.Form.NFKD)
-                            .replaceAll("\\p{InCombiningDiacriticalMarks}+", "");
+                            .replaceAll("\\p{InCombiningDiacriticalMarks}+", "")
+                            .replace("ß", "ss")
+                            .replace("ij", "ij");
                     mbuilder.setContentText(ascii);
                 }