Enhancing message entities