Merge pull request #1281 from matthias-guenther/master

Documentation fixes
fixes #1274, fixes #1269
fix test suite to catch non-safe html
fixes #1283
Add :file option for delivering mail