improved code for better distinguishment of emails
improved code for better distinguishment of emails