diff --git a/modules/echo.py b/modules/echo.py
index e2a43089..087f6413 100644
--- a/modules/echo.py
+++ b/modules/echo.py
@@ -7,3 +7,9 @@ class Module(ModuleManager.BaseModule):
     @utils.kwarg("min_args", 1)
     def echo(self, event):
         event["stdout"].write(event["args"])
+
+    @utils.hook("received.command.action")
+    @utils.kwarg("min_args", 1)
+    @utils.kwarg("expect_output", False)
+    def action(self, event):
+        event["target"].send_message("\x01ACTION %s\x01" % event["args"])