Added support for mail attachments