Changed logic of the message notification