[PATCH] Upstream patch - 06062022

addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js

@@ -7,6 +7,7 @@ const useUpdate = require('mail/static/src/component_hooks/use_update/use_update
 
 const { FormViewDialog } = require('web.view_dialogs');
 const { ComponentAdapter } = require('web.OwlCompatibility');
+const session = require('web.session');
 
 const { Component } = owl;
 const { useRef } = owl.hooks;
@@ -124,11 +125,13 @@ class ComposerSuggestedRecipient extends Component {
             // recipient that does not have a partner, the partner creation form
             // should be opened.
             if (isChecked && this._dialogRef && !this._isDialogOpen) {
+                const widget = this._dialogRef.comp.widget;
                 this._isDialogOpen = true;
-                this._dialogRef.comp.widget.on('closed', this, () => {
+                widget.on('closed', this, () => {
                     this._isDialogOpen = false;
                 });
-                this._dialogRef.comp.widget.open();
+                widget.context = Object.assign({}, widget.context, session.user_context)
+                widget.open();
             }
         }
     }

addons/mail/static/src/widgets/discuss/discuss.js

@@ -147,6 +147,7 @@ const DiscussWidget = AbstractAction.extend({
             'o-update-control-panel',
             this._updateControlPanelEventListener
         );
+        this._lastPushStateActiveThread = null;
     },
 
     //--------------------------------------------------------------------------

addons/mail/wizard/mail_compose_message.py

@@ -423,6 +423,7 @@ class MailComposer(models.TransientModel):
                 'body_html': record.body or False,
                 'model_id': model.id or False,
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])],
+                'use_default_to': True,
             }
             template = self.env['mail.template'].create(values)
             # generate the saved template