diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 6af7f806b..294e312ee 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -270,12 +270,7 @@
 
                   <div *ngFor="let event of events.value" class="EventListBox"   >
 
-<<<<<<< HEAD
-                    <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) &&  showEventBox(event) ">
-=======
                     <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)">
->>>>>>> 5de16776a2d0d5cddbb186151ec203ae12509873
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index a3a0d8983..c23d4678e 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -301,6 +301,10 @@ export class EventsService {
 
     params = params.set("conflictResolutionMode", conflictResolutionMode.toString());
     params = params.set("sendInvitationsOrCancellationsMode", sendInvitationsOrCancellationsMode.toString());
+    params.set('CalendarId', event.CalendarId)
+    params.set('CalendarName', event.CalendarName)
+    this.headers['CalendarId'] =  event.CalendarId
+    this.headers['CalendarName'] =  event.CalendarName
     
     let options = { 
       headers: this.headers, 
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index d3539b232..ddea0f9c0 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -116,7 +116,7 @@
           <mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
               placeholder="Choose a date"
-              [formControl]="dateControlStart"
+              [(ngModel)]="postEvent.StartDate"
               [max]="maxDate"
               [disabled]="disabled"
             >
@@ -144,7 +144,7 @@
           <mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"
               placeholder="Choose a date"
-              [formControl]="dateControlEnd"
+              [(ngModel)]="postEvent.EndDate"
               [max]="maxDate"
               [disabled]="disabled"
             >
@@ -283,7 +283,7 @@
       </ion-label>
     </div>
 
-    <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments; let i = index" >
+    <div class="d-flex container-div width-100"  *ngFor="let document of postEvent.Attachments; let i = index" >
       <ion-list class="width-100 list"  *ngIf="!document.remove">
         <ion-item class="width-100">
         <ion-label class="width-100">
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 9e8ea4ffc..2106c2e83 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -66,18 +66,10 @@ export class EditEventPage implements OnInit {
   @Output() setIntervenientCC = new EventEmitter<any>();
   @Output() clearPostEvent = new EventEmitter<any>();
 
-  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
-  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
 
   showLoader = false
 
-  get dateStart () {
-    return this.dateControlStart.value
-  }
 
-  get dateEnd () {
-    return this.dateControlEnd.value
-  }
 
   @ViewChild('picker') picker: any;
   @ViewChild('fim') fim: any;
@@ -146,9 +138,7 @@ export class EditEventPage implements OnInit {
       }
     }
 
-    this.getAttachments(this.postEvent.EventId);
 
-    this.restoreDatepickerData();
     this.getRecurrenceTypes();
 
     this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
@@ -200,19 +190,13 @@ export class EditEventPage implements OnInit {
       Categories: new FormControl(this.postEvent.Category, [
         Validators.required
       ]),
-      dateStart: new FormControl(this.dateStart, [
-        Validators.required
-      ]),
-      dateEnd: new FormControl(this.dateEnd, [
-        Validators.required
-      ]),
       dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type, [
         Validators.required
       ]),
       participantes: new FormControl(this.taskParticipants, [
         // Validators.required
       ]),
-      Date: new FormControl( new Date(this.dateControlStart.value).toLocaleString('pt') < new Date(this.dateControlEnd.value).toLocaleString('pt')? 'ok': null,[
+      Date: new FormControl( new Date(this.postEvent.StartDate).toLocaleString('pt') < new Date(this.postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
         Validators.required
       ]),
 
@@ -262,7 +246,6 @@ export class EditEventPage implements OnInit {
       return false
     }
 
-    this.getDatepickerData()
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
     if(!this.postEvent.EventRecurrence.hasOwnProperty('Type')) {
@@ -358,24 +341,10 @@ export class EditEventPage implements OnInit {
   }
 
 
-  getDatepickerData() {
-    if (this.postEvent) {
-      this.postEvent.StartDate = this.dateStart
-      this.postEvent.EndDate = this.dateEnd
-    }
-  }
 
-  restoreDatepickerData() {
-    if (this.postEvent) {
-      this.dateControlStart = new FormControl(moment(this.postEvent.StartDate));
-      this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate));
-    }
-  }
 
   saveTemporaryData() {
 
-    this.getDatepickerData()
-
     window['temp.path:/home/agenda/edit-event.component.ts'] = {
       postEvent: this.postEvent,
       eventBody: this.eventBody,
@@ -392,8 +361,6 @@ export class EditEventPage implements OnInit {
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
 
-      this.restoreDatepickerData()
-
       return true;
     } else {
       return false;