Minor adjustment to email class