fix messages for notification