Email Upgrade, bug fixes