when no domain is specified on mail from or rcpt to, assume local user
Merge branch 'master' into portable