From fae335cd8edf6687e24358f41db00cfbe40c9987 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 15 Oct 2023 14:26:44 +0200
Subject: [PATCH] Revert "Refactoring"

This reverts commit 0d6f8ec9eb0ba77c25a3d976a6f3b3c8e95f734e.
---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index eb30929cc5..a18d9c28d4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1256,11 +1256,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean outbox = EntityFolder.OUTBOX.equals(message.folderType);
             boolean outgoing = isOutgoing(message);
             boolean reverse = (outgoing && viewType != ViewType.THREAD &&
-                    (EntityFolder.isOutgoing(type) ||
-                            EntityFolder.isOutgoing(message.folderInheritedType) ||
-                            viewType == ViewType.SEARCH ||
-                            (viewType == ViewType.UNIFIED && type == null && message.folderUnified) ||
-                            (viewType == ViewType.FOLDER && EntityFolder.INBOX.equals(type) && message.folderUnified)));
+                    (EntityFolder.isOutgoing(type) || viewType == ViewType.SEARCH)) ||
+                    (viewType == ViewType.UNIFIED && type == null && message.folderUnified && outgoing) ||
+                    EntityFolder.isOutgoing(message.folderInheritedType);
             String selector = (reverse ? null : message.bimi_selector);
             Address[] addresses = (reverse ? message.to : (message.isForwarder() ? message.submitter : message.from));
             Address[] senders = ContactInfo.fillIn(