Working on implementing attachments (added Content-Type and Content-Disposition headers)