diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 446b93c42bdd55881e1d0098cfbcfa6e2c4be549..a392590c31c6b69113cc36d76832b6a3223b936c 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -575,6 +575,7 @@ class FolderController
                     'attachments'   => $attachments,
                     'checkLocked'   => false,
                     'trackedMails'  => $followedResources,
+                    'listDisplay'   => ['folders']
                 ]);
             }
 
diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.html b/src/frontend/app/folder/document-list/folder-document-list.component.html
index 481c1d5294da7e2e6698e664f2be6ba9ed702a72..90cbf1dda64fdf4fd766d702dfc9a3461d07b10a 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.html
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.html
@@ -168,6 +168,9 @@
                                             </button>
                                     </span>
                                 </div>
+                                <div *ngIf="row.folders !== undefined && row.folders.length > 0" class="folder-info">
+                                    <span class="badge badge-folder" *ngFor="let folder of row.folders | sortBy : 'label'" routerLink="/folders/{{folder.id}}" title="{{lang.goToFolder}} : {{folder.label}}"><i class="fa fa-folder"></i> {{folder.label}}</span>
+                                </div>
                             </td>
                         </ng-container>
                         <tr mat-row *matRowDef="let row; columns: displayedColumnsBasket;"
diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.scss b/src/frontend/app/folder/document-list/folder-document-list.component.scss
index 7a6af119a53257534cc90bb70e36a7e6cc50df81..3c256aca35a0eeab0c62b688cb03b0040c90f7ec 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.scss
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.scss
@@ -93,3 +93,17 @@
 .followIcon {
     color: $secondary;
 }
+
+.folder-info {
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+.badge-folder {
+    cursor: pointer;
+    background: $secondary;
+    margin: 5px;
+    font-size: 12px;
+    border-radius: 3px;
+    opacity: 0.8;
+}