This. Except I'd nix the left-margin line as well, and just go with the bigger indent (I apparently don't read things with blockquotes here, since I'm not sure what the current indent looks like, but I find the quotes-in-boxes thing on other sites aesthetically displeasing/somewhat jarring).