diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index bf176b50396..f4d9edfda05 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -110,7 +110,7 @@
         % endif
     </td>
     <td valign="center" align="right">
-        <img src="/logo.png" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${user.company_id.name}">
+        <img src="/logo.png" style="padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;" alt="${user.company_id.name}">
     </td>
 </tr>
 <tr>
@@ -118,16 +118,18 @@
         <hr width="100%"
             style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;">
         % if ctx.get('subtype') and ctx.get('subtype').internal:
-        <span style="background-color: #f2dede; padding: 5px;">
-            <strong>Internal note</strong>: replies are not sent to followers.
-        </span>
+        <p style="background-color: #f2dede; padding: 5px; margin-bottom: 16px;">
+            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.
+        </p>
         % endif
     </td>
 </tr>
 </tbody></table>
 </div>
 % endif
-${object.body | safe}
+<div>
+    ${object.body | safe}
+</div>
 % if ctx.get('tracking'):
     <ul>
     % for tracking in ctx['tracking']