Add attachments support
Initial release by fork