diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 0a17250c3..104876975 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -818,10 +818,14 @@ export class MailMessageList extends AbstractViewRight {
 		showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
 	}
 
-	groupSearchClick(group) {
+	groupSearch(group) {
 		group.search && MessagelistUserStore.mainSearch(group.search);
 	}
 
+	groupCheck(group) {
+		group.messages.forEach(message => message.checked(!message.checked()));
+	}
+
 	quotaTooltip() {
 		return i18n('MESSAGE_LIST/QUOTA_SIZE', {
 			SIZE: FileInfo.friendlySize(FolderUserStore.quotaUsage()),
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index d13027a03..e3458780b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -131,7 +131,7 @@
 
 		<!-- ko if: listGrouped -->
 		<div class="messageListPlace" data-bind="dragmessages: 1, i18nUpdate: groupedList, foreach: groupedList" draggable="true">
-			<div class="groupLabel" data-bind="text: label, click: $root.groupSearchClick" data-i18n="[title]GLOBAL/SEARCH"></div>
+			<div class="groupLabel" data-bind="text: label, click: $root.groupSearch" data-i18n="[title]GLOBAL/SEARCH"></div>
 			<!-- ko foreach: messages -->
 			<div class="messageListItem" data-bind="css: lineAsCss()">
 				<div class="messageCheckbox">