Ok, let's leave it like this for now.

I've created https://issues.jboss.org/browse/ISPN-2819 and https://issues.jboss.org/browse/ISPN-2820 to improve the charset handling on the server.