re-add changes to find apple attachments, with old typos fixed