fix(discussion): New topics and their replies should be threaded in email

What do people think about this solution?

Fixes #6894