added support for message attachments