Refactored Email handling into single PQ mailer