Fix for html in message, add h2 from message to title