diff --git a/activity.go b/activity.go
index 659d1d4..e7ed0a6 100644
--- a/activity.go
+++ b/activity.go
@@ -711,7 +711,7 @@ func subsub(user *WhatAbout, xid string) {
 	deliverate(0, user.Name, xid, msg)
 }
 
-var re_spicy = regexp.MustCompile("^(\U0001f336\ufe0f?){3}")
+var re_spicy = regexp.MustCompile("^(\U0001f336\ufe0f?){3,}")
 
 func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
 	dt := h.Date.Format(time.RFC3339)
@@ -753,9 +753,13 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
 		}
 		jo["summary"] = h.Precis
 		jo["content"] = mentionize(h.Noise)
-		if strings.HasPrefix(h.Precis, "DZ:") || re_spicy.MatchString(h.Noise) {
+		if strings.HasPrefix(h.Precis, "DZ:") {
+			jo["sensitive"] = true
+		} else if peppers := re_spicy.FindString(h.Noise); peppers != "" {
+			jo["summary"] = peppers
 			jo["sensitive"] = true
 		}
+
 		var tags []interface{}
 		g := bunchofgrapes(h.Noise)
 		for _, m := range g {
diff --git a/fun.go b/fun.go
index c389273..defbef8 100644
--- a/fun.go
+++ b/fun.go
@@ -54,6 +54,9 @@ func reverbolate(honks []*Honk) {
 		zap := make(map[*Donk]bool)
 		h.Noise = unpucker(h.Noise)
 		precis := h.Precis
+		if strings.HasPrefix(h.Noise, "<p>" + precis) {
+			precis = ""
+		}
 		if precis != "" {
 			if strings.IndexByte(precis, ':') == -1 {
 				precis = "summary: " + precis