- ($email) = get_addresses($email);
- return $config{libravatar_uri}.uri_escape($email.($config{libravatar_uri_options}//''));
+ ($email) = grep {/\@/} get_addresses($email);
+ return $config{libravatar_uri}.uri_escape_utf8($email.($config{libravatar_uri_options}//''));