Rely on action of assigning email to automatically match message fixes #6675