email handler changes