VID-2138 properly escape our messages