Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -r1.33.2.11 -r1.33.2.12
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	21 Apr 2017 13:51:54 -0000	1.33.2.11
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	2 May 2017 13:51:25 -0000	1.33.2.12
@@ -628,18 +628,18 @@
           #               [list item_id [$c item_id]] \
           #               [list name [$c pretty_link]] return_url]]
       
-      set delete_link [export_vars -base $page_link {{m delete} return_url}]
+      set delete_link [export_vars -no_base_encode -base $page_link {{m delete} return_url}]
       
       $t add \
           -ID [$c name] \
           -name $prettyName \
-          -name.href [export_vars -base $page_link {template_file html-content}] \
+          -name.href [export_vars -no_base_encode -base $page_link {template_file html-content}] \
           -name.title [$c set title] \
           -object_type $icon(text) \
           -object_type.richtext $icon(is_richtext) \
           -last_modified [$c set last_modified] \
           -edit "" \
-          -edit.href [export_vars -base $page_link {{m edit} return_url}] \
+          -edit.href [export_vars -no_base_encode -base $page_link {{m edit} return_url}] \
           -edit.title #xowiki.edit# \
           -mod_user [::xo::get_user_name [$c set creation_user]] \
           -delete "" \