diff --git a/mercurial/patch.py b/mercurial/patch.py
index 25a58881efdde4c5a7bcf4ec5c763749ba083334_bWVyY3VyaWFsL3BhdGNoLnB5..1a680ccdb09aa96545157af27b4025ba74b3b635_bWVyY3VyaWFsL3BhdGNoLnB5 100644
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -262,6 +262,7 @@
 
     if subject and not message.startswith(subject):
         message = '%s\n%s' % (subject, message)
+    data['message'] = message
     tmpfp.close()
     if not diffs_seen:
         os.unlink(tmpname)
@@ -265,7 +266,6 @@
     tmpfp.close()
     if not diffs_seen:
         os.unlink(tmpname)
-        data['message'] = message
         data['user'] = user
         data['date'] = date
         data['branch'] = branch
@@ -278,7 +278,6 @@
             p2 = parents.pop(0)
 
     data['filename'] = tmpname
-    data['message'] = message
     data['user'] = user
     data['date'] = date
     data['branch'] = branch