diff --git a/src/store/index.js b/src/store/index.js
index a9fb2a773..d5f797196 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -16,6 +16,7 @@ import {base64regex, WelcomeMessage, Cryptos} from '../lib/constants'
 import Queue from 'promise-queue'
 import utils from '../lib/adamant'
 import i18n from '../i18n'
+import renderMarkdown from '../lib/markdown'
 
 var maxConcurrent = 1
 var maxQueue = Infinity
@@ -179,6 +180,8 @@ const store = {
       let internalPayload = Object.assign({}, payload)
       internalPayload.message = internalPayload.message.replace(/\n/g, '<br>')
       if (currentDialogs.last_message.timestamp < payload.timestamp || !currentDialogs.last_message.timestamp) {
+        internalPayload.message = renderMarkdown(internalPayload.message)
+        internalPayload.message = internalPayload.message.replace(/<p>|<\/p>/g, '')
         updateLastChatMessage(currentDialogs, internalPayload, 'sent', 'from', payload.id)
       }
       Vue.set(chats[partner].messages, payload.id, internalPayload)
diff --git a/src/views/Chats.vue b/src/views/Chats.vue
index f1f710c8e..cfe21ee87 100644
--- a/src/views/Chats.vue
+++ b/src/views/Chats.vue
@@ -278,4 +278,8 @@ export default {
       font-size: 8px;
     }
 
+    .md-list-item a {
+        color: black !important;
+    }
+
 </style>