diff --git a/modules/fediverse/__init__.py b/modules/fediverse/__init__.py
index ea16c5e9..25f87900 100644
--- a/modules/fediverse/__init__.py
+++ b/modules/fediverse/__init__.py
@@ -74,8 +74,12 @@ class Module(ModuleManager.BaseModule):
         if not items:
             raise utils.EventError("No toots found")
 
-        out, url = ap_utils.format_note(actor, items[0])
+        cw, out, url = ap_utils.format_note(actor, items[0])
         shorturl = self.exports.get_one("shorturl")(event["server"], url,
             context=event["target"])
-        out = "%s - %s" % (out, shorturl)
+
+        if not cw == None:
+            out = "CW: %s - %s" % (cw, shorturl)
+        else:
+            out = "%s - %s" % (out, shorturl)
         event["stdout"].write(out)
diff --git a/modules/fediverse/ap_utils.py b/modules/fediverse/ap_utils.py
index a71692ed..d15ff243 100644
--- a/modules/fediverse/ap_utils.py
+++ b/modules/fediverse/ap_utils.py
@@ -67,13 +67,14 @@ def format_note(actor, note):
         retooted_user = "@%s@%s" % (original_tooter.username, retoot_instance)
         retoot_content = utils.http.strip_html(retoot.data["content"])
 
-        return "%s (boost %s): %s - %s" % (
-            actor.username, retooted_user, retoot_content), retoot_url
+        return (retoot.data.get("summary", None),  "%s (boost %s): %s - %s" % (
+            actor.username, retooted_user, retoot_content), retoot_url)
 
     elif note["type"] == "Create":
         content = utils.http.strip_html(note["object"]["content"])
         url = note["object"]["id"]
 
-        return "%s: %s" % (actor.username, content), url
+        return (note["object"].get("summary", None),
+            "%s: %s" % (actor.username, content), url)
 
-    return None, None
+    return None, None, None