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 -r1.35.2.4 -r1.35.2.5
--- openacs-4/packages/file-storage/www/file.tcl	11 Apr 2017 05:52:30 -0000	1.35.2.4
+++ openacs-4/packages/file-storage/www/file.tcl	19 Apr 2017 18:15:56 -0000	1.35.2.5
@@ -73,14 +73,22 @@
         "Rename file"
 }
 
-lappend actions \
-    [_ file-storage.Copy_File] \
-    [export_vars -base copy {{object_id $file_id} return_url}] \
-    "Copy file" \
-    [_ file-storage.Move_File] \
-    [export_vars -base move {{object_id $file_id} {return_url $folder_view_url}}] \
-    "Move file"
+# add button only when available folders for copy exist
+if {[db_list_of_lists dbqd.file-storage.www.copy.get_folder_tree {}] ne ""} {    
+    lappend actions \
+        [_ file-storage.Copy_File] \
+        [export_vars -base copy {{object_id $file_id} return_url}] \
+        "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 ""} {
+    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] \