-From: %(commname)s <%(commemail)s>
-Subject: [PATCH %(patchnr)s/%(totalnr)s] %(shortdescr)s
-Date: %(date)s
-%(endofheaders)s
+From: %(maintainer)s
+Subject: [%(prefix)sPATCH%(version)s%(number)s] %(shortdescr)s
+
+From: %(authname)s <%(authemail)s>
+
%(longdescr)s
---