From 0346c23ae008f2fe73e83066ca3fb5559581fca0 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 15 May 2019 01:30:21 -0400
Subject: [PATCH] fix #387

---
 irc/client.go         | 2 +-
 irc/responsebuffer.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/irc/client.go b/irc/client.go
index ea01b658..8c38f378 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -1120,7 +1120,7 @@ func (session *Session) sendFromClientInternal(blocking bool, serverTime time.Ti
 	}
 	// attach message-id
 	if msgid != "" && session.capabilities.Has(caps.MessageTags) {
-		msg.SetTag("draft/msgid", msgid)
+		msg.SetTag("msgid", msgid)
 	}
 	// attach server-time
 	if session.capabilities.Has(caps.ServerTime) {
diff --git a/irc/responsebuffer.go b/irc/responsebuffer.go
index 3b7b0bcb..794254c0 100644
--- a/irc/responsebuffer.go
+++ b/irc/responsebuffer.go
@@ -90,7 +90,7 @@ func (rb *ResponseBuffer) AddFromClient(time time.Time, msgid string, fromNickMa
 	}
 	// attach message-id
 	if len(msgid) > 0 && rb.session.capabilities.Has(caps.MessageTags) {
-		msg.SetTag("draft/msgid", msgid)
+		msg.SetTag("msgid", msgid)
 	}
 	// attach server-time
 	if rb.session.capabilities.Has(caps.ServerTime) && !msg.HasTag("time") {