Fixing up the library, and adding better integration with Zend_Mail