Users sending email to themselves

I have set Email Handling in CB Configuration to "Display Link to Email Form". With the email field also set to display on profile, this means the field is shown as a "Send Email" link, and the CB menu item "Send Email to User" is present also. All good. However if a user views their own profile, the CB menu item is correctly omitted, but the field "Send Email" link is incorrectly still shown, as this is a link that would mean the user sends an email to themselves. Note that if they follow the link an error is given ("You are not allowed to send an email to yourself!") but it would be a better user experience to prevent them from getting this far.

Rather than removing the email field from the profile in this instance, it would make sense if it was displayed back to the user as text and not a link.

(Latest versions: Joomla 3.4.6, CB 2.0.12)

I've just implemented an acceptable workaround for this using substitutions in the Profile Value Layout, i.e.