diff --git a/mail/js/app.js b/mail/js/app.js
index f44a8876f5..3fbe4ab701 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -426,7 +426,8 @@ app.classes.mail = AppJS.extend(
 		if (foldertree && pushData.acl.folder && typeof pushData.acl.unseen !== 'undefined')
 		{
 			let folder_id = {};
-			folder_id[folder] = foldertree.getLabel(folder).replace(this._unseen_regexp, '')+
+			folder_id[folder] = (foldertree.getLabel(folder) || pushData.acl.folder)
+				.replace(this._unseen_regexp, '')+
 				(pushData.acl.unseen ? " ("+pushData.acl.unseen+")" : '');
 			this.mail_setFolderStatus(folder_id);
 		}