diff -urb libvmime-0.9.2.orig/src/platforms/posix/posixHandler.cpp libvmime-0.9.2/src/platforms/posix/posixHandler.cpp --- libvmime-0.9.2.orig/src/platforms/posix/posixHandler.cpp 2009-12-09 12:23:06.000000000 +0100 +++ libvmime-0.9.2/src/platforms/posix/posixHandler.cpp 2014-01-17 17:42:08.000000000 +0100 @@ -153,11 +153,7 @@ { const PLockHelper lock; - const char* prevLocale = ::setlocale(LC_ALL, ""); - vmime::charset ch(::nl_langinfo(CODESET)); - ::setlocale(LC_ALL, prevLocale); - - return (ch); + return vmime::charset(::nl_langinfo(CODESET)); }