add and adapt Thomas Link's subject simplification patch