1 files changed, 6 insertions, 1 deletions

diff --git a/ui-patch.c b/ui-patch.c
index ef79c7c..e7a010a 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -67,39 +67,44 @@ static void filepair_cb(struct diff_filepair *pair)
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
                 html("Error running diff");
 }
 
 void cgit_print_patch(char *hex, struct cacheitem *item)
 {
         struct commit *commit;
         struct commitinfo *info;
         unsigned char sha1[20], old_sha1[20];
         char *patchname;
 
         if (!hex)
                 hex = cgit_query_head;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
         }
         commit = lookup_commit_reference(sha1);
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
         hashcpy(old_sha1, commit->parents->item->object.sha1);
 
         patchname = fmt("%s.patch", sha1_to_hex(sha1));
         cgit_print_snapshot_start("text/plain", patchname, item);
         htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
         htmlf("From: %s%s\n", info->author, info->author_email);
         html("Date: ");
         cgit_print_date(info->author_date, "%a, %d  %b  %Y  %H:%M:%S  %z%n");
-        htmlf("Subject: %s\n\n%s", info->subject, info->msg);
+        htmlf("Subject: %s\n\n", info->subject);
+        if (info->msg && *info->msg) {
+                htmlf("%s", info->msg);
+                if (info->msg[strlen(info->msg) - 1] != '\n')
+                        html("\n");
+        }
         html("---\n");
         cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
         html("--\n");
         htmlf("cgit %s\n", CGIT_VERSION);
         cgit_free_commitinfo(info);
 }