diff --git a/include/maskfld.cpp b/include/maskfld.cpp
index c79d7160b..9c3f47df9 100755
--- a/include/maskfld.cpp
+++ b/include/maskfld.cpp
@@ -324,8 +324,6 @@ int TMask_field::create_prompt(
 #if XVT_OS == XVT_OS_WIN
     const int k = _prompt.find('~');
     if (k >= 0) _prompt[k] = '&';
-    //    if (required() && _prompt[0] != '@')
-    //      _prompt.insert("@b", 0);
 #endif
     _promptwin = xvt_create_control
       (
@@ -1516,7 +1514,24 @@ bool TBrowse::do_insert()
   {
     app = &_insert[1];
   }
-
+  if (app.find('#') != -1)
+  {
+    TString80 w(app);
+    app = "";
+    for (const char* f = w; *f; f++)
+    {
+      if (*f == '#') 
+      {
+        const int id = atoi(++f);
+        app << _fld->mask().get(id);
+        while (isspace(*f)) ++f;
+        while (isdigit(*f)) ++f; 
+        app << ' ';
+      }
+      else
+        app << *f;
+    }
+  }  
   TMailbox mail;
   TMessage msg(app, MSG_AI, "");
   mail.send(msg);