diff --git a/share/cpim_grammar b/share/cpim_grammar
index 066afb558..c89e4f87f 100644
Binary files a/share/cpim_grammar and b/share/cpim_grammar differ
diff --git a/src/chat/cpim/parser/cpim-rules b/src/chat/cpim/parser/cpim-rules
index b11cccb9a..18c438efc 100644
--- a/src/chat/cpim/parser/cpim-rules
+++ b/src/chat/cpim/parser/cpim-rules
@@ -1,4 +1,6 @@
-Message = Message-headers CRLF Content-headers CRLF
+Message = [Crappy-header CRLF] Message-headers CRLF Content-headers CRLF
+
+Crappy-header = "Content-Type: Message/CPIM" CRLF
 
 Message-headers = 1*( Message-header CRLF )
 Message-header = From-header / To-header / DateTime-header / cc-header / Subject-header / NS-header / Require-header / Header