diff --git a/src/common/outbound.c b/src/common/outbound.c
index b3b4ce90..0853c8fa 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -3025,7 +3025,7 @@ cmd_msg (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 									  newsess->server->nick, msg + offset, TRUE, FALSE,
 									  &no_tags);
 			}
-			else
+			else if (!sess->server->have_echo_message)
 			{
 				/* mask out passwords */
 				if (g_ascii_strcasecmp (nick, "nickserv") == 0)
@@ -5058,6 +5058,11 @@ handle_user_input (session *sess, char *text, int history, int nocommand)
 		handle_say (sess, text, TRUE);
 		return 1;
 	}
+	if (text[0] == cmd_char && text[1] == cmd_char)
+	{
+		handle_say (sess, text + 1, TRUE);
+		return 1;
+	}
 
 	for (i = 1; text[i]; i++)
 	{