diff --git a/wpc/static/scripts/chat.js b/wpc/static/scripts/chat.js
index 76dd114..de4422f 100644
--- a/wpc/static/scripts/chat.js
+++ b/wpc/static/scripts/chat.js
@@ -112,6 +112,9 @@
         });
         
         var format_message = function(message) {
+            message.text = message.text.replace(/(\*\*|__)(.*?)\1/g, "<b>$2</b>"); //Markdown bold
+            message.text = message.text.replace(/(\*|_)(.*?)\1/g, "<i>$2</i>"); //Markdown italic
+
             if (message.sender === myUsername) { 
                 return '<b style="color: orangered">' + message.sender + '</b>: ' + message.text;
             } else {