More work on /mail command.