Split out HTML encoding into separate class
Add javax.mail dependency