diff --git a/Whatsapp_Chat_Exporter/extract_exported.py b/Whatsapp_Chat_Exporter/extract_exported.py
index e099165..5c734e9 100644
--- a/Whatsapp_Chat_Exporter/extract_exported.py
+++ b/Whatsapp_Chat_Exporter/extract_exported.py
@@ -67,6 +67,10 @@ def messages(path, data, assume_first_as_me=False):
                             msg.meta = True
                     else:
                         msg.data = message
+                        if "\r\n" in message:
+                            msg.data = message.replace("\r\n", "<br>")
+                        if "\n" in message:
+                            msg.data = message.replace("\n", "<br>")
                 data["chat"].add_message(index, msg)
             else:
                 lookback = index - 1