Email aggregation

 * Changed mail bucketing to on aggregation rather than on routing
 * Added logic that ensures all links include the base url