Civimail displays incomplete 'domain' info

This is a major issue becasue the 'domain' token is required in all messages and is displaying confusing information.

The domain token currently displays the second line of the address, then the city, state, and zip. I think the domain should default to the name and URL of the organization. The street address is irrelevant at best in an e-mail, and a portion of the street address is both useless and confusing.