diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8560b48682..c7d23dae4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 For support you can use [the contact form](https://contact.faircode.eu/?product=fairemailsupport).
 
+### [Ubirajara](https://en.wikipedia.org/wiki/Ubirajara_jubatus)
+
+* Small improvements and minor bug fixes
+* Updated [translations](https://crowdin.com/project/open-source-email)
+
 ### [Tratayenia](https://en.wikipedia.org/wiki/Tratayenia)
 
 ### 1.2074 - 2023-06-08
diff --git a/app/build.gradle b/app/build.gradle
index 28f9455de1..a0c84acdec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'de.undercouch.download'
 
 def getVersionCode = { -> return 2075 }
 def getRevision = { -> return "a" }
-def getReleaseName = { -> return "Tratayenia" }
+def getReleaseName = { -> return "Ubirajara" }
 // https://en.wikipedia.org/wiki/List_of_dinosaur_genera
 
 def keystoreProperties = new Properties()
diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md
index 8560b48682..c7d23dae4d 100644
--- a/app/src/main/assets/CHANGELOG.md
+++ b/app/src/main/assets/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 For support you can use [the contact form](https://contact.faircode.eu/?product=fairemailsupport).
 
+### [Ubirajara](https://en.wikipedia.org/wiki/Ubirajara_jubatus)
+
+* Small improvements and minor bug fixes
+* Updated [translations](https://crowdin.com/project/open-source-email)
+
 ### [Tratayenia](https://en.wikipedia.org/wiki/Tratayenia)
 
 ### 1.2074 - 2023-06-08
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ddfc18f807..5d5761bf49 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -7789,11 +7789,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     same = false;
                     log("uid changed", next.id);
 
-                    // Download body when needed
-                    if (!next.content &&
-                            prev.uid == null && next.uid != null && // once only
-                            properties.getValue("expanded", next.id))
-                        EntityOperation.queue(context, next, EntityOperation.BODY);
+                    if (prev.uid == null && next.uid != null) { // once only
+                        // Mark seen when needed
+                        if (!Boolean.TRUE.equals(next.ui_seen) && next.accountAutoSeen)
+                            EntityOperation.queue(context, next, EntityOperation.SEEN, true);
+
+                        // Download body when needed
+                        if (!next.content && properties.getValue("expanded", next.id))
+                            EntityOperation.queue(context, next, EntityOperation.BODY);
+                    }
                 }
                 if (!Objects.equals(prev.msgid, next.msgid)) {
                     // debug info
diff --git a/metadata/en-US/changelogs/2075.txt b/metadata/en-US/changelogs/2075.txt
index b245eb3b7a..9a32a809d2 100644
--- a/metadata/en-US/changelogs/2075.txt
+++ b/metadata/en-US/changelogs/2075.txt
@@ -4,6 +4,11 @@ Changelog
 
 For support you can use the contact form.
 
+Ubirajara
+
+* Small improvements and minor bug fixes
+* Updated translations
+
 Tratayenia
 
 1.2074 - 2023-06-08