Jani pointed out to me that the new id stashing with less quoting is more likely to result in emails containing id: links that get buttonized wrong. Since id: links without quotes are hip, this series fixes the buttonization regexp to match Xapian query syntax, rather than being ad hoc.