properly set up envelope when returning email