diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
index 93ce0b53be..9de73ac63b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -327,20 +327,24 @@
             [% FOREACH patron_message IN patron_messages %]
                 <li>
                     [% SET span_class = '' %]
-                    [% SET msg_type = 'OPAC' %]
-                    [% IF(patron_message.message_type == "L") %]
+                    [% IF patron_message.message_type == "L" %]
                         [% span_class = 'circ-hlt' %]
-                        [% msg_type = 'Staff note' %]
                     [% END %]
                     <span class="[% span_class | html %]">
                         [% patron_message.message_date | $KohaDates %]
-                        [% Branches.GetName( patron_message.branchcode ) | html %]
-                        - [% t(msg_type) | html %]
+                        [% Branches.GetName(patron_message.branchcode) | html %]
+                        -
+                        [% IF patron_message.message_type == 'L' %]
+                            <span>Staff note</span>
+                        [% ELSE %]
+                            <span>OPAC</span>
+                        [% END %]
+
                         [% IF patron_message.manager_id %]
                             (
-                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]"
-                                >[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a
-                            >
+                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]">
+                                [% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]
+                            </a>
                             )
                         [% END %]
                         <em>"[% patron_message.message | html | html_line_break %]"</em>