Issue 3086 email hidden from myself

Modified the profile view to check for current_user as well as email visibility preference. 

Unfortunately, I've managed to tie this fix to the fix for 1807 by accident. Whoops.