Merge "string support for 'show original'" into jb-ub-mail-ur9