diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index a375b4cb93..27a6793b87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -80,9 +80,9 @@ tr.selected td {
 [% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
+    [% INCLUDE 'messages.inc' %]
       [% IF ( opsearch ) %]
     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
-            [% INCLUDE 'messages.inc' %]
     <div class="row">
     <div class="col-sm-6">
     <h1>Order from external source</h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 86d33dc792..73e97bc864 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -44,9 +44,9 @@
 <body id="main_auth" class="main_main-auth">
 
 <div class="main container-fluid">
+    [% INCLUDE 'messages.inc' %]
 
 <div id="login">
-            [% INCLUDE 'messages.inc' %]
 <h1><a href="http://koha-community.org">Koha</a></h1>
 [% IF (Koha.Preference('StaffLoginInstructions')) %]<div id="login_instructions">[% Koha.Preference('StaffLoginInstructions') | $raw %]</div>[% END %]
 [% IF ( nopermission ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
index 1014176cf2..6380ddd94d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
@@ -13,9 +13,9 @@
 
 <body id="labels_label-print" class="tools labels">
     <div class="main container-fluid">
+        [% INCLUDE 'messages.inc' %]
         <h1>Label printing/exporting</h1>
         [% IF ( batches ) %]
-                [% INCLUDE 'messages.inc' %]
             <form>
                 <h3>Click on the following links to download the exported batch(es).</h3>
                 [% IF warn_empty_range %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
index 46f43c2acd..93dba9115e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
@@ -34,9 +34,9 @@
 
 <body id="labels_result" class="tools labels">
     <div class="main container-fluid">
+        [% INCLUDE 'messages.inc' %]
         <h1>Search results</h1>
         [% IF ( results ) %]
-                [% INCLUDE 'messages.inc' %]
             <h3>Results [% from | html %] through [% to | html %] [% IF ( total ) %] of [% total | html %][% END %]</h3>
         [% ELSE %]
             <h3>No results found</h3>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
index 680725ae4c..3e0e7cea2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
@@ -11,13 +11,13 @@
 
 <body id="labels_search" class="tools labels">
     <div class="main container-fluid">
+        [% INCLUDE 'messages.inc' %]
 
         <h1>Search for items
             [% IF ( batch_id ) %]
                 to add to Batch [% batch_id | html %]
             [% END %]
         </h1>
-        [% INCLUDE 'messages.inc' %]
 
         <form name="f" method="post" action="/cgi-bin/koha/labels/label-item-search.pl">
             <input type="hidden" name="op" value="do_search" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
index b58336a564..61138e2ba0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
@@ -7,9 +7,9 @@
 <body id="ser_result" class="ser">
 
 <div class="main container-fluid">
+    [% INCLUDE 'messages.inc' %]
 
 [% IF ( total ) %]
-            [% INCLUDE 'messages.inc' %]
 <h1>Search results from [% from | html %] to [% to | html %] of [% total | html %]</h1>
 <div class="page-section">
 <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
index 4f3e8a042d..4bbbdf1758 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
@@ -5,9 +5,9 @@
 <body id="ser_subscription-bib-search" class="ser">
 
 <div class="main container-fluid">
+    [% INCLUDE 'messages.inc' %]
 
 <h1>Catalog search</h1>
-            [% INCLUDE 'messages.inc' %]
 [% IF ( no_query ) %]
     <div class="warning">You must enter a term to search on </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 574a81dc0b..71b997226f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -55,9 +55,9 @@
 [% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
+    [% INCLUDE 'messages.inc' %]
 
     <h1>Batch item deletion</h1>
-            [% INCLUDE 'messages.inc' %]
 
     [% FOREACH message IN messages %]
       [% IF message.type == 'success' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index fe3053053a..b773f0d445 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -56,9 +56,9 @@
     [% END #/ WRAPPER sub-header.inc %]
 
     <div class="main container-fluid">
+        [% INCLUDE 'messages.inc' %]
 
         <h1>Batch item modification</h1>
-                [% INCLUDE 'messages.inc' %]
         [% IF op == 'enqueued' %]
             <div class="dialog message">
                 <h1>The job has been enqueued!</h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
index 0d6facfc67..f4b57f4de6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
@@ -11,9 +11,9 @@
     </head>
     <body id="preview_letter" class="catalog">
         <div class="main container-fluid">
+            [% INCLUDE 'messages.inc' %]
             <h1>Preview notice template</h1>
             [% FOR m IN messages %]
-                    [% INCLUDE 'messages.inc' %]
                 [%# FIXME The message block does not appear at the top of the modal! %]
                 <div class="dialog [% m.type | html %]">
                     [% SWITCH m.code %]