Added from email and fixed attachments