Properly tag source and topic for emails
Merge pull request #1104 from greezybacon/issue/1097

Properly tag source and topic for emails

Reviewed-By: Peter Rotich <peter@osticket.com>