A few more features and a fix for HTML embedded in messages.