From 8fa6b65d7ad6814886bd54a399de7094269637ec Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 23 May 2024 09:04:28 +0200
Subject: [PATCH] Small logic fix

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 70d2ccd002..540ff5e15e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5679,7 +5679,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             if (!junk) {
                                 SharedPreferences.Editor editor = prefs.edit();
 
-                                if (senders != null)
+                                if (cbNotAgain.isChecked() && cbNeverAgain.isChecked())
+                                    editor.putBoolean(full ? "confirm_html" : "confirm_images", false);
+                                else if (senders != null && !cbNotAgain.isChecked())
                                     for (Address sender : senders) {
                                         String from = ((InternetAddress) sender).getAddress();
                                         if (TextUtils.isEmpty(from))
@@ -5694,9 +5696,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                                 editor.putBoolean(full ? "ask_html" : "ask_images", !cbNotAgain.isChecked());
 
-                                if (cbNotAgain.isChecked())
-                                    editor.putBoolean(full ? "confirm_html" : "confirm_images", false);
-
                                 editor.apply();
                             }