[task] adding email patch and tests