diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 0d4bdf500d..6ed24164b8 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1577,11 +1577,18 @@ public class HtmlHelper {
         if (full)
             return text;
 
-        String preview = text.substring(0, Math.min(text.length(), PREVIEW_SIZE));
-        if (preview.length() < text.length())
-            preview += "…";
+        return truncate(text, PREVIEW_SIZE);
+    }
+
+    static String truncate(String text, int at) {
+        if (text.length() < at)
+            return text;
 
-        return preview;
+        String preview = text.substring(0, at);
+        int space = preview.lastIndexOf(' ');
+        if (space > 0)
+            preview = preview.substring(0, space + 1);
+        return preview + "…";
     }
 
     static String getText(Context context, String html) {