Modify email to support read, not query