Removed double-escaping of user's names; they're now only escaped as part of a delivered message.