Index: wp-mail.php
===================================================================
--- wp-mail.php	(revision 21651)
+++ wp-mail.php	(working copy)
@@ -73,7 +73,7 @@
 				$content_type = trim($line);
 				$content_type = substr($content_type, 14, strlen($content_type) - 14);
 				$content_type = explode(';', $content_type);
-				if ( ! empty( $content_type[1] ) ) {
+ 				if ( ! empty( $content_type[1] ) && stripos( $content_type[1], 'charset' ) !== FALSE ) {
 					$charset = explode('=', $content_type[1]);
 					$charset = ( ! empty( $charset[1] ) ) ? trim($charset[1]) : '';
 				}
@@ -184,7 +184,11 @@
 	}
 
 	if ( function_exists('iconv') && ! empty( $charset ) ) {
-		$content = iconv($charset, get_option('blog_charset'), $content);
+		$content_check = iconv($charset, get_option('blog_charset'), $content);
+		# If iconv can't read the charset it returns false. Post anyway. 
+		if ( false !== $content_check ) { 
+			$content = $content_check;
+		}
 	}
 
 	// Captures any text in the body after $phone_delim as the body