2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2b082481..afb8a918 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ fetchmail-4.0.6 ()
 * Changed semantics of `via' and `poll <name>' to be more orthogonal.
 * Substantially improved option coverage on the man page.
 * Yet another try at getting the remote-build right for Harry McGavran.
+* Don't emit "No mail" messages in (non-verbose) daemon mode).
 
 WARNING: If you are running multidrop, (RE)READ FAQ ITEM F1 NOW!
 There are 255 people on the fetchmail-friends list.
diff --git a/driver.c b/driver.c
index 11d68982..1934e9cf 100644
--- a/driver.c
+++ b/driver.c
@@ -1475,7 +1475,11 @@ const struct method *proto;	/* protocol method table */
 		if (count == -1)		/* only used for ETRN */
 		    error(0, 0, "Polling %s", buf);
 		else if (count == 0)
-		    error(0, 0, "No mail at %s", buf); 
+		{
+		    /* these are pointless in normal daemon mode */
+		    if (poll_interval == 0 || outlevel == O_VERBOSE )
+			error(0, 0, "No mail at %s", buf); 
+		}
 		else
 		{
 		    if (new != -1 && (count - new) > 0)