VE-695: Fix message regressions

https://wikia-inc.atlassian.net/browse/VE-695

@lizlux