mail-refactoring-TS1