diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 8ab097d09fa..b2926f804b8 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -45,6 +45,7 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.AbsListView
 import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.PopupMenu
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
@@ -1153,8 +1154,8 @@ class ChatActivity :
                         binding.outOfOfficeContainer.findViewById<TextView>(R.id.replacement_user_name).text =
                             uiState.userAbsence.replacementUserDisplayName
                     } else {
-                        binding.outOfOfficeContainer.findViewById<TextView>(R.id.absenceReplacement).visibility =
-                            View.GONE
+                        binding.outOfOfficeContainer.findViewById<LinearLayout>(R.id.userAbsenceReplacement)
+                            .visibility = View.GONE
                     }
                     binding.outOfOfficeContainer.findViewById<TextView>(R.id.userAbsenceLongMessage).text =
                         uiState.userAbsence.message
diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
index 328170b3487..0f64432ec17 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
@@ -7,6 +7,7 @@
  */
 package com.nextcloud.talk.chat.viewmodels
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import android.os.Bundle
@@ -54,6 +55,7 @@ import java.io.File
 import javax.inject.Inject
 
 @Suppress("TooManyFunctions", "LongParameterList")
+@SuppressLint("TooGenericExceptionCaught")
 class ChatViewModel @Inject constructor(
     // should be removed here. Use it via RetrofitChatNetwork
     private val chatNetworkDataSource: ChatNetworkDataSource,
diff --git a/app/src/main/res/layout/out_of_office_view.xml b/app/src/main/res/layout/out_of_office_view.xml
index 98c7a885f9f..ed208ee9fc0 100644
--- a/app/src/main/res/layout/out_of_office_view.xml
+++ b/app/src/main/res/layout/out_of_office_view.xml
@@ -5,12 +5,19 @@
   ~ SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
   ~ SPDX-License-Identifier: GPL-3.0-or-later
   -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="150dp"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/out_of_office_view">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent"
+    android:id="@+id/out_of_office_view"
+    app:layout_constraintHeight_min="0dp"
+    app:layout_constraintHeight_max="150dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -45,6 +52,7 @@
             tools:text="Dec 5, 2024 - Dec 15, 2024"/>
 
         <LinearLayout
+            android:id="@+id/userAbsenceReplacement"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -101,4 +109,5 @@
             tools:text="Hi, I am out of office this week. Please contact ....., ..........write very very very very very very very very very very very very very very very long message..................................................................................................................................if you have any issues."/>
     </LinearLayout>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file