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 a5a3175ed..91f5feff1 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -46,7 +46,6 @@ import android.widget.AbsListView
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.PopupMenu
-import android.widget.ScrollView
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResult
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 4d3639768..354541450 100644
--- a/app/src/main/res/layout/out_of_office_view.xml
+++ b/app/src/main/res/layout/out_of_office_view.xml
@@ -8,7 +8,9 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="150dp"
+    android:layout_height="wrap_content"
+    android:maxHeight="150dp"
+    android:padding="12dp"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/out_of_office_view"
     style="@style/ScrollViewStyle">
@@ -16,10 +18,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="8dp"
-        android:elevation="4dp"
-        app:cornerRadius="8dp">
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/userAbsenceShortMessage"