Fix Messages for unicode