cleanup email notification a bit