diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index c8449b1bb8..4acdf3d746 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -284,29 +284,37 @@ limitations under the License.
             z-index: 3; // above media and location share maps
         }
 
-        &.mx_EventTile_mediaLine .mx_MVoiceMessageBody {
-            // allow the event to be collapsed, this causes the waveform to get cropped
-            min-width: 0;
-        }
-
-        // we put the timestamps for media (other than stickers) atop the media
-        // for images we also apply a linear gradient and change the timestamp colour to aid readability
-        &.mx_EventTile_mediaLine.mx_EventTile_image {
-            .mx_MessageTimestamp {
-                color: #ffffff; // regardless of theme, always visible on the below gradient
+        &.mx_EventTile_mediaLine {
+            // TODO: Use a common class name instead
+            .mx_MFileBody,
+            .mx_MAudioBody {
+                max-width: 100%; // avoid overflow
             }
 
-            // linear gradient to make the timestamp more visible
-            .mx_MImageBody::before {
-                content: "";
-                position: absolute;
-                background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.2) 100%);
-                z-index: 1;
-                top: 0;
-                bottom: 0;
-                left: 0;
-                right: 0;
-                pointer-events: none;
+            .mx_MVoiceMessageBody {
+                // allow the event to be collapsed, this causes the waveform to get cropped
+                min-width: 0;
+            }
+
+            // we put the timestamps for media (other than stickers) atop the media
+            // for images we also apply a linear gradient and change the timestamp colour to aid readability
+            &.mx_EventTile_image {
+                .mx_MessageTimestamp {
+                    color: #ffffff; // regardless of theme, always visible on the below gradient
+                }
+
+                // linear gradient to make the timestamp more visible
+                .mx_MImageBody::before {
+                    content: "";
+                    position: absolute;
+                    background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.2) 100%);
+                    z-index: 1;
+                    top: 0;
+                    bottom: 0;
+                    left: 0;
+                    right: 0;
+                    pointer-events: none;
+                }
             }
         }
 
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 9b7cd06ced..e37868d252 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -903,10 +903,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
             .mx_EventTile_line.mx_EventTile_mediaLine {
                 padding: 0;
                 max-width: 100%;
-
-                .mx_MFileBody {
-                    width: 100%;
-                }
             }
 
             &[data-self=true] {