--- form.py	2008-01-05 13:39:09.000000000 +0100
+++ form.py	2008-01-06 12:05:18.000000000 +0100
@@ -29,14 +29,14 @@
         out += self.rendernote(self.note)
         out += '<table>\n'
         for i in self.inputs:
-            out += '   <tr><th><label for="%s">%s</label></th>' % (i.id, i.description)
-            out += "<td>"+i.pre+i.render()+i.post+"</td>"
+            out += ' <tr><th><label for="%s">%s</label></th>' % (i.id, net.websafe(i.description).decode('utf-8'))
+            out += "<td>"+i.pre+i.render().decode('utf-8')+i.post+"</td>"
             out += '<td id="note_%s">%s</td></tr>\n' % (i.id, self.rendernote(i.note))
         out += "</table>"
         return out
     
     def rendernote(self, note):
-        if note: return '<strong class="wrong">%s</strong>' % note
+        if note: return '<strong class="wrong">%s</strong>' % net.websafe(note).decode('utf-8')
         else: return ""
 
     def validates(self, source=None, _validate=True, **kw):