diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index f2ab615a1..8a9bd1918 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -940,7 +940,11 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
 
   codepage = [Codepages getCodepageFromName: headerCharset];
   if (!codepage)
-    codepage = [Codepages getCodepageFromName: @"utf-8"];
+    {
+      [self warnWithFormat: @"Couldn't find codepage from `%@`. "
+                            @"Using UTF-8 by default", headerCharset];
+      codepage = [Codepages getCodepageFromName: @"utf-8"];
+    }
 
   *data = MAPILongValue(memCtx, [codepage intValue]);