diff --git a/Classes/Swift/Chat/Views/MultilineMessageCell.swift b/Classes/Swift/Chat/Views/MultilineMessageCell.swift
index 986976011..09b456e8d 100644
--- a/Classes/Swift/Chat/Views/MultilineMessageCell.swift
+++ b/Classes/Swift/Chat/Views/MultilineMessageCell.swift
@@ -399,6 +399,8 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource,
 			imageViewBubble.trailingAnchor.constraint(equalTo: contentMediaViewBubble.trailingAnchor, constant: labelInset.right),
 		]
 		
+		imageViewBubble.contentMode = .scaleAspectFit
+		
 		imageViewBubble.addSubview(circularProgressBarImageView)
 		progressBarImageConstraints = [
 			circularProgressBarImageView.centerXAnchor.constraint(equalTo: imageViewBubble.centerXAnchor),
@@ -422,6 +424,9 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource,
 			imageVideoViewBubble.leadingAnchor.constraint(equalTo: contentMediaViewBubble.leadingAnchor, constant: labelInset.left),
 			imageVideoViewBubble.trailingAnchor.constraint(equalTo: contentMediaViewBubble.trailingAnchor, constant: labelInset.right)
 		]
+		
+		imageVideoViewBubble.contentMode = .scaleAspectFit
+		
 		if #available(iOS 13.0, *) {
 			imagePlayViewBubble.image = (UIImage(named: "vr_play")!.withTintColor(.white))
 		}