Issue 1756

git-svn-id: http://svn.dmdirc.com/trunk@4825 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/messages/Styliser.java

@@ -246,8 +246,8 @@ public final class Styliser {
     public static String doSmilies(final String string) {
         // TODO: read types from config. Check if they're enabled.
 
-        return string.replaceAll("(\\s|^):[\\\\/](\\s|$)", "\\1" + CODE_SMILIE + ":/"
-                + CODE_SMILIE + "\\2");
+        return string.replaceAll("(\\s|^):[\\\\/](?=\\s|$)", "$1" + CODE_SMILIE + ":/"
+                + CODE_SMILIE);
     }
     
     /**