Replace email_* calls with raw email_generic calls. This is to try and make a shorter patchset in a bit ;)