diff --git a/dashboard/src/views/emails.html b/dashboard/src/views/emails.html
index 05930d274..36aeba123 100644
--- a/dashboard/src/views/emails.html
+++ b/dashboard/src/views/emails.html
@@ -216,8 +216,6 @@
       <div class="pull-right">
         <a class="btn btn-default" ng-show="user.isAtLeastOwner" href="#/emails-queue">{{ 'emails.action.queue' | tr }}</a>
         <a class="btn btn-default" ng-show="user.isAtLeastOwner" href="#/emails-eventlog">{{ 'eventlog.title' | tr }}</a>
-        <!-- hidden for now, until we see a purpose -->
-        <!-- <a class="btn btn-sm btn-default" ng-disabled="user.isAtLeastOwner" href="/filemanager.html?id=mail&type=mail" target="_blank" uib-tooltip="{{ 'app.filemanagerActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-folder"></i></a> -->
       </div>
     </h1>
   </div>
diff --git a/filemanager/src/views/Home.vue b/filemanager/src/views/Home.vue
index 139a5e3ab..1ff36e2ac 100644
--- a/filemanager/src/views/Home.vue
+++ b/filemanager/src/views/Home.vue
@@ -381,8 +381,6 @@ export default {
       }
 
       this.title = result.body.name;
-    } else if (type === 'mail') {
-      this.title = 'Mail';
     } else {
       console.error(`Unsupported type ${type}`);
       return;
@@ -393,6 +391,7 @@ export default {
     this.cwd = sanitize('/' + (cwd ? cwd.join('/') : '/'));
     this.resourceType = type;
     this.resourceId = resourceId;
+
     this.directoryModel = createDirectoryModel(this.apiOrigin, this.accessToken, type === 'volume' ? `volumes/${resourceId}` : `apps/${resourceId}`);
     this.loadCwd();
 
@@ -405,6 +404,7 @@ export default {
       if ((toParams.type !== this.resourceType) || (toParams.resourceId !== this.resourceId)) {
         this.resourceType = toParams.type;
         this.resourceId = toParams.resourceId;
+
         this.directoryModel = createDirectoryModel(this.apiOrigin, this.accessToken, toParams.type === 'volume' ? `volumes/${toParams.resourceId}` : `apps/${toParams.resourceId}`);
       }