Use full MIME parsing for #10