Merge pull request #8828 from crdlc/bug-854813

Bug 854813 - Linked contacts without name but with e-mail are rendered w...(cherry picked from commit 4978fc82b2877394af5bc43a377cfafff99b4e06)