diff --git a/db/tests.db b/db/tests.db
index 2950cd7e..2275afd8 100644
--- a/db/tests.db
+++ b/db/tests.db
@@ -223,6 +223,7 @@ MAIL-8814:test:security:mail_messaging::Check postfix process status:
 MAIL-8816:test:security:mail_messaging::Check Postfix configuration:
 MAIL-8816:test:security:mail_messaging::Postfix configuration errors:
 MAIL-8818:test:security:mail_messaging::Postfix banner:
+MAIL-8820:test:security:mail_messaging::Postfix configuration:
 MAIL-8838:test:security:mail_messaging::Check dovecot process:
 MAIL-8860:test:security:mail_messaging::Check Qmail status:
 MAIL-8880:test:security:mail_messaging::Check Sendmail status:
diff --git a/include/tests_mail_messaging b/include/tests_mail_messaging
index 6157e671..c893f83a 100644
--- a/include/tests_mail_messaging
+++ b/include/tests_mail_messaging
@@ -154,6 +154,28 @@
     fi
 #
 #################################################################################
+#
+    # Test        : MAIL-8820
+    Register --test-no MAIL-8820 --weight L --network NO --category security --description "Postfix configuration scan"
+    if [ ${SKIPTEST} -eq 0  ]; then
+        if [ "$(postconf -h inet_interfaces 2> /dev/null)" = "all" ]; then
+            if ! SkipAtomicTest "${TEST_NO}:disable_vrfy_command"; then
+                if [ "$(postconf -h disable_vrfy_command 2> /dev/null)" = "no" ]; then
+                    ReportSuggestion "${TEST_NO}:disable_vrfy_command" "Disable the 'VRFY' command" "disable_vrfy_command=no" "text:run postconf -e disable_vrfy_command=yes to change the value"
+                fi
+            fi
+        fi
+
+        #FIND=$(${POSTCONFBINARY} 2> /dev/null | ${SEDBINARY} 's/ /:space:/g' | ${SEDBINARY} 's/ =$//')
+        #for line in ${FIND}; do
+        #    line=$(echo ${line} | ${SEDBINARY} 's/:space:/ /g')
+        #    key=$(echo ${line} | ${AWKBINARY} -F" = " '{print $1}')
+        #    value=$(echo ${line} | ${AWKBINARY} -F" = " '{print $2}')
+        #    #echo "Found key '${key}' with value '${value}'"
+        #done
+    fi
+#
+#################################################################################
 #
     # Test        : MAIL-8838
     # Description : Check Dovecot process