diff --git a/CHANGELOG b/CHANGELOG
index 069b8fc..cf002a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ Enable image embedding without cookies as there is no more risk of session leaka
 Allow configuring password and nickname regex
 Prevent browser from caching at all.
 Add external CSS setting for large stylesheets
+Make /me work with custom texts
 
 Version 1.20.6 - Jul. 23, 2016
 Simplify ignore logic + disallow ignoring chatters with higher status
diff --git a/chat.php b/chat.php
index b62099f..0d7de79 100644
--- a/chat.php
+++ b/chat.php
@@ -2786,7 +2786,7 @@ function validate_input(){
 function apply_filter(){
 	global $I, $U;
 	if($U['poststatus']!==9 && preg_match('~^/me~i', $U['message'])){
-		$U['displaysend']=substr($U['displaysend'], 0, -3);
+		$U['displaysend']=style_this($U['nickname'], $U['style']);
 		$U['message']=preg_replace("~^/me~i", '', $U['message']);
 	}
 	$U['message']=preg_replace_callback('/\@([^\s]+)/i', function ($matched){