DP-2961: correcting sender's address