Merge pull request #103 from philrandal/master

Fix &nbsp without trailing ';'
Merge pull request #104 from philrandal/master

Fix Message Headers display for PHP 5.4+