diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c1620b7796..e8776db62d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -185,6 +185,7 @@ import org.openintents.openpgp.OpenPgpSignatureResult;
 import org.openintents.openpgp.util.OpenPgpApi;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -10806,6 +10807,14 @@ public class FragmentMessages extends FragmentBase
                     db.message().setMessageStored(message.id, new Date().getTime());
                     db.message().setMessageFts(message.id, false);
 
+                    if (BuildConfig.DEBUG || debug) {
+                        File raw = message.getRawFile(context);
+                        try (OutputStream os = new BufferedOutputStream(new FileOutputStream(raw))) {
+                            imessage.writeTo(os);
+                        }
+                        db.message().setMessageRaw(message.id, true);
+                    }
+
                     if (alias != null && !duplicate && message.identity != null) {
                         EntityIdentity identity = db.identity().getIdentity(message.identity);
                         if (identity != null) {