diff --git a/code/chat.js b/code/chat.js
index 8bb97598..1df65472 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -362,12 +362,19 @@ window.chat.renderMsg = function(msg, nick, time, team) {
   var tb = unixTimeToString(time, true);
   // help cursor via “#chat time”
   var t = '<time title="'+tb+'" data-timestamp="'+time+'">'+ta+'</time>';
-  var s = 'style="color:'+COLORS[team]+'"';
+  var s = 'style="cursor:pointer; color:'+COLORS[team]+'"';
   var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : '';
   var i = ['<span class="invisep">&lt;</span>', '<span class="invisep">&gt;</span>'];
-  return '<tr><td>'+t+'</td><td>'+i[0]+'<mark class="nickname" '+s+'>'+nick+'</mark>'+i[1]+'</td><td>'+msg+'</td></tr>';
+  return '<tr><td>'+t+'</td><td>'+i[0]+'<mark class="nickname" onclick="window.chat.addNickname(\'@' + nick + '\')" ' + s + '>'+ nick+'</mark>'+i[1]+'</td><td>'+msg+'</td></tr>';
 }
 
+window.chat.addNickname= function(nick){
+    var c = document.getElementById("chattext");
+    c.value = [c.value, nick, " "].join(" ").trim() + " ";
+    c.focus()
+}
+
+
 
 
 window.chat.getActive = function() {
diff --git a/main.js b/main.js
index 08b92a19..f95230c8 100644
--- a/main.js
+++ b/main.js
@@ -81,7 +81,7 @@ document.getElementsByTagName('body')[0].innerHTML = ''
   + '<form id="chatinput" style="display:none"><table><tr>'
   + '  <td><time></time></td>'
   + '  <td><mark>tell faction:</mark></td>'
-  + '  <td><input type="text"/></td>'
+  + '  <td><input id="chattext" type="text"/></td>'
   + '</tr></table></form>'
   + '<a id="sidebartoggle"><span class="toggle close"></span></a>'
   + '<div id="scrollwrapper">' // enable scrolling for small screens