diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a935ce9ec..35d1670ae 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -147,6 +147,15 @@ module ApplicationHelper
     end
     content
   end
+  
+  # Renders flash messages
+  def render_flash_messages
+    s = ''
+    flash.each do |k,v|
+      s << content_tag('div', v, :class => "flash #{k}")
+    end
+    s
+  end
 
   # Truncates and returns the string as a single line
   def truncate_single_line(string, *args)
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index b146d615e..0de3b0e3d 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -50,8 +50,7 @@
     </div>
     
     <div id="content">
-            <%= content_tag('div', flash[:error], :class => 'flash error') if flash[:error] %>
-            <%= content_tag('div', flash[:notice], :class => 'flash notice') if flash[:notice] %>
+				<%= render_flash_messages %>
         <%= yield %>
     </div>
 </div>