@@ -111,13 +111,15 @@
 	    (contentType = [_headers objectForKey: @"Content-Type"]) != nil) {
 		contentType = [contentType lowercaseString];
 
 		if ([contentType hasSuffix: @"charset=utf-8"])
 			encoding = OF_STRING_ENCODING_UTF_8;
-		else if ([contentType hasSuffix: @"charset=iso-8859-1"])
+		else if ([contentType hasSuffix: @"charset=iso-8859-1"] ||
+		    [contentType hasSuffix: @"charset=iso_8859-1"])
 			encoding = OF_STRING_ENCODING_ISO_8859_1;
-		else if ([contentType hasSuffix: @"charset=iso-8859-15"])
+		else if ([contentType hasSuffix: @"charset=iso-8859-15"] ||
+		    [contentType hasSuffix: @"charset=iso_8859-15"])
 			encoding = OF_STRING_ENCODING_ISO_8859_15;
 		else if ([contentType hasSuffix: @"charset=windows-1251"] ||
 		    [contentType hasSuffix: @"charset=cp1251"] ||
 		    [contentType hasSuffix: @"charset=cp-1251"])
 			encoding = OF_STRING_ENCODING_WINDOWS_1251;