diff --git a/assets/scripts/app/helpers/helpers.coffee b/assets/scripts/app/helpers/helpers.coffee
index 209f333f..42aa27b7 100644
--- a/assets/scripts/app/helpers/helpers.coffee
+++ b/assets/scripts/app/helpers/helpers.coffee
@@ -40,7 +40,9 @@ require 'config/emoij'
     message = @_emojize(@_escape(message))
     if !!options.repo
       message = @githubify(message, options.repo.get('owner'), options.repo.get('name'))
-    message.replace /\n/g, '<br/>'
+    if !!options.pre
+      message = message.replace /\n/g, '<br/>'
+    message
 
   pathFrom: (url) ->
     (url || '').split('/').pop()
diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee
index bea75130..545e071f 100644
--- a/assets/scripts/app/models/commit.coffee
+++ b/assets/scripts/app/models/commit.coffee
@@ -10,5 +10,16 @@ require 'travis/model'
   authorEmail:       Ember.attr('string')
   committerName:     Ember.attr('string')
   committerEmail:    Ember.attr('string')
+  subject:           Ember.attr('string')
+  body:              Ember.attr('string')
 
   build: Ember.belongsTo('Travis.Build')
+
+  subject: ( ->
+    @get('message').split("\n", 1)[0]
+  ).property('message')
+
+  body: ( ->
+    message = @get('message')
+    message.substr(message.indexOf("\n") + 1).trim()
+  ).property('message')
diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index 075dea5a..325cfef2 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -46,7 +46,10 @@
 
 
     <dt>Message</dt>
-    <dd class="message">{{formatMessage build.commit.message repoBinding=build.repo}}</dd>
+    <dd class="message">
+      {{formatMessage build.commit.subject repoBinding=build.repo}}
+      <pre class="body">{{formatMessage build.commit.body repoBinding=build.repo pre=true}}</pre>
+    </dd>
   </dl>
 
   {{#unless build.isMatrix}}
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs
index 6b0ae420..0a2ad988 100644
--- a/assets/scripts/app/templates/jobs/show.hbs
+++ b/assets/scripts/app/templates/jobs/show.hbs
@@ -43,7 +43,10 @@
         </div>
       {{/with}}
       <dt>Message</dt>
-      <dd class="message">{{formatMessage job.commit.message repoBinding=job.repo}}</dd>
+      <dd class="message">
+        {{formatMessage job.commit.subject repoBinding=job.repo}}
+        <pre>{{formatMessage job.commit.body repoBinding=job.repo pre=true}}</pre>
+      </dd>
     </dl>
 
     {{view Travis.AnnotationsView annotationsBinding="view.annotations"}}
diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass
index 3066e184..4de82e5f 100644
--- a/assets/styles/main/summary.sass
+++ b/assets/styles/main/summary.sass
@@ -29,5 +29,13 @@
     white-space: nowrap
 
   .message
-    white-space: pre-wrap
+    white-space: normal
     min-width: 0
+  
+    pre
+      font-size: 12px
+      display: inline-block
+      width: 100%
+      line-height: 20px
+      margin-bottom: 0
+      font-family: Monaco, 'Liberation Mono', Courier, monospace