Merge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs