diff --git a/abonapp/templates/abonapp/modal_addstreet.html b/abonapp/templates/abonapp/modal_addstreet.html
index c723157..37ae844 100644
--- a/abonapp/templates/abonapp/modal_addstreet.html
+++ b/abonapp/templates/abonapp/modal_addstreet.html
@@ -5,7 +5,7 @@
         <h4 class="modal-title"><span class="glyphicon glyphicon-plus"></span>{% trans 'Add street' %}</h4>
     </div>
 
-    {% include 'message_block.html' %}
+    {% include '_messages.html' %}
 
     <div class="modal-body">
         <div class="form-group-sm">
diff --git a/abonapp/templates/abonapp/modal_dev.html b/abonapp/templates/abonapp/modal_dev.html
index 128d248..138cdb1 100644
--- a/abonapp/templates/abonapp/modal_dev.html
+++ b/abonapp/templates/abonapp/modal_dev.html
@@ -6,7 +6,7 @@
         <h4 class="modal-title"><span class="glyphicon glyphicon-plus"></span>{% trans 'Add clutch' %}</h4>
     </div>
 
-    {% include 'message_block.html' %}
+    {% include '_messages.html' %}
 
     <div class="modal-body">
         <div class="form-group-sm">
diff --git a/abonapp/templates/abonapp/modal_editstreet.html b/abonapp/templates/abonapp/modal_editstreet.html
index bf2b39d..0bc3759 100644
--- a/abonapp/templates/abonapp/modal_editstreet.html
+++ b/abonapp/templates/abonapp/modal_editstreet.html
@@ -5,7 +5,7 @@
         <h4 class="modal-title"><span class="glyphicon glyphicon-edit"></span>{% trans 'Edit streets' %}</h4>
     </div>
 
-    {% include 'message_block.html' %}
+    {% include '_messages.html' %}
 
     <div class="modal-body">
 
diff --git a/abonapp/templates/abonapp/modal_periodic_pay.html b/abonapp/templates/abonapp/modal_periodic_pay.html
index ee51e8e..8379cef 100644
--- a/abonapp/templates/abonapp/modal_periodic_pay.html
+++ b/abonapp/templates/abonapp/modal_periodic_pay.html
@@ -6,7 +6,7 @@
         <h4 class="modal-title"><span class="glyphicon glyphicon-plus"></span>{% trans 'Add periodic pay' %}</h4>
     </div>
 
-    {% include 'message_block.html' %}
+    {% include '_messages.html' %}
 
     <div class="modal-body">
 
diff --git a/clientsideapp/templates/clientsideapp/ext.html b/clientsideapp/templates/clientsideapp/ext.html
index 305d090..145c9a4 100644
--- a/clientsideapp/templates/clientsideapp/ext.html
+++ b/clientsideapp/templates/clientsideapp/ext.html
@@ -92,7 +92,7 @@
     </div>
     {% endif %}
 
-    {% include 'message_block.html' %}
+    {% include '_messages.html' %}
 
     {% block client_main %}{% endblock %}
 </div>
diff --git a/dialing_app/templates/modal_send_sms.html b/dialing_app/templates/modal_send_sms.html
index e936c6e..15f7339 100644
--- a/dialing_app/templates/modal_send_sms.html
+++ b/dialing_app/templates/modal_send_sms.html
@@ -5,7 +5,7 @@
         <h4 class="modal-title"><span class="glyphicon glyphicon-envelope"></span>{% trans 'Send sms' %}</h4>
     </div>
 
-    {% include 'message_block.html' %}
+    {% include '_messages.html' %}
 
     <div class="modal-body">
 
diff --git a/templates/base.html b/templates/base.html
index d04e14c..1e353c5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -124,7 +124,7 @@
             </ol>
         {% endblock %}
 
-        {% include 'message_block.html' %}
+        {% include '_messages.html' %}
 
         <div class="page-header">
             <h3>{% block page-header %}{% endblock %}</h3>
diff --git a/templates/message_block.html b/templates/message_block.html
deleted file mode 100644
index 5688cc6..0000000
--- a/templates/message_block.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% if messages %}
-    {% for message in messages %}
-
-        {% if message.tags == 'error' %}
-            <div class="alert alert-danger alert-dismissable">
-                <span class="glyphicon glyphicon-exclamation-sign"></span>
-        {% elif message.tags == 'warning' %}
-            <div class="alert alert-warning alert-dismissable">
-                <span class="glyphicon glyphicon-warning-sign"></span>
-        {% elif message.tags == 'success' %}
-            <div class="alert alert-success alert-dismissable">
-                <span class="glyphicon glyphicon-ok-circle"></span>
-        {% elif message.tags == 'info' %}
-            <div class="alert alert-info alert-dismissable">
-                <span class="glyphicon glyphicon-info-sign"></span>
-        {% endif %}
-
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{ message|safe }}
-        </div>
-    {% endfor %}
-{% endif %}
\ No newline at end of file