highlights, annotations and new lines

Is there a way I can get the Highlight and Annotate features to respect my document’s margins? The way it’s working right now, I’m getting these long extensions out from left margin to the edge of what Scrivener is calling the page’s edge. Hopefully the attached screen shot will explain what I mean and show what I’d like to change.

I’m afraid not, as for speed highlights and annotations currently use the line rectangle rather than trying to fit to the exact paragraph margins. (The highlights actually just use Apple’s code for background colours.)

All the best,
Keith