diff --git a/modules/installed/apps/templates/owncloud.html b/modules/installed/apps/templates/owncloud.html
index de66a9f74..1e7efebd0 100644
--- a/modules/installed/apps/templates/owncloud.html
+++ b/modules/installed/apps/templates/owncloud.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/router/templates/pagekite_configure.html b/modules/installed/router/templates/pagekite_configure.html
index 86f9e28e9..dd31c47de 100644
--- a/modules/installed/router/templates/pagekite_configure.html
+++ b/modules/installed/router/templates/pagekite_configure.html
@@ -31,9 +31,7 @@
 
 {% else %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/router/templates/router_setup.html b/modules/installed/router/templates/router_setup.html
index 5036ad6a6..34fd9c0ae 100644
--- a/modules/installed/router/templates/router_setup.html
+++ b/modules/installed/router/templates/router_setup.html
@@ -24,9 +24,7 @@
 
   <h3>WAN Connection</h3>
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/services/templates/xmpp_configure.html b/modules/installed/services/templates/xmpp_configure.html
index 75b537232..718d7d353 100644
--- a/modules/installed/services/templates/xmpp_configure.html
+++ b/modules/installed/services/templates/xmpp_configure.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/services/templates/xmpp_register.html b/modules/installed/services/templates/xmpp_register.html
index 1d81e299d..bfb7c3de4 100644
--- a/modules/installed/services/templates/xmpp_register.html
+++ b/modules/installed/services/templates/xmpp_register.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/system/templates/config.html b/modules/installed/system/templates/config.html
index 8d8319c40..5e5310481 100644
--- a/modules/installed/system/templates/config.html
+++ b/modules/installed/system/templates/config.html
@@ -24,9 +24,7 @@
 
 {% if  cfg.users.expert %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/system/templates/expert_mode.html b/modules/installed/system/templates/expert_mode.html
index 64db2cda5..c6df98b36 100644
--- a/modules/installed/system/templates/expert_mode.html
+++ b/modules/installed/system/templates/expert_mode.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <p>The {{ cfg.box_name }} can be administered in two modes, 'basic'
   and 'expert'.  Basic mode hides a lot of features and configuration
diff --git a/modules/installed/system/templates/packages.html b/modules/installed/system/templates/packages.html
index dc46b4088..d8d7d6164 100644
--- a/modules/installed/system/templates/packages.html
+++ b/modules/installed/system/templates/packages.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <p>aptitude purge modules</p>
 
diff --git a/modules/installed/system/templates/users_add.html b/modules/installed/system/templates/users_add.html
index 3a5c7feab..4afbc68c9 100644
--- a/modules/installed/system/templates/users_add.html
+++ b/modules/installed/system/templates/users_add.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/system/templates/users_edit.html b/modules/installed/system/templates/users_edit.html
index 3f4714984..da1ef4136 100644
--- a/modules/installed/system/templates/users_edit.html
+++ b/modules/installed/system/templates/users_edit.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/modules/installed/system/templates/wan.html b/modules/installed/system/templates/wan.html
index 229a8b19a..ea83226d0 100644
--- a/modules/installed/system/templates/wan.html
+++ b/modules/installed/system/templates/wan.html
@@ -24,9 +24,7 @@
 
 {% if  cfg.users.expert %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <p>For security reasons, neither WAN Administration nor WAN SSH is
     available to the `admin` user account.</p>
diff --git a/modules/installed/templates/firstboot_state0.html b/modules/installed/templates/firstboot_state0.html
index f8b1f56f9..656fe406f 100644
--- a/modules/installed/templates/firstboot_state0.html
+++ b/modules/installed/templates/firstboot_state0.html
@@ -24,9 +24,7 @@
 
   <h2>Welcome to Your FreedomBox!</h2>
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <p>Welcome.  It looks like this FreedomBox isn't set up yet.  We'll
     need to ask you a just few questions to get started.</p>
diff --git a/templates/form.html b/templates/form.html
index e1a948ba3..bfc33167b 100644
--- a/templates/form.html
+++ b/templates/form.html
@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
+  {% include 'messages.html' %}
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/templates/messages.html b/templates/messages.html
new file mode 100644
index 000000000..fa5404495
--- /dev/null
+++ b/templates/messages.html
@@ -0,0 +1,25 @@
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+{% endcomment %}
+
+{% for severity, message in messages %}
+  <div class='alert alert-{{ severity }} alert-dismissable'>
+    <a class="close" data-dismiss="alert">&times;</a>
+    {{ message }}
+  </div>
+{% endfor %}