Separate mail class into new file, not test yet