Refactor mail converter
Refactor the constructors
More refactoring