diff --git a/server/ui-src/components/Notifications.vue b/server/ui-src/components/Notifications.vue
index 5e71c37..2e647e4 100644
--- a/server/ui-src/components/Notifications.vue
+++ b/server/ui-src/components/Notifications.vue
@@ -21,7 +21,6 @@ export default {
 			socketBreaks: 0, // to track sockets that continually connect & disconnect, reset every 15s
 			pauseNotifications: false, // prevent spamming
 			version: false,
-			paginationDelayed: false, // for delayed pagination URL changes
 		}
 	},
 
@@ -58,21 +57,6 @@ export default {
 				if (response.Type == "new" && response.Data) {
 					this.eventBus.emit("new", response.Data)
 
-					if (!mailbox.searching) {
-						if (pagination.start < 1) {
-							// push results directly into first page
-							mailbox.messages.unshift(response.Data)
-							if (mailbox.messages.length > pagination.limit) {
-								mailbox.messages.pop()
-							}
-						} else {
-							// update pagination offset
-							pagination.start++
-							// prevent "Too many calls to Location or History APIs within a short time frame"
-							this.delayedPaginationUpdate()
-						}
-					}
-
 					for (let i in response.Data.Tags) {
 						if (mailbox.tags.findIndex(e => { return e.toLowerCase() === response.Data.Tags[i].toLowerCase() }) < 0) {
 							mailbox.tags.push(response.Data.Tags[i])
@@ -173,39 +157,6 @@ export default {
 			}, 15000)
 		},
 
-		// This will only update the pagination offset at a maximum of 2x per second
-		// when viewing the inbox on > page 1, while receiving an influx of new messages.
-		delayedPaginationUpdate() {
-			if (this.paginationDelayed) {
-				return
-			}
-
-			this.paginationDelayed = true
-
-			window.setTimeout(() => {
-				const path = this.$route.path
-				const p = {
-					...this.$route.query
-				}
-				if (pagination.start > 0) {
-					p.start = pagination.start.toString()
-				} else {
-					delete p.start
-				}
-				if (pagination.limit != pagination.defaultLimit) {
-					p.limit = pagination.limit.toString()
-				} else {
-					delete p.limit
-				}
-
-				mailbox.autoPaginating = false // prevent reload of messages when URL changes
-				const params = new URLSearchParams(p)
-				this.$router.replace(path + '?' + params.toString())
-
-				this.paginationDelayed = false
-			}, 500)
-		},
-
 		browserNotify(title, message) {
 			if (!("Notification" in window)) {
 				return
diff --git a/server/ui-src/views/MailboxView.vue b/server/ui-src/views/MailboxView.vue
index ea4679d..782c99d 100644
--- a/server/ui-src/views/MailboxView.vue
+++ b/server/ui-src/views/MailboxView.vue
@@ -31,6 +31,7 @@ export default {
 		return {
 			mailbox,
 			delayedRefresh: false,
+			paginationDelayed: false, // for delayed pagination URL changes
 		}
 	},
 
@@ -46,6 +47,7 @@ export default {
 		this.loadMailbox()
 
 		// subscribe to events
+		this.eventBus.on("new", this.handleWSNew)
 		this.eventBus.on("update", this.handleWSUpdate)
 		this.eventBus.on("delete", this.handleWSDelete)
 		this.eventBus.on("truncate", this.handleWSTruncate)
@@ -53,6 +55,7 @@ export default {
 
 	unmounted() {
 		// unsubscribe from events
+		this.eventBus.off("new", this.handleWSNew)
 		this.eventBus.off("update", this.handleWSUpdate)
 		this.eventBus.off("delete", this.handleWSDelete)
 		this.eventBus.off("truncate", this.handleWSTruncate)
@@ -73,6 +76,55 @@ export default {
 			this.loadMessages()
 		},
 
+		// This will only update the pagination offset at a maximum of 2x per second
+		// when viewing the inbox on > page 1, while receiving an influx of new messages.
+		delayedPaginationUpdate() {
+			if (this.paginationDelayed) {
+				return
+			}
+
+			this.paginationDelayed = true
+
+			window.setTimeout(() => {
+				const path = this.$route.path
+				const p = {
+					...this.$route.query
+				}
+				if (pagination.start > 0) {
+					p.start = pagination.start.toString()
+				} else {
+					delete p.start
+				}
+				if (pagination.limit != pagination.defaultLimit) {
+					p.limit = pagination.limit.toString()
+				} else {
+					delete p.limit
+				}
+
+				mailbox.autoPaginating = false // prevent reload of messages when URL changes
+				const params = new URLSearchParams(p)
+				this.$router.replace(path + '?' + params.toString())
+
+				this.paginationDelayed = false
+			}, 500)
+		},
+
+		// handler for websocket new messages
+		handleWSNew(data) {
+			if (pagination.start < 1) {
+				// push results directly into first page
+				mailbox.messages.unshift(data)
+				if (mailbox.messages.length > pagination.limit) {
+					mailbox.messages.pop()
+				}
+			} else {
+				// update pagination offset
+				pagination.start++
+				// prevent "Too many calls to Location or History APIs within a short time frame"
+				this.delayedPaginationUpdate()
+			}
+		},
+
 		// handler for websocket message updates
 		handleWSUpdate(data) {
 			for (let x = 0; x < this.mailbox.messages.length; x++) {