diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings
index c1ecee1ab..d722a0c56 100644
--- a/Riot/Assets/de.lproj/Bwi.strings
+++ b/Riot/Assets/de.lproj/Bwi.strings
@@ -583,3 +583,6 @@
 
 // MARK: - Chat creation
 "room_creation_title" = "Neue Direktnachricht";
+
+// MARK: - Notice Room
+"notice_room_leave" = "%@ verließ den Raum";
diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings
index 400338f51..b50a9e55c 100644
--- a/Riot/Assets/en.lproj/Bwi.strings
+++ b/Riot/Assets/en.lproj/Bwi.strings
@@ -462,3 +462,6 @@
 
 // MARK: - Chat creation
 "room_creation_title" = "New chat";
+
+// MARK: - Notice Room
+"notice_room_leave" = "%@ left";
diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift
index ab989b97d..0cc920474 100644
--- a/Riot/Generated/BWIStrings.swift
+++ b/Riot/Generated/BWIStrings.swift
@@ -903,6 +903,10 @@ public class BWIL10n: NSObject {
   public static var next: String { 
     return BWIL10n.tr("Bwi", "next") 
   }
+  /// %@ verließ den Raum
+  public static func noticeRoomLeave(_ p1: String) -> String {
+    return BWIL10n.tr("Bwi", "notice_room_leave", p1)
+  }
   /// Dein Account %@ wurde erstellt.
   public static func onboardingCongratulationsMessage(_ p1: String) -> String {
     return BWIL10n.tr("Bwi", "onboarding_congratulations_message", p1)
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
index da231c119..cb5bf9c14 100644
--- a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -740,7 +740,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
                                 }
                                 else
                                 {
-                                    displayText = [VectorL10n noticeRoomLeave:targetDisplayName];
+                                    displayText = [BWIL10n noticeRoomLeave:targetDisplayName];
                                 }
                             }
                         }
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.h b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
index 8b3a49a5f..8f71a82e0 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.h
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
@@ -24,8 +24,8 @@ extern NSString *const URLPreviewDidUpdateNotification;
 typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
 {
     RoomBubbleCellDataTagMessage = 0, // Default value used for messages
-    RoomBubbleCellDataTagMembership,
-    RoomBubbleCellDataTagRoomCreateConfiguration,
+    RoomBubbleCellDataTagMembership = 1, // bwi: default value for the room membership changes (status messages)
+    RoomBubbleCellDataTagRoomCreateConfiguration = 2, // bwi: default value for the room configuration (status messages)
     RoomBubbleCellDataTagRoomCreateWithPredecessor,
     RoomBubbleCellDataTagKeyVerificationNoDisplay,
     RoomBubbleCellDataTagKeyVerificationRequestIncomingApproval,
diff --git a/Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.m b/Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.m
index d5d9f08ed..20a1fde2c 100644
--- a/Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.m
+++ b/Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.m
@@ -895,7 +895,8 @@ static BOOL _disableLongPressGestureOnEvent;
         id<RoomCellLayoutUpdating> cellLayoutUpdater = timelineConfiguration.currentStyle.cellLayoutUpdater;
         
         // Handle updated text view layout if needed
-        if (cellLayoutUpdater)
+        // bwi: don't use cellLayoutUpdater for status messages (bubbleData.tag / RoomBubbleCellDataTag == 1 and 2), fixes cell sizing problem (status messages getting cut off)
+        if (cellLayoutUpdater && bubbleData.tag != 2 && bubbleData.tag != 1)
         {
             maxTextViewWidth = [cellLayoutUpdater maximumTextViewWidthFor:cell cellData:cellData maximumCellWidth:maxWidth];
         }