lucc Merge pull request #1305 from lucc/test-send-mail …