Merge pull request #440 from leider/master

technical remake of mailsender module