Email Service - milestone 2