fix double escaping of decorated messages (refs #3506)