clean up and adding email view modes
clean up and adding email view modes