Refactored to no longer embed javax.mail.