diff --git a/circ/add_message.pl b/circ/add_message.pl
index 317f34bf6d..aee65a1b91 100755
--- a/circ/add_message.pl
+++ b/circ/add_message.pl
@@ -51,5 +51,5 @@ Koha::Patron::Message->new(
     }
 )->store;
 
-print $input->redirect(
-    "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
+my $url = $input->referer() // "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber";
+print $input->redirect($url);
diff --git a/circ/circulation.pl b/circ/circulation.pl
index bf10bc6150..ef743bedc5 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -658,15 +658,10 @@ $template->param(
 my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
 $template->param( picture => 1 ) if $patron_image;
 
-# get authorised values with type of BOR_NOTES
-
-my $canned_notes = GetAuthorisedValues("BOR_NOTES");
-
 $template->param(
     debt_confirmed            => $debt_confirmed,
     SpecifyDueDate            => $duedatespec_allow,
     CircAutocompl             => C4::Context->preference("CircAutocompl"),
-    canned_bor_notes_loop     => $canned_notes,
     debarments                => GetDebarments({ borrowernumber => $borrowernumber }),
     todaysdate                => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
     modifications             => Koha::Patron::Modifications->GetModifications({ borrowernumber => $borrowernumber }),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index b7e7178f0a..75cb6bc893 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -1,5 +1,7 @@
 [% USE Koha %]
 [% USE Borrowers %]
+[% USE Branches %]
+[% USE AuthorisedValues %]
 [% SET NorwegianPatronDBEnable = Koha.Preference( 'NorwegianPatronDBEnable' ) %]
 <script type="text/javascript">
 //<![CDATA[
@@ -170,6 +172,8 @@ function searchToHold(){
         <a id="searchtohold" class="btn btn-small" href="#"><i class="fa fa-search"></i> Search to hold</a>
     [% END %]
 
+    <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-small"><i class="fa fa-comment-o"></i> Add message</a>
+
          <div class="btn-group">
         <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
             <ul class="dropdown-menu">
@@ -212,3 +216,44 @@ function searchToHold(){
             </ul>
     </div>
 </div>
+
+<!-- Modal -->
+<div id="add_message_form" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addnewmessageLabel" aria-hidden="true">
+    <div class="modal-body">
+        <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="message_form" name="message_f">
+        <fieldset id="borrower_messages" class="brief">
+            <legend>Leave a message</legend>
+            <ol>
+                <li>
+                    <label for="message_type">Add a message for:</label>
+                    <select name="message_type" id="message_type">
+                        <option value="L">Staff - Internal note</option>
+                        <option value="B">OPAC - [% firstname %] [% surname %]</option>
+                    </select>
+                </li>
+                [% bor_notes = AuthorisedValues.Get( 'BOR_NOTES' ) %]
+                [% IF bor_notes %]
+                    <li>
+                        <label for="type">Predefined notes: </label>
+                        <select name="type" id="type" onchange="this.form.borrower_message.value=this.options[this.selectedIndex].value;">
+                            <option value="">Select note</option>
+                            [% FOREACH bor_note IN bor_notes %]
+                                <option value="[% bor_note.lib %]">[% bor_note.lib %]</option>
+                            [% END %]
+                        </select>
+                    </li>
+                [% END %]
+                <li>
+                    <textarea rows="3" cols="60" name="borrower_message" id="borrower_message" ></textarea>
+                </li>
+            </ol>
+            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+            <input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
+        </fieldset>
+    </div>
+    <div class="modal-footer">
+        <fieldset class="action">
+            <input type="submit" value="Save" /> </form><a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
+        </fieldset>
+    </div>
+</div>
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 bd0c861912..0056dfc8d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -47,7 +47,6 @@ var relatives_borrowernumbers = new Array();
     relatives_borrowernumbers.push("[% b %]");
 [% END %]
 
-var MSG_ADD_MESSAGE = _("Add a new message");
 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
 var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
 
@@ -140,43 +139,6 @@ $(document).ready(function() {
 [% END %]
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-<div style="display: none;" id="add_message_form">
-<form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="message_form" name="message_f">
-<fieldset id="borrower_messages" class="brief">
-<legend>Leave a message</legend>
-	<ol>
-    <li>
-            <label for="message_type">Add a message for:</label>
-          <select name="message_type" id="message_type">
-            <option value="L">Staff - Internal note</option>
-            <option value="B">OPAC - [% firstname %] [% surname %]</option>
-        </select>
-    </li>
-    [% IF ( canned_bor_notes_loop ) %]
-        <li>
-                <label for="type">Predefined notes: </label>
-                <select name="type" id="type" onchange="this.form.borrower_message.value=this.options[this.selectedIndex].value;">
-                    <option value="">Select note</option>
-                    [% FOREACH canned_bor_notes_loo IN canned_bor_notes_loop %]
-                    <option value="[% canned_bor_notes_loo.lib %]">[% canned_bor_notes_loo.lib %]</option>
-                    [% END %]
-                </select>
-        </li>
-    [% END %]
-    <li>
-        <textarea rows="3" cols="60" name="borrower_message" id="borrower_message" ></textarea>
-    </li>
-	</ol>
-    <fieldset class="action">
-        <input type="submit" value="Save" /> <a href="#" class="cancel">Cancel</a>
-    </fieldset>
-
-        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-        <input type="hidden" name="branchcode" value="[% branch %]" />
-</fieldset>
-</form>
-</div>
-
 [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry | $KohaDates %]</div>[% END %]
 
 [% IF additional_materials %]
@@ -880,6 +842,7 @@ No patron matched <span class="ex">[% message %]</span>
                 [% END %]</li>
             [% END %]
         </ul>
+        <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal">Add a new message</a>
     </div>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 614fdbbc01..e36dfc0de7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -79,7 +79,7 @@ $(document).ready(function() {
     [% END %]
   </div>
 [% ELSIF borrower and not checkout_infos %]
-  <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
+  <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&batch=1">
     <fieldset id="circ_circulation_issue">
       <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
       <fieldset class="rows">
@@ -110,7 +110,7 @@ $(document).ready(function() {
 [% ELSIF borrower %]
   [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
     <h3>Batch checkout confirmation [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
-    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
+    <form method="post" action="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]" id="mainform" name="mainform" autocomplete="off">
   [% ELSE %]
     <h3>Batch checkout information [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
   [% END %]
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 80a80a97d4..2213a7c6bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -42,7 +42,6 @@ var relatives_borrowernumbers = new Array();
     relatives_borrowernumbers.push("[% b %]");
 [% END %]
 
-var MSG_ADD_MESSAGE = _("Add a new message");
 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
 
 columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
index 2d85c81888..d1481ee42a 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
@@ -14,8 +14,6 @@ $(document).ready(function() {
         }
     });
 
-    $("#messages ul").after("<a href=\"#\" id=\"addmessage\">"+MSG_ADD_MESSAGE+"</a>");
-
     $("#borrower_messages .cancel").on("click",function(){
         $("#add_message_form").hide();
         $("#addmessage").show();
diff --git a/members/readingrec.pl b/members/readingrec.pl
index 79351ff51a..35a1ad4e3a 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -119,7 +119,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     );
 }
 
-
 $template->param(%$data);
 
 $template->param(
diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index c8377db2aa..8c6d3ac8b4 100755
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -88,7 +88,6 @@ if ($borrowernumber) {
 
 ##################################################################################
 
-
 $template->param(%$borrower);
 
 $template->param(