gistfile1.txt

diff --git a/lib/merb-core/controller/mixins/controller.rb b/lib/merb-core/controller/mixi
index 8c8078c..0b3c596 100644
--- a/lib/merb-core/controller/mixins/controller.rb
+++ b/lib/merb-core/controller/mixins/controller.rb
@@ -127,7 +127,9 @@ module Merb
     def redirect(url, opts = {})
       default_redirect_options = { :message => nil, :permanent => false }
       opts = default_redirect_options.merge(opts)
-      if opts[:message]
+      if opts[:message] || opts[:notice] || opts[:error]
+        opts[:message][:notice] = opts[:notice] if opts[:notice]
+        opts[:message][:error] = opts[:error] if opts[:error]
         notice = Merb::Request.escape([Marshal.dump(opts[:message])].pack("m"))
         url = url =~ /\?/ ? "#{url}&_message=#{notice}" : "#{url}?_message=#{notice}"
       end