--- etc/periodic/daily/440.status-mailq.orig	2007-12-08 18:09:45.000000000 +0100
+++ etc/periodic/daily/440.status-mailq	2008-05-09 13:25:38.000000000 +0200
@@ -58,6 +58,46 @@
 		    [ $rc_submit -gt 0 ] && rc=1
 		fi;;
 	    esac
+
+	    case "$daily_status_include_quarantine_mailq" in
+	    [Yy][Ee][Ss])
+		echo ""
+		echo "Mail in quarantine queue:"
+
+		rc_submit=$(case "$daily_status_mailq_shorten" in
+			[Yy][Ee][Ss])
+			    mailq -qQ |
+				egrep -e '^[[:space:]]+[^[:space:]]+@' |
+				sort |
+				uniq -c |
+				sort -nr |
+				awk '$1 >= 1 {print $1, $2}';;
+			*)
+			    mailq -qQ;;
+		esac | tee /dev/stderr |
+		egrep -v '(mqueue is empty|Total requests)' | wc -l)
+		[ $rc_submit -gt 0 ] && rc=1
+	    esac
+
+	    case "$daily_status_include_lost_mailq" in
+	    [Yy][Ee][Ss])
+		echo ""
+		echo "Mail in lost queue:"
+
+		rc_submit=$(case "$daily_status_mailq_shorten" in
+			[Yy][Ee][Ss])
+			    mailq -qL |
+				egrep -e '^[[:space:]]+[^[:space:]]+@' |
+				sort |
+				uniq -c |
+				sort -nr |
+				awk '$1 >= 1 {print $1, $2}';;
+			*)
+			    mailq -qL;;
+		esac | tee /dev/stderr |
+		egrep -v '(mqueue is empty|Total requests)' | wc -l)
+		[ $rc_submit -gt 0 ] && rc=1
+	    esac
 	fi;;
 		
     *)  rc=0;;
--- etc/defaults/periodic.conf.orig	2007-12-08 18:09:00.000000000 +0100
+++ etc/defaults/periodic.conf	2008-05-09 13:21:01.000000000 +0200
@@ -119,6 +119,8 @@
 daily_status_mailq_enable="YES"				# Check mail status
 daily_status_mailq_shorten="NO"				# Shorten output
 daily_status_include_submit_mailq="YES"			# Also submit queue
+daily_status_include_quarantine_mailq="YES"		# Also quarantine queue
+daily_status_include_lost_mailq="YES"			# Also lost queue
 
 # 450.status-security
 daily_status_security_enable="YES"			# Security check