Update to support ack emails