Fix other issues when a message contains unclosed XML entities.
Fix other issues when a message contains unclosed XML entities.

flottokarotto/ada-util,flottokarotto/ada-util,Letractively/ada-util,Letractively/ada-util