Removing message element as it sometimes fails due to escaping