Switch to using Zend_Mail
Formatting changes