make this test pass...
Merge branch 'email_attachments'