Restore subject mangling functionnality