Updated EmailService.java