diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c94b044bd4..f9c9ab5c81 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4965,7 +4965,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                         db.beginTransaction();
 
                                         // Write decrypted body
-                                        Helper.copy(plain, message.getFile(context));
+                                        String text = Helper.readText(plain);
+                                        String html = HtmlHelper.formatPre(text);
+                                        Helper.writeText(message.getFile(context), html);
                                         db.message().setMessageStored(message.id, new Date().getTime());
                                         db.message().setMessageFts(message.id, false);