diff --git a/BEZ/BEZ_TRI.SRC b/BEZ/BEZ_TRI.SRC
index b6f02c59..73473c1b 100644
--- a/BEZ/BEZ_TRI.SRC
+++ b/BEZ/BEZ_TRI.SRC
@@ -1,7 +1,7 @@
 #ifdef  BEZ // 03-11-2000 PF
 
-/*  $Revision: 25 $
- *  $Modtime: 20-12-07 13:54 $
+/*  $Revision: 26 $
+ *  $Modtime: 3-01-08 15:03 $
  */
 
 #include "comsql.h"
@@ -141,8 +141,8 @@ BEGIN
              WHERE bez_afspraak_key = :NEW.bez_afspraak_key;
 
              -- We support substitution of placeholders in the messages
-             -- ##KEY##    = ins_srtdiscipline_prefix+key+/+volgnr
-            -- ##NAAM##    = volledige naam van de afmelder
+             -- ##KEY##    = afspraaknummer
+            -- ##NAAM##    = volledige naam van de bezoeker
             IF INSTR2(soms, '#') > 0
             THEN
                soms :=
@@ -266,12 +266,13 @@ BEGIN
                        );
          END IF;
 
-         IF soms IS NOT NULL
+         -- Prevent sending these messages to self
+         IF soms IS NOT NULL AND lsender != lreceiver
          THEN
             fac.putnotificationsrt (lsender, lreceiver, scode, :NEW.bez_afspraak_key, soms, NULL, NULL, NULL, NULL);
          END IF;
 
-         IF soms2 IS NOT NULL
+         IF soms2 IS NOT NULL AND lsender != lreceiver2
          THEN
             fac.putnotificationsrt (lsender, lreceiver2, scode2, :NEW.bez_afspraak_key, soms2, NULL, NULL, NULL, NULL);
          END IF;
diff --git a/_UP/471to480.src b/_UP/471to480.src
index efdd79f1..2627ec87 100644
--- a/_UP/471to480.src
+++ b/_UP/471to480.src
@@ -1,5 +1,5 @@
 --
--- Update script van Facilitor versie 4.71.3 naar 4.80 $Revision: 29 $
+-- Update script van Facilitor versie 4.71.3 naar 4.80 $Revision: 30 $
 --
 /*
  * This script is to be precompiled.
@@ -35,8 +35,8 @@ PROMPT versie voor MS SQL Server
 #else
 PROMPT versie voor Oracle
 #endif
-PROMPT $Revision: 29 $
-PROMPT $Modtime: 21-12-07 14:38 $
+PROMPT $Revision: 30 $
+PROMPT $Modtime: 3-01-08 15:47 $
 PROMPT Copyright 1996-2007 Dijkoraad IT bv/Facilitor Software Nederland bv
 PROMPT
 SELECT 'De huidige versie van Facilitor/' || USER || ' is: ' || fac_module_version
@@ -357,6 +357,21 @@ DEF_FAC_MESSAGE ('ALG_OPEN_CONTRACT', 'heeft lopend contract', '');
 
 ///////////////////////////////////////////////////////////////////////////////////////////////// DML
 
+/////////////////////////////////////////////////////////////////////////////////////////////////  UWVA#13637
+-- Verwijder alle informatieve portalberichten (statusinfo) ouder dan 2 maanden; 
+-- dit ruimt op en de nieuwswaarde is ondertussen nihil
+DELETE FROM web_user_messages w
+      WHERE web_user_mess_action_datum + 30 < SYSDATE
+        AND w.fac_srtnotificatie_key IN (SELECT s.fac_srtnotificatie_key
+                                           FROM fac_srtnotificatie s
+                                          WHERE s.fac_srtnotificatie_code NOT IN ('BESAP1', 'MLDAP1'));
+
+-- Onverhoopte fiatteringsverzoeken ouder dan een half jaar zijn ook wel vervallen
+DELETE FROM web_user_messages w
+      WHERE web_user_mess_action_datum + 60 < SYSDATE
+        AND w.fac_srtnotificatie_key IN (SELECT s.fac_srtnotificatie_key
+                                           FROM fac_srtnotificatie s
+                                          WHERE s.fac_srtnotificatie_code IN ('BESAP1', 'MLDAP1'));
 
 ///////////////////////////////////////////////////////////////////////////////////////////////// DDL
 
@@ -370,11 +385,11 @@ DEF_FAC_MESSAGE ('ALG_OPEN_CONTRACT', 'heeft lopend contract', '');
 UPDATE_VERSION(_VERSION);
 
 UPDATE FAC_MESSAGE
-   SET FAC_MESSAGE_TEXT = 'Facilitor '||_VERSION||'$Revision: 29 $'
+   SET FAC_MESSAGE_TEXT = 'Facilitor '||_VERSION||'$Revision: 30 $'
  WHERE FAC_MESSAGE_CODE = 'FAC_M002';
 
 UPDATE FAC_MESSAGE
-   SET FAC_MESSAGE_TEXT = 'Welkom bij Facilitor '||_VERSION||'$Revision: 29 $'
+   SET FAC_MESSAGE_TEXT = 'Welkom bij Facilitor '||_VERSION||'$Revision: 30 $'
  WHERE FAC_MESSAGE_CODE = 'FAC_M035';
 
 COMMIT;