anchor.diff:  <style type="text/css">
     #message_headers {
       width: 100%;
  -    padding: 10px 0;
  +    height: 90px;
  +    padding: 10px 0 0 0;
       margin: 0;
       background: #fff;
       font-size: 12px;
  
positive.code:       <dt>Attachments:</dt>
        <dd>
          <% @attachments.each do |filename, path| %>
            <div><a href="<%= path %>"><%= filename %></a></div>
          <% end %>
        </dd>
      <% end %>
  
negative.code:     padding: 10px;
      word-wrap: break-word;
    }
  <<<<<<< HEAD
  =======
  
    body {
      margin-top: 100px !important;
    }
  >>>>>>> Turns out there was a good reason for that
  </style>
  
  <div id="message_headers">
  