Add charset support for subject