[WIP] Email notification finishing