EMails refactor