Merge "Change message escaping on ImagePage"