diff --git a/daklib/queue.py b/daklib/queue.py
index c2f0414f6e31adb42402376a928e30787bf1405a..514e3226ced30ee048d3ff22843f57ae7a7d4a8b 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2012,6 +2012,10 @@ distribution."""
 
         self.Subst["__SHORT_SUMMARY__"] = short_summary
 
+        # Skip all of this if not sending mail to avoid confusing people
+        if cnf.has_key("Dinstall::Options::No-Mail") and cnf["Dinstall::Options::No-Mail"]:
+            return summary
+
         for dist in self.pkg.changes["distribution"].keys():
             suite = get_suite(dist)
             if suite is None: continue