add support for mail interception for queueing