diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 53a5c7ab53..f514a14cb4 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1703,6 +1703,10 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 			else
 			{
 				$sortResult = array();
+				$uids = array_map(function($row_id)
+				{
+					return self::splitRowID($row_id)['msgUID'];
+				}, (array)$query['col_filter']['row_id']) ?: null;
 				// fetch headers
 				$sortResultwH = $mail_ui->mail_bo->getHeaders(
 					$_folderName,
@@ -1711,7 +1715,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 					$sort,
 					$reverse,
 					$filter,
-					null, // this uids only
+					$uids, // this uids only
 					true, // cacheResult
 					($query['filter2']?true:false) // fetchPreview
 				);
diff --git a/mail/js/app.js b/mail/js/app.js
index 30fe0a91b1..f230a086cb 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -426,7 +426,7 @@ app.classes.mail = AppJS.extend(
 		if (pushData.acl.folder && typeof pushData.acl.unseen !== 'undefined')
 		{
 			let folder_id = {};
-			folder_id[folder] = pushData.acl.folder+(pushData.acl.unseen ? " ("+pushData.acl.unseen+")" : '');
+			folder_id[folder] = foldertree.getLabel(folder).replace(this._unseen_regexp, '')+(pushData.acl.unseen ? " ("+pushData.acl.unseen+")" : '');
 			this.mail_setFolderStatus(folder_id);
 		}
 	},
@@ -441,7 +441,7 @@ app.classes.mail = AppJS.extend(
 		let framework = egw_getFramework();
 		let notify = this.egw.preference('new_mail_notification', 'mail');
 		// never notify for Trash, Junk or Drafts folder
-		if (pushData.acl.folder.match(/^(INBOX.)?(Trash|Spam|Junk|Drafts)$/)) return;
+		if (pushData.acl.folder.match(/^(INBOX.)?(Trash|Spam|Junk|Drafts|Sent)$/)) return;
 		if (typeof notify === 'undefined' || notify === 'always' ||
 			notify === 'not-mail' && framework && framework.activeApp.appName !== 'mail')
 		{