replacing messages
Merge pull request #2297 from Wikia/VE-695

VE-695: Fix message regressions