adding email replace support