--- simplemente.py	2008-01-27 16:46:26.000000000 +0100
+++ simplemente-v1.8.py	2008-10-06 14:57:59.000000000 +0200
@@ -552,27 +552,6 @@
 
 
         # tribute to the most sucking browser: MS IE6
-
-        # Try..except for backwards compatibility of Moin versions only
-        try:
-            if self.cfg.hacks.get('ie7', False) and self.request.action != 'edit':
-                # using FCKeditor and IE7 at the same time makes nices crashes in IE
-                html.append("""
-<!-- compliance patch for microsoft browsers -->
-<!--[if lt IE 7]>
-   <script src="%s/common/ie7/ie7-standard-p.js" type="text/javascript"></script>
-<![endif]-->
-""" % prefix)
-        except:
-            if self.cfg.hacks.get('ie7', False) and self.request.form.get('action', [''])[0] != 'edit':
-                html.append("""
-<!-- compliance patch for microsoft browsers -->
-<!--[if lt IE 7]>
-   <script src="%s/common/ie7/ie7-standard-p.js" type="text/javascript"></script>
-<![endif]-->
-""" % prefix)
-
-
         csshref = '%s/%s/css/msie.css' % (prefix, self.name)
         html.append("""
 <!-- css only for MSIE browsers -->
@@ -823,7 +802,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,26 +909,32 @@
     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