Fix recipient format & add attachments content-id