Charset errors on macro insertion

Inserting or editing a macro in the rich content editor has a broken output when using non ASCII characters.
This happens when editing both java and wiki macros content, but the character representation of the output for the two macros seems to be different.