Email notifications v1.5 #2

According to @gergely-ujvari, this has already been reviewed by @tilgovi, and he has made modifications to east all his concerns. Thus I am merging this without much further ado.