Properly tag source and topic for emails

Fixes #1097