Improvements submitted by @efraimgentil and Jesper Pedersen (RedHat). Improvements on the datasource creation and addition of command lines to configure the email session.