From ef8e6d60945f65c960be5beaeb12118f8f026f8f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 15 Apr 2021 17:34:40 +0200
Subject: [PATCH] Skip hidden messages on reply/move check

---
 .../main/java/eu/faircode/email/ServiceSend.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index ffbfbb0f13..c90b58b012 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -556,13 +556,14 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
         if (reply_move && !TextUtils.isEmpty(message.inreplyto)) {
             List<EntityMessage> replied = db.message().getMessagesByMsgId(message.account, message.inreplyto);
             if (replied != null)
-                for (EntityMessage m : replied) {
-                    EntityFolder folder = db.folder().getFolder(m.folder);
-                    if (folder != null && EntityFolder.USER.equals(folder.type)) {
-                        sent = folder;
-                        break;
+                for (EntityMessage m : replied)
+                    if (!m.ui_hide) {
+                        EntityFolder folder = db.folder().getFolder(m.folder);
+                        if (folder != null && EntityFolder.USER.equals(folder.type)) {
+                            sent = folder;
+                            break;
+                        }
                     }
-                }
         }
 
         if (sent == null)