2 files changed, 18 insertions, 25 deletions

diff --git a/cgit.css b/cgit.css
index 0c88b65..7a5f423 100644
--- a/cgit.css
+++ b/cgit.css
@@ -152,36 +152,25 @@ table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
 table.list td.logsubject {
         font-family: monospace;
         font-weight: bold;
 }
 
 table.list td.logmsg {
         font-family: monospace;
         white-space: pre;
-        padding: 1em 0.5em 2em 0.5em;
-}
-
-table.list td.lognotes-label {
-        text-align:right;
-        vertical-align:top;
-}
-
-table.list td.lognotes {
-        font-family: monospace;
-        white-space: pre;
-        padding: 0em 0.5em 2em 0.5em;
+        padding: 0 0.5em;
 }
 
 table.list td a {
         color: black;
 }
 
 table.list td a.ls-dir {
         font-weight: bold;
         color: #00f;
 }
 
 table.list td a:hover {
diff --git a/ui-log.c b/ui-log.c
index 27f5a1a..6d7fcae 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -102,47 +102,51 @@ void print_commit(struct commit *commit)
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                 html("</td><td>");
                 htmlf("%d", files);
                 if (ctx.repo->enable_log_linecount) {
                         html("</td><td>");
                         htmlf("-%d/+%d", rem_lines, add_lines);
                 }
         }
         html("</td></tr>\n");
-        if (ctx.qry.showmsg) {
-                struct strbuf notes = STRBUF_INIT;
-                format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
+
+        if (ctx.qry.showmsg) { /* Print message + notes in a second table row */
+                /* Concatenate commit message and notes in msgbuf */
+                struct strbuf msgbuf = STRBUF_INIT;
+                if (info->msg && *(info->msg)) {
+                        strbuf_addstr(&msgbuf, info->msg);
+                        strbuf_addch(&msgbuf, '\n');
+                }
+                format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING,
+                            NOTES_SHOW_HEADER | NOTES_INDENT);
+                strbuf_addch(&msgbuf, '\n');
+                strbuf_ltrim(&msgbuf);
 
                 if (ctx.repo->enable_log_filecount) {
                         cols++;
                         if (ctx.repo->enable_log_linecount)
                                 cols++;
                 }
+
+                /* Create second table row containing msgbuf */
                 htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
                         cols);
-                html_txt(info->msg);
+                html_txt(msgbuf.buf);
                 html("</td></tr>\n");
-                if (notes.len != 0) {
-                        html("<tr class='nohover'>");
-                        html("<td class='lognotes-label'>Notes:</td>");
-                        htmlf("<td colspan='%d' class='lognotes'>",
-                                cols);
-                        html_txt(notes.buf);
-                        html("</td></tr>\n");
-                }
-                strbuf_release(&notes);
+                strbuf_release(&msgbuf);
         }
+
         cgit_free_commitinfo(info);
 }
 
 static const char *disambiguate_ref(const char *ref)
 {
         unsigned char sha1[20];
         const char *longref;
 
         longref = fmt("refs/heads/%s", ref);
         if (get_sha1(longref, sha1) == 0)
                 return longref;