diff --git a/speak-logs.sh b/speak-logs.sh
index 29d6368..8070c77 100644
--- a/speak-logs.sh
+++ b/speak-logs.sh
@@ -19,13 +19,13 @@ sed -E 's,^ --- (Day changed .*)$,<meta>\1</meta>,' |
 # Remove minicat topic diffs
 sed -E '/^(..:..) \&lt\;.minicat\&gt\; .?\(diff\).*/d' |
 # Speak timestaps and nicks specially
-sed -E 's,^(..:..) \&lt\;.?([^& ]+)\&gt\;,<meta>\1 \2</meta>,' |
+sed -E 's,^(..:..) \&lt\;[+@ ]?([^& ]+)\&gt\;,<meta>\1 \2</meta>,' |
 sed -E 's,^(..:..)  \* ([^ ]+),<meta>\1 action \2</meta>,' |
 
 # Handle "<-" and "←" answers
 sed -E 's,\&lt;-|←,<meta>answer</meta>,' |
 # Handle someone quoting another person
-sed -E 's,\&lt\;.?([^& ]+)\&gt\;,<meta>quoting \1</meta>,g' |
+sed -E 's,\&lt\;[+@ ]?([^& :]+)\&gt\;,<meta>quoting \1</meta>,g' |
 sed -E 's,\* ([^ ]+),<meta>quoting action \1</meta>,g' |
 # Handle URLs
 sed -E 's,(https?|gopher)://[^ )>]+,<meta> \1 URL</meta>,g' |