Fix double formatting in mailcount for mbox.
Merge remote-tracking branch 'erikw/master'