Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -N -r1.35.2.5 -r1.35.2.6
--- openacs-4/packages/file-storage/www/file.tcl	19 Apr 2017 18:15:56 -0000	1.35.2.5
+++ openacs-4/packages/file-storage/www/file.tcl	25 Apr 2017 18:08:26 -0000	1.35.2.6
@@ -81,15 +81,14 @@
         "Copy file"
 }
 
-# add button only when available folders for move exist
-if {[db_list_of_lists dbqd.file-storage.www.move.get_folder_tree {}] ne ""} {
+if {$delete_p} {
+    # add button only when available folders for move exist.  We
+    # lazily check for deletion, as a proper check of a suitable
+    # destination for moving would be too much effort
     lappend actions \
         [_ file-storage.Move_File] \
         [export_vars -base move {{object_id $file_id} {return_url $folder_view_url}}] \
         "Move file"
-}
-
-if {$delete_p} {
     lappend actions \
         [_ file-storage.Delete_File] \
         [export_vars -base delete {{object_id $file_id} {return_url $folder_view_url}}] \