Fixed/improved email address check for ticket bounce and merge.
This fixes bug #3007.