diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 5f7eb4b357..0c294750fa 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.getPreviewText(html);
+                                        String text = HtmlHelper.getFullText(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 edeb241507..3f316b0361 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3215,7 +3215,7 @@ class Core {
                 if (notify_preview_all)
                     try {
                         String html = Helper.readText(message.getFile(context));
-                        preview = HtmlHelper.getPreviewText(html);
+                        preview = HtmlHelper.getFullText(html);
                     } catch (Throwable ex) {
                         Log.e(ex);
                     }
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index e9f46f57b2..8b231f5e3a 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1050,18 +1050,29 @@ public class HtmlHelper {
 
     static String getPreview(String body) {
         try {
-            return _getPreview(body);
+            return _getText(body, false);
         } catch (OutOfMemoryError ex) {
             Log.e(ex);
             return null;
         }
     }
 
-    private static String _getPreview(String body) {
+    static String getFullText(String body) {
+        try {
+            return _getText(body, true);
+        } catch (OutOfMemoryError ex) {
+            Log.e(ex);
+            return null;
+        }
+    }
+
+    private static String _getText(String body, boolean full) {
         if (body == null)
             return null;
 
         String text = JsoupEx.parse(body).text();
+        if (full)
+            return text;
 
         String preview = text.substring(0, Math.min(text.length(), PREVIEW_SIZE));
         if (preview.length() < text.length())
diff --git a/app/src/main/java/eu/faircode/email/WorkerFts.java b/app/src/main/java/eu/faircode/email/WorkerFts.java
index 5962ad2dec..a5ee015a2c 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.getPreviewText(html);
+                            String text = HtmlHelper.getFullText(html);
                             try {
                                 sdb.beginTransaction();
                                 FtsDbHelper.insert(sdb, message, text);