Merge "Show underline when text show a link"