--- alt_simplemente.txt	2008-01-27 16:46:26.000000000 +0100
+++ neu_simplemente.txt	2008-06-16 20:21:46.000000000 +0200
@@ -823,7 +823,7 @@
 
 
         from MoinMoin import config
-        for scheme in self.linkSchemas:
+        for scheme in config.url_schemas:
             if pagename.startswith(scheme):
                 title = wikiutil.escape(title)
                 link = self.request.formatter.url(1, pagename, name=title) + \
@@ -930,27 +930,33 @@
     def msg(self, d):
         """ Assemble the msg display
 
-        Changed: Added hidden h1 heading for better navigation with screenreaders
-        
+        Display a message with a widget or simple strings with a clear message link.
+
         @param d: parameter dictionary
         @rtype: unicode
         @return: msg display html
         """
         _ = self.request.getText
-        msg = d['msg']
-        if not msg:
-            return u''
+        msgs = d['msg']
 
-        if isinstance(msg, (str, unicode)):
-            # Render simple strings with a close link
-            close = d['page'].link_to(self.request, text=_('Clear message'))
-            html = u'<p>%s</p>\n<div class="buttons">%s</div>\n' % (msg, close)
+        result = u""
+        close = d['page'].link_to(self.request, text=_('Clear message'), css_class="clear-link")
+        for msg, msg_class in msgs:
+            try:
+                result += u'<p>%s</p>' % msg.render()
+                close = ''
+            except AttributeError:
+                if msg and msg_class:
+                    result += u'<p><div class="%s">%s</div></p>' % (msg_class, msg)
+                elif msg:
+                    result += u'<p>%s</p>\n' % msg
+        if result:
+            html = result + close
+            return u'<div id="message">\n%s\n</div>\n' % html
         else:
-            # msg is a widget
-            html = msg.render()
-
-        return u'<div id="message">\n<h1 class="screenreader_info">%s</h1>\n%s\n</div>\n' % (_('Message'), html)
-
+            return u''
+        return u'<div id="message">\n<h1 class="screenreader_info">%s</h1>\n</div>\n' % html
+    
     def navibar(self, d):
         """ Assemble the navibar
 
