diff --git a/mail_attach_existing_attachment_account/README.rst b/mail_attach_existing_attachment_account/README.rst
index 8b839e3f7..f50521126 100644
--- a/mail_attach_existing_attachment_account/README.rst
+++ b/mail_attach_existing_attachment_account/README.rst
@@ -36,6 +36,10 @@ This Module adds the mail_attach_existing_attachment feature to the
 account module, since there is a change in odoo 12.0, which adds a new
 mail wizard form to the account module
 
+The invoice's attachments are offered through the same foldable,
+multi-column picker the mail composer uses, so a long-lived invoice does
+not bury the wizard's own buttons under a column of checkboxes.
+
 **Table of contents**
 
 .. contents::
@@ -78,6 +82,10 @@ Contributors
   - Ernesto Tejeda
   - Carlos Lopez
 
+- `PureKarting <https://www.purekarting.com>`__:
+
+  - Cliff Kujala
+
 Maintainers
 -----------
 
diff --git a/mail_attach_existing_attachment_account/__manifest__.py b/mail_attach_existing_attachment_account/__manifest__.py
index ddfda43a4..14e7e2a96 100644
--- a/mail_attach_existing_attachment_account/__manifest__.py
+++ b/mail_attach_existing_attachment_account/__manifest__.py
@@ -7,7 +7,7 @@
     "author": "Thore Baden, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/mail",
     "category": "Social Network",
-    "version": "19.0.1.0.0",
+    "version": "19.0.2.0.0",
     "license": "AGPL-3",
     "maintainers": ["chienandalu", "rafaelbn"],
     "depends": ["account", "mail_attach_existing_attachment"],
diff --git a/mail_attach_existing_attachment_account/readme/CONTRIBUTORS.md b/mail_attach_existing_attachment_account/readme/CONTRIBUTORS.md
index 75dd8847c..444348b5f 100644
--- a/mail_attach_existing_attachment_account/readme/CONTRIBUTORS.md
+++ b/mail_attach_existing_attachment_account/readme/CONTRIBUTORS.md
@@ -3,3 +3,5 @@
   - Víctor Martínez
   - Ernesto Tejeda
   - Carlos Lopez
+- [PureKarting](https://www.purekarting.com):
+  - Cliff Kujala
diff --git a/mail_attach_existing_attachment_account/readme/DESCRIPTION.md b/mail_attach_existing_attachment_account/readme/DESCRIPTION.md
index 6fb430e40..0a30ff062 100644
--- a/mail_attach_existing_attachment_account/readme/DESCRIPTION.md
+++ b/mail_attach_existing_attachment_account/readme/DESCRIPTION.md
@@ -1,3 +1,7 @@
 This Module adds the mail_attach_existing_attachment feature to the
 account module, since there is a change in odoo 12.0, which adds a new
 mail wizard form to the account module
+
+The invoice's attachments are offered through the same foldable,
+multi-column picker the mail composer uses, so a long-lived invoice does
+not bury the wizard's own buttons under a column of checkboxes.
diff --git a/mail_attach_existing_attachment_account/static/description/index.html b/mail_attach_existing_attachment_account/static/description/index.html
index 5268fd3db..1b5b23236 100644
--- a/mail_attach_existing_attachment_account/static/description/index.html
+++ b/mail_attach_existing_attachment_account/static/description/index.html
@@ -378,6 +378,9 @@ <h1>Mail Attach Existing Attachment (Account)</h1>
 <p>This Module adds the mail_attach_existing_attachment feature to the
 account module, since there is a change in odoo 12.0, which adds a new
 mail wizard form to the account module</p>
+<p>The invoice’s attachments are offered through the same foldable,
+multi-column picker the mail composer uses, so a long-lived invoice does
+not bury the wizard’s own buttons under a column of checkboxes.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -427,6 +430,10 @@ <h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <li>Carlos Lopez</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://www.purekarting.com">PureKarting</a>:<ul>
+<li>Cliff Kujala</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/mail_attach_existing_attachment_account/wizard/account_move_send_wizard_view.xml b/mail_attach_existing_attachment_account/wizard/account_move_send_wizard_view.xml
index 203117a77..bdaaf19a5 100644
--- a/mail_attach_existing_attachment_account/wizard/account_move_send_wizard_view.xml
+++ b/mail_attach_existing_attachment_account/wizard/account_move_send_wizard_view.xml
@@ -12,7 +12,7 @@
             <xpath expr="//field[@name='mail_attachments_widget']" position="after">
                 <field
                     name="object_attachment_ids"
-                    widget="many2many_checkboxes"
+                    widget="attachment_checkbox_grid"
                     domain="[('res_model', '=', 'account.move'), ('res_id', '=', move_id)]"
                     invisible="not can_attach_attachment"
                     context="{'skip_res_field_check': True}"