EmailService: minor cleanup
EmailService: convert to Scala