diff --git a/files/renderer.php b/files/renderer.php
index ac8e5829463..3728a23443c 100644
--- a/files/renderer.php
+++ b/files/renderer.php
@@ -185,7 +185,6 @@ class core_files_renderer extends plugin_renderer_base {
         $strmakedir  = get_string('makeafolder', 'moodle');
         $strdownload = get_string('downloadfolder', 'repository');
         $strloading  = get_string('loading', 'repository');
-        $strnofilesattached = get_string('nofilesattached', 'repository');
         $strdroptoupload = get_string('droptoupload', 'moodle');
         $icon_progress = $OUTPUT->pix_icon('i/loading_small', $strloading).'';
         $restrictions = $this->fm_print_restrictions($fm);
@@ -220,7 +219,7 @@ class core_files_renderer extends plugin_renderer_base {
     <div class="filemanager-container" >
         <div class="fm-content-wrapper">
             <div class="fp-content"></div>
-            <div class="fm-empty-container <!--mdl-align-->">'.$strnofilesattached.'
+            <div class="fm-empty-container <!--mdl-align-->">
                 <span class="dndupload-message">'.$strdndenabledinbox.'<br/><span class="dndupload-arrow"></span></span>
             </div>
             <div class="dndupload-target">'.$strdroptoupload.'<br/><span class="dndupload-arrow"></span></div>
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 073d3eb405f..224b7411f87 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -466,7 +466,7 @@ $string['displayonpage'] = 'Display on page';
 $string['dndenabled'] = 'Drag and drop available';
 $string['dndenabled_help'] = 'You can drag one or more files from your desktop and drop them onto the box below to upload them.<br />Note: this may not work with other web browsers';
 $string['dndenabled_insentence'] = 'drag and drop available';
-$string['dndenabled_inbox'] = 'drag and drop files here to upload them';
+$string['dndenabled_inbox'] = 'You can drag and drop files here to add them.';
 $string['dnduploadwithoutcontent'] = 'This upload does not have any content';
 $string['dndworkingfiletextlink'] = 'Drag and drop files, text or links onto course sections to upload them';
 $string['dndworkingfilelink'] = 'Drag and drop files or links onto course sections to upload them';
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 80f20c65824..697ca6f383c 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -2025,7 +2025,9 @@ class core_renderer extends renderer_base {
 
         $currentfile = $options->currentfile;
         if (empty($currentfile)) {
-            $currentfile = get_string('nofilesattached', 'repository');
+            $currentfile = '';
+        } else {
+            $currentfile .= ' - ';
         }
         if ($options->maxbytes) {
             $size = $options->maxbytes;
@@ -2056,7 +2058,7 @@ EOD;
             $html .= <<<EOD
     <div id="file_info_{$client_id}" class="mdl-left filepicker-filelist" style="position: relative">
     <div class="filepicker-filename">
-        <div class="filepicker-container">$currentfile<span class="dndupload-message"> - $strdndenabled <br/><span class="dndupload-arrow"></span></span></div>
+        <div class="filepicker-container">$currentfile<span class="dndupload-message">$strdndenabled <br/><span class="dndupload-arrow"></span></span></div>
     </div>
     <div><div class="dndupload-target">{$strdroptoupload}<br/><span class="dndupload-arrow"></span></div></div>
     </div>