EmailManager bugfix