Moving mail-watcher to a separate folder