diff --git a/server.go b/server.go
index 886a358..92260e3 100644
--- a/server.go
+++ b/server.go
@@ -358,6 +358,11 @@ func (s *Server) handleRegisteredCommand(command string, args []string) {
 
 		message := strings.Join(args[1:], " ")[1:] // strip leading colon
 
+		if strings.HasPrefix(message, "\x01ACTION ") {
+			message = "/me " + message[8:]
+			message = message[:len(message)-1]
+		}
+
 		// IRC is case-insensitive case-preserving. We can respect that for the
 		//  channel name, but not really for user nicks