diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index af277ed4f8..5d8618f18b 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1126,7 +1126,7 @@ class Core {
                         addresses.addAll(Arrays.asList(tos));
                     if (ccs != null)
                         addresses.addAll(Arrays.asList(ccs));
-                    if (EntityFolder.ARCHIVE.equals(folder.type)) {
+                    if (EntityFolder.ARCHIVE.equals(folder.type) || BuildConfig.DEBUG) {
                         if (froms != null)
                             addresses.addAll(Arrays.asList(froms));
                     }