Make email handler work