diff --git a/svn/Changelog b/svn/Changelog
index fddd1e7..9102dbd 100644
--- a/svn/Changelog
+++ b/svn/Changelog
@@ -5,6 +5,8 @@ Changelog
 - Added initscript for Ubuntu (posted by Paolo Martinelli)
 - Added patch "Patch: Treat --daemon values as intervals"
   (submitted by James deBoer)
+- Don't send any mail when in not running daemon mode (patch submitted by 
+  Daniel Thaler)
 
 
 3.7.0
diff --git a/svn/ddclient b/svn/ddclient
index 94eefc0..b1801b8 100755
--- a/svn/ddclient
+++ b/svn/ddclient
@@ -1353,7 +1353,7 @@ sub logger {
 sub sendmail {
     my $recipients = opt('mail');
 
-    if (opt('mail-failure') && ($result ne 'OK')) {
+    if (opt('mail-failure') && ($result ne 'OK' && $result != 0)) {
 	$recipients = opt('mail-failure');
     }
     if ($msgs && $recipients && $msgs ne $last_msgs) {