diff --git a/src/components/Mailbox.vue b/src/components/Mailbox.vue
index 096444cd19..9f8a5e400f 100644
--- a/src/components/Mailbox.vue
+++ b/src/components/Mailbox.vue
@@ -235,7 +235,7 @@ export default {
 			}
 		},
 		async loadMore() {
-			if (!this.expanded) {
+			if (!this.expanded && this.envelopesToShow.length < this.envelopes.length) {
 				logger.debug('expanding envelope list')
 				this.expanded = true
 				return