diff --git a/app/assets/javascripts/backbone/plugins/emoticons.js.coffee b/app/assets/javascripts/backbone/plugins/emoticons.js.coffee
index d950986e..32c1cfe2 100644
--- a/app/assets/javascripts/backbone/plugins/emoticons.js.coffee
+++ b/app/assets/javascripts/backbone/plugins/emoticons.js.coffee
@@ -909,10 +909,11 @@ class Kandan.Plugins.Emoticons
     Kandan.Modifiers.register @options.regex, (message, activity) =>
       matches = message.match(@options.regex)
       for match in _.unique(matches)
-        match = match.trim();
+        match = match.trim()
         emoticon = @emoticons[match]
-        
+
         if emoticon
-            message = message.replace(match, @options.template(emoticon)) 
+          # replace all matches
+          message = message.split(match).join(@options.template(emoticon))
 
       return message
diff --git a/app/assets/javascripts/layout.js.coffee b/app/assets/javascripts/layout.js.coffee
index d7698be6..75ea4f16 100644
--- a/app/assets/javascripts/layout.js.coffee
+++ b/app/assets/javascripts/layout.js.coffee
@@ -1,8 +1,8 @@
 $(document).ready ->
 	$(".user_menu_link").click (e)->
-      e.preventDefault()
-      $(".user_menu").toggle()
-      false
+    e.preventDefault()
+    $(".user_menu").toggle()
+    false
 
-  	$(".user_menu a").click (e)->
-      $(".user_menu").toggle()
\ No newline at end of file
+  $(".user_menu a").click (e)->
+    $(".user_menu").toggle()