diff --git a/APPL/FAC/fac_verify.inc b/APPL/FAC/fac_verify.inc
index 6ddebd2319..9d561e5983 100644
--- a/APPL/FAC/fac_verify.inc
+++ b/APPL/FAC/fac_verify.inc
@@ -1354,6 +1354,24 @@ checker("E-mail sending",
             }
         )
 
+if (this.settings) // (deze test werkt niet vanuit verify.asp.inc)
+checker("IIS SMTP service installed?",
+            function ()
+            {
+                var pick = "c:/inetpub/mailroot/Pickup";
+                if (fso.FolderExists(pick))
+                    return { result: resultcodes.ok,
+                             message: "Mail pickup folder found at: {0}".format(pick, S("puo_smtpserver")) };
+
+                if (S("puo_sendusing") == 2 && S("puo_smtpserver"))
+                    return { result: resultcodes.ok,
+                             message: "Mail pickup folder not found at: {0}<br>but relay for {1} is configured.".format(pick, S("puo_smtpserver"))};
+
+                return { result: resultcodes.warning,
+                         message: "Mail pickup folder not found at: {0}<br>and no mail relay server configured.".format(pick)};
+            }
+        )
+
 checker("Immediate E-mail test",
             function ()
             {