Improve the source viewer in newer Android versions

If merged after  #621 this patch improves the source viewer for newer Android versions.