Try to fix two issues:

 * Issue #32 (https://github.com/Pylons/pyramid_mailer/issues/32)
 * Issue #29 (https://github.com/Pylons/pyramid_mailer/issues/29)