Email display problem solved.
Bugfix for previous commit.
Email links are clickable.