Index: head/contrib/nvi/common/exf.c
===================================================================
--- head/contrib/nvi/common/exf.c
+++ head/contrib/nvi/common/exf.c
@@ -1237,7 +1237,10 @@
 	}
 
 	/*
-	 * Detect UTF-8 and fallback to the locale/preset encoding.
+	 * 1. Check for valid UTF-8.
+	 * 2. Check if fallback fileencoding is set and is NOT UTF-8.
+	 * 3. Check if user locale's encoding is NOT UTF-8.
+	 * 4. Use ISO8859-1 as last resort.
 	 *
 	 * XXX
 	 * A manually set O_FILEENCODING indicates the "fallback
@@ -1246,9 +1249,13 @@
 	 */
 	if (looks_utf8(buf, blen) > 1)
 		o_set(sp, O_FILEENCODING, OS_STRDUP, "utf-8", 0);
-	else if (!O_ISSET(sp, O_FILEENCODING) ||
-	    !strcasecmp(O_STR(sp, O_FILEENCODING), "utf-8"))
+	else if (O_ISSET(sp, O_FILEENCODING) &&
+	    strcasecmp(O_STR(sp, O_FILEENCODING), "utf-8") != 0)
+		/* Use fileencoding as is */ ;
+	else if (strcasecmp(codeset(), "utf-8") != 0)
 		o_set(sp, O_FILEENCODING, OS_STRDUP, codeset(), 0);
+	else
+		o_set(sp, O_FILEENCODING, OS_STRDUP, "iso8859-1", 0);
 
 	conv_enc(sp, O_FILEENCODING, 0);
 #endif