1 files changed, 17 insertions, 1 deletions
diff --git a/app.go b/app.go
index 47ab02f..6025595 100644
--- a/app.go
+++ b/app.go
@@ -379,8 +379,24 @@ func (app *App) handleInput(buffer, content string) {
 		target := split[0]
 		content := split[1]
 		app.s.PrivMsg(target, content)
-		// TODO echo mssage
+		if !app.s.HasCapability("echo-message") {
+			if app.s.IsChannel(target) {
+				buffer = ui.Home
+			} else {
+				buffer = target
+			}
+			line := ui.LineFromIRCMessage(time.Now(), app.s.Nick(), content, false, false)
+			app.win.AddLine(buffer, line)
+		}
 	case "R":
+		if buffer != ui.Home {
+			return
+		}
+
 		app.s.PrivMsg(app.lastQuery, args)
+		if !app.s.HasCapability("echo-message") {
+			line := ui.LineFromIRCMessage(time.Now(), app.s.Nick(), args, false, false)
+			app.win.AddLine(ui.Home, line)
+		}
 	}
 }