diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c
index 3d253c0..8f2a8fa 100644
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@@ -1007,12 +1007,13 @@ static int fixup_msg(MmsMsg *m, Octstr *from)
 	  } else
 	       octstr_destroy(s);
 
+#if 0    /* This will be done elsewhere. */
 	  /* Check for msgid, put in if missing. */
 	  if ((s = http_header_value(m->headers, octstr_imm("Message-ID"))) == NULL) 
 	       http_header_add(m->headers, "Message-ID", "00000");
 	  else
 	       octstr_destroy(s);
-
+#endif 
 	  /* check for content-type. */
 	  if ((s = http_header_value(m->headers, octstr_imm("Content-Type"))) == NULL) {
 	       char *ctype;