Properly handle RFC2231 everywhere