Improve notification e-mail sending