Improved the fix for issue #584 even further ;-)
Merge pull request #763 from waywalker/issue-584-scrollview-position

Improved the fix for issue #584 even further ;-)