skip mail part in send_confirmmail itself
Merge branch 'master' into admin