Making sure email notifications are based on categories as well

Change-Id: Ib7cee67c940a4bb1b770f509edd995cb0631950d
Merge "Making sure email notifications are based on categories as well"