encode HTML payloads when we don't need to. This is follow on for: 7607e1f932
7607e1f932
overriding the uploader.