Message parsing fix.
More regex message parsing
Fix for one-off error in message parsing.
Testing resolve by email functionality.
Removing stray character
something. not sure what, but I've got to merge
Merge branch 'master' of heroku.com:olinfiltr