use com.sun.mail
Merge branch 'master' into hs_staging