diff --git a/src/users.cpp b/src/users.cpp
index cfe9d5f1d..3fd744c98 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -351,9 +351,10 @@ void User::SendMessage(BotInfo *source, const Anope::string &msg)
 
 void User::SendMessage(CommandSource &source, const Anope::string &msg)
 {
+	// TODO: remove support for the draft tag when other software catches up.
 	Anope::map<Anope::string> tags;
 	if (!source.msgid.empty())
-		tags["+draft/reply"] = source.msgid;
+		tags["+draft/reply"] = tags["+reply"] = source.msgid;
 
 	SendMessageInternal(*source.service, this, msg, tags);
 }