Refactor so that whole message is inside link