merge bug correction + adding javax.mail dependancy in pom.xml