diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index e8c84ab..0a345d8 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -1134,8 +1134,12 @@
 			return "no reviewers listed in CL"
 		cl.cc = Sub(cl.cc, defaultcc)
 		cl.reviewer = defaultcc
-		cl.Flush(ui, repo)		
-	cl.Mail(ui, repo)
+		cl.Flush(ui, repo)
+
+	if cl.files == []:
+		return "no changed files, not sending mail"
+
+	cl.Mail(ui, repo)		
 
 def nocommit(ui, repo, *pats, **opts):
 	"""(disabled when using this extension)"""