[#ENGINE-20: using original sender and recipient when delivering]