diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml
index 5f1fd9bb..3c95ebd7 100644
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/admin/mail_options.rhtml
@@ -14,7 +14,7 @@
 <p><%= check_all_links('mail-options-form') %></p>
 </fieldset>
 
-<fieldset class="box"><legend>Emails footer</legend>
+<fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
 <%= text_area_tag 'emails_footer', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %>
 </fieldset>
 
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 2b25820d..3cd384c1 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -64,10 +64,8 @@
     </div>
     
     <div id="content">
-        <div id="flash">
-            <%= content_tag('div', flash[:error], :class => 'error') if flash[:error] %>
-            <%= content_tag('div', flash[:notice], :class => 'notice') if flash[:notice] %>
-        </div>
+            <%= content_tag('div', flash[:error], :class => 'flash error') if flash[:error] %>
+            <%= content_tag('div', flash[:notice], :class => 'flash notice') if flash[:notice] %>
         <%= yield %>
     </div>
 </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 979c0d27..298e5748 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -154,23 +154,23 @@ width: 200px;
 div.attachments p { margin:4px 0 2px 0; }
 
 /***** Flash & error messages ****/
-#flash div, #errorExplanation, .nodata {
+#errorExplanation, div.flash, div.nodata {
     padding: 4px 4px 4px 30px;
     margin-bottom: 12px;
 	font-size: 1.1em;
 	border: 2px solid;
 }
 
-#flash div {margin-top: 6px;}
+div.flash {margin-top: 8px;}
 
-#flash div.error, #errorExplanation {
+div.flash.error, #errorExplanation {
     background: url(../images/false.png) 8px 5px no-repeat;
 	background-color: #ffe3e3;
 	border-color: #dd0000;
 	color: #550000;
 }
 
-#flash div.notice {
+div.flash.notice {
     background: url(../images/true.png) 8px 5px no-repeat;
 	background-color: #dfffdf;
 	border-color: #9fcf9f;