diff --git a/addons/snailmail/static/src/js/snailmail_external_layout.js b/addons/snailmail/static/src/js/snailmail_external_layout.js
new file mode 100644
index 00000000000..be0ef5962c4
--- /dev/null
+++ b/addons/snailmail/static/src/js/snailmail_external_layout.js
@@ -0,0 +1,7 @@
+// Change address font-size if needed
+document.addEventListener('DOMContentLoaded', function (evt) {
+    var recipientAddress = document.getElementsByClassName('recipient_address')[0].getElementsByTagName('address')[0];
+    var height = parseFloat(window.getComputedStyle(recipientAddress, null).getPropertyValue('height'));
+    var fontSize = parseFloat(window.getComputedStyle(recipientAddress, null).getPropertyValue('font-size'));
+    recipientAddress.style.fontSize = (85/height) * fontSize + 'px';
+});
diff --git a/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss b/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss
index be7331a9b61..69424392f63 100644
--- a/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss
+++ b/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss
@@ -1,18 +1,34 @@
 /* Generic report layouts*/
 .header {
-    height: 200px;
+    max-height: 40mm;
+    overflow: hidden;
+}
+.container {
+    margin-top: 5mm;
+}
+.o_standard_footer, .o_clean_footer, .o_boxed_footer, .o_background_footer {
+    max-height: 90px !important;
+    overflow: hidden;
+    width: 95%;
+    div > div:first-child {
+        padding-left: 10mm;
+    }
 }
 .article>.page {
+    margin-top: -40px;
     > h1, > h2, > h3 {
         width: 50%;
     }
 }
-.article {
-    > .address.row {
-        padding-top: 95px;
-    }
-    > .page {
-        margin-top:-20px;
+.article > .address.row .recipient_address {
+    height: 65mm;
+    background-color: #ffffff;
+    padding-top: 23mm;
+    padding-left: 5mm;
+    padding-bottom: 5mm;
+    left: -20px !important;
+    address {
+        height: 28mm;
     }
 }
 
diff --git a/addons/snailmail/views/report_assets.xml b/addons/snailmail/views/report_assets.xml
index 9ede269e291..9b779fccf2e 100644
--- a/addons/snailmail/views/report_assets.xml
+++ b/addons/snailmail/views/report_assets.xml
@@ -3,6 +3,7 @@
     <template id="report_assets_snailmail">
         <t t-call="web._assets_helpers"/>
         <link rel="stylesheet" type="text/scss" href="/snailmail/static/src/scss/snailmail_external_layout_asset.scss"/>
+        <script type="text/javascript" src="/snailmail/static/src/js/snailmail_external_layout.js"/>
     </template>
     <template id="report_layout" inherit_id="web.report_layout">
         <xpath expr="//head" position="inside">
@@ -14,4 +15,9 @@
             <t t-if="env and env.context.get('snailmail_layout')" t-call-assets="snailmail.report_assets_snailmail"/>
         </xpath>
     </template>
+    <template id="address_layout" inherit_id="web.address_layout">
+        <xpath expr='//div[@name="address"]' position="before">
+            <t t-set="colclass" t-value="colclass + ' recipient_address'"/>
+        </xpath>
+    </template>
 </odoo>