changes for emails delivery