Revert "Fix to email message backlog check"

This reverts commit 5c90f0f212dcb3270ddc22532905be795aed90e2.