diff --git a/degesch.c b/degesch.c
index dc9427e..b521555 100644
--- a/degesch.c
+++ b/degesch.c
@@ -4034,7 +4034,9 @@ irc_get_buffer_for_message (struct server *s,
 		if (irc_is_this_us (s, target))
 			buffer = irc_get_or_make_user_buffer (s, nickname);
 		// With the IRCv3.2 echo-message capability, we can receive messages
-		// as they are delivired to the target; in that case, check the origin
+		// as they are delivered to the target; in that case, check the origin
+		// FIXME: this breaks /msg with CAP echo-message, we should return
+		//   NULL and the caller should do this check instead and handle it
 		else if (soft_assert (irc_is_this_us (s, nickname)))
 			buffer = irc_get_or_make_user_buffer (s, target);
 		free (nickname);