early e-mail exit
Revert "early e-mail exit"

This reverts commit c87dafba80541d5ac595023871afc781c9ac46ae.
Revert "Revert "early e-mail exit""

This reverts commit 40c346eaf07f3df15d0bea1c696c39846db4f30f.