diff --git a/extensions/irc/xul/content/handlers.js b/extensions/irc/xul/content/handlers.js
index 842a1d55ee4..c3e4bbacb3d 100644
--- a/extensions/irc/xul/content/handlers.js
+++ b/extensions/irc/xul/content/handlers.js
@@ -1946,7 +1946,8 @@ function my_cjoin (e)
 
     if (userIsMe(e.user))
     {
-        this.display (getMsg(MSG_YOU_JOINED, e.channel.unicodeName), "JOIN",
+        var params = [e.user.unicodeName, e.channel.unicodeName];
+        this.display (getMsg(MSG_YOU_JOINED, params), "JOIN", 
                       e.server.me, this);
         if (client.globalHistory)
             client.globalHistory.addPage(this.getURL());
@@ -1993,8 +1994,8 @@ function my_cpart (e)
 
     if (userIsMe (e.user))
     {
-        this.display (getMsg(MSG_YOU_LEFT, e.channel.unicodeName), "PART",
-                      e.user, this);
+        var params = [e.user.unicodeName, e.channel.unicodeName];
+        this.display (getMsg(MSG_YOU_LEFT, params), "PART", e.user, this);
 
         if (client.currentObject == this)
             /* hide the tree while we remove (possibly tons) of nodes */
@@ -2046,15 +2047,15 @@ function my_ckick (e)
         if (e.user)
         {
             this.display (getMsg(MSG_YOURE_GONE,
-                                 [e.channel.unicodeName, e.user.unicodeName,
-                                  e.reason]),
+                                 [e.lamer.unicodeName, e.channel.unicodeName,
+                                  e.user.unicodeName, e.reason]),
                           "KICK", e.user, this);
         }
         else
         {
             this.display (getMsg(MSG_YOURE_GONE,
-                                 [e.channel.unicodeName, MSG_SERVER,
-                                  e.reason]),
+                                 [e.lamer.unicodeName, e.channel.unicodeName, 
+                                  MSG_SERVER, e.reason]),
                           "KICK", (void 0), this);
         }
 
@@ -2154,8 +2155,8 @@ function my_cquit (e)
     if (userIsMe(e.user))
     {
         /* I dont think this can happen */
-        this.display (getMsg(MSG_YOU_QUIT, [e.server.parent.unicodeName, e.reason]),
-                      "QUIT", e.user, this);
+        var pms = [e.user.unicodeName, e.server.parent.unicodeName, e.reason];
+        this.display (getMsg(MSG_YOU_QUIT, pms),"QUIT", e.user, this);
     }
     else
     {
diff --git a/extensions/irc/xul/locale/en-US/chatzilla.properties b/extensions/irc/xul/locale/en-US/chatzilla.properties
index 21fda7b0d90..b0462af901a 100644
--- a/extensions/irc/xul/locale/en-US/chatzilla.properties
+++ b/extensions/irc/xul/locale/en-US/chatzilla.properties
@@ -986,12 +986,12 @@ msg.topic         = Topic for %S is ``%S''
 msg.no.topic      = No topic for channel %S"
 msg.topic.date    = Topic for %S was set by %S on %S"
 
-msg.you.joined      = YOU have joined %S"
+msg.you.joined      = YOU (%S) have joined %S"
 msg.someone.joined  = "%S (%S@%S) has joined %S"
-msg.you.left        = YOU have left %S"
+msg.you.left        = YOU (%S) have left %S"
 msg.someone.left    = "%S has left %S"
 msg.someone.left.reason = "%S has left %S (%S)
-msg.youre.gone      = YOU have been booted from %S by %S (%S)
+msg.youre.gone      = YOU (%S) have been booted from %S by %S (%S)
 msg.someone.gone    = "%S was booted from %S by %S (%S)
 
 msg.mode.changed    = Mode %S by %S"
@@ -999,7 +999,7 @@ msg.mode.changed    = Mode %S by %S"
 msg.away.on      = You are now marked as away (%S).
 msg.away.off     = You are no longer marked as away.
 
-msg.you.quit     = YOU have left %S (%S)
+msg.you.quit     = YOU (%S) have left %S (%S)
 msg.someone.quit = "%S has left %S (%S)
 
 msg.unknown.ctcp = Unknown CTCP %S (%S) from %S"