diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ea5c06e45c..7c1f20b6d7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -512,7 +512,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             view.setActivated(selectionTracker != null && selectionTracker.isSelected(message.id));
             view.setAlpha(
                     message.uid == null &&
-                            !EntityFolder.OUTBOX.equals(message.folderType)
+                            !(EntityFolder.OUTBOX.equals(message.folderType) && !message.ui_seen)
                             ? Helper.LOW_LIGHT : 1.0f);
 
             // Duplicate
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index d7ff009428..759e2c1f09 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -349,8 +349,7 @@ public class ServiceSend extends LifecycleService {
                     db.message().setMessageFolder(message.id, sent.id);
                     message.folder = sent.id;
                     EntityOperation.queue(this, db, message, EntityOperation.ADD);
-                } else
-                    db.message().setMessageUiHide(message.id, true);
+                }
 
                 if (message.inreplyto != null) {
                     List<EntityMessage> replieds = db.message().getMessageByMsgId(message.account, message.inreplyto);