--- Mailman/htmlformat.py.orig	Tue Mar 21 15:58:15 2000
+++ Mailman/htmlformat.py	Wed Mar 22 09:19:00 2000
@@ -121,7 +121,7 @@
 		output = output + ' NOWRAP'
 		continue
 	    else:
-		output = output + ' %s=%s' %(string.upper(key), val) 
+		output = output + ' %s="%s"' %(string.upper(key), val) 
 
 	return output
 
@@ -132,7 +132,7 @@
 	for (key, val) in info.items():
 	    if not key in valid_mods:
 		continue
-	    output = output + ' %s=%s' %(string.upper(key), val) 
+	    output = output + ' %s="%s"' %(string.upper(key), val) 
 
 	return output
 
@@ -149,7 +149,7 @@
 		output = output + ' BORDER'
 		continue
 	    else:	
-		output = output + ' %s=%s' %(string.upper(key), val) 	
+		output = output + ' %s="%s"' %(string.upper(key), val) 	
 
 	return output
 
@@ -284,7 +284,7 @@
 	else:
 	    output = output + '>\n'
 	output = output + Container.Format(self, indent)
-	output = output + '%s</html>\n' % spaces
+	output = output + '%s</body>\n%s</html>\n' % (spaces, spaces)
 	return output
 
 class HeadlessDocument(Document):