1908 improve email scanner logic