diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 056196c..c53bb0d 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -25,9 +25,13 @@ hr {
 </style>
 </head>
 <body>
+<% if not Setting.emails_header.empty? -%>
 <span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
+<% end -%>
 <%= yield %>
+<% if not Setting.emails_footer.empty? -%>
 <hr />
 <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
+<% end -%>
 </body>
 </html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
index 4b8c0b4..c16a673 100644
--- a/app/views/layouts/mailer.text.erb
+++ b/app/views/layouts/mailer.text.erb
@@ -1,4 +1,8 @@
+<% if not Setting.emails_header.empty? -%>
 <%= Setting.emails_header %>
+<% end -%>
 <%= yield %>
+<% if not Setting.emails_footer.empty? -%>
 -- 
 <%= Setting.emails_footer %>
+<% end -%>
