Icky regex replaced. Dependency on address-rfc2822 added.