Version 4.0.21

Improvements to single name emails, plus other enhancements and bug fixes.More