We could possibly make sure it mentions the username of the person who sent the message as well.