1 files changed, 8 insertions, 2 deletions
diff --git a/app.go b/app.go
index af2ca2e..c6027e2 100644
--- a/app.go
+++ b/app.go
@@ -326,8 +326,14 @@ func (app *App) handleInput(buffer, content string) {
 		}
 
 		if args == "" {
-			topic := app.s.Topic(buffer)
-			line := fmt.Sprintf("\x0314Topic: %s", topic)
+			var line string
+
+			topic, who, at := app.s.Topic(buffer)
+			if who == "" {
+				line = fmt.Sprintf("\x0314Topic: %s", topic)
+			} else {
+				line = fmt.Sprintf("\x0314Topic (by %s, %s): %s", who, at.Format("Mon Jan 2 15:04:05"), topic)
+			}
 			app.win.AddLine(buffer, ui.NewLineNow("--", line))
 		} else {
 			app.s.SetTopic(buffer, args)