diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index b9d46b3a6..0a7d30c41 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -102,8 +102,8 @@ addComputablesTo(MessagelistUserStore, {
 		const
 			selectedMessage = MessagelistUserStore.selectedMessage(),
 			focusedMessage = MessagelistUserStore.focusedMessage(),
-			checked = MessagelistUserStore.filter(item => isChecked(item) || item === selectedMessage);
-		return checked.length ? checked : (focusedMessage ? [focusedMessage] : []);
+			checked = MessagelistUserStore.filter(item => isChecked(item));
+		return checked.length ? checked : (selectedMessage || focusedMessage ? [selectedMessage || focusedMessage] : []);
 	},
 
 	listCheckedOrSelectedUidsWithSubMails: () => {