Improved regexes. Tidied code.
Removed comment test.
Fixed/improved email address check for ticket bounce and merge.
This fixes bug #3007.