diff --git a/mail_tracking/views/mail_tracking_email_view.xml b/mail_tracking/views/mail_tracking_email_view.xml
index 6aad21d..bc1a37e 100644
--- a/mail_tracking/views/mail_tracking_email_view.xml
+++ b/mail_tracking/views/mail_tracking_email_view.xml
@@ -105,9 +105,9 @@
                     filter_domain="[('sender', 'ilike', self)]"
                 />
             <field
-                    name="recipient"
-                    string="Recipient"
-                    filter_domain="[('recipient', 'ilike', self)]"
+                    name="recipient_address"
+                    string="Recipient Address"
+                    filter_domain="[('recipient_address', '=', self)]"
                 />
             <field name="name" string="Subject" />
             <field name="time" string="Time" />
diff --git a/mail_tracking/views/res_partner_view.xml b/mail_tracking/views/res_partner_view.xml
index 4a4723c..db76fa5 100644
--- a/mail_tracking/views/res_partner_view.xml
+++ b/mail_tracking/views/res_partner_view.xml
@@ -12,8 +12,8 @@
         <div name="button_box" position="inside">
             <button
                     name="%(mail_tracking.action_view_mail_tracking_email)d"
-                    context="{'search_default_recipient': email,
-                              'default_recipient': email}"
+                    context="{'search_default_recipient_address': email,
+                              'default_recipient_address': email}"
                     type="action"
                     class="oe_stat_button"
                     icon="fa-envelope-o"