email aggregation

 * Fixed previous bad merge
 * Added extra test to assert that users who change their mail preference to never don’t get any email