Fix bad substitution and add old mail count