diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
index 0c2bc81997..0a569cc010 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
@@ -33,6 +33,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-sm-12 col-md-8 col-md-offset-2">
+            [% INCLUDE 'messages.inc' %]
 
       <h1>Search history</h1>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
index ba98b10a4b..b91d9f07de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
@@ -35,7 +35,6 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
                 <div class="row">
 
                 [% IF Koha.Preference('CircSidebar') %]
@@ -43,6 +42,7 @@
                 [% ELSE %]
                     <div class="col-md-12 col-lg-10 col-lg-offset-1">
                 [% END %]
+                [% INCLUDE 'messages.inc' %]
 
             <h1>Checkout notes</h1>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 0a8fd9414e..979f916cd8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -53,9 +53,9 @@
 
     <div class="main container-fluid">
         <main>
-            [% INCLUDE 'messages.inc' %]
             <div class="row">
                 <div class="col-sm-10 col-sm-push-2">
+                    [% INCLUDE 'messages.inc' %]
 
                     [% IF patron %]
                         [% INCLUDE 'members-toolbar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
index c4a41f22a2..0950e16e77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
@@ -35,7 +35,6 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
                 <div class="row">
 
                 [% IF Koha.Preference('CircSidebar') %]
@@ -43,6 +42,7 @@
                 [% ELSE %]
                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                 [% END %]
+                [% INCLUDE 'messages.inc' %]
 
         <h1>Pending on-site checkouts</h1>
         [% IF pending_onsite_checkouts %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
index 080c4a647e..606a11fb42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
@@ -35,7 +35,6 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
                 <div class="row">
 
                 [% IF Koha.Preference('CircSidebar') %]
@@ -43,6 +42,7 @@
                 [% ELSE %]
                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                 [% END %]
+                [% INCLUDE 'messages.inc' %]
 
                 [% IF error %]
                     <div class="dialog alert">
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 436ff39f08..a177126da7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -59,7 +59,6 @@
         <div class="row">
             <div class="col-sm-12">
                 <main>
-                    [% INCLUDE 'messages.inc' %]
                     <div class="row">
 
                         [% IF Koha.Preference('CircSidebar') %]
@@ -67,6 +66,7 @@
                         [% ELSE %]
                             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                         [% END %]
+                        [% INCLUDE 'messages.inc' %]
 
                         [% BLOCK all_checkin_messages %]
                             [% IF hold_auto_filled %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
index 8f401a11d8..7bff51ab4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
@@ -41,17 +41,15 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
                 <div class="row">
 
                 [% IF Koha.Preference('CircSidebar') %]
                     <div class="col-sm-10 col-sm-push-2">
-                    <h1>Set library</h1>
                 [% ELSE %]
                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-                    <h1>Set library</h1>
                 [% END %]
-
+                [% INCLUDE 'messages.inc' %]
+                <h1>Set library</h1>
 
 [% IF ( updated ) %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
index 8d39bfed4a..65ccee88f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
@@ -34,7 +34,6 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
                 <div class="row">
 
                 [% IF Koha.Preference('CircSidebar') %]
@@ -42,6 +41,7 @@
                 [% ELSE %]
                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                 [% END %]
+                [% INCLUDE 'messages.inc' %]
 
         <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
 	[% IF ( branchesloop ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 411e846071..24978b60d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -49,7 +49,6 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
                 <div class="row">
 
                 [% IF ( total || Koha.Preference('CircSidebar') ) %]
@@ -57,6 +56,7 @@
                 [% ELSE %]
                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                 [% END %]
+                [% INCLUDE 'messages.inc' %]
 
 <h1>Holds queue</h1>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 4445add844..75f50f1f64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -36,7 +36,6 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
                 <div class="row">
 
                     [% IF Koha.Preference('CircSidebar') %]
@@ -44,6 +43,7 @@
                     [% ELSE %]
                         <div class="col-sm-12">
                     [% END %]
+                    [% INCLUDE 'messages.inc' %]
 
                         <h1>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]</h1>
                         <h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
index 7cc644537e..a3a69b6c4a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
@@ -42,6 +42,7 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
+                [% INCLUDE 'messages.inc' %]
         <h1>
             [% IF list.patron_list_id %]
                 [% tx("Modify patron list '{list_name}'", { list_name = list.name }) | html %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
index eb6bd9d32b..228d6eecd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
@@ -29,7 +29,7 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
-
+                [% INCLUDE 'messages.inc' %]
                 <h1>Upload plugin</h1>
                 [% IF ( ERRORS ) %]
                 <div class="dialog alert">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index 8e9566b6a2..db39e59957 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -65,10 +65,10 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
     <div class="row">
         <div class="col-sm-12">
             <main>
-                [% INCLUDE 'messages.inc' %]
 
 <div class="row">
 <div class="col-sm-8 col-sm-push-2">
+                [% INCLUDE 'messages.inc' %]
 <h1>Tags</h1>
 <form method="post" action="/cgi-bin/koha/tags/review.pl">
     <h4>