diff --git a/app/build.gradle b/app/build.gradle
index c417442e..202f1f8d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 33
-        versionCode 479
-        versionName "3.18.1"
+        versionCode 480
+        versionName "3.18.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 50cd786f..7aaf714c 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.18.2",
+    "code": "480",
+    "note": "Changed:\n- First media layout will depend of its ratio\n\nFixed:\n- Impossible to add media with the chat view\n- Chat view limited in chars\n- Freezes / bad behaviors due to the new media presentation"
+  },
   {
     "version": "3.18.1",
     "code": "479",
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml b/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml
index 2146e32a..00dd98df 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml
@@ -90,9 +90,11 @@
             android:id="@+id/status_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
             android:layout_marginHorizontal="6dp"
             android:layout_marginTop="6dp"
-            tools:maxLines="10"
+            android:maxLines="5"
+            tools:maxLines="5"
             tools:text="@tools:sample/lorem/random" />
 
         <HorizontalScrollView
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/480.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/480.txt
new file mode 100644
index 00000000..fba299e1
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/480.txt
@@ -0,0 +1,7 @@
+Changed:
+- First media layout will depend of its ratio
+
+Fixed:
+- Impossible to add media with the chat view
+- Chat view limited in chars
+- Freezes / bad behaviors due to the new media presentation
\ No newline at end of file