LILY-322: always try to show an emailaddress for contact and account
Merge branch 'fix/show/email' into develop