Changes to add custom link at the end of the message