Fix message handling to be more internationalizable