diff --git a/config.xml b/config.xml
index db621118f..b3e4a2084 100644
--- a/config.xml
+++ b/config.xml
@@ -3,7 +3,7 @@
     <name>gabinete digital</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
-    <content original-src="index.html" src="http://localhost:8101" />
+    <content src="index.html" />
     <access origin="*" />
     <allow-navigation href="http://*/*" />
     <allow-navigation href="https://*/*" />
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 673b2c65c..5d46eb719 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -1,13 +1,17 @@
-<ion-content class="height-100">
-  <div class="main-content d-flex height-100">
+<ion-content>
+  <div class="main-content">
     <div class="content d-flex flex-column width-100">
       <div class="main-header">
+        <ion-header>
         <div class="title-content">
           <div class="middle">
             <ion-label class="title">Editar Evento</ion-label>
           </div>
         </div>
+      </ion-header>
       </div>
+      <ion-item-sliding>
+
       <div class="ion-item-container width-100">
         <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
       </div>
@@ -173,8 +177,8 @@
           <div class="ion-icon-class">
             <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
           </div>
-          <div class="ion-input-class">
-            <ion-input placeholder="Detalhes" [(ngModel)]="postEvent.Body.Text"></ion-input>
+          <div class="ion-input-class-no-height width-100">
+            <ion-textarea placeholder="Detalhes" [(ngModel)]="postEvent.Body.Text" rows="6" cols="20"></ion-textarea>
           </div>
         </div>
       </div>
@@ -203,7 +207,9 @@
         </ion-item>
         </ion-list>
       </div>
+      </ion-item-sliding>
     </div>
+    
     <div class="aside-right flex-column height-100">
       
     </div>
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss
index 9659a0bfa..f3440bae6 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.scss
+++ b/src/app/pages/agenda/edit-event/edit-event.page.scss
@@ -69,6 +69,7 @@
         float: left;
       }
       .ion-input-class-no-height{
+        width: calc(100% - 45px);
         border: 1px solid #ebebeb;
         border-radius: 5px;
         overflow: auto;
@@ -162,4 +163,5 @@
     justify-content: space-between;
     padding: 20px;
     overflow: auto;
-  }
\ No newline at end of file
+  }
+  
\ No newline at end of file
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 3a68f4910..448628f3f 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -47,6 +47,7 @@
           </ion-label>
         </div>
       </div>
+      <div class="line"></div>
       <div class="middle-content">
         <div *ngIf="loadedEvent.Attendees">
         <h5>Intervenientes</h5>
@@ -60,7 +61,7 @@
       </div>
         <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
-          <p [innerHTML]="loadedEvent.Body.Text"></p>
+          <textarea disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></textarea>
         </ion-item>
       </div>
     
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index c74dbf83b..54eaf645b 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -151,6 +151,10 @@ ion-menu{
             font-size: 16px;
         }
       }
+      .line{
+        margin-top: 15px;
+        border-top: 1px solid #d8d8d8;
+      }
       .middle-conten{
         .middle-content h3, .middle-content p{
           font-size: 16px;
@@ -230,4 +234,8 @@ ion-menu{
       margin: 0 auto !important;
       margin-bottom: 10px !important;
     }
+  }
+  textarea{
+    border:none;
+    --background:#fff !important;
   }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 160c2abdc..23aa99595 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -54,6 +54,7 @@
       </ion-label>
     </div>
   </div>
+  <div class="line"></div>
   <div class="middle-content" *ngIf="loadedEvent">
     <h5>Intervenientes</h5>
     <ion-item>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index a9678402e..a7bda9ddf 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -80,6 +80,7 @@ export class ExpedientTaskModalPage implements OnInit {
     this.taskDate = new Date(this.task.taskStartDate);
 
     this.getAttachments();
+    this.getSubjectType();
   }
 
   close(){
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index d4f238c72..a7d6b17b7 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -55,8 +55,8 @@
   <ion-menu-button></ion-menu-button>
 </div>
 
-<ion-content class="height-100">
-  <div class="main-content d-flex height-100">
+<ion-content>
+  <div class="main-content d-flex">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content">
@@ -79,6 +79,7 @@
           </ion-label>
         </div>
       </div>
+      <div class="line"></div>
       <div class="middle-content">
         <h5 *ngIf="intervenientes">Intervenientes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index e0be9c7e9..2f4b88c16 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -192,7 +192,7 @@ export class EventsService {
     return this.http.delete(`${puturl}`, options)
   }
   postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any){
-    const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente');
+    const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/event';
     let params = new HttpParams();
 
     params = params.set("DocId", docId);
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html
index bfe3ff7ba..8f9862116 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -65,6 +65,7 @@
           </ion-label>
         </div>
       </div>
+      <div class="line"></div>
       <div class="middle-content">
         <h5>Intervenientes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html
index 0ccb16d5b..8f5e704f3 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.html
+++ b/src/app/shared/agenda/edit-event/edit-event.component.html
@@ -177,10 +177,8 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class-no-height flex-grow-1">
-          
-          <ion-textarea [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
-          
+        <div class="ion-input-class-no-height width-100">
+          <ion-textarea [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.scss b/src/app/shared/agenda/edit-event/edit-event.component.scss
index fcb66c717..dc20d1e33 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.scss
+++ b/src/app/shared/agenda/edit-event/edit-event.component.scss
@@ -57,7 +57,6 @@ ion-content{
         margin-bottom: 15px;
       }
       .ion-item-class-2{
-
         margin: 0px auto;
       }
       .ion-icon-class{
@@ -81,8 +80,11 @@ ion-content{
         float: left;
       }
       .ion-input-class-no-height{
+        height: auto !important;
         border: 1px solid #ebebeb;
         border-radius: 5px;
+        margin-bottom: 15px;
+        overflow: auto;
       }
       .list-people{
 
@@ -165,11 +167,4 @@ ion-content{
         color:red;
       }
 
-  }
-
-
-.container-div{
-  ion-textarea{
-    height: 81px;
-  }
-}
\ No newline at end of file
+  }
\ No newline at end of file
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts
index 7cf1473f5..0da22289c 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -36,10 +36,15 @@ export class EditEventComponent implements OnInit {
     private eventsService: EventsService,
     public alertController: AlertController,
   ) { 
+   
 
   }
 
   ngOnInit() {
+    let innerHtml :string = this.postEvent.Body.Text;
+    this.postEvent.Body.Text = innerHtml;
+    console.log(this.postEvent);
+    
     this.isEventEdited = false;
 
     if(this.postEvent.IsRecurring == false){
@@ -49,13 +54,13 @@ export class EditEventComponent implements OnInit {
       this.isRecurring = "Repete";
     }
   }
+  
   close(){
     console.log('!!!!!!!!!!!!!!!!! close')
     this.closeComponent.emit();
     this.clearContact.emit();
   }
   save(){
-
     this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
       const alert = await this.alertController.create({
         cssClass: 'my-custom-class',
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 2c5e63791..4790b191d 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -32,6 +32,7 @@
         </ion-label>
       </div>
     </div>
+    <div class="line"></div>
     <div class="middle-content">
       <div *ngIf="loadedEvent.Attendees">
         <h5>Intervenientes</h5>
@@ -44,15 +45,16 @@
         </ion-item>
       </div>
       <h5>Detalhes</h5>
-      <ion-item class="ion-no-margin ion-no-padding">
-          <p [innerHTML]="loadedEvent.Body.Text"></p>
+      <ion-item lines="none" class="ion-no-margin ion-no-padding">
+          <ion-textarea [innerHTML]="loadedEvent.Body.Text"></ion-textarea>
       </ion-item>
     </div>
+    <div class="line"></div>
   
     <div *ngIf="loadedAttachments" class="bottom-content">
       <ion-list>
         <h3>Documentos Anexados</h3>
-        <ion-item class="ion-no-margin ion-no-padding">
+        <ion-item lines="none" class="ion-no-margin ion-no-padding">
         <ion-label *ngFor="let attach of loadedAttachments"
         (click)="viewDocument()">
           <p class="attach-title-item">{{attach.SourceName}}</p>
@@ -61,5 +63,6 @@
       </ion-item>
       </ion-list>
     </div>
+    <!-- <div class="line"></div> -->
   </div>    
 </ion-content>
\ No newline at end of file
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index fc6473ef4..316f0026a 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -123,6 +123,10 @@ ion-menu{
             font-size: 16px;
         }
       }
+      .line{
+        margin-top: 15px;
+        border-top: 1px solid #d8d8d8;
+      }
       .middle-conten{
         .middle-content h3, .middle-content p{
           font-size: 16px;