mail send fixes