diff --git a/mbuni/mmlib/mms_mm7soap.c b/mbuni/mmlib/mms_mm7soap.c
index ec5b6af..ed2b9a2 100644
--- a/mbuni/mmlib/mms_mm7soap.c
+++ b/mbuni/mmlib/mms_mm7soap.c
@@ -544,7 +544,12 @@ static Octstr *headers_to_soapxml(List *hdrs, MM7Version_t *ver)
 	       skip = 1;
 	       break;
 	  case MM7_TAG_Content: 
-	       octstr_format_append(s, "<mm7:Content href=\"%S\"/>\n", v);
+	       if ((p = http_header_value(hdrs, octstr_imm("allowAdaptations"))) != NULL) 
+		    p = octstr_format(" allowAdaptations=\"%S\"", p);
+	       else 
+		    p = octstr_imm("");
+	       octstr_format_append(s, "<mm7:Content href=\"%S\"%S/>\n", v,p);
+	       octstr_destroy(p);
 	       skip = 1;
 	       break;
 	  case  MM7_TAG_ReplyCharging:
diff --git a/mbuni/mmsbox/Makefile.am b/mbuni/mmsbox/Makefile.am
index 6f63af5..12d8f60 100644
--- a/mbuni/mmsbox/Makefile.am
+++ b/mbuni/mmsbox/Makefile.am
@@ -1,7 +1,7 @@
 libmms = $(top_builddir)/mmlib/libmms.a
 
 bin_PROGRAMS = mmsbox
-mmsbox_SOURCES = mmsbox.c mmsbox_cfg.c dlr.c bearerbox.c
+mmsbox_SOURCES = mmsbox.c mmsbox_cfg.c dlr.c bearerbox.c 
 mmsbox_LDADD = $(libmms)
 
-EXTRA_DIST = mmsbox_cfg.h  mmsbox.h mmsbox_msg_filter.h
+EXTRA_DIST = mmsbox_cfg.h  mmsbox.h mmsbox_mt_filter.h