diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 318cde9a65..8e878368d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -535,7 +535,7 @@
                                         [% IF ( patron.borrowernotes ) %]
                                             <li id="patron-borrowernotes">
                                                 <span class="label">Circulation note: </span><br />
-                                                [% patron.borrowernotes | html | html_line_break %]
+                                                [% patron.borrowernotes | $raw | html_line_break %]
                                             </li>
                                         [% END %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
index 39b6cfd97d..2dbf70dac3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
@@ -4,12 +4,12 @@
         <ul>
             [% FOREACH message IN patron_messages %]
                 <li>
-                    <strong>[% message.message | html %]</strong><br>
+                    <strong>[% message.message | html | html_line_break %]</strong><br>
                     &nbsp;&nbsp;&nbsp;<i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) | html %]</i>
                 </li>
             [% END %]
 
-            [% IF ( opacnote ) %]<li>[% opacnote | html %]</li>[% END %]
+            [% IF ( opacnote ) %]<li>[% opacnote | html | html_line_break %]</li>[% END %]
         </ul>
     </div>
 [% END %]