fix double escaping of decorated messages (fixes #3549, BP from #3506)
(cherry picked from commit f96898ea2c1003c1bea79610e0a77b65a63776ee)