FREQ-54 EmailManagerImpl improvement