Majorly refactor e-mail functionality.