diff --git a/mbuni/doc/examples/mmsc.conf b/mbuni/doc/examples/mmsc.conf
index 5784139..0f44a08 100644
--- a/mbuni/doc/examples/mmsc.conf
+++ b/mbuni/doc/examples/mmsc.conf
@@ -77,6 +77,8 @@ vasp-password = news123
vasp-url = http://localhost:23535/
mmsc-username = user
mmsc-password = secret
+mms-to-email-handler = true
+mms-to-local-copy-handler = true
group = mmsproxy
name = "A test mms proxy"
diff --git a/mbuni/doc/userguide.shtml b/mbuni/doc/userguide.shtml
index 2ac4712..1cb5e07 100644
--- a/mbuni/doc/userguide.shtml
+++ b/mbuni/doc/userguide.shtml
@@ -1502,6 +1502,36 @@ mmsc-password
+
+
+ mms-to-email-handler
+ |
+
+Boolean
+ |
+
+ Set this to true if all MMS destined to email addresses should be
+ routed via this VASP by the MMC. The message will be packed as an
+ MM7 message and handed over. This could be used to customise the
+ appearance of the email.
+ |
+
+
+
+
+ mms-to-local-copy-handler
+ |
+
+ Boolean
+ |
+
+ Set this to true if all MMS destined to local recipients
+ (e.g. mobiles) should be copied to this VASP. This is useful if you
+ want to implement a web-based viewer (as a backup solution) for your
+ users.
+ |
+
+
diff --git a/mbuni/misc-patches/mbuni-kannel-patch-full b/mbuni/misc-patches/mbuni-kannel-patch-full
index 70b41b0..34adcf7 100644
--- a/mbuni/misc-patches/mbuni-kannel-patch-full
+++ b/mbuni/misc-patches/mbuni-kannel-patch-full
@@ -717,8 +717,8 @@ diff -Naur gateway-1.4.0/gw/xml_shared.h gateway-1.4.0-patched/gw/xml_shared.h
/*
diff -Naur gateway-1.4.0/gwlib/cfg.def gateway-1.4.0-patched/gwlib/cfg.def
--- gateway-1.4.0/gwlib/cfg.def 2004-06-28 18:18:35.000000000 +0300
-+++ gateway-1.4.0-patched/gwlib/cfg.def 2005-09-05 11:30:55.000000000 +0300
-@@ -544,6 +544,113 @@
++++ gateway-1.4.0-patched/gwlib/cfg.def 2005-10-25 13:10:00.000000000 +0300
+@@ -544,6 +544,115 @@
OCTSTR(unified-prefix)
)
@@ -784,6 +784,8 @@ diff -Naur gateway-1.4.0/gwlib/cfg.def gateway-1.4.0-patched/gwlib/cfg.def
+ OCTSTR(vasp-username)
+ OCTSTR(vasp-password)
+ OCTSTR(vasp-url)
++ OCTSTR(mms-to-email-handler)
++ OCTSTR(mms-to-local-copy-handler)
+ OCTSTR(mmsc-username)
+ OCTSTR(mmsc-password)
+)