Fixed issues with editing message & displaying HTML.

As we discussed, this fixes stuff with message & the display of HTML.