Add extra email loop protection