diff --git a/themes/default/templates/files.html.ep b/themes/default/templates/files.html.ep
index be68d11..a4389ec 100644
--- a/themes/default/templates/files.html.ep
+++ b/themes/default/templates/files.html.ep
@@ -3,9 +3,11 @@
 <div class="box">
   <h1 class="title is-1 has-text-centered mb-6"><%= l('My files') %></h1>
 
-  <div class="intro">
-    <%= l('Only the files sent with this browser will be listed here. This list is stored in localStorage: if you delete your localStorage data, you\'ll lose this list.') %><br>
-    <%= l('Rows in red mean that the files have expired and are no longer available.') %>
+  <div class="message is-info">
+    <div class="message-body">
+      <%= l('Only the files sent with this browser will be listed here. This list is stored in localStorage: if you delete your localStorage data, you\'ll lose this list.') %><br>
+      <%= l('Rows in red mean that the files have expired and are no longer available.') %>
+    </div>
   </div>
 
 
diff --git a/themes/default/templates/mail.html.ep b/themes/default/templates/mail.html.ep
index 500919d..55e3a65 100644
--- a/themes/default/templates/mail.html.ep
+++ b/themes/default/templates/mail.html.ep
@@ -1,14 +1,14 @@
 <div class="box">
 % if (defined(stash('msg'))) {
-  <div class="message">
-    <div class="message-body is-danger">
+  <div class="message is-danger">
+    <div class="message-body">
       <%= stash('msg')%>
     </div>
   </div>
 % }
 
-  <div class="message">
-    <div class="message-body is-info">
+  <div class="message is-info">
+    <div class="message-body">
     <p><%= l('If you send the mail from this server, the links will be sent to the server, which may lower your privacy protection.') %></p>
     <p><%= l('Adding URLs not related to this Lufi instance to the mail body or subject is prohibited.') %></p>
     </div>
diff --git a/themes/default/templates/render.html.ep b/themes/default/templates/render.html.ep
index 0152aac..eabc9a2 100755
--- a/themes/default/templates/render.html.ep
+++ b/themes/default/templates/render.html.ep
@@ -1,6 +1,6 @@
 % if (!defined(stash('f')) && defined(stash('msg'))) {
-<div class="message">
-  <div class="message-body is-danger">
+<div class="message is-danger">
+  <div class="message-body">
     <%= stash('msg')%>
   </div>
 </div>