Fix deliver per mail DDBNEXT-828