Lost changes

Signed-off-by: feafarot <sly.feafarot@gmail.com>
Merge branch 'master' of github.com:feafarot/fMailer