Issue #404 - Edit location of send email methods