diff --git a/modules/git/notes.go b/modules/git/notes.go
index 65242f4581..574f5adc3e 100644
--- a/modules/git/notes.go
+++ b/modules/git/notes.go
@@ -6,11 +6,14 @@ package git
 
 import (
 	"io/ioutil"
+
+	"gopkg.in/src-d/go-git.v4/plumbing"
 )
 
 // Note stores information about a note created using git-notes.
 type Note struct {
 	Message []byte
+	Commit  *Commit
 }
 
 // GetNote retrieves the git-notes data for a given commit.
@@ -36,7 +39,18 @@ func GetNote(repo *Repository, commitID string, note *Note) error {
 	if err != nil {
 		return err
 	}
-
 	note.Message = d
+
+	commit, err := repo.gogitRepo.CommitObject(plumbing.Hash(notes.ID))
+	if err != nil {
+		return err
+	}
+
+	lastCommits, err := getLastCommitForPaths(commit, "", []string{commitID})
+	if err != nil {
+		return err
+	}
+	note.Commit = convertCommit(lastCommits[commitID])
+
 	return nil
 }
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index b7208d74e9..4a19db2c1b 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -252,6 +252,8 @@ func Diff(ctx *context.Context) {
 	err = git.GetNote(ctx.Repo.GitRepo, commitID, &note)
 	if err == nil {
 		ctx.Data["Note"] = string(templates.ToUTF8WithFallback(note.Message))
+		ctx.Data["NoteCommit"] = note.Commit
+		ctx.Data["NoteAuthor"] = models.ValidateCommitWithEmail(note.Commit)
 	}
 
 	if commit.ParentCount() > 0 {
diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl
index 016d92a8f4..9fee2b3221 100644
--- a/templates/repo/diff/page.tmpl
+++ b/templates/repo/diff/page.tmpl
@@ -66,10 +66,28 @@
 				{{end}}
 			{{end}}
 			{{if .Note}}
-				<div class="ui top bottom attached info clearing segment">
+				<div class="ui top attached info clearing segment">
 					<h3>{{.i18n.Tr "repo.diff.git-notes"}}</h3>
 					<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
 				</div>
+				<div class="ui bottom attached info segment">
+					<div class="ui stackable grid">
+						<div class="nine wide column">
+							{{if .NoteAuthor}}
+								<img class="ui avatar image" src="{{.NoteAuthor.RelAvatarLink}}" />
+							{{if .NoteAuthor.FullName}}
+							<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteAuthor.FullName}}</strong></a>
+							{{else}}
+							<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteCommit.Author.Name}}</strong></a>
+							{{end}}
+							{{else}}
+								<img class="ui avatar image" src="{{AvatarLink .NoteCommit.Author.Email}}" />
+								<strong>{{.NoteCommit.Author.Name}}</strong>
+							{{end}}
+							<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
+						</div>
+					</div><!-- end grid -->
+				</div>
 			{{end}}
 		{{end}}