diff --git a/src/components/Mailbox.vue b/src/components/Mailbox.vue
index 8563e112df..58732d2178 100644
--- a/src/components/Mailbox.vue
+++ b/src/components/Mailbox.vue
@@ -112,7 +112,7 @@ export default {
 			return this.mainStore.getPreference('sort-order', 'DESC')
 		},
 		envelopes() {
-			return this.mainStore.getEnvelopes(this.mailbox.databaseId, this.searchQuery)
+			return this.mainStore.getEnvelopes(this.mailbox.databaseId, this.searchQuery).map(envelopes => envelopes.at(-1))
 		},
 		envelopesToShow() {
 			if (this.paginate === 'manual' && !this.expanded) {
diff --git a/src/store/mainStore/actions.js b/src/store/mainStore/actions.js
index 6cc5098356..31ef3e0f84 100644
--- a/src/store/mainStore/actions.js
+++ b/src/store/mainStore/actions.js
@@ -2355,7 +2355,7 @@ export default function mainStoreActions() {
 		},
 		getEnvelopes(mailboxId, query) {
 			const list = this.getMailbox(mailboxId).envelopeLists[normalizedEnvelopeListId(query)] || []
-			return list.map((msgId) => this.envelopes[msgId])
+			return list.map((msgId) => this.getEnvelopesByThreadRootId(this.envelopes[msgId].accountId, this.envelopes[msgId].threadRootId))
 		},
 		getEnvelopesByThreadRootId(accountId, threadRootId) {
 			return sortBy(