diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.html b/packages/rocketchat-message-attachments/client/messageAttachment.html
index 46b033f4a0f02..4378ce94b97fd 100644
--- a/packages/rocketchat-message-attachments/client/messageAttachment.html
+++ b/packages/rocketchat-message-attachments/client/messageAttachment.html
@@ -63,7 +63,7 @@
 
 			{{#if image_url}}
 				{{#unless mediaCollapsed}}
-					<div class="attachment-image">
+					<div class="attachment-image inline-image">
 					{{#if loadImage}}
 						<figure>
 							{{> lazyloadImage src=image_url preview=image_preview height=(getImageHeight image_dimensions.height) class="gallery-item" title=title description=description}}
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 362af719c35d0..6f0e0c49e5703 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3162,7 +3162,6 @@
 
 		& .inline-image {
 			display: inline-block;
-			overflow: hidden;
 
 			border-radius: 3px;
 			background-repeat: no-repeat;
@@ -3175,6 +3174,7 @@
 			& img {
 				max-width: 100%;
 				max-height: 200px;
+				object-fit: contain;
 
 				cursor: pointer;
 			}
@@ -3295,7 +3295,7 @@
 }
 
 .rc-old .attachment-description {
-	margin-top: 10px;
+	margin: 6px;
 
 	line-height: 1;
 }