Merge pull request #5644 from totten/4.6-mail-estimates2