diff -r d0837696fd3a -r 7470b03b0914 libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/libpurple/protocols/irc/irc.c	Sun Nov 02 06:41:34 2008 +0000
@@ -62,8 +62,6 @@
 
 PurplePlugin *_irc_plugin = NULL;
 
-static const char *status_chars = "@+%&";
-
 static void irc_view_motd(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
@@ -518,10 +516,7 @@
 	char *plain;
 	const char *args[2];
 
-	if (strchr(status_chars, *who) != NULL)
-		args[0] = who + 1;
-	else
-		args[0] = who;
+	args[0] = irc_nick_skip_mode(irc, who);
 
 	purple_markup_html_to_xhtml(what, NULL, &plain);
 	args[1] = plain;