diff -Nurb --strip-trailing-cr claws-mail-3.8.1-orig/src/procmime.c claws-mail-3.8.1/src/procmime.c
--- claws-mail-3.8.1-orig/src/procmime.c	2012-06-27 11:05:22.000000000 +0200
+++ claws-mail-3.8.1/src/procmime.c	2012-10-03 18:00:09.438577924 +0200
@@ -1753,6 +1753,8 @@
 			continue;
 
 		charset = value;
+        if (charset == NULL)
+            continue;
 		lang = strchr(charset, '\'');
 		if (lang == NULL)
 			continue;