Fix regresion that caused double charset conversion in some messages (#1490121)