Take two of blockquote manipulation