Small modification to EmailIndexer