Email aggregation

 * email template tweaks
 * aggregation bug fix