1 files changed, 6 insertions, 3 deletions
diff --git a/app.go b/app.go
index e8f1246..f0ad553 100644
--- a/app.go
+++ b/app.go
@@ -323,9 +323,12 @@ func (app *App) handleInput(buffer, content string) {
 			return
 		}
 
-		line := fmt.Sprintf("\x01ACTION %s\x01", args)
-		app.s.PrivMsg(buffer, line)
-		// TODO echo message
+		args := fmt.Sprintf("\x01ACTION %s\x01", args)
+		app.s.PrivMsg(buffer, args)
+		if !app.s.HasCapability("echo-message") {
+			line := ui.LineFromIRCMessage(time.Now(), app.s.Nick(), args, false, false)
+			app.win.AddLine(buffer, line)
+		}
 	case "MSG":
 		split := strings.SplitN(args, " ", 2)
 		if len(split) < 2 {