Bug 1015541 - choosing a word suggestion after moving the caret changes the wrong text

Advice taken, and update the patch!
Jan, thanks.