Merge pull request #6577 from rabuzarus/20190129_-_jot_atachment_preview