CE-311 Refactoring messages one double escape