removed unneeded checking from EmailSenderListener