diff --git a/mbuni/mmsbox/bearerbox.c b/mbuni/mmsbox/bearerbox.c
index 36322fe..54b20a6 100644
--- a/mbuni/mmsbox/bearerbox.c
+++ b/mbuni/mmsbox/bearerbox.c
@@ -343,7 +343,9 @@ static void mm7eaif_receive(MmsHTTPClientInfo *h)
 	  /* Get Message ID */
 	  if ((msgid = http_header_value(h->headers, octstr_imm("X-NOKIA-MMSC-Message-Id"))) == NULL)
 	       msgid = http_header_value(mh, octstr_imm("Message-ID"));	  
-	  
+	  else 
+	       mms_replace_header_value(m, "Message-ID", octstr_get_cstr(msgid)); /* replace it in the message.*/
+
 	  value = http_header_value(mh, octstr_imm("X-Mms-Delivery-Report"));	  
 	  if (value && 
 	      octstr_case_compare(value, octstr_imm("Yes")) == 0)