have email views use iid
Merge pull request #4945 from jameswritescode/iid_for_emails

have email views use iid