CBD-779:  simplify email sending so that we can avoid errors

Change-Id: Id2a527ac721ac2f32eb28cad536acb8334771d33