diff --git a/KMMO/kmmo.sql b/KMMO/kmmo.sql
index 6e8192f35..dacdfebb2 100644
--- a/KMMO/kmmo.sql
+++ b/KMMO/kmmo.sql
@@ -134,6 +134,8 @@ CREATE OR REPLACE PACKAGE BODY KMMO AS
       errormsg            fac_result.fac_result_waarde%TYPE;
    BEGIN
 
+      defaultstdmelding := NULL;
+
       CASE
          WHEN UPPER (pto) LIKE 'FEEDBACK@%'
          THEN
@@ -142,6 +144,26 @@ CREATE OR REPLACE PACKAGE BODY KMMO AS
             kkey_mail := 541;
             sender := 1841;    -- Ontvangen feedback
 
+         WHEN UPPER (pto) LIKE 'AANVRAAG@%'
+         THEN
+            defaultstdmelding := 481;
+            kkey_att := 1;
+            kkey_mail := 581;
+            sender := 1841;    -- Ontvangen feedback
+
+         WHEN UPPER (pto) LIKE 'STORING@%'
+         THEN
+            defaultstdmelding := 501;
+            kkey_att := 1;
+            kkey_mail := 582;
+            sender := 1841;    -- Ontvangen feedback
+
+         ELSE
+            NULL;
+      END CASE;
+
+      IF defaultstdmelding IS NOT NULL
+      THEN
             -- suggested extensions:
             -- check for MLDUSE-write autorisations
             -- parse the subject to find an appropriate stdmelding, if uniquely possible
@@ -200,9 +222,7 @@ CREATE OR REPLACE PACKAGE BODY KMMO AS
                                        'maillog',
                                        'Geregistreerd onder melding ' || newkey);
             END;
-         ELSE
-            NULL;
-      END CASE;
+      END IF;
 
       IF errormsg IS NOT NULL
       THEN