Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -N -r1.36.2.6 -r1.36.2.7
--- openacs-4/packages/xowiki/www/admin/list.tcl	2 May 2017 13:51:25 -0000	1.36.2.6
+++ openacs-4/packages/xowiki/www/admin/list.tcl	3 May 2017 07:12:52 -0000	1.36.2.7
@@ -123,6 +123,9 @@
             ::xo::Package initialize -package_id $package_id -keep_cc true
           }
           set page_link [::$package_id pretty_link -parent_id $parent_id $name]
+          set edit_link [::$package_id pretty_link -parent_id $parent_id \
+                             -query [export_vars {{m edit} return_url}] \
+                             $name]
           set name [::$package_id external_name -parent_id $parent_id $name]
 
 	  ::template::t1 add \
@@ -134,11 +137,11 @@
               -syndicated [info exists syndicated($revision_id)] \
               -size [expr {$content_length ne "" ? $content_length : 0}]  \
               -edit "" \
-              -edit.href [export_vars -no_base_encode -base $page_link {{m edit} return_url}] \
+              -edit.href $edit_link \
               -edit.title #xowiki.edit# \
               -mod_user [::xo::get_user_name $creation_user] \
               -delete "" \
-              -delete.href [export_vars -base  [$package_id package_url] {{delete 1} item_id name return_url}] \
+              -delete.href [export_vars -base [$package_id package_url] {{delete 1} item_id name return_url}] \
               -delete.title #xowiki.delete# 
 
           if {$::individual_permissions} {