diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 78cc92b1a..72a87cf89 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -72,8 +72,9 @@
                       <div *ngIf="dm.lastMessage" class="item-description" [class.item-description-active]="dm._id == idSelected">
                         <ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
                         <ion-label *ngIf="dm.lastMessage.file">
-                          <fa-icon icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
-                          <span> {{dm.lastMessage.file.name}}</span>
+                          <fa-icon *ngIf="dm.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
+                          <fa-icon *ngIf="dm.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
+                          <span> {{dm.lastMessage.file.name || dm.lastMessage.file.subject }}</span>
                         </ion-label>
                         <ion-label *ngIf="dm.lastMessage.attachments">
                           <div *ngIf="dm.lastMessage.attachments[0].image_url">
@@ -109,9 +110,10 @@
                       </div>
                       <div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group._id ==idSelected">
                         <div class="item-message">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
-                        <div class="item-files" *ngIf="group.lastMessage.file">
-                          <fa-icon icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
-                          <span> {{group.lastMessage.file.name}}</span>
+                        <div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
+                          <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
+                          <fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
+                          <span class="item-files-title"> {{group.lastMessage.file.name || group.lastMessage.file.subject}}</span>
                         </div>
                         <div  class="item-files" *ngIf="group.lastMessage.attachments">
                           <div *ngIf="group.lastMessage.attachments[0].image_url">
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index 2fc786346..e192f166b 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -126,6 +126,11 @@ ion-content{
     }
     .item-files{
       float: left;
+      overflow: auto;
+
+      .item-files-title{
+        width: 100%;
+      }
     }
   }
   .item-description-active{