Removing unecessary dependency on javamail