Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.241 -r1.242
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	16 Nov 2009 09:55:22 -0000	1.241
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	18 Nov 2009 16:17:55 -0000	1.242
@@ -1235,7 +1235,6 @@
   } {
     my instvar page_template doc root package_id
     ::xowiki::Form requireFormCSS
-    #my msg "edit [self args]"
     #my log "edit [self args]"
 
     set form [my get_form]
@@ -1518,7 +1517,8 @@
     set html [my regsub_eval  \
                   {(^|[^\\])\x003([a-zA-Z0-9_:]+)\x003} $html \
                   {my form_field_as_html -mode edit "\\\1" "\2" $form_fields}]
-
+    # replace unbalanced @ characters
+    set html [string map [list \x003 @] $html]
     #my log "calling VIEW with HTML [string length $html]"
     if {$view} {
       my view $html