1st refactor of Mail class