diff --git a/app/talk/inbox-conversation.cjsx b/app/talk/inbox-conversation.cjsx
index 3fd19f7349..1695f3b5fc 100644
--- a/app/talk/inbox-conversation.cjsx
+++ b/app/talk/inbox-conversation.cjsx
@@ -37,7 +37,7 @@ Message = createReactClass
         <strong><Link to="/users/#{@state.commentOwner?.login}">{@state.commentOwner?.display_name}</Link> (@{@state.commentOwner?.login})</strong>{' '}
         <span>{timestamp(@props.data.updated_at)}</span>
       </span>
-      <Markdown>{@props.data.body}</Markdown>
+      <Markdown>{@props.data.body.trim()}</Markdown>
     </div>
 
 module.exports = createReactClass
diff --git a/css/inbox.styl b/css/inbox.styl
index 3f7b14e3a0..5d3352d58d 100644
--- a/css/inbox.styl
+++ b/css/inbox.styl
@@ -50,6 +50,9 @@
         font-style: italic
     p
       margin: 5px 0
+    .markdown
+      > pre
+        white-space: pre-wrap
 
 .new-message-form
   @extend .talk-module