Build fix
Fix plaintext email handling