[#ENGINE-27: added use of original subject if present]