Issue #6899 fixed. Email watchers address fix