Merge pull request #2503 from Oldiesmann/release-2.1

! Add default character set to un_htmlspecialchars (fixes #2483)
Merge pull request #2504 from Oldiesmann/release-2.1

! show_email cleanup (fixes #2500)