Cluster mails on exercise, not on commenter

Fixes #1200