Email Service - milestone 3