Merge pull request #22474 from braders/incoming-mail-broken-fn-reference