diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index f728f63fa..f6afc0046 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -14,11 +14,11 @@
         <!-- Toolbar -->
         <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 
-        <div [class]="weeksToShow" > 
+        <div  class="weeksToShow"> 
           <!--  Calendar is here -->
 
           <div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="SessionStore.user.Profile =='PR'">
-            <div class="calendar-container"  [class]="calendarHeight">
+            <div class="calendar-container" class="calendarHeight" >
 
               <ion-row class="ion-justify-content-between calendar-tool-tip">
                 <ion-row class="ion-align-items-center first-row">
@@ -140,25 +140,28 @@
                 </thead>
               </table>
 
-              <calendar
-                class="calendar-component"
-                [eventSource]="listToPresent"
-                [calendarMode]="calendar.mode"
-                [currentDate]="calendar.currentDate"
-                (onEventSelected)="onEventSelected($event)"
-                (onTitleChanged)="onViewTitleChanged($event)"
-                (onRangeChanged)="onRangeChanged($event)"
-                (onCurrentDateChanged)="onCurrentChanged($event)"
-                queryMode="remote"
-                startHour="6"
-                endHour="20"
-                step="30"
-                startingDayMonth="1"
-                noEventsLabel="Sem Eventos"
-                allDayLabel="Todo o dia"
-                [monthviewDisplayEventTemplate]="template"
-              >
-              </calendar>
+              <div class="calendar-conteiner-height overflow-hidden" [style.height]="height">
+                <calendar
+                    class="calendar-component"
+                    [eventSource]="listToPresent"
+                    [calendarMode]="calendar.mode"
+                    [currentDate]="calendar.currentDate"
+                    (onEventSelected)="onEventSelected($event)"
+                    (onTitleChanged)="onViewTitleChanged($event)"
+                    (onRangeChanged)="onRangeChanged($event)"
+                    (onCurrentDateChanged)="onCurrentChanged($event)"
+                    queryMode="remote"
+                    startHour="6"
+                    endHour="20"
+                    step="30"
+                    startingDayMonth="1"
+                    noEventsLabel="Sem Eventos"
+                    allDayLabel="Todo o dia"
+                    [monthviewDisplayEventTemplate]="template"
+                  >
+                  </calendar>
+              </div>
+
 
               <!-- Adding a customized ng-template -->
               <ng-template #template let-view="view" let-row="row" let-col="col">
@@ -183,12 +186,12 @@
           <div class="calendar-title-container px-20 d-flex">
 
             <ion-row class="timeline-date align-center pr-10">
-              <button class="no-color"  *ngIf="showCalendar" (click)="calendarHeight=['height-75'];showCalendar=false">
+              <button class="no-color"  *ngIf="showCalendar" (click)="height='0px';showCalendar=false">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  class="collaps  font-25"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
               </button>
-              <button  class="no-color" *ngIf="!showCalendar" (click)="calendarHeight=['height-356'];showCalendar=true">
+              <button  class="no-color" *ngIf="!showCalendar" (click)="weekToShow();showCalendar=true">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps  font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 4d017eb84..3418faa07 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -242,7 +242,7 @@ label{
   color:  #e16817;
 }
 td.monthview-primary-with-event {
-  background-color: red !important;
+  background-color: white !important;
 }
 .header-title{
   font-family: Roboto;
@@ -1031,7 +1031,7 @@ $font-size: rem(15);
     }
     
     .height-356 {
-      height: 369px;
+      height: 360px;
     }
   }
 
@@ -1066,3 +1066,13 @@ $font-size: rem(15);
   
 }
 
+.calendar-conteiner-height {
+  height: 100%;
+  transition: 0.5s;
+  animation: 0.5s;
+  -webkit-transition: 0.5s;
+  -moz-transition: 0.5s;
+  -ms-transition: 0.5s;
+  -o-transition: 0.5s;
+  -webkit-animation: 0.5s;
+}
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 9903032c1..ad585f9f6 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -291,34 +291,37 @@ export class AgendaPage implements OnInit {
     }, 1000)
   }
 
-  weeksToShow = []
+  height = '75px'
 
   weekToShow() {
 
     setTimeout(() => {
-      let num = 0;
+      try {
+        let weekNum = 0;
 
-      function Week(a) {
-        for(let b of a.querySelectorAll('td')) {
-          if(!b.className.includes('text-muted')) {
-            num++;
-            return true
+        function Week(a) {
+          for(let b of a.querySelectorAll('td')) {
+            if(!b.className.includes('text-muted')) {
+              weekNum++;
+              return true
+            }
           }
         }
-      }
-  
-      for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
-        Week(a)
-      } 
-  
-      if(num <= 5) {
         
-        this.weeksToShow = ["week-5"]
-      } else {
-        
-        this.weeksToShow = ["week-6"]
-      }
+        const dayBoxHeight = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td').clientHeight
+        const weeks = document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr');
   
+        for (let week of weeks as any ){
+          Week(week)
+        } 
+    
+        this.showCalendar = true
+        this.height = (weekNum * dayBoxHeight) +'px'
+      } catch (e) {
+        setTimeout(()=> {
+          this.weekToShow()
+        }, 100)
+      }
     }, 250)
 
   }
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 6201dad59..4673ecb8d 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -72,8 +72,6 @@ export class ListBoxService {
 				endTime: event.end
 			})
 
-		
-			
 			const day = this.dateService.getDay(event.start) 
 			
 			event['manyDays'] = !this.dateService.isSameDate(event.start, event.end)
@@ -89,11 +87,10 @@ export class ListBoxService {
 			if (this.dateService.notSameDate(startDate, endDate)) {
 
 
-
-				if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
+				if (diffDays <= 150 ) {
 
 					if (diffDays >= 1) {
-						
+
 						const StartEvent =  this.transForm(event, {startMany: true, endMany: false,	middle: false})
 						
 						if(this.CanPush(event, selectedDate)) days[day].push(StartEvent)
@@ -138,7 +135,6 @@ export class ListBoxService {
 						if(this.CanPush(event, selectedDate)) days[day].push(event)
 					}
 				} else {
-
 					if(this.CanPush(event, selectedDate)) days[day].push(event)
 				}
 			} else {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index a1b6ab1e4..c9343aaff 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -698,4 +698,13 @@ export class MessageService {
     } catch (error) {}
 	}
 
+
+
+  UIdata() {
+    this.incomingFromCurrentUser = this.u.username!= SessionStore.user.UserName
+   this.hasMessage =  this.msg !=''
+  }
+
+  incomingFromCurrentUser = false
+  hasMessage = false
 }
diff --git a/src/global.scss b/src/global.scss
index b756dd52a..a3ff1b1a5 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -257,7 +257,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 } */
 
 .calendar-container{
-    height: 333px;
     z-index: 10;
     transition: 0.5s;
     overflow-y: hidden;
diff --git a/version/git-version.ts b/version/git-version.ts
index 285fbfff4..4687e666a 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "7280e5d49",
-  "SHA": "7280e5d494205bb9e123f16cfa3f67b32b1f09f0",
-  "branch": "developer-prod",
+  "shortSHA": "7302918ed",
+  "SHA": "7302918ed8848523427b6d8db025ee721bdae072",
+  "branch": "agenda",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Aug 23 17:19:22 2023 +0100'",
-  "lastCommitMessage": "Publication image adjust",
-  "lastCommitNumber": "5207",
-  "change": "diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html\nindex f728f63fa..f6afc0046 100644\n--- a/src/app/pages/agenda/agenda.page.html\n+++ b/src/app/pages/agenda/agenda.page.html\n@@ -14,11 +14,11 @@\n         <!-- Toolbar -->\n         <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\n \n-        <div [class]=\"weeksToShow\" > \n+        <div  class=\"weeksToShow\"> \n           <!--  Calendar is here -->\n \n           <div class=\"calendar-segment-{{profile}}\" [class.calendar-segment-pr-force]=\"SessionStore.user.Profile =='PR'\">\n-            <div class=\"calendar-container\"  [class]=\"calendarHeight\">\n+            <div class=\"calendar-container\" class=\"calendarHeight\" >\n \n               <ion-row class=\"ion-justify-content-between calendar-tool-tip\">\n                 <ion-row class=\"ion-align-items-center first-row\">\n@@ -140,25 +140,28 @@\n                 </thead>\n               </table>\n \n-              <calendar\n-                class=\"calendar-component\"\n-                [eventSource]=\"listToPresent\"\n-                [calendarMode]=\"calendar.mode\"\n-                [currentDate]=\"calendar.currentDate\"\n-                (onEventSelected)=\"onEventSelected($event)\"\n-                (onTitleChanged)=\"onViewTitleChanged($event)\"\n-                (onRangeChanged)=\"onRangeChanged($event)\"\n-                (onCurrentDateChanged)=\"onCurrentChanged($event)\"\n-                queryMode=\"remote\"\n-                startHour=\"6\"\n-                endHour=\"20\"\n-                step=\"30\"\n-                startingDayMonth=\"1\"\n-                noEventsLabel=\"Sem Eventos\"\n-                allDayLabel=\"Todo o dia\"\n-                [monthviewDisplayEventTemplate]=\"template\"\n-              >\n-              </calendar>\n+              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"height\">\n+                <calendar\n+                    class=\"calendar-component\"\n+                    [eventSource]=\"listToPresent\"\n+                    [calendarMode]=\"calendar.mode\"\n+                    [currentDate]=\"calendar.currentDate\"\n+                    (onEventSelected)=\"onEventSelected($event)\"\n+                    (onTitleChanged)=\"onViewTitleChanged($event)\"\n+                    (onRangeChanged)=\"onRangeChanged($event)\"\n+                    (onCurrentDateChanged)=\"onCurrentChanged($event)\"\n+                    queryMode=\"remote\"\n+                    startHour=\"6\"\n+                    endHour=\"20\"\n+                    step=\"30\"\n+                    startingDayMonth=\"1\"\n+                    noEventsLabel=\"Sem Eventos\"\n+                    allDayLabel=\"Todo o dia\"\n+                    [monthviewDisplayEventTemplate]=\"template\"\n+                  >\n+                  </calendar>\n+              </div>\n+\n \n               <!-- Adding a customized ng-template -->\n               <ng-template #template let-view=\"view\" let-row=\"row\" let-col=\"col\">\n@@ -183,12 +186,12 @@\n           <div class=\"calendar-title-container px-20 d-flex\">\n \n             <ion-row class=\"timeline-date align-center pr-10\">\n-              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"calendarHeight=['height-75'];showCalendar=false\">\n+              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"height='0px';showCalendar=false\">\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'default' \" class=\"collaps  font-25\" src=\"assets/images/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'gov' \" class=\"collaps  font-25\" src=\"assets/images/theme/gov/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  class=\"collaps  font-25\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg\"></ion-icon>\n               </button>\n-              <button  class=\"no-color\" *ngIf=\"!showCalendar\" (click)=\"calendarHeight=['height-356'];showCalendar=true\">\n+              <button  class=\"no-color\" *ngIf=\"!showCalendar\" (click)=\"weekToShow();showCalendar=true\">\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'default' \" class=\"collaps  font-25\" src=\"assets/images/icons-collaps-down.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'gov' \" class=\"collaps  font-25\" src=\"assets/images/theme/gov/icons-collaps-down.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \" class=\"collaps  font-25\" src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg\" ></ion-icon>\ndiff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss\nindex 4d017eb84..3418faa07 100644\n--- a/src/app/pages/agenda/agenda.page.scss\n+++ b/src/app/pages/agenda/agenda.page.scss\n@@ -242,7 +242,7 @@ label{\n   color:  #e16817;\n }\n td.monthview-primary-with-event {\n-  background-color: red !important;\n+  background-color: white !important;\n }\n .header-title{\n   font-family: Roboto;\n@@ -1031,7 +1031,7 @@ $font-size: rem(15);\n     }\n     \n     .height-356 {\n-      height: 369px;\n+      height: 360px;\n     }\n   }\n \n@@ -1066,3 +1066,13 @@ $font-size: rem(15);\n   \n }\n \n+.calendar-conteiner-height {\n+  height: 100%;\n+  transition: 0.5s;\n+  animation: 0.5s;\n+  -webkit-transition: 0.5s;\n+  -moz-transition: 0.5s;\n+  -ms-transition: 0.5s;\n+  -o-transition: 0.5s;\n+  -webkit-animation: 0.5s;\n+}\n\\ No newline at end of file\ndiff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts\nindex 9903032c1..ad585f9f6 100644\n--- a/src/app/pages/agenda/agenda.page.ts\n+++ b/src/app/pages/agenda/agenda.page.ts\n@@ -291,34 +291,37 @@ export class AgendaPage implements OnInit {\n     }, 1000)\n   }\n \n-  weeksToShow = []\n+  height = '75px'\n \n   weekToShow() {\n \n     setTimeout(() => {\n-      let num = 0;\n-\n-      function Week(a) {\n-        for(let b of a.querySelectorAll('td')) {\n-          if(!b.className.includes('text-muted')) {\n-            num++;\n-            return true\n+      try {\n+        let weekNum = 0;\n+\n+        function Week(a) {\n+          for(let b of a.querySelectorAll('td')) {\n+            if(!b.className.includes('text-muted')) {\n+              weekNum++;\n+              return true\n+            }\n           }\n         }\n-      }\n-  \n-      for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){\n-        Week(a)\n-      } \n-  \n-      if(num <= 5) {\n         \n-        this.weeksToShow = [\"week-5\"]\n-      } else {\n-        \n-        this.weeksToShow = [\"week-6\"]\n-      }\n+        const dayBoxHeight = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td').clientHeight\n+        const weeks = document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr');\n   \n+        for (let week of weeks as any ){\n+          Week(week)\n+        } \n+    \n+        this.showCalendar = true\n+        this.height = (weekNum * dayBoxHeight) +'px'\n+      } catch (e) {\n+        setTimeout(()=> {\n+          this.weekToShow()\n+        }, 100)\n+      }\n     }, 250)\n \n   }\ndiff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts\nindex 6201dad59..4673ecb8d 100644\n--- a/src/app/services/agenda/list-box.service.ts\n+++ b/src/app/services/agenda/list-box.service.ts\n@@ -72,8 +72,6 @@ export class ListBoxService {\n \t\t\t\tendTime: event.end\n \t\t\t})\n \n-\t\t\n-\t\t\t\n \t\t\tconst day = this.dateService.getDay(event.start) \n \t\t\t\n \t\t\tevent['manyDays'] = !this.dateService.isSameDate(event.start, event.end)\n@@ -89,11 +87,10 @@ export class ListBoxService {\n \t\t\tif (this.dateService.notSameDate(startDate, endDate)) {\n \n \n-\n-\t\t\t\tif (diffDays <= 150 && !event.event.IsAllDayEvent ) {\n+\t\t\t\tif (diffDays <= 150 ) {\n \n \t\t\t\t\tif (diffDays >= 1) {\n-\t\t\t\t\t\t\n+\n \t\t\t\t\t\tconst StartEvent =  this.transForm(event, {startMany: true, endMany: false,\tmiddle: false})\n \t\t\t\t\t\t\n \t\t\t\t\t\tif(this.CanPush(event, selectedDate)) days[day].push(StartEvent)\n@@ -138,7 +135,6 @@ export class ListBoxService {\n \t\t\t\t\t\tif(this.CanPush(event, selectedDate)) days[day].push(event)\n \t\t\t\t\t}\n \t\t\t\t} else {\n-\n \t\t\t\t\tif(this.CanPush(event, selectedDate)) days[day].push(event)\n \t\t\t\t}\n \t\t\t} else {\ndiff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts\nindex a1b6ab1e4..c9343aaff 100644\n--- a/src/app/services/chat/message.service.ts\n+++ b/src/app/services/chat/message.service.ts\n@@ -698,4 +698,13 @@ export class MessageService {\n     } catch (error) {}\n \t}\n \n+\n+\n+  UIdata() {\n+    this.incomingFromCurrentUser = this.u.username!= SessionStore.user.UserName\n+   this.hasMessage =  this.msg !=''\n+  }\n+\n+  incomingFromCurrentUser = false\n+  hasMessage = false\n }\ndiff --git a/src/global.scss b/src/global.scss\nindex b756dd52a..a3ff1b1a5 100644\n--- a/src/global.scss\n+++ b/src/global.scss\n@@ -257,7 +257,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-\n } */\n \n .calendar-container{\n-    height: 333px;\n     z-index: 10;\n     transition: 0.5s;\n     overflow-y: hidden;",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified:   src/app/pages/publications/publications.page.html\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified:   src/app/pipes/publication.pipe.ts\n\tmodified:   src/app/shared/header/header.page.html\n\tmodified:   src/app/shared/header/header.page.scss\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified:   src/app/store/publication-folder.service.ts\n\tnew file:   src/assets/images/camera.png\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   src/app/services/chat/message.service.ts\n\tmodified:   src/global.scss",
+  "lastCommitTime": "'Thu Aug 24 22:15:56 2023 +0100'",
+  "lastCommitMessage": "merg",
+  "lastCommitNumber": "5208",
+  "change": "",
+  "changeStatus": "On branch agenda\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   src/app/services/chat/message.service.ts\n\tmodified:   src/global.scss",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file