hunk.code_window:                 }
                   values.setdefault('attachment_ids', list()).append(ir_attach_obj.create(cr, uid, data_attach, context=context))
           else:
               values = self.default_get(cr, uid, ['subject', 'body', 'email_from', 'reply_to', 'attachment_ids', 'mail_server_id'], context=context)
           if values.get('body_html'):
               values['body'] = values.pop('body_html')
           return {'value': values}
  
hunk.labels: keep keep keep replace keep keep keep keep keep
hunk.after_edit:             default_context = dict(context, default_composition_mode=composition_mode, default_model=model, default_res_id=res_id)
               default_values = self.default_get(cr, uid, ['composition_mode', 'model', 'res_id', 'subject', 'body', 'email_from', 'reply_to', 'attachment_ids', 'mail_server_id'], context=default_context)
               values = dict((key, default_values[key]) for key in ['subject', 'body', 'email_from', 'reply_to', 'attachment_ids', 'mail_server_id'] if key in default_values)
  
hunk.file_path: addons/email_template/wizard/mail_compose_message.py
hunk.type: replace
file: /*
  * bootstrap-sphinx.css
  * ~~~~~~~~~~~~~~~~~~~~
  *
  * Sphinx stylesheet -- Twitter Bootstrap theme.
  */
  
  .navbar-inverse .brand {
    color: #FFF;
  }
  
  .page-top {
    top: 0px;
  }
  
  {% if theme_bootstrap_version == "2" %}
  @media (min-width: 980px) {
  {% endif %}
    {% if theme_navbar_fixed_top == 'true' %}
    body {
    {% if theme_bootswatch_theme %}
      padding-top: 60px;
    {% else %}
      padding-top: 40px;
    {% endif %}
    }
    .page-top {
    {% if theme_bootswatch_theme %}
      top: 60px;
    {% else %}
      top: 40px;
    {% endif %}
    }
  {% if theme_bootstrap_version == "2" %}
  }
  {% endif %}
  
  .navbar-inner {
    padding-left:  12px !important;
    padding-right: 12px !important;
  }
  {% endif %}
  
  table {
    border: 0;
  }
  
  .highlighttable .code pre {
      font-size: 12px;
  }
  
  .highlighttable .linenos pre {
      word-break: normal;
      font-size: 12px;
  }
  
  div.highlight {
    background: none;
  }
  
  a.footnote-reference {
    vertical-align: super;
    font-size: 75%;
  }
  
  table.footnote td.label {
    font-size: 100%;
    display: block;
    line-height: normal;
    background: inherit;
  }
  
  table.footnote {
    width: auto;
    margin-bottom: 0px;
  }
  
  table.field-list {
    width: auto;
  }
  
  .footer {
    width: 100%;
    border-top: 1px solid #ccc;
    padding-top: 10px;
  }
  
  .bs-sidenav form, .bs-sidenav #sourcelink {
    padding: 5px 20px;
  }
  
  {% if theme_bootstrap_version == "3" %}
  
  /* The code below is based on the bootstrap website sidebar */
  
  .bs-sidenav.affix {
    position: static;
  }
  
  /* First level of nav */
  .bs-sidenav {
    margin-top: 30px;
    margin-bottom: 30px;
    padding-top:    10px;
    padding-bottom: 10px;
    text-shadow: 0 1px 0 #fff;
    background-color: #f7f5fa;
    border-radius: 5px;
  }
  
  /* All levels of nav */
  .bs-sidenav .nav > li > a {
    display: block;
    color: #716b7a;
    padding: 5px 20px;
  }
  .bs-sidenav .nav > li > a:hover,
  .bs-sidenav .nav > li > a:focus {
    text-decoration: none;
    background-color: #e5e3e9;
    border-right: 1px solid #dbd8e0;
  }
  .bs-sidenav .nav > .active > a,
  .bs-sidenav .nav > .active:hover > a,
  .bs-sidenav .nav > .active:focus > a {
    font-weight: bold;
    color: #563d7c;
    background-color: transparent;
    border-right: 1px solid #563d7c;
  }
  
  .bs-sidenav .nav .nav > li > a {
    padding-top:    3px;
    padding-bottom: 3px;
    padding-left: 30px;
    font-size: 90%;
  }
  
  .bs-sidenav .nav .nav .nav > li > a {
    padding-top:    3px;
    padding-bottom: 3px;
    padding-left: 40px;
    font-size: 90%;
  }
  
  .bs-sidenav .nav .nav .nav .nav > li > a {
    padding-top:    3px;
    padding-bottom: 3px;
    padding-left: 50px;
    font-size: 90%;
  }
  
  /* Show and affix the side nav when space allows it */
  @media screen and (min-width: 992px) {
    .bs-sidenav .nav > .active > ul {
      display: block;
    }
    /* Widen the fixed sidenav */
    .bs-sidenav.affix,
    .bs-sidenav.affix-bottom {
      width: 213px;
    }
    .bs-sidenav.affix {
      position: fixed; /* Undo the static from mobile first approach */
      top: 80px;
    }
    .bs-sidenav.affix-bottom {
      position: absolute; /* Undo the static from mobile first approach */
    }
    .bs-sidenav.affix-bottom .bs-sidenav,
    .bs-sidenav.affix .bs-sidenav {
      margin-top: 0;
      margin-bottom: 0;
    }
  }
  @media screen and (min-width: 1200px) {
    /* Widen the fixed sidenav again */
    .bs-sidenav.affix-bottom,
    .bs-sidenav.affix {
      width: 263px;
    }
  }
  
  
  {% else %}
  
  .bs-sidenav {
    width: 228px;
    margin: 30px 0 0;
    padding: 10px 0 0 5px;
  }
  
  .bs-sidenav ul{
    list-style-type: none;
    padding-left: 25px;
    margin-left: 0;  /* bootstrap 2 compatability. */
  }
  
  @media (min-width: 1200px) {
    .bs-sidenav {
        width: 258px;
    }
  }
  
  /* Desktop
  ------------------------- */
  @media (max-width: 980px) {
    .bs-sidenav {
      width: 218px;
      margin-top: 30px;
      margin-right: 0;
    }
  }
  
  /* Tablet to desktop
  ------------------------- */
  @media (min-width: 768px) and (max-width: 979px) {
    .bs-sidenav {
      width: 166px;
      margin-top: 20px;
    }
  }
  
  /* Tablet
  ------------------------- */
  @media (max-width: 767px) {
    .navbar-version {
      padding-left: 5px;
    }
    .bs-sidenav {
      width: auto;
      margin-bottom: 20px;
    }
    .bs-sidenav.affix {
      position: static;
      top: 0;
    }
  }
  {% endif %}
  