Use proper message identifiers
Update release charset setting