From 08ad7cc7d6f6e2a89385b8caaf524f17b23f5ef9 Mon Sep 17 00:00:00 2001
From: Shane Ferrell <Shanefe@live.com>
Date: Fri, 16 Aug 2024 10:20:32 -0700
Subject: [PATCH 1/2] search for Delete MB and Map Skype MMS

---
 Calendar/CalLogHelpers/Invoke-GetMailbox.ps1        | 8 +++++---
 Calendar/CalLogHelpers/ShortClientNameFunctions.ps1 | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1 b/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
index ea894111bd..ce15b46934 100644
--- a/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
+++ b/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
@@ -21,14 +21,16 @@ function GetMailbox {
         [bool]$UseGetMailbox
     )
 
+    $params = @{Identity       = $Identity
+        ErrorAction            = "SilentlyContinue"
+    }
+
     if ($UseGetMailbox) {
         $Cmdlet = "Get-Mailbox"
+        $params.Add("IncludeInactiveMailbox", $true)
     } else {
         $Cmdlet = "Get-Recipient"
     }
-    $params = @{Identity = $Identity
-        ErrorAction      = "SilentlyContinue"
-    }
 
     try {
         Write-Verbose "Searching $Cmdlet $(if (-not ([string]::IsNullOrEmpty($Organization))) {"with Org: $Organization"}) for $Identity."
diff --git a/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1 b/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1
index 2fa1082da1..9148542442 100644
--- a/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1
+++ b/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1
@@ -111,6 +111,8 @@ function CreateShortClientName {
             $ShortClientName = "Outlook-ModernCalendarSharing"
         } elseif ($LogClientInfoString -like "*SkypeSpaces*") {
             $ShortClientName = "Teams"
+        } elseif ($LogClientInfoString -like "*AppId=82f45fb0-18b4-4d68-8bed-9e44909e3890*") {
+            $ShortClientName = "Teams MMS Service"
         } elseif ($LogClientInfoString -like "*AppId=7b7fdad6-df9d-4cd5-a4f2-b5f749350419*") {
             $ShortClientName = "Bookings B2 Service"
         } elseif ($LogClientInfoString -like "*bcad1a65-78eb-4725-9bce-ce1a8ed30b95*" -or

From 4a644be905f76191d44a2c43e9405b7a3c54628b Mon Sep 17 00:00:00 2001
From: Shane Ferrell <Shanefe@live.com>
Date: Fri, 16 Aug 2024 10:54:08 -0700
Subject: [PATCH 2/2] Fix spacing

---
 Calendar/CalLogHelpers/Invoke-GetMailbox.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1 b/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
index ce15b46934..92795adf59 100644
--- a/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
+++ b/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
@@ -21,8 +21,8 @@ function GetMailbox {
         [bool]$UseGetMailbox
     )
 
-    $params = @{Identity       = $Identity
-        ErrorAction            = "SilentlyContinue"
+    $params = @{Identity = $Identity
+        ErrorAction      = "SilentlyContinue"
     }
 
     if ($UseGetMailbox) {