diff --git a/app/src/main/res/layout/fragment_main_item.xml b/app/src/main/res/layout/fragment_main_item.xml
index a494f03..3106688 100644
--- a/app/src/main/res/layout/fragment_main_item.xml
+++ b/app/src/main/res/layout/fragment_main_item.xml
@@ -22,7 +22,7 @@
             android:layout_marginStart="12dp" app:layout_constraintStart_toEndOf="@+id/main_item_image"
             app:layout_constraintVertical_bias="0.0" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary" android:layout_marginTop="10dp"
-            app:layout_constraintEnd_toStartOf="@+id/main_item_instant_image"/>
+            app:layout_constraintEnd_toStartOf="@id/main_item_notification_disabled_until_image"/>
     <TextView
             android:text="89 notifications, reconnecting ... This may wrap in the case of UnifiedPush"
             android:layout_width="0dp"
diff --git a/fastlane/metadata/android/en-US/changelog/27.txt b/fastlane/metadata/android/en-US/changelog/27.txt
index 2a3c944..477ab66 100644
--- a/fastlane/metadata/android/en-US/changelog/27.txt
+++ b/fastlane/metadata/android/en-US/changelog/27.txt
@@ -8,6 +8,7 @@ Bugs:
 * Fix app icon on old Android versions (#120, thanks to @shadow00 for reporting)
 * Fix races in UnifiedPush registration (#230, thanks to @Jakob for reporting)
 * Prevent view action from crashing the app (#233)
+* Prevent long topic names and icons from overlappng (#240, thanks to @cmeis)
 
 **Thanks for testing:**