Adapter 'mail' was fixed to work with command line options as well as with options from config file.
Added explicit import of email.message, fixing a error on python2.7.