Added some code to Email object, fixed indexer to work with changes to
email object, should index now!