diff -r 25a58881efdd -r 1a680ccdb09a mercurial/patch.py
--- a/mercurial/patch.py	Tue Oct 06 02:04:06 2015 -0700
+++ b/mercurial/patch.py	Tue Oct 06 02:04:46 2015 -0700
@@ -262,10 +262,10 @@
 
     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)
-        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