diff --git a/src/components/Inbox/Message.tsx b/src/components/Inbox/Message.tsx
index 9fdbeb0c..1f1d3e91 100644
--- a/src/components/Inbox/Message.tsx
+++ b/src/components/Inbox/Message.tsx
@@ -19,7 +19,8 @@ type Props = {
 }
 
 const md = new MarkdownIt({
-  linkify: true
+  linkify: true,
+  breaks: true
 })
 
 const Message = (props: Props) => {
diff --git a/src/components/Views/Inbox.tsx b/src/components/Views/Inbox.tsx
index 79971a77..4f9bec5a 100644
--- a/src/components/Views/Inbox.tsx
+++ b/src/components/Views/Inbox.tsx
@@ -143,6 +143,7 @@ export const InboxView = () => {
   }
 
   const handleKeyDown = (event) => {
+    if (event.keyCode === 13 && event.shiftKey) return
     if (event.keyCode === 13 && !event.shiftKey && postMessageText().trim().length > 0) {
       event.preventDefault()
       handleSubmit()