Email aggregation follow-up

 * Removed underscore dependency for activity adapter