Emailaggregation

Can we avoid the `activity.activity` here by giving the outer `activity` a more accurate name?