Initial fix for Zend\Mail headers