diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
index df066c2f6..c9f30f91b 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
@@ -119,14 +119,11 @@ class ConversationInfoEditActivity : BaseActivity() {
 
         pickImage = PickImage(this, conversationUser)
 
+        val max = CapabilitiesUtil.conversationDescriptionLength(conversationUser.capabilities?.spreedCapability!!)
         binding.conversationDescription.filters = arrayOf(
-            InputFilter.LengthFilter(
-                CapabilitiesUtil.conversationDescriptionLength(
-                    conversationUser
-                        .capabilities?.spreedCapability!!
-                )
-            )
+            InputFilter.LengthFilter(max)
         )
+        binding.conversationDescriptionInputLayout.counterMaxLength = max
 
         initObservers()
     }
diff --git a/app/src/main/res/layout/activity_conversation_info_edit.xml b/app/src/main/res/layout/activity_conversation_info_edit.xml
index a1ca3bf93..914d30b6b 100644
--- a/app/src/main/res/layout/activity_conversation_info_edit.xml
+++ b/app/src/main/res/layout/activity_conversation_info_edit.xml
@@ -138,12 +138,14 @@
             app:boxStrokeColor="@color/colorPrimary"
             app:errorTextAppearance="@style/ErrorAppearance"
             app:hintTextColor="@color/colorPrimary"
+            app:counterEnabled="true"
             android:hint="@string/nc_conversation_description">
 
             <com.nextcloud.talk.utils.EmojiTextInputEditText
                 android:id="@+id/conversation_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:maxHeight="300dp"
                 android:imeOptions="actionNext"
                 android:inputType="text|textMultiLine"
                 android:singleLine="true"