diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 727207a292..8efc76575d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -7097,13 +7097,7 @@ public class FragmentCompose extends FragmentBase {
                             if (draft.bcc != null)
                                 recipients.addAll(Arrays.asList(draft.bcc));
 
-                            boolean noreply = false;
-                            for (Address recipient : recipients)
-                                if (MessageHelper.isNoReply(recipient)) {
-                                    noreply = true;
-                                    break;
-                                }
-                            args.putBoolean("remind_noreply", noreply);
+                            args.putBoolean("remind_noreply", MessageHelper.isNoReply(recipients));
 
                             if (identity != null && !TextUtils.isEmpty(identity.internal)) {
                                 boolean external = false;
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 1283667bd3..cf68d5795e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -5588,6 +5588,13 @@ public class MessageHelper {
         return false;
     }
 
+    static boolean isNoReply(@NonNull List<Address> addresses) {
+        for (Address address : addresses)
+            if (isNoReply(address))
+                return true;
+        return false;
+    }
+
     static boolean isNoReply(Address address) {
         if (address instanceof InternetAddress) {
             String email = ((InternetAddress) address).getAddress();