diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
index e52bd99ec9..d35d8b97f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -98,11 +98,11 @@
                                 </li>
                                 [% INCLUDE display_holdpatron_address %]
                                 [% IF ( patron.phone ) %]
-                                    <li> [% patron.phone | html %]</li>
+                                    <li class="patron-phone"> [% patron.phone | html %]</li>
                                 [% END %]
 
                                 [% IF ( patron.email ) %]
-                                    <li><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>
+                                    <li class="patron-email"><a href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a></li>
                                 [% END %]
 
                                 [% IF ( patron.is_debarred ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index fdb59deb10..cd1cc8d3de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -84,15 +84,15 @@
                     [% INCLUDE display_holdpatron_address %]
 
                     [% IF ( patron.phone ) %]
-                        <li class="patronphone">[% patron.phone | html %]</li>
+                        <li class="patron-phone">[% patron.phone | html %]</li>
                     [% END %]
 
                     [% IF ( patron.email ) %]
-                        <li class="patronemail">
+                        <li class="patron-email">
                             [% IF ( transfertodo ) %]
                                 [% patron.email | html %]
                             [% ELSE %]
-                                <a href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
+                                <a href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a>
                             [% END %]
                         </li>
                     [% END %]
@@ -704,10 +704,10 @@
                                     </li>
                                     [% INCLUDE display_holdpatron_address %]
                                     [% IF ( patron.phone ) %]
-                                        <li class="patronphone"> [% patron.phone | html %]</li>
+                                        <li class="patron-phone"> [% patron.phone | html %]</li>
                                     [% END %]
                                     [% IF ( patron.email ) %]
-                                        <li class="patronemail"><a href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>
+                                        <li class="patron-email"><a href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a></li>
                                     [% END %]
 
                                     [% IF ( patron.smsalertnumber ) %]
@@ -923,11 +923,11 @@
                     [% END %]
 
                     [% IF ( patron.email ) %]
-                        <li class="patronemail">
+                        <li class="patron-email">
                             [% IF ( transfertodo ) %]
                                 [% patron.email | html %]
                             [% ELSE %]
-                                <a href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
+                                <a href="mailto:[% patron.email | uri %]">[% patron.email | uri %]</a>
                             [% END %]
                         </li>
                     [% END %]
@@ -1037,15 +1037,15 @@
                                     [% INCLUDE display_holdpatron_address patron=recall.patron %]
 
                                     [% IF ( recall.patron.phone ) %]
-                                        <l >[% recall.patron.phone | html %]</li>
+                                        <li class="patron-phone">[% recall.patron.phone | html %]</li>
                                     [% END %]
 
                                     [% IF ( recall.patron.email ) %]
-                                        <li>
+                                        <li class="patron-email">
                                             [% IF ( transfertodo ) %]
                                                 [% recall.patron.email | html %]
                                             [% ELSE %]
-                                                <a id="boremail" href="mailto:[% recall.patron.email | html %]">[% recall.patron.email | html %]</a>
+                                                <a href="mailto:[% recall.patron.email | uri %]">[% recall.patron.email | html %]</a>
                                             [% END %]
                                         </li>
                                     [% END %]
@@ -1134,15 +1134,15 @@
                                     [% INCLUDE display_holdpatron_address patron=recall.patron %]
 
                                     [% IF ( recall.patron.phone ) %]
-                                        <li>[% recall.patron.phone | html %]</li>
+                                        <li class="patron-phone">[% recall.patron.phone | html %]</li>
                                     [% END %]
 
                                     [% IF ( recall.patron.email ) %]
-                                        <li>
+                                        <li class="patron-email">
                                             [% IF ( transfertodo ) %]
                                                 [% recall.patron.email | html %]
                                             [% ELSE %]
-                                                <a id="boremail" href="mailto:[% recall.patron.email | html %]">[% recall.patron.email | html %]</a>
+                                                <a href="mailto:[% recall.patron.email | uri %]">[% recall.patron.email | html %]</a>
                                             [% END %]
                                         </li>
                                     [% END %]