diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index e49333fdda..8bdd1a692d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -176,12 +176,12 @@
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=orderacquisition">Order acquisition</a></li>
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=members">Patrons</a></li>
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=patron_slip">Patrons (custom slip)</a></li>
+                                <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=add_message">Patrons (custom message)</a></li>
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=preservation">Preservation</a></li>
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=serial">Serials (new issue)</a></li>
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=suggestions">Suggestions</a></li>
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=pos">Point of sale</a></li>
                                 <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=report">Reports</a></li>
-                                <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=add_message">Add message</a></li>
                             </ul>
                         </div>
                     </div> <!-- /#toolbar -->
@@ -237,12 +237,12 @@
                                                     [% CASE 'ill' %]<span>Interlibrary loans</span>
                                                     [% CASE 'members' %]<span>Patrons</span>
                                                     [% CASE 'patron_slip' %]<span>Patrons (custom slip)</span>
+                                                    [% CASE 'add_message' %]<span>Patrons (custom message)</span>
                                                     [% CASE 'preservation' %]<span>Preservation</span>
                                                     [% CASE 'serial' %]<span>Serials (new issue)</span>
                                                     [% CASE 'suggestions' %]<span>Suggestions</span>
                                                     [% CASE 'pos' %]<span>Point of sale</span>
                                                     [% CASE 'report' %]<span>Reports</span>
-                                                    [% CASE 'add_message' %]<span>Add message</span>
                                                     [% CASE %]<span>[% lette.module | html %]</span>
                                                 [% END %]
                                             </td>
@@ -411,6 +411,11 @@
                                         [% ELSE %]
                                             <option value="patron_slip">Patron (custom slip)</option>
                                         [% END %]
+                                        [% IF ( module == "add_message" ) %]
+                                            <option value="add_message" selected="selected">Patrons (custom message)</option>
+                                        [% ELSE %]
+                                            <option value="add_message">Patrons (custom message)</option>
+                                        [% END %]
                                         [% IF ( module == "preservation" ) %]
                                             <option value="preservation" selected="selected">Preservation</option>
                                         [% ELSE %]
@@ -436,11 +441,6 @@
                                         [% ELSE %]
                                             <option value="report">Reports</option>
                                         [% END %]
-                                        [% IF ( module == "add_message" ) %]
-                                            <option value="add_message" selected="selected">Add message</option>
-                                        [% ELSE %]
-                                            <option value="add_message">Add message</option>
-                                        [% END %]
                                     </select>
                                 </li>
                                 <li>