diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 8b1f948df7..5f7eb4b357 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -252,7 +252,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                 if (file.exists()) {
                                     String html = Helper.readText(file);
                                     if (html.toLowerCase(Locale.ROOT).contains(find)) {
-                                        String text = HtmlHelper.getText(html);
+                                        String text = HtmlHelper.getPreviewText(html);
                                         if (text.toLowerCase(Locale.ROOT).contains(find))
                                             match.matched = true;
                                     }
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 1de3612467..92a3978955 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3213,7 +3213,7 @@ class Core {
                 String text = null;
                 try {
                     String html = Helper.readText(message.getFile(context));
-                    text = HtmlHelper.getText(html);
+                    text = HtmlHelper.getPreviewText(html);
                 } catch (Throwable ex) {
                     Log.e(ex);
                     text = message.preview;
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 4475f72d63..e9f46f57b2 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1070,6 +1070,10 @@ public class HtmlHelper {
         return preview;
     }
 
+    static String getPreviewText(String html) {
+        return JsoupEx.parse(html).text();
+    }
+
     static String getText(String html) {
         final StringBuilder sb = new StringBuilder();
 
diff --git a/app/src/main/java/eu/faircode/email/WorkerFts.java b/app/src/main/java/eu/faircode/email/WorkerFts.java
index bfbd3dbf30..5962ad2dec 100644
--- a/app/src/main/java/eu/faircode/email/WorkerFts.java
+++ b/app/src/main/java/eu/faircode/email/WorkerFts.java
@@ -71,7 +71,7 @@ public class WorkerFts extends Worker {
 
                             File file = message.getFile(getApplicationContext());
                             String html = Helper.readText(file);
-                            String text = HtmlHelper.getText(html);
+                            String text = HtmlHelper.getPreviewText(html);
                             try {
                                 sdb.beginTransaction();
                                 FtsDbHelper.insert(sdb, message, text);