diff --git a/src/pages/chat.js b/src/pages/chat.js
index f7350e5..87036a3 100644
--- a/src/pages/chat.js
+++ b/src/pages/chat.js
@@ -517,6 +517,7 @@ export default class Chat extends React.Component {
         {this.renderLoadMore()}
         {selectedMsgs.reduce((acc, currMessage, i) => {
           const { date, sender, unread } = currMessage
+          const msgStyle = sender === user ? styles.ownMsg : styles.partnerMsg
           const timeString = new Date(date).toLocaleString()
           if (prevMsg && prevMsg.unread === 0 && unread === 1) {
             if (sender === selectedUser) {
@@ -530,7 +531,7 @@ export default class Chat extends React.Component {
               key={i}
               title={timeString}
               className={`${styles.messageContainer} ${
-                sender === user ? styles.ownMsg : styles.partnerMsg
+                currMessage.type !== 'img' ? msgStyle : ''
               }`}
             >
               {this.renderMsg(currMessage, i)}
diff --git a/src/pages/chat.module.css b/src/pages/chat.module.css
index e071f81..b67caf3 100644
--- a/src/pages/chat.module.css
+++ b/src/pages/chat.module.css
@@ -135,7 +135,7 @@
 }
 
 .messageContainer img {
-  max-width: 100%;
+  max-width: 150px;
   width: 100%;
   height: auto;
   border-radius: 5px;