Revert javax mail dependency