Minor rewrites, cache destroyed on mailexchange auto-activation