Properly add attachments to encrypted messages