Merge pull request #555 from tobiasd/20180320-securemailDE