fixed tracking, message display
remved email override
Merge pull request #804 from tonyrd/development

fixed tracking, message display