Use @mail_user instead of vmail (fix #31)
Merge remote-tracking branch 'upstream/master'