diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a4e7aad525..71d9fb4d38 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4110,6 +4110,9 @@ public class FragmentCompose extends FragmentBase {
                             if (empty && d.select("div[fairemail=reference]").isEmpty())
                                 args.putBoolean("remind_text", true);
 
+                            if (draft.plain_only != null && draft.plain_only)
+                                args.putBoolean("remind_plain", true);
+
                             int attached = 0;
                             for (EntityAttachment attachment : attachments)
                                 if (!attachment.available)
@@ -4296,6 +4299,7 @@ public class FragmentCompose extends FragmentBase {
                 boolean remind_pgp = args.getBoolean("remind_pgp", false);
                 boolean remind_subject = args.getBoolean("remind_subject", false);
                 boolean remind_text = args.getBoolean("remind_text", false);
+                boolean remind_plain = args.getBoolean("remind_plain", false);
                 boolean remind_attachment = args.getBoolean("remind_attachment", false);
 
                 int recipients = (draft.to == null ? 0 : draft.to.length) +
@@ -4303,7 +4307,7 @@ public class FragmentCompose extends FragmentBase {
                         (draft.bcc == null ? 0 : draft.bcc.length);
                 if (send_dialog || (send_reminders &&
                         (address_error != null || remind_to || remind_extra || remind_pgp ||
-                                remind_subject || remind_text || remind_attachment ||
+                                remind_subject || remind_text || remind_plain || remind_attachment ||
                                 recipients > RECIPIENTS_WARNING))) {
                     setBusy(false);