SourceTree diff horizontal scroll bars are wigging out! (Mac)

I have two ongoing issues with diff-view in the latest stable SourceTree (2.3.2) for MacOS (10.11.6).

While in the "File Status" workspace, looking at a file diff, while my cursor is in the commit message box (cursor, not mouse pointer), with each blink of the cursor, the horizontal scroll bars on each diff-hunk grow, as if the lines just got longer. But only after I scroll the diff a little bit with my mouse wheel!

Here's a brief video (40mb) of the bug in action: https://dl.dropboxusercontent.com/u/3831772/sourcetree_bug.mov

Additionally, the diff view seems to refresh itself, resetting vertical scroll position all of the way at the top, a few moments after selecting a file whose diff I want to view. It also does this after you stage a hunk which is INCREDIBLY annoying, because I then have to scroll back down to find where I was before I staged that hunk.