Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -N -r1.57.2.12 -r1.57.2.13
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	5 Mar 2017 16:44:14 -0000	1.57.2.12
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	27 Mar 2017 11:21:38 -0000	1.57.2.13
@@ -444,7 +444,7 @@
     foreach column [[self]::__columns children] {
       if {[$column exists no_csv]} continue
       set label [$column label]
-      if {[regexp {^#(.*)#$} $label _ message_key]} {
+      if {[regexp {^#([a-zA-Z0-9_:-]+\.[a-zA-Z0-9_:-]+)#$} $label _ message_key]} {
         set label [_ $message_key]
       }
       set value [string map {\" \\\" \n \r)} $label]
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.248.2.46 -r1.248.2.47
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	13 Mar 2017 17:34:21 -0000	1.248.2.46
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	27 Mar 2017 11:21:38 -0000	1.248.2.47
@@ -3942,7 +3942,7 @@
     }
 
     set time_label [my time_label]
-    if {[regexp {^#(.+)#$} $time_label _ msg_key]} {
+    if {[regexp {^#([a-zA-Z0-9_:-]+\.[a-zA-Z0-9_:-]+)#$} $time_label _ msg_key]} {
       set time_label [lang::message::lookup [my locale] $msg_key]
     }