E-mail sender fix