diff --git a/mbuni/configure.ac b/mbuni/configure.ac
index 20061b4..ccc3d54 100644
--- a/mbuni/configure.ac
+++ b/mbuni/configure.ac
@@ -61,10 +61,10 @@ case "$host" in
     EXE_EXT=".exe"
     ;;
   *apple-darwin*) 
-    CFLAGS="$CFLAGS -DDARWIN=1" 
+    CFLAGS="$CFLAGS -DDARWIN=1 -O4 -Wall" 
     ;;
   *-linux-*)
-    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -O4 -Wall"
     LDFLAGS="$LDFLAGS -rdynamic"
     ;;
   *-*-openbsd* | *-*-freebsd*)
diff --git a/mbuni/mmlib/mms_mm7soap.c b/mbuni/mmlib/mms_mm7soap.c
index 17b27ca..0212b41 100644
--- a/mbuni/mmlib/mms_mm7soap.c
+++ b/mbuni/mmlib/mms_mm7soap.c
@@ -777,6 +777,11 @@ MmsMsg *mm7_soap_to_mmsmsg(MSoapMsg_t *m, Octstr *from)
 	       mms_replace_header_value(msg, "Subject", octstr_get_cstr(s));
 	       octstr_destroy(s);
 	  }
+
+	  if ((s = http_header_value(m->envelope, octstr_imm("MessageID"))) != NULL) {
+	       mms_replace_header_value(msg, "Message-ID", octstr_get_cstr(s));
+	       octstr_destroy(s);
+	  }
 	  
 	  /* Put in recipient list. XXX - really?? */
 	  l = list_create();
diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c
index fd2b3f4..094e0b4 100644
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@@ -1601,6 +1601,10 @@ MmsMsg *mms_retrieveconf(MmsMsg *msg, Octstr *transactionid,
 		    i<n; i++) 
 		    list_append(m->body.l, 
 				mime_entity_duplicate(list_get(msg->body.l, i)));
+	  /* Remove some headers that may not be permitted. */
+	  mms_remove_headers(m, "X-Mms-Expiry");
+	  mms_remove_headers(m, "X-Mms-Delivery-Time");
+	  mms_remove_headers(m, "X-Mms-Sender-Visibility");
      }
      return m;
 }