small fix and code cleanups, working on contact us label on message wrapper