Change message escaping on ImagePage

by Nikerabbit on I2a91f0ef1cf82360da2d17c7dc42633ae3e79100

Change-Id: I96c42974a2bc435abd65e9b1e8daba6cc9669409
Merge "Change message escaping on ImagePage"