more fixes of the email adapter