Updated email handler.