Merge pull request #2480 from florisluiten/develop

Prevent email header injection